From 0c494912a4ed9d89ae514ad5ede9fcbed3010186 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Fri, 30 Aug 2013 11:51:57 +0200
Subject: [PATCH] // BO fix product tabs

---
 admin-dev/themes/default/css/admin-theme.css  |   3 -
 admin-dev/themes/default/css/admin-theme.sass |   3 -
 .../controllers/products/associations.tpl     | 152 +++++++++---------
 .../products/helpers/form/form.tpl            |   2 +-
 .../controllers/products/informations.tpl     |   5 +-
 .../template/controllers/products/pack.tpl    | 116 ++++++-------
 6 files changed, 134 insertions(+), 147 deletions(-)

diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index cfe5570a8..0fbc3ee52 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -6675,9 +6675,6 @@ html, body {
   margin: 0 0 -60px 0;
   background-color: #f8f8f8; }
 
-.container-fluid, .row-fluid {
-  width: 100%; }
-
 #content {
   padding: 90px 20px 0;
   margin-left: 240px;
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index ecd73c304..878360c0b 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -140,9 +140,6 @@ html, body
 	background-color: $bg-content-color
 	//background-image: url('../img/patterns/bedge_grunge.png') // texture
 
-.container-fluid, .row-fluid
-	width: 100%
-
 #content
 	padding: 90px 20px 0
 	margin-left: 240px
diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl
index 069065032..b8086fda1 100644
--- a/admin-dev/themes/default/template/controllers/products/associations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/associations.tpl
@@ -24,92 +24,84 @@
 *}
 <fieldset>
 	<input type="hidden" name="submitted_tabs[]" value="Associations" />
-	<div class="Associations">
-
-		<h3>{l s='Associations'}</h3>
-
-		{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
-		<div id="no_default_category" class="alert alert-info">
-			{l s='Please select a default category.'}
-		</div>
-
-		<div class="row">
-			{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
-			<label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
-			<div class="col-lg-9">
-				<div id="category_block">
-					{$category_tree}
-				</div>
-				<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
-					<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
-				</a>
+	<h3>{l s='Associations'}</h3>
+	{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
+	<div id="no_default_category" class="alert alert-info">
+		{l s='Please select a default category.'}
+	</div>
+	<div class="row">
+		{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
+		<label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
+		<div class="col-lg-9">
+			<div id="category_block">
+				{$category_tree}
 			</div>
+			<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
+				<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
+			</a>
 		</div>
-
-		<div class="row">
-			{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
-			<label class="control-label col-lg-3" for="id_category_default">
-				<span class="label-tooltip" data-toggle="tooltip"
-				title="{l s='The default category is the category displayed by default.'}">
-					{l s='Default category:'}
-				</span>
-			</label>
-			<div class="col-lg-5">
-				<select id="id_category_default" name="id_category_default">
-					{foreach from=$selected_cat item=cat}
-						<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
-					{/foreach}
-				</select>
-			</div>
-		</div>
-
-		<div class="row">
-			<label class="control-label col-lg-3" for="product_autocomplete_input">
-				<span class="label-tooltip" data-toggle="tooltip"
-				title="{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}{l s='(Do not forget to save the product afterward)'}">
-				{l s='Accessories:'}
-				</span>
-			</label>
-			<div class="col-lg-5">
-				<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
-				<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
-
-				<div id="ajax_choose_product">
-					<input type="text" value="" id="product_autocomplete_input" />				
-					<div class="help-block">
-						
-					</div>
-				</div>
-				<div id="divAccessories">
-				{* @todo : donot use 3 foreach, but assign var *}
-				{foreach from=$accessories item=accessory}
-					{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
-					<span class="delAccessory" name="{$accessory.id_product}" style="cursor: pointer;">
-						<img src="../img/admin/delete.gif" class="middle" alt="" />
-					</span>
+	</div>
+	<div class="row">
+		{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
+		<label class="control-label col-lg-3" for="id_category_default">
+			<span class="label-tooltip" data-toggle="tooltip"
+			title="{l s='The default category is the category displayed by default.'}">
+				{l s='Default category:'}
+			</span>
+		</label>
+		<div class="col-lg-5">
+			<select id="id_category_default" name="id_category_default">
+				{foreach from=$selected_cat item=cat}
+					<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
 				{/foreach}
+			</select>
+		</div>
+	</div>
+	<div class="row">
+		<label class="control-label col-lg-3" for="product_autocomplete_input">
+			<span class="label-tooltip" data-toggle="tooltip"
+			title="{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}{l s='(Do not forget to save the product afterward)'}">
+			{l s='Accessories:'}
+			</span>
+		</label>
+		<div class="col-lg-5">
+			<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
+			<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
+
+			<div id="ajax_choose_product">
+				<input type="text" value="" id="product_autocomplete_input" />				
+				<div class="help-block">
+					
 				</div>
 			</div>
+			<div id="divAccessories">
+			{* @todo : donot use 3 foreach, but assign var *}
+			{foreach from=$accessories item=accessory}
+				{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
+				<span class="delAccessory" name="{$accessory.id_product}" style="cursor: pointer;">
+					<img src="../img/admin/delete.gif" class="middle" alt="" />
+				</span>
+			{/foreach}
+			</div>
 		</div>
-
-		<div class="row">
-			<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer:'}</label>
-			<div class="col-lg-9">
-				<div class="row">
-					<div class="col-lg-7">
-						<select name="id_manufacturer" id="id_manufacturer">
-							<option value="0">-- {l s='Choose (optional)'} --</option>
-							{if $product->id_manufacturer}
-							<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
-							{/if}
-							<option disabled="disabled">----------</option>
-						</select>
-					</div>
-					<div class="col-lg-5">
-						<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
-							<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i> 
-						</a>
-					</div>
+	</div>
+	<div class="row">
+		<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer:'}</label>
+		<div class="col-lg-9">
+			<div class="row">
+				<div class="col-lg-7">
+					<select name="id_manufacturer" id="id_manufacturer">
+						<option value="0">-- {l s='Choose (optional)'} --</option>
+						{if $product->id_manufacturer}
+						<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
+						{/if}
+						<option disabled="disabled">----------</option>
+					</select>
+				</div>
+				<div class="col-lg-5">
+					<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
+						<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i> 
+					</a>
 				</div>
 			</div>
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index 7c39d30ee..bdb22cef8 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -63,7 +63,7 @@
 {/block}
 
 {block name="defaultForm"}
-	<div class="row-fluid">
+	<div class="row">
 		<div class="productTabs col-lg-2">
 			<div class="list-group">
 			{foreach $product_tabs key=numStep item=tab}
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index f56637599..6b908eab7 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -264,7 +264,7 @@
 				{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="online_only" type="default"}
 			</div>
 			{/if}
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="available_for_order">{l s='Options:'}</label>
 				<div class="col-lg-5">
 					<p class="checkbox">
@@ -281,7 +281,8 @@
 					</p>
 				</div>
 			</div>
-			<div class="row">
+
+			<div class="form-group">
 				{include file="controllers/products/multishop/checkbox.tpl" field="condition" type="default"}
 				<label class="control-label col-lg-3" for="condition">{l s='Condition:'}</label>
 				<div class="col-lg-3">
diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl
index aa8dfbf17..7e37ac1d0 100644
--- a/admin-dev/themes/default/template/controllers/products/pack.tpl
+++ b/admin-dev/themes/default/template/controllers/products/pack.tpl
@@ -27,69 +27,69 @@
 	var msg_select_one = "{l s='Please select at least one product.' js=1}";
 	var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}";
 </script>
-<input type="hidden" name="submitted_tabs[]" value="Pack" />
-<h3>{l s='Pack'}</h3>
-<div class="alert alert-info">{l s='You cannot add combinations to a pack.'}</div>
 
-<div class="ppack">
-	<input type="checkbox" name="ppack" id="ppack" value="1" {if $product_type == Product::PTYPE_PACK}checked="checked"{/if} onclick="$('#ppackdiv').slideToggle();" />
-	<label class="t" for="ppack">{l s='Pack'}</label>
-</div>
+<fieldset>
+	<input type="hidden" name="submitted_tabs[]" value="Pack" />
+	<h3>{l s='Pack'}</h3>
+	<div class="alert alert-info">{l s='You cannot add combinations to a pack.'}</div>
 
-<div id="ppackdiv" {if !($product_type == Product::PTYPE_PACK)}style="display: none;"{/if}>
-
-<div class="row">
-	<label class="control-label col-lg-3" for="curPackItemName">
-		<span class="label-tooltip" data-toggle="tooltip"
-			title="{l s='Begin typing the first letters of the product name. Then select the product from the drop-down list:'}">
-			{l s='Product'}
-		</span>
-	</label>
-	<div class="input-group col-lg-6">
-		<input type="text" id="curPackItemName" />
-		<span class="input-group-addon"><i class="icon-search"></i></span>
+	<div class="ppack">
+		<input type="checkbox" name="ppack" id="ppack" value="1" {if $product_type == Product::PTYPE_PACK}checked="checked"{/if} onclick="$('#ppackdiv').slideToggle();" />
+		<label class="t" for="ppack">{l s='Pack'}</label>
 	</div>
-</div>
-	
-<div class="row">
-	<label class="control-label col-lg-3" for="curPackItemQty">
-		{l s='Quantity'}
-	</label>
-	<div class="input-group col-lg-2">
-		<span class="input-group-addon">&times;</span>
-		<input type="text" name="curPackItemQty" id="curPackItemQty" value="1"/>
+
+	<div id="ppackdiv" {if !($product_type == Product::PTYPE_PACK)}style="display: none;"{/if}>
+
+	<div class="form-group">
+		<label class="control-label col-lg-3" for="curPackItemName">
+			<span class="label-tooltip" data-toggle="tooltip"
+				title="{l s='Begin typing the first letters of the product name. Then select the product from the drop-down list:'}">
+				{l s='Product'}
+			</span>
+		</label>
+		<div class="input-group col-lg-6">
+			<input type="text" id="curPackItemName" />
+			<span class="input-group-addon"><i class="icon-search"></i></span>
+		</div>
 	</div>
-</div>
-
-<div class="row">
-	<div class="col-lg-9 col-lg-offset-3">
-		<button type="button" id="add_pack_item" class="btn btn-default">
-			<i class="icon-plus-sign-alt"></i> {l s='Add this product to the pack'}
-		</button>	
+		
+	<div class="form-group">
+		<label class="control-label col-lg-3" for="curPackItemQty">
+			{l s='Quantity'}
+		</label>
+		<div class="input-group col-lg-2">
+			<span class="input-group-addon">&times;</span>
+			<input type="text" name="curPackItemQty" id="curPackItemQty" value="1"/>
+		</div>
 	</div>
-</div>
 
-<input type="hidden" name="inputPackItems" id="inputPackItems" value="{$input_pack_items}" />
-<input type="hidden" name="namePackItems" id="namePackItems" value="{$input_namepack_items}" />
-<input type="hidden" id="curPackItemId" />
-
-<hr/>
-
-<div class="row">
-	<label class="control-label col-lg-3 product_description listOfPack" style="display:{if count($pack_items) > 0}block{else}none{/if};">
-		{l s='List of products for that pack:'}
-	</label>
-	<div class="col-lg-9">
-		<ul id="divPackItems">
-			{foreach $pack_items as $pack_item}
-			<li>
-				<button type="button" class="btn btn-default delPackItem" name="{$pack_item.id}">
-					<i class="icon-trash"></i>
-				</button>
-				{$pack_item.pack_quantity} x {$pack_item.name}
-			</li>
-			{/foreach}
-		</ul>
+	<div class="form-group">
+		<div class="col-lg-9 col-lg-offset-3">
+			<button type="button" id="add_pack_item" class="btn btn-default">
+				<i class="icon-plus-sign-alt"></i> {l s='Add this product to the pack'}
+			</button>	
+		</div>
 	</div>
-</div>
 
+	<input type="hidden" name="inputPackItems" id="inputPackItems" value="{$input_pack_items}" />
+	<input type="hidden" name="namePackItems" id="namePackItems" value="{$input_namepack_items}" />
+	<input type="hidden" id="curPackItemId" />
+
+	<div class="form-group">
+		<label class="control-label col-lg-3 product_description listOfPack" style="display:{if count($pack_items) > 0}block{else}none{/if};">
+			{l s='List of products for that pack:'}
+		</label>
+		<div class="col-lg-9">
+			<ul id="divPackItems">
+				{foreach $pack_items as $pack_item}
+				<li>
+					<button type="button" class="btn btn-default delPackItem" name="{$pack_item.id}">
+						<i class="icon-trash"></i>
+					</button>
+					{$pack_item.pack_quantity} x {$pack_item.name}
+				</li>
+				{/foreach}
+			</ul>
+		</div>
+	</div>
+</fieldset>