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

// Changed modules list button (Sarah needed here!)

Browse Source
This commit is contained in:
Damien Metzger
2013-02-25 12:16:58 +01:00
parent f80e0aee8d
commit d4a6a56d1b
6 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+20 -17
View File
@@ -235,7 +235,10 @@ a.module_toggle_all{color: #268CCD;}
.toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');} .toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');}
.toolbarBox .process-icon-modules-list{ background-image: url('../img/process-icon-modules-list.png');} .toolbarBox .process-icon-modules-list{ background-image: url('../img/process-icon-modules-list.png');}
.toolbarBox #modules_list_container { .toolbarReduced {margin-right:221px}
#modules_list_button {width:211px;height:63px;border:none;float:right;background-image:url('../img/modules_list_button.png');font-size: 1.6em;cursor:pointer;padding-left:45px;margin-top:-73px}
#modules_list_container {
background: none repeat scroll 0 0 #FFF; background: none repeat scroll 0 0 #FFF;
border: solid 1px #CCC; border: solid 1px #CCC;
display: block; display: block;
@@ -244,7 +247,7 @@ a.module_toggle_all{color: #268CCD;}
width: 300px; width: 300px;
position: absolute; position: absolute;
right: 13px; right: 13px;
top: 63px; top: 83px;
z-index: 100; z-index: 100;
padding: 10px; padding: 10px;
box-shadow: 1px 5px 5px #CCCCCC; box-shadow: 1px 5px 5px #CCCCCC;
@@ -253,29 +256,29 @@ a.module_toggle_all{color: #268CCD;}
opacity: 1; opacity: 1;
} }
.toolbarBox #modules_list_container #modules_list_container_content #modules_list_container #modules_list_container_content
{ {
max-height: 500px; max-height: 500px;
overflow: auto; overflow: auto;
} }
.toolbarBox #modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; } #modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; }
.toolbarBox #modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px; } #modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px; }
.toolbarBox #modules_list_container #modules_list_container_tab tr { height: auto} #modules_list_container #modules_list_container_tab tr { height: auto}
.toolbarBox #modules_list_container #modules_list_container_tab tr.rowalt {background-color: #EEE} #modules_list_container #modules_list_container_tab tr.rowalt {background-color: #EEE}
.toolbarBox #modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;} #modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;}
.toolbarBox #modules_list_container #modules_list_loader {margin-top: 10px} #modules_list_container #modules_list_loader {margin-top: 10px}
.toolbarBox #modules_list_container .nav-tabs-modules:after {clear: both;} #modules_list_container .nav-tabs-modules:after {clear:both}
.toolbarBox #modules_list_container .nav-tabs-modules > li {height: 19px;} #modules_list_container .nav-tabs-modules > li {height: 19px;float:left}
.toolbarBox #modules_list_container .nav-tabs-modules > li > a { #modules_list_container .nav-tabs-modules > li > a {
padding-right: 12px; padding-right: 12px;
padding-left: 12px; padding-left: 12px;
margin-right: 2px; margin-right: 2px;
line-height: 14px; line-height: 14px;
} }
.toolbarBox #modules_list_container .nav-tabs-modules > li > a { #modules_list_container .nav-tabs-modules > li > a {
padding-top: 8px; padding-top: 8px;
padding-bottom: 7px; padding-bottom: 7px;
border: 1px solid transparent; border: 1px solid transparent;
@@ -285,15 +288,15 @@ a.module_toggle_all{color: #268CCD;}
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
} }
.toolbarBox #modules_list_container .nav-tabs-modules > li > a:hover { #modules_list_container .nav-tabs-modules > li > a:hover {
border-color: #C0C0C0; border-color: #C0C0C0;
background-color: #ffffff; background-color: #ffffff;
} }
.toolbarBox #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;} #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;}
.toolbarBox #modules_list_container .nav-tabs-modules > .active > a, #modules_list_container .nav-tabs-modules > .active > a,
.toolbarBox #modules_list_container .nav-tabs-modules > .active > a:hover { #modules_list_container .nav-tabs-modules > .active > a:hover {
color: #555555; color: #555555;
cursor: default; cursor: default;
background-color: #EEE; background-color: #EEE;
admin-dev/themes/default/template/toolbar.tpl
+51 -42
View File
@@ -24,7 +24,7 @@
*} *}
<div class="toolbar-placeholder"> <div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}"> <div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if} {if isset($tab_modules_list)}toolbarReduced{/if}">
{block name=toolbarBox} {block name=toolbarBox}
<ul class="cc_button"> <ul class="cc_button">
{foreach from=$toolbar_btn item=btn key=k} {foreach from=$toolbar_btn item=btn key=k}
@@ -33,15 +33,6 @@
<span class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></span> <span class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></span>
<div {if isset($btn.force_desc) && $btn.force_desc == true } class="locked" {/if}>{$btn.desc}</div> <div {if isset($btn.force_desc) && $btn.force_desc == true } class="locked" {/if}>{$btn.desc}</div>
</a> </a>
{if $k == 'modules-list'}
<div id="modules_list_container" style="display:none">
<div style="float:right;top:-5px">
<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png"></a>
</div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0"></div>
<div id="modules_list_container_tab" style="display:none;"></div>
</div>
{/if}
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
@@ -117,13 +108,51 @@
} }
{/block} {/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 (){ </script>
{/block}
<div class="pageTitle">
<h3>{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">
{if $title}
{foreach $title as $key => $item name=title}
{* Use strip_tags because if the string already has been through htmlentities using escape will break it *}
<span class="breadcrumb item-{$key} ">{$item|strip_tags}
{if !$smarty.foreach.title.last}
<img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrumb.png" />
{/if}
</span>
{/foreach}
{else}
&nbsp;
{/if}
</span>
{/block}
</h3>
</div>
</div>
{if isset($tab_modules_list)}
<button id="modules_list_button">
{l s='Modules list'}
</button>
<div class="clear">&nbsp;</div>
<div id="modules_list_container" style="display:none">
<div style="float:right;top:-5px">
<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png"></a>
</div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0"></div>
<div id="modules_list_container_tab" style="display:none"></div>
</div>
<script language="javascript" type="text/javascript">
//<![CDATA[
{if isset($tab_modules_open)}
if ({$tab_modules_open})
openModulesList();
{/if}
{if isset($tab_modules_list)}
$('#modules_list_button').bind('click', function (){
openModulesList(); openModulesList();
}); });
@@ -133,7 +162,7 @@
if (!modules_list_loaded) if (!modules_list_loaded)
{ {
$.ajax({ $.ajax({
type:"POST", type: "POST",
url : '{$admin_module_ajax_url}', url : '{$admin_module_ajax_url}',
async: true, async: true,
data : { data : {
@@ -158,28 +187,8 @@
} }
return false; return false;
} }
{/if} {/if}
//]]> //]]>
</script> </script>
{/block} {/if}
<div class="pageTitle"> </div>
<h3>{block name=pageTitle}
<span id="current_obj" style="font-weight: normal;">
{if $title}
{foreach $title as $key => $item name=title}
{* Use strip_tags because if the string already has been through htmlentities using escape will break it *}
<span class="breadcrumb item-{$key} ">{$item|strip_tags}
{if !$smarty.foreach.title.last}
<img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrumb.png" />
{/if}
</span>
{/foreach}
{else}
&nbsp;
{/if}
</span>
{/block}
</h3>
</div>
</div>
</div>
classes/controller/AdminController.php
+2 -13
View File
@@ -1069,7 +1069,6 @@ class AdminControllerCore extends Controller
'desc' => $this->l('Export') 'desc' => $this->l('Export')
); );
} }
$this->addToolBarModulesListButton();
} }
/** /**
@@ -1465,26 +1464,16 @@ class AdminControllerCore extends Controller
if (is_array($this->tab_modules_list['default_list']) && count($this->tab_modules_list['default_list'])) if (is_array($this->tab_modules_list['default_list']) && count($this->tab_modules_list['default_list']))
$this->filter_modules_list = $this->tab_modules_list['default_list']; $this->filter_modules_list = $this->tab_modules_list['default_list'];
else if (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list'])) elseif (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list']))
{ {
$this->addToolBarModulesListButton();
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'tab_modules_list' => implode(',', $this->tab_modules_list['slider_list']), 'tab_modules_list' => implode(',', $this->tab_modules_list['slider_list']),
'admin_module_ajax_url' => $this->context->link->getAdminLink('AdminModules'), 'admin_module_ajax_url' => $this->context->link->getAdminLink('AdminModules'),
'back_tab_modules_list' => $this->context->link->getAdminLink(Tools::getValue('controller')), 'back_tab_modules_list' => $this->context->link->getAdminLink(Tools::getValue('controller')),
'tab_modules_open' => (int)Tools::getValue('tab_modules_open') 'tab_modules_open' => (int)Tools::getValue('tab_modules_open')
)); ));
} }
} }
protected function addToolBarModulesListButton()
{
if (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list']))
$this->toolbar_btn['modules-list'] = array(
'href' => '#',
'desc' => $this->l('Modules List')
);
}
/** /**
* initialize the invalid doom page of death * initialize the invalid doom page of death
controllers/admin/AdminEmailsController.php
-1
View File
@@ -173,7 +173,6 @@ class AdminEmailsControllerCore extends AdminController
{ {
$this->initTabModuleList(); $this->initTabModuleList();
$this->initToolbar(); $this->initToolbar();
$this->addToolBarModulesListButton();
unset($this->toolbar_btn['save']); unset($this->toolbar_btn['save']);
$back = $this->context->link->getAdminLink('AdminHome'); $back = $this->context->link->getAdminLink('AdminHome');
controllers/admin/AdminModulesController.php
+3 -3
View File
@@ -259,9 +259,9 @@ class AdminModulesControllerCore extends AdminController
} }
} }
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'tab_modules_list' => $modules_list, 'tab_modules_list' => $modules_list,
'admin_module_favorites_view' => $this->context->link->getAdminLink('AdminModules').'&select=favorites' 'admin_module_favorites_view' => $this->context->link->getAdminLink('AdminModules').'&select=favorites'
)); ));
$this->smartyOutputContent('controllers/modules/tab_modules_list.tpl'); $this->smartyOutputContent('controllers/modules/tab_modules_list.tpl');
exit; exit;
controllers/admin/AdminStatsTabController.php
-1
View File
@@ -37,7 +37,6 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
public function initContent() public function initContent()
{ {
$this->initTabModuleList(); $this->initTabModuleList();
$this->addToolBarModulesListButton();
$this->toolbar_title = $this->l('Stats', 'AdminStatsTab'); $this->toolbar_title = $this->l('Stats', 'AdminStatsTab');
if ($this->display == 'view') if ($this->display == 'view')
{ {