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

// fix update form.tpl in AdminTaxRulesGroupsController

Browse Source
This commit is contained in:
lLefevre
2011-11-07 13:03:04 +00:00
parent 659a9a6319
commit 8747306424
8 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/helper/form/form.tpl
+14 -14
View File
@@ -64,21 +64,21 @@
<script type="text/javascript" src="../js/form.js"></script>
{/if}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
{/block}
</h3>
</div>
{/if}
<div class="leadin">{block name="leadin"}{/block}</div>
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
{/block}
</h3>
</div>
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
</div>
</div>
{/if}
{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
<form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
admin-dev/themes/template/helper/list/list_header.tpl
+11 -9
View File
@@ -60,17 +60,19 @@
{/if}{* End if simple_header *}
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
{/block}</h3>
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
{/block}
</h3>
</div>
</div>
</div>
</div>
</div>
{/if}
<div class="leadin">{block name="leadin"}{/block}</div>
<a name="{$table}">&nbsp;</a>
admin-dev/themes/template/helper/view/view.tpl
+9 -9
View File
@@ -24,20 +24,20 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
{/block}
</h3>
</div>
{/if}
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
</div>
</div>
{/if}
{block name="override_tpl"}{/block}
admin-dev/themes/template/tax_rules_group/form_new.tpl → admin-dev/themes/template/tax_rules/form.tpl
+5 -2
View File
@@ -24,6 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{extends file="../helper/form/form.tpl"}
{block name="label"}
{if $input.type == 'select' && $input.name == 'country[]'}
<div id="add_new_tax_rule" style="display:none">
@@ -64,10 +65,12 @@
populateStates($(this).val(), '');
});
$('.toolbar_btn').click(function() {
$('#desc-tax_rules_group-new').click(function() {
initForm();
$('#add_new_tax_rule').slideToggle();
$('#add_new_tax_rule').show();
return false;
}, function() {
$('#add_new_tax_rule').hide();
});
});
admin-dev/themes/template/tax_rules_group/form.tpl
+2 -3
View File
@@ -24,6 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{extends file="../helper/form/form.tpl"}
{block name="label"}
{if $input.type == 'select' && $input.name == 'country[]'}
<div id="add_new_tax_rule" style="display:none">
@@ -52,10 +53,8 @@
{block name="end_field_block"}
{if $input.type == 'submit'}
</div>
</div>
{else}
</div>
{/if}
</div>
{/block}
{block name="script"}