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

// Improve multishop ergonomy (new toolbar)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-15 10:04:05 +00:00
parent bc1580fcd4
commit 97c7e11df0
13 changed files with 434 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/functions.php
+2 -2
View File
@@ -410,7 +410,7 @@ function generateShopList()
// Generate HTML
$url = $_SERVER['REQUEST_URI'].(($_SERVER['QUERY_STRING']) ? '&' : '?').'setShopContext=';
$html = '<select class="shopList" onchange="location.href = \''.$url.'\'+$(this).val();">';
$html = '<select class="shopList chosen" onchange="location.href = \''.$url.'\'+$(this).val();">';
if ($context->employee->id_profile == _PS_ADMIN_PROFILE_ ||
$context->shop->getTotalShopsWhoExists() == Employee::getTotalEmployeeShopById($context->employee->id))
@@ -419,7 +419,7 @@ function generateShopList()
foreach ($tree as $gID => $group_data)
{
$disabled = ($group_data['totalShops'] != count($group_data['shops'])) ? 'disabled="disabled"' : '';
$html .= '<option class="group" value="g-'.$gID.'" '.(($value == 'g-'.$gID) ? 'selected="selected"' : '').' '.$disabled.'>'.htmlspecialchars($group_data['name']).'</option>';
$html .= '<option class="group" value="g-'.$gID.'" '.(($value == 'g-'.$gID) ? 'selected="selected"' : '').' '.$disabled.'>'.translate('Group:').' '.htmlspecialchars($group_data['name']).'</option>';
foreach ($group_data['shops'] as $sID => $shopData)
if ($shopData['active'])
$html .= '<option value="s-'.$sID.'" class="shop" '.(($value == 's-'.$sID || $context->shop->id == $sID) ? 'selected="selected"' : '').'>&raquo; '.$shopData['name'].'</option>';
admin-dev/themes/default/css/admin.css
+10 -2
View File
@@ -63,8 +63,6 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
#header #header_search #bo_search_submit { background: transparent url('../img/icon-search.png') no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0; cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
#header #header_quick{float:right; display:block; margin-top:15px;}
#header #header_quick #quick_select{ font-size:13px; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:140px; height:27px;}
#header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
#header #header_shoplist span { float:left; padding:3px;}
#header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
@@ -168,6 +166,16 @@ a.module_toggle_all{color: #268CCD;}
/*TABLE STATUS COMMANDE*/
.table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
/*multishop toolbar*/
.multishop_toolbar { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; font-size: 18px;}
.multishop_toolbar span.text_multishop {vertical-align: 7px; padding-right: 5px; }
.multishop_toolbar select.shopList { width: 300px; }
.multishop_toolbar a.chzn-single { background: url('../img/icon-multishop.png') no-repeat 5px 5px; padding: 1px 2px 2px 25px; font-weight: bold; }
.multishop_toolbar .chzn-container .first{font-weight: bold;background-color: #408BD5;color: #ffffff;}
.multishop_toolbar .chzn-container .group{font-weight: bold;font-style: italic;padding-left: 15px;background-color: #C6DEFC;}
.multishop_toolbar .chzn-container .shop{padding-left: 30px;background-color: #EAF2FC;}
/*toolbarBox*/
.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
admin-dev/themes/default/img/icon-multishop.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

admin-dev/themes/default/template/header.tpl
+4 -10
View File
@@ -188,9 +188,6 @@
</select>
</div>
{if $multi_shop}
<div id="header_shoplist"><span>{l s='Select your shop:'}</span>{$shop_list}</div>
{/if}
{hook h="displayBackOfficeTop"}
</div>
<ul id="menu">
@@ -221,12 +218,9 @@
</div>
{/if}
{if $display_header && $is_multishop && $shop_context != 'all'}
<div class="multishop_info">
{if $shop_context == 'group'}
{l s='You are configuring your store for group shop '} <b>{$group_shop->name}</b>
{elseif $shop_context == 'shop'}
{l s='You are configuring your store for shop '} <b>{$shop->name}</b>
{/if}
{if $display_header && $is_multishop && $display_multishop_toolbar}
<div class="multishop_toolbar">
<span class="text_multishop">{l s='Multishop configuration for'}</span>
{$shop_list}
</div>
{/if}