app: bugfixes

data/home.json

@@ -8,44 +8,46 @@
         "theme": "slapos-white"
       },
       "view_dict": {
-        "default": [{
-          "generate": "widget",
-          "type": "controlbar",
-          "property_dict": {
-            "class_list": "span_1 responsive"
+        "default": [
+          {
+            "generate": "widget",
+            "type": "controlbar",
+            "property_dict": {
+              "class_list": "span_1 responsive"
+            },
+            "children": [
+              {
+                "generate": "widget",
+                "type": "carousel",
+                "property_dict": {
+                  "handles": true
+                },
+                "children": [
+                  {"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Bleu.png", "alt": ""}]},
+                  {"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Pub.png", "alt": ""}]},
+                  {"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Vert.png", "alt": ""}]}
+                ]
+              }
+            ]
           },
-          "children": [
-            {
-              "generate": "widget",
-              "type": "carousel",
-              "property_dict": {
-                "handles": true,
-                "captions": true,
-                "map_children": "listItem"
-              },
-              "children": [
-                {"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Bleu.png", "alt": ""}]},
-                {"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Pub.png", "alt": ""}]},
-                {"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Vert.png", "alt": ""}]}
-              ]
-            }]
-          }, {
+          {
             "generate": "widget",
             "type": "controlbar",
             "property_dict": {
               "class_list": "span_3 responsive"
             },
-            "children": [{
+            "children": [
+              {
               "type": "div",
               "direct": {"className": "offer violet background"},
               "children": [{
                   "type": "img",
-                  "direct": {"src": "website-Logo-offre.png", "alt": "Bip&Go"}
+                  "direct": {"src": "img/website-Logo-offre.png", "alt": "Bip&Go"}
                 },{
                   "type": "h3",
                   "direct": {"className": "translate"},
                   "attributes": {"data-i18n": "global_dict.fixed"},
-                  "logic": {"text": "Au Forfait"},
+                  "logic": {"text": "Au Forfait"}
                 }, {
                   "type": "a",
                   "direct": {"href": "#"},
@@ -88,7 +90,7 @@
                   "type": "h3",
                   "direct": {"className": "translate"},
                   "attributes": {"data-i18n": "global_dict.pay_as_you_go"},
-                  "logic": {"text": "A la Carte"},
+                  "logic": {"text": "A la Carte"}
                 }, {
                   "type": "a",
                   "direct": {"href": "#"},
@@ -132,7 +134,7 @@
                   "type": "h3",
                   "direct": {"className": "translate"},
                   "attributes": {"data-i18n": "global_dict.pro"},
-                  "logic": {"text": "Pour Le Pro"},
+                  "logic": {"text": "Pour Le Pro"}
                 }, {
                   "type": "a",
                   "direct": {"href": "#"},
@@ -176,7 +178,7 @@
                   "type": "h3",
                   "direct": {"className": "translate"},
                   "attributes": {"data-i18n": "global_dict.vacances"},
-                  "logic": {"text": "Liber-T Vacances"},
+                  "logic": {"text": "Liber-T Vacances"}
                 }, {
                   "type": "a",
                   "direct": {"href": "#"},
@@ -239,7 +241,7 @@
             "logic":{"text": "Trafic en temps réel"}
           }, {
             "type": "img",
-            "direct": {"src": "img/website-Visuel-home.png", "alt": ""},
+            "direct": {"src": "img/website-Visuel-home.png", "alt": ""}
           }, {
             "type": "a",
             "direct": {"className": "light ui-btn ui-corner-all ui-icon-caret-r ui-btn-icon-right", "href": "#"},
@@ -259,7 +261,7 @@
             "logic":{"text": "Conseils & Astuces"}
           }, {
             "type": "img",
-            "direct": {"src": "img/website-Visuel-home2.png", "alt": ""},
+            "direct": {"src": "img/website-Visuel-home2.png", "alt": ""}
           }, {
             "type": "a",
             "direct": {"className": "light ui-btn ui-corner-all ui-icon-caret-r ui-btn-icon-right", "href": "#"},
@@ -267,9 +269,10 @@
             "logic": {"text":"En savoir plus"}
           }]
         }
-      ]
+          
+        ]
+      }
     }
-  }
-]
+  ]
 }
 

js/erp5_loader.js

@@ -467,7 +467,7 @@
       element_target.appendChild(factory.element({
         "type": "span",
         "direct": {"className": "ui-invalid-label"},
-        "attributes": {"data-i18n":"validation_dict.required_field},
+        "attributes": {"data-i18n":"validation_dict.required_field"},
         "logic": {"text": "Ce champ est obligatoire."}
       }));
     }
@@ -3313,7 +3313,11 @@
           })
           .fail(app.util.error);
       }
-      return RSVP.resolve(wrapper.child_constructor(element, wrapper, i));
+      return RSVP.resolve(wrapper.child_constructor({
+        "item": element,
+        "wrapper": wrapper,
+        "count": i
+      }));
     }
     // NOTE: when loading content via href, element is set to undefined
     return RSVP.resolve(element || wrapper.inherit);