From 5defc39def8c7605d3dc26fbe3c7a1e21125ac56 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Thu, 1 Aug 2013 14:42:43 +0200
Subject: [PATCH] [+] BO Images / Marketing / Spe. Prices Rules

---
 .../template/controllers/images/content.tpl   | 92 +++++++++++--------
 .../template/helpers/options/options.tpl      |  5 +-
 controllers/admin/AdminImagesController.php   | 23 +++--
 .../admin/AdminMarketingController.php        |  7 +-
 .../AdminSpecificPriceRuleController.php      | 15 +--
 5 files changed, 78 insertions(+), 64 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl
index 9ad86cfb7..ea48719a0 100644
--- a/admin-dev/themes/default/template/controllers/images/content.tpl
+++ b/admin-dev/themes/default/template/controllers/images/content.tpl
@@ -26,30 +26,33 @@
 {$content}
 
 {if isset($display_regenerate)}
-	<h2 class="space">{l s='Regenerate thumbnails'}</h2>
-	{l s='Regenerates thumbnails for all existing images'}<br /><br />
-	<div  class="width4">
-		<div class="alert alert-block">
-			{l s='Please be patient. This can take several minutes.'}<br />
-			{l s='Be careful! Manually uploaded thumbnails will be erased and replaced by automatically generated thumbnails.'}
-		</div>
-	</div>
-	<form action="{$current}&token={$token}" method="post">
-		<fieldset class="width4">
-			<legend><img src="../img/admin/picture.gif" /> {l s='Regenerate thumbnails'}</legend><br />
-			<label>{l s='Select an image'}</label>
-			<div class="margin-form">
-				<select name="type" onchange="changeFormat(this)">
-					<option value="all">{l s='All'}</option>
-					{foreach $types AS $k => $type}
-						<option value="{$k}">{$type}</option>
-					{/foreach}
-				</select>
+
+	<form class="form-horizontal" action="{$current}&token={$token}" method="post">
+		<fieldset>
+			<h3 class="space">{l s='Regenerate thumbnails'}</h3>
+
+			<div class="alert alert-info">
+				{l s='Regenerates thumbnails for all existing images'}<br />
+				{l s='Please be patient. This can take several minutes.'}<br />
+				{l s='Be careful! Manually uploaded thumbnails will be erased and replaced by automatically generated thumbnails.'}
+			</div>
+			
+			<div class="row">
+				<label class="control-label col-lg-3">{l s='Select an image'}</label>
+				<div class="col-lg-9">
+					<select name="type" onchange="changeFormat(this)">
+						<option value="all">{l s='All'}</option>
+						{foreach $types AS $k => $type}
+							<option value="{$k}">{$type}</option>
+						{/foreach}
+					</select>
+				</div>
 			</div>
 
+			<div class="row">
 			{foreach $types AS $k => $type}
-				<label class="second-select format_{$k}" style="display:none;">{l s='Select a format'}</label>
-				<div class="second-select margin-form format_{$k}" style="display:none;">
+				<label class="control-label col-lg-3 second-select format_{$k}" style="display:none;">{l s='Select a format'}</label>
+				<div class="col-lg-9 second-select margin-form format_{$k}" style="display:none;">
 					<select class="second-select format_{$k}" name="format_{$k}">
 						<option value="all">{l s='All'}</option>
 						{foreach $formats[$k] AS $format}
@@ -58,6 +61,8 @@
 					</select>
 				</div>
 			{/foreach}
+			</div>
+
 			<script>
 				function changeFormat(elt)
 				{ldelim}
@@ -65,36 +70,49 @@
 					$('.format_' + $(elt).val()).show();
 				{rdelim}
 			</script>
-			<label>{l s='Erase previous images'}</label>
-			<div class="margin-form">
-				<input name="erase" type="checkbox" value="1" checked="checked" />
-				<p>{l s='Deselect this checkbox only if your server timed out and you need to resume the regeneration.'}</p>
+
+			<div class="row">
+				<label class="control-label col-lg-3">
+					{l s='Erase previous images'}
+				</label>
+				<div class="col-lg-9">
+					<div class="radio">
+						<label>
+							<input name="erase" type="checkbox" value="1" checked="checked" />
+							{l s='Deselect this checkbox only if your server timed out and you need to resume the regeneration.'}
+						</label>
+					</div>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-lg-9 col-push-3">
+					<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
+				</div>
 			</div>
-			<div class="clear"></div>
-			<center><input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="button space" onclick="return confirm('{l s='Are you sure?'}');" /></center>
 		</fieldset>
 	</form>
 {/if}
 
 {if isset($display_move) && $display_move}
-	<br /><h2 class="space">{l s='Move images'}</h2>
-	{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a large number of products.'}<br />
-	<br />
+	<h2 class="space">{l s='Move images'}</h2>
+	{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a large number of products.'}
+
 	{if $safe_mode}
-		<div class="alert alert-block">
+		<div class="alert alert-info">
 			{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}
 		</div>
 	{else}
 		<form action="{$current}&token={$token}" method="post">
 			<fieldset class="width4">
-				<legend><img src="../img/admin/picture.gif" /> {l s='Move images'}</legend><br />
-				{l s='You can choose to keep your images stored in the previous system. There\'s nothing wrong with that.'}<br />
-				{l s='You can also decide to move your images to the new storage system. In this case, click on the "Move images" button below. Please be patient. This can take several minutes.'}
-				<br /><br />
-				<div class="alert alert-info" style="display: block;">&nbsp;
+				<h3><img src="../img/admin/picture.gif" /> {l s='Move images'}</h3>
+	
+				<div class="alert alert-info" >
+					{l s='You can choose to keep your images stored in the previous system. There\'s nothing wrong with that.'}<br />
+					{l s='You can also decide to move your images to the new storage system. In this case, click on the "Move images" button below. Please be patient. This can take several minutes.'}<br />
 					{l s='After moving all of your product images, set the "Use the legacy image filesystem" option above to "No" for best performance.'}
 				</div>
-				<center><input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="button space" onclick="return confirm('{l s='Are you sure?'}');" /></center>
+
+				<input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="button space" onclick="return confirm('{l s='Are you sure?'}');" />
 			</fieldset>
 		</form>
 	{/if}
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index 764470819..5a81381dd 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -75,7 +75,7 @@
 								{/if}
 								{block name="label"}
 									{if isset($field['title']) && isset($field['hint'])}
-										<label class="control-label col-lg-3">
+										<label class="control-label col-lg-3 {if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}required{/if}">
 											<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{$field['hint']}">
 												{$field['title']}
 											</span>
@@ -273,9 +273,6 @@
 
 									{/if}
 
-									{if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}
-										<sup>*</sup>
-									{/if}
 
 								{/block}{* end block input *}
 								{if $field['is_invisible']}
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 8791cd27f..ebfbf5899 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -32,6 +32,7 @@ class AdminImagesControllerCore extends AdminController
 
 	public function __construct()
 	{
+		$this->bootstrap = true;
 		$this->table = 'image_type';
 		$this->className = 'ImageType';
 		$this->lang = false;
@@ -40,16 +41,16 @@ class AdminImagesControllerCore extends AdminController
 		$this->addRowAction('delete');
 
 		$this->fields_list = array(
-			'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
+			'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center'),
 			'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),
-			'categories' => array('title' => $this->l('Categories'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
-			'manufacturers' => array('title' => $this->l('Manufacturers'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
-			'suppliers' => array('title' => $this->l('Suppliers'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
-			'scenes' => array('title' => $this->l('Scenes'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
-			'stores' => array('title' => $this->l('Stores'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false)
+			'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px'),
+			'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px'),
+			'products' => array('title' => $this->l('Products'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
+			'categories' => array('title' => $this->l('Categories'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
+			'manufacturers' => array('title' => $this->l('Manufacturers'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
+			'suppliers' => array('title' => $this->l('Suppliers'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
+			'scenes' => array('title' => $this->l('Scenes'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
+			'stores' => array('title' => $this->l('Stores'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false)
 		);
 		
 		// No need to display the old image system if the install has been made later than 2013-03-26
@@ -147,7 +148,7 @@ class AdminImagesControllerCore extends AdminController
 						'visibility' => Shop::CONTEXT_ALL
 					)
 				),
-				'submit' => array('title' => $this->l('Save   '), 'class' => 'button'),
+				'submit' => array('title' => $this->l('Save   '), 'class' => 'btn btn-primary'),
 			),
 		);
 		
@@ -180,7 +181,6 @@ class AdminImagesControllerCore extends AdminController
 					'label' => $this->l('Width'),
 					'name' => 'width',
 					'required' => true,
-					'size' => 4,
 					'maxlength' => 5,
 					'desc' => $this->l('Maximum image width in pixels')
 				),
@@ -189,7 +189,6 @@ class AdminImagesControllerCore extends AdminController
 					'label' => $this->l('Height'),
 					'name' => 'height',
 					'required' => true,
-					'size' => 4,
 					'maxlength' => 5,
 					'desc' => $this->l('Maximum image height in pixels')
 				),
diff --git a/controllers/admin/AdminMarketingController.php b/controllers/admin/AdminMarketingController.php
index 97f1ff3e0..fed124483 100644
--- a/controllers/admin/AdminMarketingController.php
+++ b/controllers/admin/AdminMarketingController.php
@@ -27,6 +27,12 @@
 class AdminMarketingControllerCore extends AdminController
 {
 
+	public function __construct()
+	{
+		$this->bootstrap = true;
+		parent::__construct();
+	}
+
 	public function initContent()
 	{
 		$this->display = 'view';
@@ -51,4 +57,3 @@ class AdminMarketingControllerCore extends AdminController
 		return parent::renderView();
 	}
 }
-
diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php
index 4421b4a68..de935a5a2 100755
--- a/controllers/admin/AdminSpecificPriceRuleController.php
+++ b/controllers/admin/AdminSpecificPriceRuleController.php
@@ -30,6 +30,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 
 	public function __construct()
 	{
+		$this->bootstrap = true;
 	 	$this->table = 'specific_price_rule';
 		$this->className = 'SpecificPriceRule';
 	 	$this->lang = false;
@@ -55,8 +56,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 		$this->fields_list = array(
 			'id_specific_price_rule' => array(
 				'title' => $this->l('ID'),
-				'align' => 'center',
-				'width' => 25
+				'align' => 'center'
 			),
 			'name' => array(
 				'title' => $this->l('Name'),
@@ -142,7 +142,6 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Name'),
 					'name' => 'name',
-					'size' => 33,
 					'maxlength' => 32,
 					'required' => true,
 					'hint' => $this->l('Forbidden characters').' <>;=#{}'
@@ -193,7 +192,6 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('From quantity'),
 					'name' => 'from_quantity',
-					'size' => 6,
 					'maxlength' => 10,
 					'required' => true,
 				),
@@ -201,7 +199,6 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Price (tax excl.)'),
 					'name' => 'price',
-					'size' => 6,
 					'disabled' => ($this->object->price == -1 ? 1 : 0),
 					'maxlength' => 10,
 					'suffix' => $this->context->currency->getSign('right'),
@@ -226,14 +223,12 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 				array(
 					'type' => 'date',
 					'label' => $this->l('From'),
-					'name' => 'from',
-					'size' => 12,
+					'name' => 'from'
 				),
 				array(
 					'type' => 'date',
 					'label' => $this->l('To'),
-					'name' => 'to',
-					'size' => 12,
+					'name' => 'to'
 				),
 				array(
 					'type' => 'select',
@@ -254,7 +249,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'button'
+				'class' => 'btn btn-primary'
 			),
 		);
 		if (($value = $this->getFieldValue($this->object, 'price')) != -1)