data: updated JSON layouts

data/order.json

@@ -3,9 +3,10 @@
   "portal_type_title": "sales_order",
   "initial_query": {"include_docs": true, "limit":[0,1]},
   "property_dict": {
-    "wrap_gadget": 2,
+    "wrap_gadget": 1,
     "submit_to": "#subscription/personal_data",
-    "allow_new": true
+    "allow_new": true,
+    "check": true
   },
   "scheme": [
     {
@@ -61,21 +62,60 @@
         "secret_hash": "foo",
         "public_key": "6Ldpb-oSAAAAAGwriKpk4ol1n4yjN_as6M4xv0zA"
       },
-      "children": [
-        {
+      "children": [{
           "generate": "widget",
           "type": "listview",
           "property_dict": {
             "inset": "true",
-            "class_list": "subscription_selector"
+            "class_list": "subscription_selector force_corners",
+            "map_children": "listItem",
+            "wrap": 2
           },
           "children": [
             {"type": "divider", "center": [{"type": "h3", "text": "Choisissez votre offre", "text_i18n":"portal_type_dict.sales_order_dict.text_dict.choose_offer"}]},
             {"type": "item", "class_list": "violet", "left": [{"type": "image", "src": "img/bg-offre01.png", "alt":""}], "center": [{"type": "h3", "text": "Au forfait - 1,25€ par mois", "text_i18n":"portal_type_dict.sales_order_dict.text_dict.fixed_price"}, {"type": "p", "text": "Bip&Go Au forfait est fait pour vous", "text_i18n":"portal_type_dict.sales_order_dict.text_dict.fixed_details"}], "right": {"radio": true, "id": "subscription_plan-0", "name": "subscription_plan"}},
-            {"type": "item", "class_list": "rose", "left": [{"type": "image", "src": "img/bg-offre02.png", "alt":""}], "center": [{"type": "h3", "text": "A la cart - 1,6€ par mois", "text_i18n":"portal_type_dict.sales_order_dict.text_dict.carte_price"}, {"type": "p", "text": "", "text_i18n":"portal_type_dict.sales_order_dict.text_dict.carte_details"}], "right": {"radio": true, "id": "subscription_plan-1", "name": "subscription_plan"}}
+            {"type": "item", "class_list": "rose", "left": [{"type": "image", "src": "img/bg-offre02.png", "alt":""}], "center": [{"type": "h3", "text": "A la cart - 1,6€ par mois", "text_i18n":"portal_type_dict.sales_order_dict.text_dict.carte_fixed"}, {"type": "p", "text": "", "text_i18n":"portal_type_dict.sales_order_dict.text_dict.carte_details"}], "right": {"radio": true, "id": "subscription_plan-1", "name": "subscription_plan"}}
           ]
-        },
-        {
+        }, {
+        "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"},
+        "logic": {"text": "Aide"}
+      }]
+      }, {
           "generate": "widget",
           "type": "controlgroup",
           "property_dict": {
@@ -83,60 +123,11 @@
             "direction": "horizontal"
           },
           "children": [
-            {"type": "a", "direct": {"href": "#", "className": "ui-btn ui-disabled 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": {"value": "Submit", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"update", "data-icon":"caret-r", "data-i18n":"[value]global_dict.proceed"}}
+            {"type": "a", "direct": {"href": "#", "className": "ui-btn ui-disabled 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": {"value": "Submit", "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": "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"},
-        "logic": {"text": "Aide"}
-      }]
     }
   ]
 }

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": 2,
+    "wrap_gadget": 3,
     "submit_to": "#subscription/validate_order",
     "allow_new": true
   },
@@ -93,7 +93,7 @@
           },
           "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": {"value": "Submit", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"update", "data-icon":"caret-r", "data-i18n":"[value]global_dict.proceed"}}
+            {"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"}}
           ]
         }
       ]