From 61371b5b4c4c184d1b16787ca9930623344b0ea0 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 14 Jan 2013 14:24:05 +0100
Subject: [PATCH] //BO more compliant with 1024x768

---
 admin-dev/themes/default/css/admin.css        |  34 ++++++++++--------
 admin-dev/themes/default/img/logout.png       | Bin 1215 -> 2002 bytes
 admin-dev/themes/default/template/header.tpl  |  22 ++++++------
 controllers/admin/AdminImagesController.php   |   2 +-
 controllers/admin/AdminProductsController.php |   2 +-
 .../AdminSpecificPriceRuleController.php      |   2 +-
 6 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index 6af3dd8d4..62e4a133f 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -43,22 +43,29 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #top_container{margin:0;padding:0}
 
 /*HEADER*/
-#header { background-color: #394049; height:114px; }
-#header #header_infos{ position:relative; margin: 0; padding:0; height:84px; }
-#header #header_shopname {float: left; margin:15px 20px 0 20px;}
-#header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
-#header #employee_links a{ float:left; color:#BABABA; text-transform:capitalize;}
-#header #employee_links a:hover {color:#fff;}
-#header #employee_links .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#header { background-color: #394049; height:90px; }
+#header #header_infos{ position:relative; margin: 0; padding:0; height:60px; }
+#header #header_shopname {float: left; margin:10px 15px 0 10px;}
+#header #employee_box {float: right; display:block;}
+#header #employee_infos {display:block; margin:10px 15px 0 10px;}
+#header #employee_infos a{color:#BABABA; text-transform:capitalize;margin-right: 5px}
+#header #employee_infos a:hover {color:#fff;}
+#header #employee_infos .employee_name { float:left; color:#fff;padding: 0 20px 0 0;}
+#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top;height: 19px; width: 16px; margin-right: 5px}
+#header ul#employee_links  {list-style: none;display: block;text-align: left;}
+#header ul#employee_links li {display: inline;line-height: 20px;}
+
 #header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
-#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#bababa;}
+#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; padding-left:15px; color:#bababa;}
 #header #header_infos a#header_logout:hover {color:#fff;}
 #header #header_infos #header_logout a span {color:#bababa}
 #header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
 #header #header_infos #header_foaccess a {color:#bababa !important;}
 #header #header_infos a#header_foaccess:hover { color:#fff;}
-#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; margin-left:7%; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
+
+
+
+#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
 #header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 transparent;  border:none; box-shadow:none;  padding: 5px 0px 5px 4px; width: 160px; }
 #header #header_search #bo_search_type_chzn{ font-size:13px; float:left; margin:0 23px 0 0; padding:0 4px; vertical-align:middle;width:100px;height:27px; border:none;}
 #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { box-shadow:none; border-radius:0px; border:none; border-left:1px dotted #ccc;} 
@@ -92,9 +99,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 
 /*MENU*/
 #header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
-#header #menu li.maintab{float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
-#header #menu li:first-child { margin-left:15px;}
-#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
+#header #menu li.maintab{float:left;height:29px;list-style:none;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
+#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 3px 4px 0;font-weight:normal;font-size:12px;}
 #header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
 #header #menu li{_height:32px;_padding-top:3px}
 #header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
@@ -188,7 +194,7 @@ a.module_toggle_all{color: #268CCD;}
 .multishop_toolbar .chzn-container .chzn-results .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 { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
 .toolbarBox .pageTitle { margin-left:10px; line-height:48px}
 .toolbarBox .pageTitle h3 {font-size: 2em; 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;}
diff --git a/admin-dev/themes/default/img/logout.png b/admin-dev/themes/default/img/logout.png
index 3c0a1693431e2bf7b4d04682b672e7dfb1a91c4e..97741365515822ebcd49b4b5e08a7104aa5847eb 100644
GIT binary patch
delta 1750
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
Jef{0te*-VZ3N!!!

literal 1215
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81#n~YilM;-3^4tQ!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=A(aKG
z`a!A1`K3k4z=%sz23b{L<y@4SSdw29lAoUg3&ntp{F40QjQj!x=U`I>-^Aq1JP;qO
z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=$n~ABVp^KrLg{70Bp{s$VsgaSTtD}>do11}|
ztD_}MuS<S%X>Mv>2~2MaLaz}{y`ZF!TL84#CABECEH%ZgC_h&L>}9J=oNjS;!)YE=
zZwhX=7~s^a4|I$^C}NQ!8YToxJs>7L*#bH6grAxROzlO$WX&d?w~m2<(b&_)F{I+w
zluNeW%#H%bK6a}qiFI9Ep}@$g!O>+_$KV+B%6&uk)cZ<v=PsQl=D6|0QjzTV4+oT3
zSeji`Tn&0}s3^Uz|7t0z&-v&8f0?>*`OTfYbBZ0sop(41Tia$e?R!w3V$koXqtwf)
zvazK_ciUO*9j=m*d$j&HmEL*GqHHhwi`#g`?)Mf4M5J!XCyI%_^}qQ3_o8Rce>bfE
zyW!mH$1yuOr%b)Q<?Q>4u*vtA`+lA&85Flu+Iqv1bHZ~k^Q$c_J$2@(P^ivv_HQZI
zbgyh(H}g;XH|C4dizQ57o3BX{;@^1w<?^?0w$!%l)oV6vH<NpNz{z&O2lvk#Uv+J(
z^gSuIZ9<1>Z=%0xXwUCI;S-ajcSp7Fa1ge<yCIXekh%QZnQzu{yU%_2zMy5!+U@!O
d%4@g`7^ZLB_<CIg^B+)=;_2$=vd$@?2>>WUs!ad@

diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 88a10229f..4ec946ed5 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -144,17 +144,19 @@
 					</div>
 				{/if}
 			</div>
-			<div id="employee_links">
-				<span class="employee_name">{$first_name}&nbsp;{$last_name}</span>
-				<span class="separator">&nbsp;</span>
-				<a class="employee" href="index.php?controller=AdminEmployees&amp;id_employee={$employee->id}&amp;updateemployee&amp;token={getAdminToken tab='AdminEmployees'}" alt="">{l s='My preferences'}</a>
-				<span class="separator">&nbsp;</span>
-				<a href="index.php?logout" id="header_logout">{l s='logout'}</a>
-				{if {$base_url}}
-					<span class="separator">&nbsp;</span>
-					<a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">{l s='View my shop'}</a>
-				{/if}
+		
+			<div id="employee_box">
+				<div id="employee_infos">
+					<div class="employee_name">{l s='Welcome,'} <strong>{$first_name}&nbsp;{$last_name}</strong></div>
+					<div class="clear"></div>
+					<ul id="employee_links">
+						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee">{l s='My preferences'}</a></li>
+						<li class="separator">&nbsp;</li>
+						<li><a id="header_logout" href="index.php?logout">{l s='logout'}</a></li>
+					</ul>
+				</div>
 			</div>
+			
 			<div id="header_search">
 				<form method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}">
 					<input type="text" name="bo_query" id="bo_query" value="{$bo_query}" />
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 9785a3143..437cd1601 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -40,7 +40,7 @@ class AdminImagesControllerCore extends AdminController
 
 		$this->fields_list = array(
 			'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
-			'name' => array('title' => $this->l('Name'), 'width' => 300),
+			'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
 			'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
 			'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
 			'products' => array('title' => $this->l('Products:'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index f0e40a9c9..42c027e72 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -206,7 +206,7 @@ class AdminProductsControllerCore extends AdminController
 		else
 			$this->fields_list['name_category'] = array(
 				'title' => $this->l('Category'),
-				'width' => 230,
+				'width' => 'auto',
 				'filter_key' => 'cl!name',
 			);
 		$this->fields_list['price'] = array(
diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php
index 117a11635..9d1f5864d 100755
--- a/controllers/admin/AdminSpecificPriceRuleController.php
+++ b/controllers/admin/AdminSpecificPriceRuleController.php
@@ -61,7 +61,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 			'name' => array(
 				'title' => $this->l('Name'),
 				'filter_key' => 'a!name',
-				'width' => 200
+				'width' => 'auto'
 			),
 			'shop_name' => array(
 				'title' => $this->l('Shop'),