From 97c7e11df0f9ccfedb59fd456d77fc6405d571e0 Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 15 Feb 2012 10:04:05 +0000 Subject: [PATCH] // Improve multishop ergonomy (new toolbar) git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/functions.php | 4 +- admin-dev/themes/default/css/admin.css | 12 +- .../themes/default/img/icon-multishop.png | Bin 0 -> 1060 bytes admin-dev/themes/default/template/header.tpl | 14 +- classes/controller/AdminController.php | 8 +- .../admin/AdminGroupShopController.php | 2 + controllers/admin/AdminHomeController.php | 4 +- controllers/admin/AdminShopController.php | 2 + controllers/admin/AdminShopUrlController.php | 2 + js/admin.js | 5 +- js/jquery/plugins/chosen/chosen-sprite.png | Bin 0 -> 1560 bytes js/jquery/plugins/chosen/jquery.chosen.css | 388 ++++++++++++++++++ js/jquery/plugins/chosen/jquery.chosen.js | 10 + 13 files changed, 434 insertions(+), 17 deletions(-) create mode 100644 admin-dev/themes/default/img/icon-multishop.png create mode 100644 js/jquery/plugins/chosen/chosen-sprite.png create mode 100644 js/jquery/plugins/chosen/jquery.chosen.css create mode 100644 js/jquery/plugins/chosen/jquery.chosen.js diff --git a/admin-dev/functions.php b/admin-dev/functions.php index e58bb1169..6dadb8f32 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -410,7 +410,7 @@ function generateShopList() // Generate HTML $url = $_SERVER['REQUEST_URI'].(($_SERVER['QUERY_STRING']) ? '&' : '?').'setShopContext='; - $html = ''; 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 .= ''; + $html .= ''; foreach ($group_data['shops'] as $sID => $shopData) if ($shopData['active']) $html .= ''; diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 4bd3e5dab..cd9ea985c 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -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} diff --git a/admin-dev/themes/default/img/icon-multishop.png b/admin-dev/themes/default/img/icon-multishop.png new file mode 100644 index 0000000000000000000000000000000000000000..6a619c0ace55c5791c6547e577d9c9ba51b73f59 GIT binary patch literal 1060 zcmaJ=OH30%7+x$GXe7Z$42XxxA|yt-ueOw~6llAxRNY!j4IJ6-PU!~r;qG7y8bK2d zauF}ao9V^iMdL{mqejC4jYbb9MiUM3NJQdE4um)hw0N*?GCT86zVG{=b0d{J)#yIr zCJ3T2F(9Pz-h|iw`n~x7@nPp8-da#>7!4XZRFEu4gcTzTK|+&8VH!%xd47UDa;uoWWn2$?)h7YYTc z;H3;}lxBm$prgTY9*pqVlRA=$9^Gy$D+th*E!9M-p#w)z${G_WMB+%dQ_#$ctZwg= z2^WkmN+!)xjFVCsD2o4wYFY(tqcq%&_n*RcX3~Uo8rsH$CF92B+8kFVAGM%_3@c+8 zOykUaqpdW~mtm=-vg%?FWq1#B(Wtb2`BvznQRpI>+FX!tDcKPC7AIrwr z?pT})$6`!4!bKyIc%aM`40%F>Ix2IOU2dQ%*BJ%P#GVCcsh6Mjb!3znDvH)V}#tmzBZh-o?kImGHW2 ziMYJ5Y=flhd;dZSyld$HF?Z~4!{WD8@6xg|U$c7X$@AH3ubB1sf=ZCB%R*%1WU1SA zdaeEC%(JDb<8Ig7!2=gux2{aj-@n;%?{{h1K=4>{-ECSpn9L1g6m EA5yPXdjJ3c literal 0 HcmV?d00001 diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 0ae79d13d..eb6f5c89d 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -188,9 +188,6 @@ - {if $multi_shop} -
{l s='Select your shop:'}{$shop_list}
- {/if} {hook h="displayBackOfficeTop"}