aligned servers and services to SlapOS

data/about.json

+{
+  "generate": "gadget",
+  "type": "pageIndex",
+  "property_dict": {},
+  "children": [
+    {
+      "generate": "widget",
+      "type": "page",
+      "title": "About",
+      "title_i18n": "global_dict.about",
+      "theme": "slapos-white",
+      "view_dict": {
+        "default": []
+      }
+    }
+  ]
+}

data/computer_fieldlist.json

@@ -626,10 +626,10 @@
     "type": "StringField",
     "widget": {
       "id": "translated_validation_state_title",
-      "title": "Status",
-      "title_i18n": "portal_type_dict.computer_dict.field_dict.status.title",
-      "description": "The current status of this computer.",
-      "description_i18n": "portal_type_dict.computer_dict.field_dict.status.description",
+      "title": "State",
+      "title_i18n": "portal_type_dict.computer_dict.field_dict.state.title",
+      "description": "The current state of this computer.",
+      "description_i18n": "portal_type_dict.computer_dict.field_dict.state.description",
       "alternate_name": "translated_validation_state_title",
       "default_value": null,
       "css_class": null,

data/computer_overview.json

@@ -20,20 +20,6 @@
       "slot": 1,
       "text": "Created Servers",
       "text_i18n": "portal_type_dict.computer_dict.text_dict.created_servers"
-    },
-    "pagination": {
-      "slot": 2,
-      "option_list": [
-        {"value": "8", "text": "8", "text_i18n":"portal_type_dict.computer_dict.text_dict.8"},
-        {"value": "16", "text": "16", "text_i18n":"portal_type_dict.computer_dict.text_dict.16"},
-        {"value": "32", "text": "32", "text_i18n":"portal_type_dict.computer_dict.text_dict.32"},
-        {"value": "64", "text": "64", "text_i18n":"portal_type_dict.computer_dict.text_dict.64"}
-      ]
-    },
-    "search": {
-      "text": "Search available servers",
-      "text_i18n": "portal_type_dict.computer_dict.text_dict.search",
-      "info_list": ["records", "filter", "sorted"]
     }
   },
   "scheme": [
@@ -57,14 +43,6 @@
     }
   ],
   "children": [{
-    "type": "a",
-    "direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#servers/new"},
-    "attributes": {
-      "data-i18n": "portal_type_dict.computer_dict.text_dict.add",
-      "data-icon": "edit"
-    },
-    "logic": {"text":"Add server"}
-  }, {
     "generate": "widget",
     "type": "table",
     "class_list": "table-stroke ui-responsive",
@@ -76,6 +54,14 @@
       "bottom_grid": 1
     },
     "children": []
+  }, {
+    "type": "a",
+    "direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#servers/new"},
+    "attributes": {
+      "data-i18n": "portal_type_dict.computer_dict.text_dict.add",
+      "data-icon": "edit"
+    },
+    "logic": {"text":"New Server"}
   }]
 }
 

data/computer_status.json

@@ -41,8 +41,7 @@
           {"type": "a", "direct": {"href": "#servers/__id__/scope", "className": "ui-btn-slapos-black"}, "attributes": {"data-i18n":"portal_type_dict.computer_dict.text_dict.scope", "data-icon":"globe"}, "logic": {"text":"Set Server Scope"}},
           {"type": "a", "direct": {"href": "#servers/__id__/config", "className": "ui-btn-slapos-black"}, "attributes": {"data-i18n":"portal_type_dict.computer_dict.text_dict.config", "data-icon":"cogs"}, "logic": {"text":"Set Configuration"}},
           {"type": "a", "direct": {"href": "#servers/__id__/ssl_on", "className": "ui-btn-slapos-black"}, "attributes": {"data-i18n":"portal_type_dict.computer_dict.text_dict.ssl_on", "data-icon":"lock"}, "logic": {"text":"Request SSL"}},
-          {"type": "a", "direct": {"href": "#", "className": "action ui-btn-slapos-black"}, "attributes": {"data-i18n":"portal_type_dict.computer_dict.text_dict.ssl_off", "data-icon":"unlock", "data-action":"revoke_ssl"}, "logic": {"text":"Revoke SSL"}},
-          {"type": "a", "direct": {"href": "#", "className": "action translate error status ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-trash" }, "attributes": {"data-i18n":"portal_type_dict.computer_dict.text_dict.delete", "data-action": "destroy"}, "logic": {"text":"Delete"}}
+          {"type": "a", "direct": {"href": "#", "className": "action ui-btn-slapos-black"}, "attributes": {"data-i18n":"portal_type_dict.computer_dict.text_dict.ssl_off", "data-icon":"unlock", "data-action":"revoke_ssl"}, "logic": {"text":"Revoke SSL"}}
         ]
       }]
     }

data/global.json

@@ -42,29 +42,12 @@
         {"type": "item", "href": "#dashboard", "left": {"icon": "home"}, "center": {"text": [{"type": "h1", "text": "Home", "text_i18n": "global_dict.home"}, {"type": "p", "text": "Your Dashboard", "text_i18n": "global_dict.dashboard"}]}},
         {"type": "item", "href": "#person", "left": {"icon":"user"}, "center": {"text": [{"type": "h1", "text": "My Account", "text_i18n": "global_dict.person"}, {"type": "p", "text": "Administration of your personal info", "text_i18n": "global_dict.person_subtitle"}]}},
         {"type": "item", "href": "#invoices", "left": {"icon":"file-text-alt"}, "center": {"text": [{"type":"h1", "text": "My Invoices", "text_i18n": "global_dict.invoices"}, {"type": "p", "text": "Administration of your invoices", "text_i18n":"global_dict.invoices_subtitle"}]}},
-        {"type": "item", "href": "#servers", "left": {"icon":"hdd"}, "center": {"text": [{"type":"h1", "text": "Servers", "text_i18n": "global_dict.servers"}, {"type":"p", "text": "Server instances being used", "text_i18n": "global_dict.servers_subtitle"}]}},
-        {"type": "item", "href": "#services", "left": {"icon":"cogs"}, "center": {"text": [{"type": "h1","text": "Services", "text_i18n":"global_dict.services"},{"type": "p", "text": "Administration of Installed Software", "text_i18n":"global_dict.services_subtitle"}]}},
+        {"type": "item", "href": "#servers", "left": {"icon":"hdd"}, "center": {"text": [{"type":"h1", "text": "My Servers", "text_i18n": "global_dict.servers"}, {"type":"p", "text": "Administration of your Servers", "text_i18n": "global_dict.servers_subtitle"}]}},
+        {"type": "item", "href": "#services", "left": {"icon":"cogs"}, "center": {"text": [{"type": "h1","text": "My Services", "text_i18n":"global_dict.services"},{"type": "p", "text": "Administration of your Services", "text_i18n":"global_dict.services_subtitle"}]}},
         {"type": "item", "href": "#networks", "left": {"icon":"sitemap"}, "center": {"text":[{"type": "h1", "text": "My Networks", "text_i18n": "global_dict.networks"},{"type": "p", "text":"Administration of your networks", "text_i18n":"global_dict.networks_subtitle"}]}},
         {"type": "item", "href": "#monitoring", "left": {"icon":"bar-chart"}, "center": {"text":[{"type":"h1", "text": "Monitoring", "text_i18n":"global_dict.monitoring"},{"type":"p", "text": "Server Status Reports", "text_i18n": "global_dict.monitoring_subtitle"}]}},
-        {"type": "divider", "center": {"text": [{"type": "h1", "text": "Support", "text_i18n": null}]}},
-        {"type": "item", "href": "#help", "left": {"icon":"question-sign"}, "center": {"text": [{"type": "h1", "text": "Help", "text_i18n": "global_dict.help"},{"type": "p", "text": "Contact Customer Support", "text_i18n": "global_dict.help_subtitle"}]}}
-      ]
-    }, {
-      "generate": "widget",
-      "type": "listview",
-      "theme": "slapos-black",
-      "property_dict": {
-        "filter":"true",
-        "input": "#global_search"
-      },
-      "children": [
-        {"type": "divider", "center": {"text": [{"type": "h1", "text":"General", "text_i18n":"global_dict.general"}]}},
-        {"type": "item", "href": "#software", "left": {"icon":"cogs"}, "center": {"text": [{"type": "h1", "text": "Software", "text_i18n":"global_dict.software"}]}},
-        {"type": "item", "href": "#documentation", "left": {"icon":"book"}, "center": {"text": [{"type": "h1", "text": "Documentation", "text_i18n":"global_dict.documentation"}]}},
-        {"type": "item", "href": "#download", "left": {"icon":"download"}, "center": {"text": [{"type": "h1", "text": "Download", "text_i18n":"global_dict.download"}]}},
-        {"type": "item", "href": "#forum", "left": {"icon":"comments-alt"}, "center": {"text": [{"type": "h1", "text": "Forum", "text_i18n":"global_dict.forum"}]}},
-        {"type": "item", "href": "#blog", "left": {"icon":"rss-sign"}, "center": {"text": [{"type": "h1", "text": "Blog", "text_i18n":"global_dict.blog"}]}},
-        {"type": "item", "href": "#pricing", "left": {"icon":"dollar"}, "center": {"text": [{"type": "h1", "text": "Pricing", "text_i18n":"global_dict.pricing"}]}}
+        {"type": "item", "href": "#help", "left": {"icon":"question-sign"}, "center": {"text": [{"type": "h1", "text": "Help", "text_i18n": "global_dict.help"},{"type": "p", "text": "Contact Customer Support", "text_i18n": "global_dict.help_subtitle"}]}},
+        {"type": "item", "href": "#about", "left": {"icon": "book"}, "center": {"text": [{"type": "h1", "text": "About", "text_i18n": "global_dict.about"}, {"type": "p", "text": "Request further information", "text_i18n": "global_dict.about_subtitle"}]}}
       ]
     }, {
       "type": "a",

data/release_install.json

@@ -61,9 +61,7 @@
         "property_dict": {
           "direction": "horizontal"
         },
-        "children": [
-          {"type": "input", "direct": {"value": "Reset", "className": "translate"}, "attributes": {"type": "reset", "data-i18n":"[value]portal_type_dict.release_dict.text_dict.cancel"}},
-          {"type": "input", "direct": {"value": "Request", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"instantiate", "data-i18n":"[value]portal_type_dict.release_dict.text_dict.request", "data-theme": "slapos-black"}}
+        "children": [{"type": "input", "direct": {"value": "Request", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"instantiate", "data-icon":"check", "data-i18n":"[value]portal_type_dict.release_dict.text_dict.request", "data-theme": "slapos-black"}}
         ]
       }]
     }

data/release_overview.json

@@ -16,20 +16,6 @@
       "slot": 1,
       "text": "Available Releases",
       "text_i18n": "portal_type_dict.release_dict.text_dict.available_releases"
-    },
-    "pagination": {
-      "slot": 2,
-      "option_list": [
-        {"value": "8", "text": "8", "text_i18n":"portal_type_dict.release_dict.text_dict.8"},
-        {"value": "16", "text": "16", "text_i18n":"portal_type_dict.release_dict.text_dict.16"},
-        {"value": "32", "text": "32", "text_i18n":"portal_type_dict.release_dict.text_dict.32"},
-        {"value": "64", "text": "64", "text_i18n":"portal_type_dict.release_dict.text_dict.64"}
-      ]
-    },
-    "search": {
-      "text": "Search available networks",
-      "text_i18n": "portal_type_dict.release_dict.text_dict.search",
-      "info_list": ["records", "filter", "sorted"]
     }
   },
   "scheme": [

data/service_overview.json

@@ -16,20 +16,6 @@
       "slot": 1,
       "text": "Installed Services",
       "text_i18n": "portal_type_dict.service_dict.text_dict.installed_services"
-    },
-    "pagination": {
-      "slot": 2,
-      "option_list": [
-        {"value": "8", "text": "8", "text_i18n":"portal_type_dict.service_dict.text_dict.8"},
-        {"value": "16", "text": "16", "text_i18n":"portal_type_dict.service_dict.text_dict.16"},
-        {"value": "32", "text": "32", "text_i18n":"portal_type_dict.service_dict.text_dict.32"},
-        {"value": "64", "text": "64", "text_i18n":"portal_type_dict.service_dict.text_dict.64"}
-      ]
-    },
-    "search": {
-      "text": "Search available services",
-      "text_i18n": "portal_type_dict.service_dict.text_dict.search",
-      "info_list": ["records", "filter", "sorted"]
     }
   },
   "scheme": [
@@ -53,14 +39,6 @@
     }
   ],
   "children": [{
-    "type": "a",
-    "direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#services/add"},
-    "attributes": {
-      "data-i18n": "portal_type_dict.service_dict.text_dict.add",
-      "data-icon": "edit"
-    },
-    "logic": {"text":"Install new service"}
-  }, {
     "generate": "widget",
     "type": "table",
     "class_list": "table-stroke ui-responsive",
@@ -72,6 +50,14 @@
       "bottom_grid": 1
     },
     "children": []
+  }, {
+    "type": "a",
+    "direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#services/add"},
+    "attributes": {
+      "data-i18n": "portal_type_dict.service_dict.text_dict.add",
+      "data-icon": "edit"
+    },
+    "logic": {"text":"New service"}
   }]
 }
 

data/software_overview.json

@@ -9,21 +9,7 @@
   "property_dict": {
     "link": true,
     "link_identifier": "_relative_url",
-    "dynamic_children": [0],
-    "pagination": {
-      "class_list": "responsive",
-      "option_list": [
-        {"value": "8", "text": "8", "text_i18n":"portal_type_dict.software_dict.text_dict.8"},
-        {"value": "16", "text": "16", "text_i18n":"portal_type_dict.software_dict.text_dict.16"},
-        {"value": "32", "text": "32", "text_i18n":"portal_type_dict.software_dict.text_dict.32"},
-        {"value": "64", "text": "64", "text_i18n":"portal_type_dict.software_dict.text_dict.64"}
-      ]
-    },
-    "search": {
-      "text": "Search available software",
-      "text_i18n": "portal_type_dict.software_dict.text_dict.search",
-      "info_list": ["records"]
-    }
+    "dynamic_children": [0]
   },
   "scheme": [
     {

lang/en-EN/dict.json

 {
   "global_dict": {
+    "about": "About",
+    "about_subtitle": "",
     "first": "First",
     "previous": "Previous",
     "next": "Next",
@@ -9,16 +11,16 @@
     "account": "Account",
     "invoices": "My Invoices",
     "invoices_subtitle": "Administration of your invoices",
-    "servers": "Servers",
-    "servers_subtitle":"Server instances being used",
-    "services": "Services",
-    "services_subtitle": "Administration of Installed Software",
+    "servers": "My Servers",
+    "servers_subtitle":"Administration of your servers",
+    "services": "My Services",
+    "services_subtitle": "Administration of your services",
     "networks": "My Networks",
     "networks_subtitle":"Administration of your networks",
     "monitoring": "Monitoring",
-    "monitoring_subtitle": "Server Status Reports",
+    "monitoring_subtitle": "Status of your servers and instances",
     "help": "Help",
-    "help_subtitle": "Contact Customer Support",
+    "help_subtitle": "",
     "software":"Software",
     "documentation": "Documentation",
     "download": "Download",
@@ -140,7 +142,7 @@
         "installations": "Installations",
         "destroy": "Destroy",
         "search": "Search available services",
-        "add": "Install new service",
+        "add": "New service",
         "installed_services": "Installed Services",
         "8":"8",
         "16": "16",
@@ -236,7 +238,7 @@
         "cancel": "Cancel",
         "status": "Status",
         "search": "Search available servers",
-        "add": "Add Server",
+        "add": "New Server",
         "servers": "Servers",
         "created_servers": "Created Servers",
         "8":"8",