From ad41e83fbc67918777f463cba1d7b92df9c1b025 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Thu, 23 Feb 2012 14:42:23 +0000
Subject: [PATCH] [+] BO : BO width can now be fixed or flexible (you can set
 it up in your employee account)

---
 admin-dev/themes/default/template/header.tpl   | 4 ++--
 classes/Employee.php                           | 4 ++++
 classes/controller/AdminController.php         | 1 +
 controllers/admin/AdminEmployeesController.php | 7 +++++++
 install-dev/data/db_structure.sql              | 1 +
 install-dev/upgrade/sql/1.5.0.7.sql            | 2 ++
 6 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 5a94d754e..905a99752 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -92,11 +92,11 @@
 			}
 		</style>
 	</head>
-	<body{if $bo_color} style="background:{$bo_color}"{/if}>
+	<body style="{if $bo_color}background:{$bo_color};{/if}{if $bo_width > 0}text-align:center;{/if}">
 {if $display_header}
 	<div id="ajax_running"><img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}</div>
 
-	<div id="top_container">
+	<div id="top_container" {if $bo_width > 0}style="margin:auto;width:{$bo_width}px"{/if}>
 		<div id="container">
 			{* begin  HEADER *}
 			<div id="header">
diff --git a/classes/Employee.php b/classes/Employee.php
index e60673a9b..4d5f833fc 100644
--- a/classes/Employee.php
+++ b/classes/Employee.php
@@ -59,6 +59,9 @@ class EmployeeCore extends ObjectModel
 	/** @var string employee's chosen theme */
 	public $bo_theme;
 
+	/** @var integer employee desired screen width */
+	public $bo_width;
+
 	/** @var bool, true */
 	public $bo_show_screencast;
 
@@ -84,6 +87,7 @@ class EmployeeCore extends ObjectModel
 			'id_profile' => 		array('type' => self::TYPE_INT, 'validate' => 'isInt', 'required' => true),
 			'bo_color' => 			array('type' => self::TYPE_STRING, 'validate' => 'isColor', 'size' => 32),
 			'bo_theme' => 			array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'size' => 32),
+			'bo_width' => 			array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'bo_show_screencast' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 			'stats_date_from' => 	array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
 			'stats_date_to' => 		array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 5cdfa3d0e..f55b1aba6 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1282,6 +1282,7 @@ class AdminControllerCore extends Controller
 			'brightness' => Tools::getBrightness($bo_color) < 128 ? 'white' : '#383838',
 			'lang_iso' => $this->context->language->iso_code,
 			'link' => $this->context->link,
+			'bo_width' => (int)$this->context->employee->bo_width,
 			'bo_color' => isset($this->context->employee->bo_color) ? Tools::htmlentitiesUTF8($this->context->employee->bo_color) : null,
 			'shop_name' => Configuration::get('PS_SHOP_NAME'),
 			'show_new_orders' => Configuration::get('PS_SHOW_NEW_ORDERS'),
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index 0316304bb..ed77ae0ca 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -188,6 +188,13 @@ class AdminEmployeesControllerCore extends AdminController
 					'size' => 20,
 					'desc' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
 				),
+				array(
+					'type' => 'text',
+					'label' => $this->l('Back office width'),
+					'name' => 'bo_width',
+					'size' => 10,
+					'desc' => $this->l('Back office width, in pixels. The value "0" means that the back office width will be flexible.')
+				),
 				array(
 					'type' => 'select',
 					'label' => $this->l('Language:'),
diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
index b769977bd..428770763 100644
--- a/install-dev/data/db_structure.sql
+++ b/install-dev/data/db_structure.sql
@@ -692,6 +692,7 @@ CREATE TABLE `PREFIX_employee` (
   `stats_date_to` date default NULL,
   `bo_color` varchar(32) default NULL,
   `bo_theme` varchar(32) default NULL,
+  `bo_width` int(10) unsigned NOT NULL DEFAULT 0,
   `bo_show_screencast` tinyint(1) NOT NULL default '1',
   `active` tinyint(1) unsigned NOT NULL default '0',
   `id_last_order` tinyint(1) unsigned NOT NULL default '0',
diff --git a/install-dev/upgrade/sql/1.5.0.7.sql b/install-dev/upgrade/sql/1.5.0.7.sql
index 7dc831a49..e9897b9ea 100644
--- a/install-dev/upgrade/sql/1.5.0.7.sql
+++ b/install-dev/upgrade/sql/1.5.0.7.sql
@@ -5,3 +5,5 @@ SET NAMES 'utf8';
 ALTER TABLE `PREFIX_cart_rule` ADD `gift_product_attribute` int(10) unsigned NOT NULL default 0 AFTER `gift_product`;
 
 UPDATE `PREFIX_product` set is_virtual = 1 WHERE id_product IN (SELECT id_product FROM `PREFIX_product_download` WHERE active = 1);
+
+ALTER TABLE `PREFIX_employee` ADD `bo_width` int(10) unsigned NOT NULL DEFAULT 0 AFTER `bo_theme`;
