Merge branch 'frontend'

2013-12-17 10:22:17 +01:00
parent c39492d6ce d6b524e39a
commit e5576864cd
53 changed files with 207 additions and 5 deletions
--- a/templates/backOffice/default/admin-layout.tpl
+++ b/templates/backOffice/default/admin-layout.tpl
@@ -267,6 +267,6 @@

 	{* Modules scripts are included now *}
 	{module_include location='footer_js'}
-
+    {block name="javascript-last-call"}{/block}
 </body>
 </html>
--- a/templates/backOffice/default/admin-logs.html
+++ b/templates/backOffice/default/admin-logs.html
@@ -231,4 +231,8 @@
        });

    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='admin-logs-js'}
 {/block}
--- a/templates/backOffice/default/administrators.html
+++ b/templates/backOffice/default/administrators.html
@@ -355,4 +355,8 @@ jQuery(function($) {
 })
 </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='administrators-js'}
 {/block}
--- a/templates/backOffice/default/attribute-edit.html
+++ b/templates/backOffice/default/attribute-edit.html
@@ -317,4 +317,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='attribute-edit-js'}
 {/block}
--- a/templates/backOffice/default/attributes.html
+++ b/templates/backOffice/default/attributes.html
@@ -327,4 +327,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='attributes-js'}
 {/block}
--- a/templates/backOffice/default/categories.html
+++ b/templates/backOffice/default/categories.html
@@ -709,4 +709,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='categories-js'}
 {/block}
--- a/templates/backOffice/default/category-edit.html
+++ b/templates/backOffice/default/category-edit.html
@@ -393,4 +393,8 @@ $(function() {

 });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='category-edit-js'}
 {/block}
--- a/templates/backOffice/default/config-store.html
+++ b/templates/backOffice/default/config-store.html
@@ -168,3 +168,7 @@
    </div>
 </div>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='config-store-js'}
+{/block}
--- a/templates/backOffice/default/configuration.html
+++ b/templates/backOffice/default/configuration.html
@@ -189,4 +189,8 @@
            </div>
        </div>
    </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='configuration-js'}
 {/block}
--- a/templates/backOffice/default/content-edit.html
+++ b/templates/backOffice/default/content-edit.html
@@ -264,4 +264,8 @@ form_content    = {$smarty.capture.delete_folder_dialog nofilter}

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='content-edit-js'}
 {/block}
--- a/templates/backOffice/default/countries.html
+++ b/templates/backOffice/default/countries.html
@@ -261,4 +261,8 @@
        </script>
    {/javascripts}

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='countries-js'}
 {/block}
--- a/templates/backOffice/default/country-edit.html
+++ b/templates/backOffice/default/country-edit.html
@@ -124,4 +124,8 @@

        </div>
    </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='country-edit-js'}
 {/block}
--- a/templates/backOffice/default/coupon-create.html
+++ b/templates/backOffice/default/coupon-create.html
@@ -62,3 +62,7 @@
    </script>

 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-create-js'}
+{/block}
--- a/templates/backOffice/default/coupon-list.html
+++ b/templates/backOffice/default/coupon-list.html
@@ -162,3 +162,7 @@
        <script src="{$asset_url}"></script>
    {/javascripts}
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-list-js'}
+{/block}
--- a/templates/backOffice/default/coupon-read.html
+++ b/templates/backOffice/default/coupon-read.html
@@ -165,3 +165,7 @@
    {/javascripts}

 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-read-js'}
+{/block}
--- a/templates/backOffice/default/coupon-update.html
+++ b/templates/backOffice/default/coupon-update.html
@@ -147,3 +147,7 @@
        });
    </script>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='coupon-update-js'}
+{/block}
--- a/templates/backOffice/default/currencies.html
+++ b/templates/backOffice/default/currencies.html
@@ -358,4 +358,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='currencies-js'}
 {/block}
--- a/templates/backOffice/default/currency-edit.html
+++ b/templates/backOffice/default/currency-edit.html
@@ -123,4 +123,8 @@

        </div>
    </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='currency-edit-js'}
 {/block}
--- a/templates/backOffice/default/customer-edit.html
+++ b/templates/backOffice/default/customer-edit.html
@@ -423,4 +423,8 @@
                {/if}
            });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='customer-edit-js'}
 {/block}
--- a/templates/backOffice/default/customers.html
+++ b/templates/backOffice/default/customers.html
@@ -371,4 +371,8 @@
            });
        </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='customers-js'}
 {/block}
--- a/templates/backOffice/default/document-edit.html
+++ b/templates/backOffice/default/document-edit.html
@@ -160,4 +160,8 @@
         });
    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='document-edit-js'}
 {/block}
--- a/templates/backOffice/default/feature-edit.html
+++ b/templates/backOffice/default/feature-edit.html
@@ -317,4 +317,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='feature-edit-js'}
 {/block}
--- a/templates/backOffice/default/features.html
+++ b/templates/backOffice/default/features.html
@@ -327,4 +327,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='features-js'}
 {/block}
--- a/templates/backOffice/default/folder-edit.html
+++ b/templates/backOffice/default/folder-edit.html
@@ -347,4 +347,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='folder-edit-js'}
 {/block}
--- a/templates/backOffice/default/folders.html
+++ b/templates/backOffice/default/folders.html
@@ -627,4 +627,8 @@

        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='folders-js'}
 {/block}
--- a/templates/backOffice/default/home.html
+++ b/templates/backOffice/default/home.html
@@ -408,4 +408,8 @@ jQuery(function($){
 });

 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='home-js'}
 {/block}
--- a/templates/backOffice/default/image-edit.html
+++ b/templates/backOffice/default/image-edit.html
@@ -165,4 +165,8 @@
         });
    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='image-edit-js'}
 {/block}
--- a/templates/backOffice/default/languages.html
+++ b/templates/backOffice/default/languages.html
@@ -306,4 +306,8 @@
            });
        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='languages-js'}
 {/block}
--- a/templates/backOffice/default/mailing-system.html
+++ b/templates/backOffice/default/mailing-system.html
@@ -140,4 +140,8 @@ jQuery(function($) {
 });

 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='mainling-system-js'}
 {/block}
--- a/templates/backOffice/default/message-edit.html
+++ b/templates/backOffice/default/message-edit.html
@@ -234,3 +234,7 @@
 	 })(jQuery);
 </script>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='message-edit-js'}
+{/block}
--- a/templates/backOffice/default/messages.html
+++ b/templates/backOffice/default/messages.html
@@ -213,4 +213,8 @@
        }
    });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='messages-js'}
 {/block}
--- a/templates/backOffice/default/module-configure.html
+++ b/templates/backOffice/default/module-configure.html
@@ -22,4 +22,8 @@
    </div>
 </div>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='module-config-js'}
 {/block}
--- a/templates/backOffice/default/module-edit.html
+++ b/templates/backOffice/default/module-edit.html
@@ -75,8 +75,6 @@

 {/block}

-{block name="javascript-initialization"}
-
-
-
+{block name="javascript-last-call"}
+    {module_include location='module-edit-js'}
 {/block}
--- a/templates/backOffice/default/modules.html
+++ b/templates/backOffice/default/modules.html
@@ -103,4 +103,8 @@
           });
        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='modules-js'}
 {/block}
--- a/templates/backOffice/default/order-edit.html
+++ b/templates/backOffice/default/order-edit.html
@@ -509,4 +509,8 @@
        });
    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='order-edit-js'}
 {/block}
--- a/templates/backOffice/default/orders.html
+++ b/templates/backOffice/default/orders.html
@@ -164,4 +164,8 @@
        });
    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='orders-js'}
 {/block}
--- a/templates/backOffice/default/product-edit.html
+++ b/templates/backOffice/default/product-edit.html
@@ -416,4 +416,8 @@ $(function() {
 </script>


+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='product-edit-js'}
 {/block}
--- a/templates/backOffice/default/profile-edit.html
+++ b/templates/backOffice/default/profile-edit.html
@@ -303,4 +303,8 @@
        <script src='{$asset_url}'></script>
    {/javascripts}

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='profile-edit-js'}
 {/block}
--- a/templates/backOffice/default/profiles.html
+++ b/templates/backOffice/default/profiles.html
@@ -208,4 +208,8 @@ jQuery(function($) {
 })
 </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='profiles-js'}
 {/block}
--- a/templates/backOffice/default/search.html
+++ b/templates/backOffice/default/search.html
@@ -235,4 +235,8 @@

    <script>
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='search-js'}
 {/block}
--- a/templates/backOffice/default/shipping-configuration-edit.html
+++ b/templates/backOffice/default/shipping-configuration-edit.html
@@ -165,4 +165,8 @@
            });
        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-configuration-edit-js'}
 {/block}
--- a/templates/backOffice/default/shipping-configuration.html
+++ b/templates/backOffice/default/shipping-configuration.html
@@ -139,4 +139,8 @@
            });
        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-configuration-js'}
 {/block}
--- a/templates/backOffice/default/shipping-zones-edit.html
+++ b/templates/backOffice/default/shipping-zones-edit.html
@@ -137,4 +137,8 @@
            });
        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-zones-edit-js'}
 {/block}
--- a/templates/backOffice/default/shipping-zones.html
+++ b/templates/backOffice/default/shipping-zones.html
@@ -63,4 +63,8 @@

    </div>
 </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='shipping-zones-js'}
 {/block}
--- a/templates/backOffice/default/system-logs.html
+++ b/templates/backOffice/default/system-logs.html
@@ -210,4 +210,8 @@ $(function() {
    });
 });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='system-logs-js'}
 {/block}
--- a/templates/backOffice/default/tax-edit.html
+++ b/templates/backOffice/default/tax-edit.html
@@ -157,4 +157,8 @@

    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='tax-edit-js'}
 {/block}
--- a/templates/backOffice/default/tax-rule-edit.html
+++ b/templates/backOffice/default/tax-rule-edit.html
@@ -422,4 +422,8 @@

    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='tax-rule-edit-js'}
 {/block}
--- a/templates/backOffice/default/taxes-rules.html
+++ b/templates/backOffice/default/taxes-rules.html
@@ -378,4 +378,8 @@ form_content        = {$smarty.capture.tax_rule_delete_dialog nofilter}
        })
    </script>

+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='taxes-rules-js'}
 {/block}
--- a/templates/backOffice/default/template-edit.html
+++ b/templates/backOffice/default/template-edit.html
@@ -119,4 +119,8 @@
            $('#attribute_list_management').load("{url noamp='1' path='/admin/configuration/templates/attributes/list'  template_id=$template_id}");
       });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='template-edit-js'}
 {/block}
--- a/templates/backOffice/default/templates.html
+++ b/templates/backOffice/default/templates.html
@@ -211,4 +211,8 @@
            }
        });
    </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='templates-js'}
 {/block}
--- a/templates/backOffice/default/translations.html
+++ b/templates/backOffice/default/translations.html
@@ -317,3 +317,7 @@
    });
 </script>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='translations-js'}
+{/block}
--- a/templates/backOffice/default/variable-edit.html
+++ b/templates/backOffice/default/variable-edit.html
@@ -114,4 +114,8 @@

    </div>
 </div>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='variable-edit-js'}
 {/block}
--- a/templates/backOffice/default/variables.html
+++ b/templates/backOffice/default/variables.html
@@ -279,4 +279,8 @@

    });
 </script>
+{/block}
+
+{block name="javascript-last-call"}
+    {module_include location='variables-js'}
 {/block}