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:
Jerome Nadaud
2013-11-07 17:58:32 +01:00
parent 8a4c036655 f5c133f6e0
commit 4d1a4393a9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/header.tpl
+3 -1
View File
@@ -71,7 +71,9 @@
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}'; var default_language = '{$default_language|intval}';
var admin_modules_link = '{$link->getAdminLink("AdminModules")|addslashes}';
var tab_modules_list = '{if isset($tab_modules_list) && $tab_modules_list}{$tab_modules_list|addslashes}{/if}';
</script> </script>
{/if} {/if}
{if isset($css_files)} {if isset($css_files)}
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -214,7 +214,7 @@
{$params.title} {$params.title}
{/if} {/if}
{if (!isset($params.orderby) || $params.orderby) && !$simple_header} {if (!isset($params.orderby) || $params.orderby) && !$simple_header && $show_filters}
<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if} href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}"> <a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if} href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
<i class="icon-caret-down"></i> <i class="icon-caret-down"></i>
</a> </a>