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

[-] BO : Bug fix #PSTEST-1014 #PSTEST-966 - Wrong call of smarty translation function

Browse Source
This commit is contained in:
fSerny
2012-03-12 14:50:14 +00:00
parent 8cc4127228
commit 0a3ed0b9eb
5 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcms/blockcms.php
+1 -1
View File
@@ -662,7 +662,7 @@ class BlockCms extends Module
public function displayBlockCMS($column)
{
$cms_titles = BlockCMSModel::getCMSTitles($column);
print_r($cms_titles);
$this->smarty->assign(array(
'block' => 1,
'cms_titles' => $cms_titles,
modules/blockcms/config.xml
+10 -10
View File
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcms</name>
<displayName><![CDATA[CMS Block]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds a block with several CMS links.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<module>
<name>blockcms</name>
<displayName><![CDATA[CMS Block]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds a block with several CMS links.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>
</module>
</module>
modules/blockcms/views/templates/admin/_configure/helpers/form/form.tpl
+14 -14
View File
@@ -44,20 +44,20 @@
<h3 style="margin-top:1px;">
{if $key == 0}
{l s='Left blocks'}
{l s='Left blocks' mod='blockcms'}
{else}
{l s='Right blocks'}
{l s='Right blocks' mod='blockcms'}
{/if}
</h3>
<table cellspacing="0" cellpadding="0" style="min-width:40em;" class="table tableDnD cms" id="cms_block_{$key%2}">
<thead>
<tr class="nodrag nodrop">
<th>{l s='ID'}</th>
<th>{l s='Name of block'}</th>
<th>{l s='Category name'}</th>
<th>{l s='Position'}</th>
<th>{l s='Actions'}</th>
<th>{l s='ID' mod='blockcms'}</th>
<th>{l s='Name of block' mod='blockcms'}</th>
<th>{l s='Category name' mod='blockcms'}</th>
<th>{l s='Position' mod='blockcms'}</th>
<th>{l s='Actions' mod='blockcms'}</th>
</tr>
</thead>
<tbody>
@@ -72,19 +72,19 @@
style="display: none;"
{/if}
href="{$current}&configure=blockcms&id_cms_block={$cms_block['id_cms_block']}&way=1&position={(int)$cms_block['position'] + 1}&location=0&token={$token}">
<img src="{$smarty.const._PS_ADMIN_IMG_}down.gif" alt="{l s='Down'}" title="{l s='Down'}" />
<img src="{$smarty.const._PS_ADMIN_IMG_}down.gif" alt="{l s='Down' mod='blockcms'}" title="{l s='Down' mod='blockcms'}" />
</a>
<a
{if (($cms_block['position'] == 0) || ($key == 0))}
style="display: none;"
{/if}
href="{$current}&configure=blockcms&id_cms_block={$cms_block['id_cms_block']}&way=0&position={(int)$cms_block['position'] - 1}&location=0&token={$token}">
<img src="{$smarty.const._PS_ADMIN_IMG_}up.gif" alt="{l s='Up'}" title="{l s='Up'}" />
<img src="{$smarty.const._PS_ADMIN_IMG_}up.gif" alt="{l s='Up' mod='blockcms'}" title="{l s='Up' mod='blockcms'}" />
</a>
</td>
<td>
<a href="{$current}&token={$token}&editBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Edit'}"><img src="{$smarty.const._PS_ADMIN_IMG_}edit.gif" alt="" /></a>
<a href="{$current}&token={$token}&deleteBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Delete'}"><img src="{$smarty.const._PS_ADMIN_IMG_}delete.gif" alt="" /></a>
<a href="{$current}&token={$token}&editBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Edit' mod='blockcms'}"><img src="{$smarty.const._PS_ADMIN_IMG_}edit.gif" alt="" /></a>
<a href="{$current}&token={$token}&deleteBlockCMS&id_cms_block={(int)$cms_block['id_cms_block']}" title="{l s='Delete' mod='blockcms'}"><img src="{$smarty.const._PS_ADMIN_IMG_}delete.gif" alt="" /></a>
</td>
</tr>
{/foreach}
@@ -132,8 +132,8 @@
<th>
<input type="checkbox" name="checkme" id="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$input.name}', this.checked)" />
</th>
<th>{l s='ID'}</th>
<th>{l s='Name'}</th>
<th>{l s='ID' mod='blockcms'}</th>
<th>{l s='Name' mod='blockcms'}</th>
</tr>
{foreach $cms as $key => $cms_category}
@@ -165,7 +165,7 @@
</table>
{else}
<p>{l s='No pages created'}</p>
<p>{l s='No pages created' mod='blockcms'}</p>
{/if}
{else}
{$smarty.block.parent}