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
@@ -232,3 +232,7 @@

    </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
@@ -356,3 +356,7 @@ 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
@@ -318,3 +318,7 @@
        });
    </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
@@ -328,3 +328,7 @@
        });
    </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
@@ -710,3 +710,7 @@
        });
    </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
@@ -394,3 +394,7 @@ $(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
@@ -190,3 +190,7 @@
        </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
@@ -265,3 +265,7 @@ 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
@@ -262,3 +262,7 @@
    {/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
@@ -125,3 +125,7 @@
        </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
@@ -359,3 +359,7 @@
        });
    </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
@@ -124,3 +124,7 @@
        </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
@@ -424,3 +424,7 @@
            });
    </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
@@ -372,3 +372,7 @@
        </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
@@ -161,3 +161,7 @@
    </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
@@ -318,3 +318,7 @@
        });
    </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
@@ -328,3 +328,7 @@
        });
    </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
@@ -348,3 +348,7 @@
        });
    </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
@@ -628,3 +628,7 @@
        });
    </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
@@ -409,3 +409,7 @@ 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
@@ -166,3 +166,7 @@
    </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
@@ -307,3 +307,7 @@
        });
    </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
@@ -141,3 +141,7 @@ 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
@@ -214,3 +214,7 @@
    });
 </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
@@ -23,3 +23,7 @@
 </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
@@ -104,3 +104,7 @@
        });
    </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
@@ -510,3 +510,7 @@
    </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
@@ -165,3 +165,7 @@
    </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
@@ -417,3 +417,7 @@ $(function() {


 {/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
@@ -304,3 +304,7 @@
    {/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
@@ -209,3 +209,7 @@ 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
@@ -236,3 +236,7 @@
    <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
@@ -166,3 +166,7 @@
        });
    </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
@@ -140,3 +140,7 @@
        });
    </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
@@ -138,3 +138,7 @@
        });
    </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
@@ -64,3 +64,7 @@
    </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
@@ -211,3 +211,7 @@ $(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
@@ -158,3 +158,7 @@
    </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
@@ -423,3 +423,7 @@
    </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
@@ -379,3 +379,7 @@ 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
@@ -120,3 +120,7 @@
       });
    </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
@@ -212,3 +212,7 @@
        });
    </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
@@ -115,3 +115,7 @@
    </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
@@ -280,3 +280,7 @@
    });
 </script>
 {/block}
+
+{block name="javascript-last-call"}
+    {module_include location='variables-js'}
+{/block}