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

// This reverts commit 9ebe9e1894. "Changed modules list button"

Browse Source
This commit is contained in:
Damien Metzger
2013-03-11 14:05:38 +01:00
parent 3c6ac17a72
commit a33c6ff54b
5 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+19 -19
View File
@@ -199,7 +199,7 @@ a.module_toggle_all{color: #268CCD;}
/*toolbarBox*/ /*toolbarBox*/
.toolbar-placeholder {position:relative} .toolbar-placeholder {position:relative}
.toolbarBox {background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;position:relative;width: auto !important;} .toolbarBox {background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;position:relative}
.toolbarBox .pageTitle { margin-left:10px; line-height:48px} .toolbarBox .pageTitle { margin-left:10px; line-height:48px}
.toolbarBox .pageTitle h3 {font-size: 1.6em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;} .toolbarBox .pageTitle h3 {font-size: 1.6em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
.toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;} .toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
@@ -243,7 +243,7 @@ a.module_toggle_all{color: #268CCD;}
.toolbarReduced {margin-right:221px} .toolbarReduced {margin-right:221px}
#modules_list_button {width:211px;height:63px;border:none;position:absolute;top:0;right:0;background-image:url('../img/modules_list_button.png');font-size: 1.6em;cursor:pointer;padding-left:45px} #modules_list_button {width:211px;height:63px;border:none;position:absolute;top:0;right:0;background-image:url('../img/modules_list_button.png');font-size: 1.6em;cursor:pointer;padding-left:45px}
#modules_list_container { .toolbarBox #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;
@@ -252,7 +252,7 @@ a.module_toggle_all{color: #268CCD;}
width: 300px; width: 300px;
position: absolute; position: absolute;
right: 13px; right: 13px;
top: 83px; top: 63px;
z-index: 100; z-index: 100;
padding: 10px; padding: 10px;
box-shadow: 1px 5px 5px #CCCCCC; box-shadow: 1px 5px 5px #CCCCCC;
@@ -261,29 +261,29 @@ a.module_toggle_all{color: #268CCD;}
opacity: 1; opacity: 1;
} }
#modules_list_container #modules_list_container_content .toolbarBox #modules_list_container #modules_list_container_content
{ {
max-height: 500px; max-height: 500px;
overflow: auto; overflow: auto;
} }
#modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; } .toolbarBox #modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; }
#modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px; } .toolbarBox #modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px; }
#modules_list_container #modules_list_container_tab tr { height: auto} .toolbarBox #modules_list_container #modules_list_container_tab tr { height: auto}
#modules_list_container #modules_list_container_tab tr.rowalt {background-color: #EEE} .toolbarBox #modules_list_container #modules_list_container_tab tr.rowalt {background-color: #EEE}
#modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;} .toolbarBox #modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;}
#modules_list_container #modules_list_loader {margin-top: 10px} .toolbarBox #modules_list_container #modules_list_loader {margin-top: 10px}
#modules_list_container .nav-tabs-modules:after {clear:both} .toolbarBox #modules_list_container .nav-tabs-modules:after {clear: both;}
#modules_list_container .nav-tabs-modules > li {height: 19px;float:left} .toolbarBox #modules_list_container .nav-tabs-modules > li {height: 19px;}
#modules_list_container .nav-tabs-modules > li > a { .toolbarBox #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;
} }
#modules_list_container .nav-tabs-modules > li > a { .toolbarBox #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;
@@ -293,15 +293,15 @@ a.module_toggle_all{color: #268CCD;}
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
} }
#modules_list_container .nav-tabs-modules > li > a:hover { .toolbarBox #modules_list_container .nav-tabs-modules > li > a:hover {
border-color: #C0C0C0; border-color: #C0C0C0;
background-color: #ffffff; background-color: #ffffff;
} }
#modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;} .toolbarBox #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;}
#modules_list_container .nav-tabs-modules > .active > a, .toolbarBox #modules_list_container .nav-tabs-modules > .active > a,
#modules_list_container .nav-tabs-modules > .active > a:hover { .toolbarBox #modules_list_container .nav-tabs-modules > .active > a:hover {
color: #555555; color: #555555;
cursor: default; cursor: default;
background-color: #EEE; background-color: #EEE;
@@ -312,7 +312,7 @@ a.module_toggle_all{color: #268CCD;}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;width:90% !important;margin:auto} div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;margin:auto}
/*button upload files*/ /*button upload files*/
#content .qq-upload-button { #content .qq-upload-button {
admin-dev/themes/default/template/toolbar.tpl
+41 -50
View File
@@ -24,7 +24,7 @@
*} *}
<div class="toolbar-placeholder"> <div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if} {if isset($tab_modules_list)}toolbarReduced{/if}"> <div class="toolbarBox {if $toolbar_scroll}toolbarHead{/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,6 +33,15 @@
<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>
@@ -108,51 +117,13 @@
} }
{/block} {/block}
} }
}); {if isset($tab_modules_open)}
//]]> if ({$tab_modules_open})
</script> openModulesList();
{/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} {/if}
</span> });
{/block} {if isset($tab_modules_list)}
</h3> $('.process-icon-modules-list').parent('a').unbind().bind('click', function (){
</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();
}); });
@@ -187,8 +158,28 @@
} }
return false; return false;
} }
{/if} {/if}
//]]> //]]>
</script> </script>
{/if} {/block}
</div> <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>
</div>
classes/controller/AdminController.php
+11
View File
@@ -1069,6 +1069,7 @@ class AdminControllerCore extends Controller
'desc' => $this->l('Export') 'desc' => $this->l('Export')
); );
} }
$this->addToolBarModulesListButton();
} }
/** /**
@@ -1466,6 +1467,7 @@ class AdminControllerCore extends Controller
$this->filter_modules_list = $this->tab_modules_list['default_list']; $this->filter_modules_list = $this->tab_modules_list['default_list'];
elseif (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'),
@@ -1474,6 +1476,15 @@ class AdminControllerCore extends Controller
)); ));
} }
} }
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,6 +173,7 @@ 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/AdminStatsTabController.php
+1
View File
@@ -37,6 +37,7 @@ 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')
{ {