From ecb9a3b5da373afb9a742242f99aaf63f2108bd3 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 15 Mar 2012 15:00:30 +0000
Subject: [PATCH] // Fix multishop display for AdminTab retrocompatibility

---
 admin-dev/header.inc.php  | 13 ++++++++++---
 translations/fr/admin.php |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php
index ade435b40..9c41ecfd1 100644
--- a/admin-dev/header.inc.php
+++ b/admin-dev/header.inc.php
@@ -41,6 +41,7 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'jquery.cluetip.css" />
 		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
+		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
 		<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
 		<script type="text/javascript">
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
@@ -53,6 +54,7 @@ echo '
 		<script type="text/javascript" src="'._PS_JS_DIR_.'toggle.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'tools.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'ajax.js"></script>
+		<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.js"></script>
 		<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
 		'.Hook::exec('displayBackOfficeHeader').'
 		<!--[if IE]>
@@ -279,9 +281,6 @@ foreach (QuickAccess::getQuickAccesses(Context::getContext()->language->id) AS $
 echo '			</select>
 			</div>';
 
-		if (Shop::isFeatureActive())
-			echo '<div id="header_shoplist">'.translate('Select your shop:').' '.Helper::renderShopList().'</div>';
-
 		echo '</div>';
 			echo Hook::exec('displayBackOfficeTop');
 			echo '<ul id="menu">';
@@ -338,3 +337,11 @@ echo '
 				';
 				if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
 					echo '<div class="warn">This tab is an AdminTab</div>';
+
+if (Shop::isFeatureActive())
+{
+   echo '<div class="multishop_toolbar">
+        <span class="text_multishop">'.translate('Multishop configuration for').'</span>'.
+		Helper::renderShopList();
+    echo '</div>';
+}
diff --git a/translations/fr/admin.php b/translations/fr/admin.php
index 6a26e9978..2eaf873dc 100644
--- a/translations/fr/admin.php
+++ b/translations/fr/admin.php
@@ -4344,7 +4344,7 @@ $_LANGADM['index77181afe06241c54ef771a23ee6da8f4'] = 'Derniers messages';
 $_LANGADM['index7de03e29467c9d376a57e40f2ace850f'] = 'Une modification de ce champ sera appliquée à la boutique %s';
 $_LANGADM['index8642a2f37a5d42b54ce53b1fbdd1583f'] = 'paniers';
 $_LANGADM['index86bbc77fd75ac02c21b84a37b260eadd'] = 'Panneau d\'administration';
-$_LANGADM['index891cea3363eb13a9ed383ae32f0b48d8'] = 'Sélectionnez votre boutique :';
+$_LANGADM['index87d6ef331c17f4e5d4e539e2098bf01a'] = 'Configuration multi-boutique pour';
 $_LANGADM['indexa2eda4e1c4dfc9bade7150b878c57a46'] = 'Voir tous les messages';
 $_LANGADM['indexa4da6f31ab268a5310bc475e63ab92db'] = 'Je comprends les risques et je veux afficher la page';
 $_LANGADM['indexa546b4ed60fa82d6e50475370c228979'] = 'Un nouveau message a été publié sur votre boutique.';