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-12-02 18:20:03 +01:00
parent 01d5087067 102b99eb1c
commit 6edf14ed71
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/sql/1.6.0.2.sql
+1 -1
View File
@@ -4,5 +4,5 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`)
SELECT m.id_module, s.id_shop, h.id_hook, 0
FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h
WHERE m.name IN ('dashgoals', 'dashactivity', 'dashtrends', 'dashproducts')
AND h.name IN ('displayBackOfficeHeader')
AND h.name IN ('actionAdminControllerSetMedia')
);
modules/blockcategories/blockcategories.tpl
+2 -3
View File
@@ -22,9 +22,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- Block categories module -->
{if $blockCategTree && $blockCategTree.children|@count}
<!-- Block categories module -->
<div id="categories_block_left" class="block">
<h4 class="title_block">{if isset($currentCategory)}{$currentCategory->name|escape}{else}{l s='Categories' mod='blockcategories'}{/if}</h4>
<div class="block_content">
@@ -46,5 +45,5 @@
</script>
</div>
</div>
{/if}
<!-- /Block categories module -->
{/if}
modules/blockcategories/blockcategories_footer.tpl
+2 -2
View File
@@ -23,8 +23,8 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- Block categories module -->
<div class="blockcategories_footer">
<!-- Block categories module -->
<h4 class="title_block">{l s='Categories' mod='blockcategories'}</h4>
<div class="category_footer" style="float:left;clear:none;width:{$widthColumn}%">
<div style="float:left" class="list">
@@ -51,5 +51,5 @@
</div>
</div>
<br class="clear"/>
</div>
<!-- /Block categories module -->
</div>
themes/default-bootstrap/modules/blockcategories/blockcategories.tpl
+2 -3
View File
@@ -22,9 +22,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- Block categories module -->
{if $blockCategTree && $blockCategTree.children|@count}
<!-- Block categories module -->
<div id="categories_block_left" class="block">
<p class="title_block">{if isset($currentCategory)}{$currentCategory->name|escape}{else}{l s='Categories' mod='blockcategories'}{/if}</p>
<div class="block_content">
@@ -46,5 +45,5 @@
</script>
</div>
</div>
{/if}
<!-- /Block categories module -->
{/if}