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-10-28 16:19:02 +01:00
parent d523d739e7 5760718b85
commit 3798adff2f
119 changed files with 1776 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/stats/menu.tpl
+1 -1
View File
@@ -28,7 +28,7 @@
{if count($modules)}
{foreach $modules as $module}
{if $module_instance[$module.name]}
<a class="list-group-item{if ($current_module_name && $current_module_name == $module.name) || (!$current_module_name && $module@first)} active{/if}" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
<a class="list-group-item{if ($current_module_name && $current_module_name == $module.name)} active{/if}" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
{/if}
{/foreach}
{else}
admin-dev/themes/default/template/header.tpl
+6 -2
View File
@@ -283,6 +283,11 @@
$('#bo_query').attr("placeholder",$(this).data('placeholder'));
$('#bo_query').focus();
});
{if isset($search_type) && $search_type}
$(document).ready(function() {
$('.search-option a[data-value='+{$search_type|intval}+']').click();
});
{/if}
</script>
<!-- js
@@ -294,7 +299,6 @@
OK - set active on right list item
OK - focus input field
OK - change place holder
- use change for first init
- clear search
(?) - keep focus state when keyword exists
@@ -369,4 +373,4 @@
<body{if isset($lite_display) && $lite_display} class="display-modal"{/if}>
<div id="main">
<div id="content" class="page-content">
{/if}
{/if}