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

// Refactoring helper forms with new blocks

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13937 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-03-07 16:34:25 +00:00
parent dde5fbb33e
commit 93a7ded19e
9 changed files with 339 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+20 -25
View File
@@ -27,12 +27,28 @@
{extends file="helpers/form/form.tpl"}
{block name="label"}
{if $input.name == 'vat_number'}
{if $vat == 'is_applicable'}
<div id="vat_area" style="display: visible">
{else if $vat == 'management'}
<div id="vat_area" style="display: hidden">
{else}
<div style="display: none;">
{/if}
{else if $input.name == 'id_state'}
<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
{/if}
{if $input.type == 'text_customer' && !isset($customer)}
<label>{l s='Customer e-mail'}</label>
{else}
{$smarty.block.parent}
{/if}
{/block}
{block name="start_field_block"}
{block name="field_block"}
{if $input.type == 'text_customer'}
{if isset($customer)}
<label>{$input.label}</label>
<div class="margin-form"><a style="display: block; padding-top: 4px;" href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">{$customer->lastname} {$customer->firstname} ({$customer->email})</a></div>
<input type="hidden" name="id_customer" value="{$customer->id}" />
<input type="hidden" name="email" value="{$customer->email}" />
@@ -71,34 +87,13 @@
}
});
</script>
<label>{l s='Customer e-mail'}</label>
<div class="margin-form">
<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'|htmlentities}" style="text-transform: lowercase;" /> <sup>*</sup>
</div>
{/if}
{else}
{if $input.name == 'vat_number'}
{if $vat == 'is_applicable'}
<div id="vat_area" style="display: visible">
{else if $vat == 'management'}
<div id="vat_area" style="display: hidden">
{else}
<div style="display: none;">
{/if}
{else if $input.name == 'id_state'}
<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
{/if}
<label>{$input.label} </label>
<div class="margin-form">
{else}
{$smarty.block.parent}
{/if}
{/block}
{block name="end_field_block"}
{* close div margin-form *}
{if $input.type != 'text_customer'}
</div>
{/if}
{* close hidden div *}
{if $input.name == 'vat_number' || $input.name == 'id_state'}
</div>
{/if}
admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+11 -19
View File
@@ -30,31 +30,24 @@
{if $input.type == 'color'}
<div id="colorAttributeProperties" style="display:{if $colorAttributeProperties}block{else}none{/if}";>
{/if}
{if isset($input.label)}
<label>{$input.label} </label>
{/if}
{$smarty.block.parent}
{/block}
{block name="start_field_block"}
<div class="margin-form">
{if $input.name == 'current_texture'}
{block name="field_block"}
{if $input.name == 'current_texture'}
<div class="margin-form">
{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>
{/if}
</div>
{if $input.name == 'name'}
{hook h="displayAttributeForm" id_attribute=$form_id}
{/if}
</div>
{else}
{$smarty.block.parent}
{/if}
{if $input.name == 'name'}
{hook h="displayAttributeForm" id_attribute=$form_id}
{/if}
{/block}
{block name="script"}
@@ -71,5 +64,4 @@
displayColorFieldsOption();
$('#id_attribute_group').change(displayColorFieldsOption);
{/block}
admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
+3 -2
View File
@@ -66,12 +66,13 @@
</div>
{/block}
{block name="start_field_block"}
<div class="margin-form">
{block name="input_block"}
{if $input.type == 'select_category'}
<select name="{$input.name}">
{$input.options.html}
</select>
{else}
{$smarty.block.parent}
{/if}
{/block}
admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
+3 -2
View File
@@ -26,12 +26,13 @@
{extends file="helpers/form/form.tpl"}
{block name="start_field_block"}
<div class="margin-form">
{block name="input_block"}
{if $input.type == 'select_category'}
<select name="id_parent">
{$input.options.html}
</select>
{else}
{$smarty.block.parent}
{/if}
{/block}
admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
+7 -4
View File
@@ -25,9 +25,9 @@
*}
{extends file="helpers/form/form.tpl"}
{block name="start_field_block"}
<div class="margin-form">
{if $input.type == 'address_layout'}
{block name="field_block"}
{if $input.type == 'address_layout'}
<div class="margin-form">
<div style="float:left">
<textarea id="ordered_fields" name="address_layout" style="width: 300px;height: 140px;">{$input.address_layout}</textarea>
</div>
@@ -46,7 +46,10 @@
{l s='Clean layout'}</a>
<div style="margin-top:10px; padding-top:5px; height:10px;" id="explanationText"></div>
</div>
{/if}
</div>
{else}
{$smarty.block.parent}
{/if}
{/block}
{block name=script}
admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
+3 -3
View File
@@ -25,8 +25,7 @@
*}
{extends file="helpers/form/form.tpl"}
{block name="start_field_block"}
<div class="margin-form">
{block name="input_block"}
{if $input.type == 'select_theme'}
<select name="{$input.name}" id="{$input.name}" {if isset($input.multiple)}multiple="multiple" {/if}{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
{foreach $input.options.query AS $option}
@@ -42,7 +41,8 @@
>{$option|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
{else}
{$smarty.block.parent}
{/if}
{/block}
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+2 -2
View File
@@ -43,7 +43,7 @@
{/block}
{block name="start_field_block"}
{block name="field_block"}
{if $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
<script type="text/javascript">
@@ -269,6 +269,6 @@
</table>
</div>
{else}
<div class="margin-form">
{$smarty.block.parent}
{/if}
{/block}
admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
+19 -18
View File
@@ -61,24 +61,25 @@
{/block}
{block name="start_field_block"}
<div class="margin-form">
{if $input.type == 'checkboxStatuses'}
{foreach $input.values.query as $value}
{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
<input type="checkbox"
name="{$input.name}[]"
id="{$id_checkbox}"
value="{$value[$input.values.id]|intval}"
{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
<label for="{$id_checkbox}"
style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
{$value[$input.values.name]}
({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
</label><br />
{/foreach}
{/if}
{block name="input_block"}
{if $input.type == 'checkboxStatuses'}
{foreach $input.values.query as $value}
{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
<input type="checkbox"
name="{$input.name}[]"
id="{$id_checkbox}"
value="{$value[$input.values.id]|intval}"
{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
<label for="{$id_checkbox}"
style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
{$value[$input.values.name]}
({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
</label><br />
{/foreach}
{else}
{$smarty.block.parent}
{/if}
{/block}
{block name="after"}<div style="clear:both">&nbsp;</div>{/block}