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

// Remove start_field and end_field blocks from options helper tpl

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14050 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean committed 2012-03-12 16:26:47 +00:00
1 parent 0e194d83b3
commit ffeb21db50
6 files changed
+30 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
+10 -10
View File
@@ -25,7 +25,7 @@
*} *}
{extends file="helpers/options/options.tpl"} {extends file="helpers/options/options.tpl"}
{block name="start_field_block"} {block name="field"}
{if $field['type'] == 'checkbox_table'} {if $field['type'] == 'checkbox_table'}
<div class="margin-form" style="float: left; padding-left: 0; width: 317px; margin-top: 6px; height: 300px; overflow-y: auto;"> <div class="margin-form" style="float: left; padding-left: 0; width: 317px; margin-top: 6px; height: 300px; overflow-y: auto;">
<table class="table" cellspacing="0"> <table class="table" cellspacing="0">
@@ -44,18 +44,18 @@
{/foreach} {/foreach}
</tbody> </tbody>
</table> </table>
{elseif $field['type'] == 'textarea_newlines'} </div>
<div class="margin-form"> <div class="clear"></div>
<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea> <br />
{else} {else}
<div class="margin-form"> {$smarty.block.parent}
{/if} {/if}
{/block} {/block}
{block name="end_field_block"} {block name="input"}
{if $field['type'] == 'checkbox_table'} {if $field['type'] == 'textarea_newlines'}
<div class="clear"></div> <textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
<br /> {else}
{$smarty.block.parent}
{/if} {/if}
</div>
{/block} {/block}
admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
+2 -3
View File
@@ -25,13 +25,12 @@
*} *}
{extends file="helpers/options/options.tpl"} {extends file="helpers/options/options.tpl"}
{block name="start_field_block"} {block name="input"}
{if $field['type'] == 'maintenance_ip'} {if $field['type'] == 'maintenance_ip'}
<div class="margin-form">
{$field['script_ip']} {$field['script_ip']}
<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'|htmlentities}" /> <input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'|htmlentities}" />
{$field['link_remove_ip']} {$field['link_remove_ip']}
{else} {else}
<div class="margin-form"> {$smarty.block.parent}
{/if} {/if}
{/block} {/block}
admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl
+3 -2
View File
@@ -25,8 +25,7 @@
*} *}
{extends file="helpers/options/options.tpl"} {extends file="helpers/options/options.tpl"}
{block name="start_field_block"} {block name="input"}
<div class="margin-form">
{if $field['type'] == 'rewriting_settings'} {if $field['type'] == 'rewriting_settings'}
{if $field['mod_rewrite']} {if $field['mod_rewrite']}
<label class="t" for="{$key}_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label> <label class="t" for="{$key}_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
@@ -39,5 +38,7 @@
<span class="warning_mod_rewrite" style="display:block;height:15px">{l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you have to active this mod.'}</span> <span class="warning_mod_rewrite" style="display:block;height:15px">{l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you have to active this mod.'}</span>
<div class="clear"></div> <div class="clear"></div>
{/if} {/if}
{else}
{$smarty.block.parent}
{/if} {/if}
{/block} {/block}
admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl
+2 -10
View File
@@ -25,18 +25,10 @@
*} *}
{extends file="helpers/options/options.tpl"} {extends file="helpers/options/options.tpl"}
{block name="start_field_block"} {block name="input"}
{if $field['type'] == 'disabled'} {if $field['type'] == 'disabled'}
<div class="margin-form">
{$field['disabled']} {$field['disabled']}
{else} {else}
<div class="margin-form"> {$smarty.block.parent}
{/if}
{/block}
{block name="end_field_block"}
{if $field['type'] == 'checkbox_table'}
<div class="clear"></div>
<br />
{/if} {/if}
{/block} {/block}
admin-dev/themes/default/template/helpers/form/form.tpl
+2 -2
View File
@@ -323,7 +323,7 @@
{$fields_value[$input.name]} {$fields_value[$input.name]}
{/if} {/if}
{if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if} {if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if}
{/block} {/block}{* end block input *}
{block name="description_block"} {block name="description_block"}
{if isset($input.desc)} {if isset($input.desc)}
<p class="preference_description"> <p class="preference_description">
@@ -344,7 +344,7 @@
{if isset($input.lang) && isset($languages)}<div class="clear"></div>{/if} {if isset($input.lang) && isset($languages)}<div class="clear"></div>{/if}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{/block} {/block}{* end block field *}
{if $input.name == 'id_state'} {if $input.name == 'id_state'}
</div> </div>
{/if} {/if}
admin-dev/themes/default/template/helpers/options/options.tpl
+11 -11
View File
@@ -72,19 +72,19 @@
{/if} {/if}
{foreach $categoryData['fields'] AS $key => $field} {foreach $categoryData['fields'] AS $key => $field}
{block name="field"}
{if $field['type'] == 'hidden'} {if $field['type'] == 'hidden'}
<input type="hidden" name="{$key}" value="{$field['value']}" /> <input type="hidden" name="{$key}" value="{$field['value']}" />
{else} {else}
<div style="clear: both; padding-top:15px;" id="conf_id_{$key}" {if $field['is_invisible']} class="isInvisible"{/if}> <div style="clear: both; padding-top:15px;" id="conf_id_{$key}" {if $field['is_invisible']} class="isInvisible"{/if}>
{block name="label"}
{if isset($field['title'])} {if isset($field['title'])}
<label class="conf_title"> <label class="conf_title">
{$field['title']}</label> {$field['title']}</label>
{/if} {/if}
{block name="start_field_block"}
<div class="margin-form">
{/block} {/block}
{block name="field"}
<div class="margin-form">
{block name="input"}
{if $field['type'] == 'select'} {if $field['type'] == 'select'}
{if $field['list']} {if $field['list']}
<select name="{$key}"{if isset($field['js'])} onchange="{$field['js']}"{/if} id="{$key}" {if isset($field['size'])} size="{$field['size']}"{/if}> <select name="{$key}"{if isset($field['js'])} onchange="{$field['js']}"{/if} id="{$key}" {if isset($field['size'])} size="{$field['size']}"{/if}>
@@ -177,6 +177,12 @@
{/if} {/if}
<br style="clear:both"> <br style="clear:both">
{/if} {/if}
{if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}
<sup>*</sup>
{/if}
{if isset($field['hint'])}<span class="hint" name="help_box">{$field['hint']}<span class="hint-pointer">&nbsp;</span></span>{/if}
{/block}{* end block input *}
{if ($field['multishop_default'])} {if ($field['multishop_default'])}
<div class="preference_default_multishop"> <div class="preference_default_multishop">
<label> <label>
@@ -184,19 +190,13 @@
</label> </label>
</div> </div>
{/if} {/if}
{if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}
<sup>*</sup>
{/if}
{if isset($field['hint'])}<span class="hint" name="help_box">{$field['hint']}<span class="hint-pointer">&nbsp;</span></span>{/if}
{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if} {if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
{if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in this shop context'}</p>{/if} {if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in this shop context'}</p>{/if}
</div> </div>
{block name="end_field_block"}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{/block} {/block}{* end block field *}
{/if} {/if}
{/block}
{/foreach} {/foreach}
{if isset($categoryData['submit'])} {if isset($categoryData['submit'])}
<div class="margin-form"> <div class="margin-form">