data: updated page layouts

data/personal_data.json

@@ -3,7 +3,7 @@
   "portal_type_title": "sales_order",
   "initial_query": {"include_docs": true, "limit":[0,1]},
   "property_dict": {
-    "wrap_gadget": 3,
+    "wrap_gadget": 1,
     "submit_to": "#subscription/validate_order",
     "allow_new": true
   },
@@ -17,8 +17,12 @@
         {"field": "first_name"},
         {"custom": true, "wrap": true, "type": "input", "direct": {"id": "dob", "name": "dob", "className": "translate"}, "logic":{"label_i18n":"portal_type_dict.sales_order_dict.text_dict.dob", "label": "Date de naissance (JJ/MM/AAAA)"}},
         {"field": "default_email_text"},
-        {"field": "default_email_confirm"}
-      ],
+        {"field": "default_email_confirm"},
+        {"field": "delivery_method"},
+        {"field": "delivery_address"},
+        {"field": "notification_language"}
+      ]
+    }, {
       "position": "right",
       "field_list": [
         {"field": "country_code"},
@@ -32,12 +36,6 @@
         {"field": "country"},
         {"field": "postcode"},
         {"field": "city"}
-      ],
-      "position": "left",
-      "field_list": [
-        {"field": "delivery_method"},
-        {"field": "delivery_address"},
-        {"field": "notification_language"}
       ]
     }
   ],
@@ -92,55 +90,45 @@
             "direction": "horizontal"
           },
           "children": [
-            {"type": "a", "direct": {"href": "#subscription", "className": "ui-btn ui-btn-icon-left ui-icon-caret-l"}, "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.retour"}, "logic": {"text": "Retour"}},
-            {"type": "input", "direct": {"className": "action translate"}, "attributes": {"type": "submit", "data-action":"update", "data-icon":"carat-r", "data-theme": "active", "data-i18n":"[value]global_dict.proceed"}}
+            {"type": "a", "direct": {"href": "#subscription", "className": "ui-btn ui-btn-icon-left ui-icon-carat-l"}, "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.retour"}, "logic": {"text": "Retour"}},
+            {"type": "input", "direct": {"className": "action translate"}, "attributes": {"type": "submit", "data-action":"update", "data-iconpos": "right", "data-theme": "active", "data-icon":"carat-r", "data-i18n":"[value]global_dict.proceed"}}
           ]
         }
       ]
-    }, {
-      "generate": "widget",
-      "type": "controlbar",
-      "property_dict": {
-        "class_list": "span_2 ui-content-element"
-      },
-      "children": [{
-        "type": "h3",
-        "direct": {"className": "translate"},
-        "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.advantages"},
-        "logic": {"text": "Les avantages Bip&Go"}
-      }, {
-        "type": "p",
-        "direct": {"className": "translate"},
-        "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.waiting"},
-        "logic": {"text": "Plus d'attente au péage"}
-      }, {
-        "type": "p",
-        "direct": {"className": "translate"},
-        "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.valid"},
-        "logic": {"text": "Valable partout en France et dans plus de 250 parkings"}
-      }, {
-        "type": "p",
-        "direct": {"className": "translate"},
-        "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.strings"},
-        "logic": {"text": "Sans engagement"}
-      }, {
-        "type": "p",
-        "direct": {"className": "translate"},
-        "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.secure"},
-        "logic": {"text": "Paiement sécurisé par prélèvement mensuel"}
-      }, {
-        "type": "p",
-        "direct": {"className": "translate"},
-        "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.delivery"},
-        "logic": {"text": "Livraison sous 48 heures en France"}
-      }]
-    }, {
-      "generate": "widget",
-      "type": "controlbar",
-      "property_dict": {
-        "class_list": "span_2 ui-content-element"
-      },
-      "children": [{
+    },{
+        "type": "div",
+        "direct": {"className": "ui-content-element"},
+        "children": [{
+          "type": "h3",
+          "direct": {"className": "translate"},
+          "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.advantages"},
+          "logic": {"text": "Les avantages Bip&Go"}
+        }, {
+          "type": "p",
+          "direct": {"className": "translate"},
+          "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.waiting"},
+          "logic": {"text": "Plus d'attente au péage"}
+        }, {
+          "type": "p",
+          "direct": {"className": "translate"},
+          "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.valid"},
+          "logic": {"text": "Valable partout en France et dans plus de 250 parkings"}
+        }, {
+          "type": "p",
+          "direct": {"className": "translate"},
+          "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.strings"},
+          "logic": {"text": "Sans engagement"}
+        }, {
+          "type": "p",
+          "direct": {"className": "translate"},
+          "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.secure"},
+          "logic": {"text": "Paiement sécurisé par prélèvement mensuel"}
+        }, {
+          "type": "p",
+          "direct": {"className": "translate"},
+          "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.delivery"},
+          "logic": {"text": "Livraison sous 48 heures en France"}
+        }, {
         "type": "a",
         "direct": {"href":"#", "className": "translate ui-btn ui-icon-medkit ui-corner-all ui-btn-icon-right"},
         "attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.help"},

data/sales_order_fieldlist.json

@@ -590,10 +590,8 @@
     "type":"ListField",
     "widget": {
       "id": "country_code",
-      "title": "International country code for cell phone (used to validate your subscription) ",
       "title_i18n": "portal_type_dict.sales_order_dict.field_dict.country_code.title",
-      "description": "The country code of the person subscribing.",
-      "description_i18n": "portal_type_dict.sales_order_dict.field_dict.country_code.description",
+      "description": "The country code of the landline phone of this person.",
       "alternate_name": "country_code",
       "default_value": null,
       "css_class": null,
@@ -607,7 +605,7 @@
       "enabled": true,
       "editable": true,
       "external_validator": null,
-      "required": true,
+      "required": null,
       "unicode": null
     },
     "message": {