matched person and invoice display to SlapOS

data/global.json

@@ -26,14 +26,9 @@
     "type": "panel",
     "theme": "slapos-black",
     "property_dict": {
-      "close": true
+      "close": null
     },
     "children": [{
-      "type": "input",
-      "direct": {"id":"global-search", "className": "translate"},
-      "attributes": {"data-enhanced":"true", "data-i18n": "[placeholder]global_dict.search","placeholder":"Search Apps", "data-icon":"search", "data-action-btn":"true", "data-type":"search", "type":"search"},
-      "logic":{"clear":"true", "action":"search"}
-    }, {
       "generate": "widget",
       "type": "listview",
       "class_list": null,
@@ -44,13 +39,12 @@
         "input": "#global-search"
       },
       "children": [
-        {"type": "divider", "center": {"text": [{"type": "h1", "text": "Account", "text_i18n": "global_dict.account"}]}},
-        {"type": "item", "href": "#person", "left": {"icon":"user"}, "center": {"text": [{"type": "h1", "text": "Account Info", "text_i18n": "global_dict.person"}, {"type": "p", "text": "Registration/Invoicing Info", "text_i18n": "global_dict.person_subtitle"}]}},
+        {"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": "#networks", "left": {"icon":"sitemap"}, "center": {"text":[{"type": "h1", "text": "Networks", "text_i18n": "global_dict.networks"},{"type": "p", "text":"Network Administration", "text_i18n":"global_dict.networks_subtitle"}]}},
-        {"type": "divider", "center": {"text": [{"type": "h1", "text": "Performance", "text_i18n":null}]}},
+        {"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"}]}}
@@ -111,10 +105,7 @@
       "property_dict": {
         "direction": "horizontal"
       },
-      "children": [
-        {"type":"select", "direct": {"id": "switch_language", "className":"action responsive translate"}, "attributes": {"data-action":"translate", "data-icon":"flag-en"}, "logic": {"wrapper_class_list":"flag", "options": [{"value": "en-EN", "text":"English", "text_i18n":"global_dict.english", "selected": true}]}},
-        {"type":"a", "direct": {"href": "#dashboard", "className":"responsive translate"}, "attributes": {"data-icon":"home", "data-i18n":"global_dict.home"},"logic": {"text":"Home"}}
-      ]
+      "children": []
     }]
   }]
 }

data/person_view.json

@@ -35,19 +35,17 @@
         {"field": "last_name"},
         {"field": "default_email_text"},
         {"field": "default_telephone_text"},
-        {"field": "default_fax_text"},
+        {"field": "default_fax_text"}
+      ]
+    }, {
+      "position": "right",
+      "fieldlist": [
         {"field": "default_address_street_address"},
         {"field": "default_address_city"},
         {"field": "default_address_zip_code"},
         {"field": "default_address_region"},
         {"field": "nationality"}
       ]
-    },{
-      "position": "right",
-      "fieldlist": []
-    },{
-      "position": "center",
-      "fieldlist": []
     }
   ],
   "children": [{
@@ -68,8 +66,7 @@
           "direction": "horizontal"
         },
         "children": [
-          {"type": "input", "direct": {"value": "Reset", "className": "translate"}, "attributes": {"type": "reset", "data-i18n":"[value]portal_type_dict.person_dict.text_dict.cancel"}},
-          {"type": "input", "direct": {"value": "Submit", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"add", "data-i18n":"[value]portal_type_dict.person_dict.text_dict.submit", "data-theme": "slapos-black"}}
+          {"type": "input", "direct": {"value": "Update My Credentials", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"add", "data-i18n":"[value]portal_type_dict.person_dict.text_dict.submit", "data-theme": "slapos-black"}}
         ]
       }]
     }

js/erp5_loader.js

@@ -3526,7 +3526,7 @@
                       "panel_element_last" : " "))
             }
           );
-          if (i === 0) {
+          if (i === 0 && closer) {
             target.appendChild(closer);
           }
 

lang/en-EN/dict.json

@@ -24,9 +24,10 @@
     "download": "Download",
     "forum": "Forum",
     "blog": "Blog",
+    "dashboard": "My Dashboard",
     "pricing": "Pricing",
-    "person": "Person",
-    "person_subtitle": "Registration/Invoicing Info",
+    "person": "My Account",
+    "person_subtitle": "Administration of your personal info",
     "general": "General",
     "nexedi": "Nexedi 2013",
     "login": "Login",
@@ -359,7 +360,7 @@
         "account": "Account",
         "register": "Register",
         "nodata": "No person found",
-        "submit": "Submit",
+        "submit": "Update My Credentials",
         "reset": "Reset"
       },
       "field_dict": {