dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-11-04 17:08:43 +01:00
parent 667848d1df ac1f142f23
commit ddd722dc14
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/features.tpl
+1 -1
View File
@@ -113,6 +113,6 @@
</div> </div>
{/if} {/if}
<script type="text/javascript"> <script type="text/javascript">
hideOtherLanguage({$default_language}); hideOtherLanguage(default_language);
$(".textarea-autosize").autosize(); $(".textarea-autosize").autosize();
</script> </script>
admin-dev/themes/default/template/header.tpl
+1
View File
@@ -71,6 +71,7 @@
var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}'; var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
var currentIndex = '{$currentIndex|@addcslashes:'\''}'; var currentIndex = '{$currentIndex|@addcslashes:'\''}';
var choose_language_translate = '{l s='Choose language' js=1}'; var choose_language_translate = '{l s='Choose language' js=1}';
var default_language = '{$default_language|addslashes}';
</script> </script>
{/if} {/if}
{if isset($css_files)} {if isset($css_files)}