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

[-] BO : #PSTEST-778 : Bug in textures for attributes

Browse Source
This commit is contained in:
lLefevre
2012-02-23 14:07:19 +00:00
parent a4761aef24
commit 79f0ba9bfc
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+11
View File
@@ -36,6 +36,17 @@
{/block}
{block name="start_field_block"}
<div class="margin-form">
{if $input.name == 'current_texture'}
{if isset($imageTextureExists) && $imageTextureExists}
<img src="{$imageTexture}" alt="{l s='Texture'}" />
{else}
{l s='None'}
{/if}
{/if}
{/block}
{block name="end_field_block"}
{if $input.type == 'text' && $input.name == 'texture'}
</div>
admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl
+5 -1
View File
@@ -95,7 +95,11 @@
{elseif isset($params.callback)}
{$tr.$key}
{elseif isset($tr.$key) && $key == 'color'}
<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
{if isset($tr.$key['texture']) && $tr.$key['texture']|count_characters > 1}
<img src="{$tr.$key.texture}" alt="" />
{else}
<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
{/if}
{elseif isset($tr.$key)}
{$tr.$key|escape:'htmlall':'UTF-8'}
{else}