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

// Toolbar modifs

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-08 18:42:07 +02:00
parent b7e13e2e7f
commit d88857610d
78 changed files with 871 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/addons_catalog/content.tpl
+27
View File
@@ -22,6 +22,33 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($content)}
{if isset($show_page_header_toolbar) && $show_page_header_toolbar &&(!isset($lite_display) || !$lite_display)}
<div class="leadin">
{foreach from=$page_header_toolbar_btn item=btn key=k}
{if $k == 'modules-list'}
<div class="modal fade" id="modules_list_container">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title">{l s='Modules'}</h3>
</div>
<div class="modal-body">
<div id="modules_list_container_tab" style="display:none;"></div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt=""/></div>
</div>
</div>
</div>
</div>
{/if}
{/foreach}
</div>
{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
{/if}
{$content}
{/if}
<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/search.php?parentUrl={$parentDomain}"></iframe>
<div class="clear">&nbsp;</div>
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+33 -41
View File
@@ -1,45 +1,37 @@
<div class="row">
{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="row">
<div class="productTabs">
<ul class="tab nav nav-tabs">
<li class="tab-row">
<a class="tab-page" id="cart_rule_link_informations" href="javascript:displayCartRuleTab('informations');"><i class="icon-info"></i> {l s='Information'}</a>
</li>
<li class="tab-row">
<a class="tab-page" id="cart_rule_link_conditions" href="javascript:displayCartRuleTab('conditions');"><i class="icon-random"></i> {l s='Conditions'}</a>
</li>
<li class="tab-row">
<a class="tab-page" id="cart_rule_link_actions" href="javascript:displayCartRuleTab('actions');"><i class="icon-wrench"></i> {l s='Actions'}</a>
</li>
</ul>
</div>
</div>
<div class="row">
<form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" class="form-horizontal" method="post">
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<fieldset id="cart_rule_informations" class="cart_rule_tab">
<h3><i class="icon-info"></i> {l s='Cart rule information'}</h3>
{include file='controllers/cart_rules/informations.tpl'}
</fieldset>
<fieldset id="cart_rule_conditions" class="cart_rule_tab">
<h3><i class="icon-random"></i> {l s='Cart rule conditions'}</h3>
{include file='controllers/cart_rules/conditions.tpl'}
</fieldset>
<fieldset id="cart_rule_actions" class="cart_rule_tab">
<h3><i class="icon-wrench"></i> {l s='Cart rule actions'}</h3>
{include file='controllers/cart_rules/actions.tpl'}
</fieldset>
<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
</form>
<div class="productTabs">
<ul class="tab nav nav-tabs">
<li class="tab-row">
<a class="tab-page" id="cart_rule_link_informations" href="javascript:displayCartRuleTab('informations');"><i class="icon-info"></i> {l s='Information'}</a>
</li>
<li class="tab-row">
<a class="tab-page" id="cart_rule_link_conditions" href="javascript:displayCartRuleTab('conditions');"><i class="icon-random"></i> {l s='Conditions'}</a>
</li>
<li class="tab-row">
<a class="tab-page" id="cart_rule_link_actions" href="javascript:displayCartRuleTab('actions');"><i class="icon-wrench"></i> {l s='Actions'}</a>
</li>
</ul>
</div>
<form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" class="form-horizontal" method="post">
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<fieldset id="cart_rule_informations" class="cart_rule_tab">
<h3><i class="icon-info"></i> {l s='Cart rule information'}</h3>
{include file='controllers/cart_rules/informations.tpl'}
{include file="footer_toolbar.tpl"}
</fieldset>
<fieldset id="cart_rule_conditions" class="cart_rule_tab">
<h3><i class="icon-random"></i> {l s='Cart rule conditions'}</h3>
{include file='controllers/cart_rules/conditions.tpl'}
{include file="footer_toolbar.tpl"}
</fieldset>
<fieldset id="cart_rule_actions" class="cart_rule_tab">
<h3><i class="icon-wrench"></i> {l s='Cart rule actions'}</h3>
{include file='controllers/cart_rules/actions.tpl'}
{include file="footer_toolbar.tpl"}
</fieldset>
<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
</form>
<script type="text/javascript">
var product_rule_groups_counter = {if isset($product_rule_groups_counter)}{$product_rule_groups_counter|intval}{else}0{/if};
admin-dev/themes/default/template/controllers/emails/content.tpl
+26 -2
View File
@@ -37,6 +37,30 @@
</script>
<script type="text/javascript" src="../js/sendMailTest.js"></script>
{$content}
{if isset($content)}
{if isset($show_page_header_toolbar) && $show_page_header_toolbar &&(!isset($lite_display) || !$lite_display)}
<div class="leadin">
{foreach from=$page_header_toolbar_btn item=btn key=k}
{if $k == 'modules-list'}
<div class="modal fade" id="modules_list_container">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title">{l s='Modules'}</h3>
</div>
<div class="modal-body">
<div id="modules_list_container_tab" style="display:none;"></div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt=""/></div>
</div>
</div>
</div>
</div>
{/if}
{/foreach}
</div>
{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
{/if}
{$content}
{/if}
admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
+2 -3
View File
@@ -26,7 +26,8 @@
{extends file="helpers/options/options.tpl"}
{block name="field"}
{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;">
{*TODO : overflow*}
<div class="well margin-form" style="height: 300px; overflow-y: auto;">
<table class="table" cellspacing="0">
<thead>
<tr>
@@ -44,8 +45,6 @@
</tbody>
</table>
</div>
<div class="clear"></div>
<br />
{else}
{$smarty.block.parent}
{/if}
admin-dev/themes/default/template/controllers/images/content.tpl
+26 -2
View File
@@ -22,8 +22,32 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{$content}
{if isset($content)}
{if isset($show_page_header_toolbar) && $show_page_header_toolbar &&(!isset($lite_display) || !$lite_display)}
<div class="leadin">
{foreach from=$page_header_toolbar_btn item=btn key=k}
{if $k == 'modules-list'}
<div class="modal fade" id="modules_list_container">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title">{l s='Modules'}</h3>
</div>
<div class="modal-body">
<div id="modules_list_container_tab" style="display:none;"></div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt=""/></div>
</div>
</div>
</div>
</div>
{/if}
{/foreach}
</div>
{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
{/if}
{$content}
{/if}
{if isset($display_regenerate)}
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+1 -1
View File
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{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/marketing/helpers/view/view.tpl
-4
View File
@@ -1,5 +1 @@
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{/if}
{$modules_list}
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
-1
View File
@@ -23,7 +23,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{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" class="form-horizontal">
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
-1
View File
@@ -28,7 +28,6 @@
var come_from = 'AdminModulesPositions';
</script>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div>{block name="leadin"}{/block}</div>
<div class="row">
admin-dev/themes/default/template/controllers/orders/form.tpl
-1
View File
@@ -976,7 +976,6 @@
}
</script>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
<form action="" method="" class="form-horizontal">
admin-dev/themes/default/template/controllers/shipping/content.tpl
+29 -1
View File
@@ -23,7 +23,35 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{$content}
<div id="ajax_confirmation" class="alert alert-success" style="display:none"></div>
{* ajaxBox allows*} <div id="ajaxBox" style="display:none"></div>
{if isset($content)}
{if isset($show_page_header_toolbar) && $show_page_header_toolbar &&(!isset($lite_display) || !$lite_display)}
<div class="leadin">
{foreach from=$page_header_toolbar_btn item=btn key=k}
{if $k == 'modules-list'}
<div class="modal fade" id="modules_list_container">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title">{l s='Modules'}</h3>
</div>
<div class="modal-body">
<div id="modules_list_container_tab" style="display:none;"></div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt=""/></div>
</div>
</div>
</div>
</div>
{/if}
{/foreach}
</div>
{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
{/if}
{$content}
{/if}
<form action="{$action_fees}" id="fees" name="fees" method="post" class="form-horizontal">
<fieldset>
admin-dev/themes/default/template/controllers/shop/content.tpl
+22 -2
View File
@@ -23,8 +23,28 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if $toolbar_btn}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{if isset($show_page_header_toolbar) && $show_page_header_toolbar &&(!isset($lite_display) || !$lite_display)}
<div class="leadin">
{foreach from=$page_header_toolbar_btn item=btn key=k}
{if $k == 'modules-list'}
<div class="modal fade" id="modules_list_container">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 class="modal-title">{l s='Modules'}</h3>
</div>
<div class="modal-body">
<div id="modules_list_container_tab" style="display:none;"></div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt=""/></div>
</div>
</div>
</div>
</div>
{/if}
{/foreach}
</div>
{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
{/if}
<div class="row">
admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
+13 -6
View File
@@ -52,16 +52,23 @@
{block name="after"}
<fieldset id="prestastore-content"></fieldset>
<script type="text/javascript">
$.post(
"ajax-tab.php",
{
$.ajax({
type: 'POST',
headers: { "cache-control": "no-cache" },
url: 'ajax-tab.php?rand=' + new Date().getTime(),
async: true,
cache: false,
dataType : "html",
data: {
tab: 'AdminThemes',
token: '{$token}',
ajax: '1',
action:'getAddonsThemes',
page:'themes'
}, function(a){
$("#prestastore-content").html("<h3><i class='icon-puzzle-piece'></i> {l s='Live from PrestaShop Addons!'}</h3>"+a);
});
},
success: function(htmlData) {
$("#prestastore-content").html("<h3><i class='icon-puzzle-piece'></i> {l s='Live from PrestaShop Addons!'}</h3>"+htmlData);
}
});
</script>
{/block}