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

[*] BO : #PI-123 - toolbar and page title refactoring

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-04-12 08:34:38 +00:00
parent ff98873fb5
commit 244a2f9102
24 changed files with 162 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
+2 -10
View File
@@ -168,18 +168,10 @@
</script>
<div class="toolbarBox">
{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}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
{/if}
<div class="productTabs">
<ul class="tab">
admin-dev/themes/default/template/controllers/accounting_configuration/content.tpl
+4 -10
View File
@@ -24,16 +24,10 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="toolbarBox">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
<span id="current_obj" style="font-weight: normal;">
{$title|default:'&nbsp;'}
</span>
</h3>
</div>
</div>
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
{/if}
{if !$has_shop_selected}
<div class="hint" style="display:block">{l s='Please select the shop you want to configure'}</div>
admin-dev/themes/default/template/controllers/accounting_registered_number/content.tpl
+4 -10
View File
@@ -24,16 +24,10 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="toolbarBox">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
<span id="current_obj" style="font-weight: normal;">
{$title|default:'&nbsp;'}
</span>
</h3>
</div>
</div>
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
{/if}
<div id="account_list">
{foreach from=$account_number_list item=detail key=name}
admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+4 -8
View File
@@ -58,14 +58,10 @@
});
</script>
<div class="toolbarBox">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
</h3>
</div>
</div>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
{if $generate}
<div class="module_confirmation conf confirm">
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+2 -15
View File
@@ -1,18 +1,5 @@
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_scroll}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 class="leadin">{block name="leadin"}{/block}</div>
{/if}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
<div>
<div class="productTabs">
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+2 -13
View File
@@ -24,19 +24,8 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox{if $toolbar_scroll} toolbarHead{/if}">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>
<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
</h3>
</div>
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
</div>
{/if}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
{if $module_confirmation}
<div class="module_confirmation conf confirm">
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+3 -10
View File
@@ -24,16 +24,9 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="toolbarBox">
{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>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
<form action="{$url_submit}" id={$table}_form method="post">
{if $display_key}
<input type="hidden" name="show_modules" value="{$display_key}" />
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+2 -13
View File
@@ -30,19 +30,8 @@
</script>
<script type="text/javascript" src="../js/admin-dnd.js"></script>
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_scroll}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>
{/if}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
<div class="filter-module">
<form>
admin-dev/themes/default/template/controllers/orders/form.tpl
+4 -16
View File
@@ -840,23 +840,11 @@
}
});
}
</script>
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
{include file="toolbar.tpl"}
<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 class="leadin">{block name="leadin"}{/block}</div>
{/if}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
<fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
<p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" />
<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p>
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+2 -12
View File
@@ -31,18 +31,8 @@ $(function() {
</script>
{if $show_toolbar}
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_scroll}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>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
{/if}
{if isset($features)}