// Toolbar modifs

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
@@ -22,12 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{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 isset($fields.title)}<h3>{$fields.title}</h3>{/if}
{block name="defaultForm"}
@@ -82,7 +76,7 @@
{/block}
{block name="field"}
<div class="col-lg-9">
<div class="col-lg-9{if !isset($input.label)} col-lg-offset-3{/if}">
{block name="input"}
{if $input.type == 'text' || $input.type == 'tags'}
{if isset($input.lang) AND $input.lang}
@@ -639,6 +633,9 @@
<!-- {*if $required_fields}
<div class="small"><sup>*</sup> {l s='Required field'}</div>
{/if*} -->
{block name="footer"}
{include file="footer_toolbar.tpl"}
{/block}
</fieldset>
{/block}
{block name="other_fieldsets"}{/block}
@@ -57,25 +57,6 @@
{if !$simple_header}
<div class="leadin">
{block name="leadin"}{/block}
{foreach from=$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>
{break}
{/if}
{/foreach}
</div>
{/if}
@@ -100,28 +81,14 @@
{if isset($toolbar_btn) && count($toolbar_btn) >0}
<span class="panel-heading-action">
{foreach from=$toolbar_btn item=btn key=k}
<a id="desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}" class="list-tooolbar-btn" {if isset($btn.href)}href="{$btn.href}"{/if} {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
<label>
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s=$btn.desc}" data-html="true">
<i class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></i>
</span>
</label>
</a>
{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 $k != 'modules-list'}
<a id="desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}" class="list-tooolbar-btn" {if isset($btn.href)}href="{$btn.href}"{/if} {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
<label>
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s=$btn.desc}" data-html="true">
<i class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></i>
</span>
</label>
</a>
{/if}
{/foreach}
<a id="desc-{$table}-refresh" class="list-tooolbar-btn" href="javascript:location.reload();">
@@ -137,7 +104,7 @@
<script language="javascript" type="text/javascript">
//<![CDATA[
var submited = false
var modules_list_loaded = false;
$(function() {
//get reference on save link
btn_save = $('i[class~="process-icon-save"]').parent();
@@ -205,52 +172,10 @@
}
{/block}
}
{if isset($tab_modules_open)}
if ({$tab_modules_open})
openModulesList();
{/if}
});
{if isset($tab_modules_list)}
$('.process-icon-modules-list').parent('a').unbind().bind('click', function (){
console.log('ok');
openModulesList();
});
function openModulesList()
{
$('#modules_list_container').modal('show');
if (!modules_list_loaded)
{
$.ajax({
type: "POST",
url : '{$admin_module_ajax_url}',
async: true,
data : {
ajax : "1",
controller : "AdminModules",
action : "getTabModulesList",
tab_modules_list : '{$tab_modules_list}',
back_tab_modules_list : '{$back_tab_modules_list}'
},
success : function(data)
{
$('#modules_list_container_tab').html(data).slideDown();
$('#modules_list_loader').hide();
modules_list_loaded = true;
}
});
}
else
{
$('#modules_list_container_tab').slideDown();
$('#modules_list_loader').hide();
}
return false;
}
{/if}
//]]>
</script>
{/if}
</script>
{/if}
</div>
{/if}
{if $simple_header}
@@ -23,10 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{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 class="leadin">{block name="leadin"}{/block}</div>
<script type="text/javascript">
id_language = Number({$current_id_lang});
@@ -380,6 +377,9 @@
<div class="small"><sup>*</sup> {l s='Required field'}</div>
{/if*} -->
{if isset($categoryData['bottom'])}{$categoryData['bottom']}{/if}
{block name="footer"}
{include file="footer_toolbar.tpl"}
{/block}
</fieldset>
{/foreach}
{hook h='displayAdminOptions'}
@@ -23,10 +23,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{/if}
<div class="leadin">{block name="leadin"}{/block}</div>
{block name="override_tpl"}{/block}