From 7d4c0ad36e0b7b8f4ff47dda73124c21f1f3c872 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Thu, 29 Aug 2013 17:04:10 +0200
Subject: [PATCH] // fix col-offset and btn-primary

---
 .../template/controllers/dashboard/helpers/view/view.tpl  | 5 -----
 .../template/controllers/import/helpers/form/form.tpl     | 4 ++--
 .../default/template/controllers/products/attachments.tpl | 2 +-
 .../template/controllers/products/informations.tpl        | 4 ++--
 .../themes/default/template/controllers/products/pack.tpl | 2 +-
 .../default/template/controllers/products/prices.tpl      | 8 ++++----
 .../themes/default/template/controllers/products/seo.tpl  | 2 +-
 admin-dev/themes/default/template/helpers/form/form.tpl   | 4 ++--
 .../themes/default/template/helpers/options/options.tpl   | 4 ++--
 controllers/admin/AdminInvoicesController.php             | 4 ++--
 10 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
index 3b6679f32..664b5e97e 100644
--- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
@@ -5,11 +5,6 @@
 </div>
 
 <div id="dashboard">
-<!--
-		<select class="form-control pull-right" name="" id="">
-			<option value="">Jan 29, 2012 - Feb 4, 2012</option>
-		</select>
--->
 	<div class="row">
 		<div class="col-lg-3">
 			<div id="dash_activity" class="panel">
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index 3115236a4..d721641e9 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -127,7 +127,7 @@
 			</div>
 		</div>
 		<div class="row">
-			<p class="alert alert-info col-offset-3">
+			<p class="alert alert-info col-lg-offset-3">
 				<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">
 					{l s='Click to view our sample import csv files.'}
 				</a>
@@ -223,7 +223,7 @@
 			</div>
 		</div>
 		<div class="row">
-			<div class="col-offset-3">
+			<div class="col-lg-offset-3">
 				<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="btn btn-primary" {if empty($files_to_import)}disabled{/if}/>
 			</div>
 			{if empty($files_to_import)}
diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl
index 87eeac09e..e0b41e7f4 100644
--- a/admin-dev/themes/default/template/controllers/products/attachments.tpl
+++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl
@@ -103,7 +103,7 @@
 	<hr/>
 
 	<div class="row">
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			<div class="row">
 				<div class="col-lg-6">
 					<p>{l s='Available attachments:'}</p>
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index 6bb451396..f56637599 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -208,7 +208,7 @@
 		</div>
 	</div>
 	<div class="row redirect_product_options" style="display:none">
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert alert-info">
 				{l s='404 : Not Found = Product does not exist and no redirect'}<br/>
 				{l s='301 : Moved Permanently = Product Moved Permanently'}<br/>
@@ -333,7 +333,7 @@
 
 	{if $images}
 	<div class="row">
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert">
 				{l s='Do you want an image associated with the product in your description?'}
 				<a class="addImageDescription" href="javascript:void(0);">{l s='Click here'}</a>.
diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl
index b422ea1b5..aa8dfbf17 100644
--- a/admin-dev/themes/default/template/controllers/products/pack.tpl
+++ b/admin-dev/themes/default/template/controllers/products/pack.tpl
@@ -62,7 +62,7 @@
 </div>
 
 <div class="row">
-	<div class="col-lg-9 col-offset-3">
+	<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>	
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index d2e5e7bf2..72e04b452 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -182,7 +182,7 @@ $(document).ready(function () {
 
 	{if $tax_exclude_taxe_option}
 	<div class="row">
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert">
 				{l s='Taxes are currently disabled'} : 
 				<a href="{$link->getAdminLink('AdminTaxes')|escape:'htmlall':'UTF-8'}">{l s='Tax options'}</a>
@@ -233,7 +233,7 @@ $(document).ready(function () {
 
 	{if $ps_tax && $country_display_tax_label}
 	<div class="row">
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert">
 				<span>{l s='or'}
 					{$currency->prefix}<span id="unit_price_with_tax">0.00</span>{$currency->suffix}
@@ -246,7 +246,7 @@ $(document).ready(function () {
 
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="on_sale" type="default"}
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			<div class="checkbox">
 				<label class="control-label" for="on_sale" >
 					<input type="checkbox" name="on_sale" id="on_sale" {if $product->on_sale}checked="checked"{/if} value="1" />
@@ -257,7 +257,7 @@ $(document).ready(function () {
 	</div>
 
 	<div class="row">
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert">
 				<strong>{l s='Final retail price:'}</strong>
 				<span {if !$country_display_tax_label}style="display:none"{/if} >
diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index 786478e1d..980839186 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -109,7 +109,7 @@
 	</div>
 
 	<div class="row">
-		<div class="col-lg-9 col-offset-3">
+		<div class="col-lg-9 col-lg-offset-3">
 			{foreach from=$languages item=language}
 			<div class="alert alert-warning translatable-field lang-{$language.id_lang}">
 				<i class="icon-link"></i> {l s='The product link will look like this:'}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index e3ad4d705..45d933855 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -31,7 +31,7 @@
 {if isset($fields.title)}<h3>{$fields.title}</h3>{/if}
 
 {block name="defaultForm"}
-<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{$table}_form{/if}" class="defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
+<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{$table}_form{/if}" class="defaultForm {$name_controller} form-horizontal" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
 	{if $form_id}
 		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
@@ -482,7 +482,7 @@
 					{/if}
 				{elseif $key == 'submit'}
 					<div class="row">
-						<div class="col-lg-9 col-offset-3">
+						<div class="col-lg-9 col-lg-offset-3">
 							<button
 								type="submit"
 								id="{if isset($field.id)}{$field.id}{else}{$table}_form_submit_btn{/if}"
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index 7c57a03b8..8506805b1 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -285,12 +285,12 @@
 			{/foreach}
 			{if isset($categoryData['submit'])}
 				<div class="row">
-					<div class="col-lg-9 col-offset-3">
+					<div class="col-lg-9 col-lg-offset-3">
 						<button
 							type="submit"
 							id="{$table}_form_submit_btn"
 							name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
-							class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-primary{/if}"
+							class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
 							>
 							<i class="{if isset($categoryData['submit']['icon'])}{$categoryData['submit']['icon']}{else}icon-save{/if}"></i>
 							{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 165f07ec0..19190ca28 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -111,7 +111,7 @@ class AdminInvoicesControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Generate PDF file by date'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'id' => 'submitPrint',
 				'icon' => 'icon-download-alt'
 			)
@@ -149,7 +149,7 @@ class AdminInvoicesControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Generate PDF file by status.'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'id' => 'submitPrint2',
 				'icon' => 'icon-download-alt'
 			)