Merge pull request #1002 from TMMeilleur/bootstrap

//fixed banners style

themes/default-bootstrap/css/global.css

@@ -228,37 +228,6 @@ span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large,
   border: none;
 }
 
-/* input button */
-input.button_mini, input.button_small, input.button, input.button_large,
-input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
-input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large,
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled {
-  /*padding-bottom: 2px*/
-}
-
-/* disabled button */
-input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled,
-span.button_mini, span.button_small, span.button, span.button_large,
-span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled {
-  /*background-position: left -36px;
-  cursor: default;
-  color: #888!important*/
-}
-
-/* exclusive button */
-input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large,
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled,
-a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large,
-span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled {
-  /*color: white!important*/
-}
-
-/* exclusive disabled button */
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large {
-  /*color: #488c40!important*/
-}
-
 /* hover button */
 input.button_mini:hover, input.button_small:hover, input.button:hover, input.button_large:hover,
 input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover,
@@ -268,11 +237,6 @@ a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_
   background-position: left -50px;
 }
 
-/* exclusive hover button */
-input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover {
-  /*color: white!important*/
-}
-
 /* active button */
 input.button_mini:active, input.button_small:active, input.button:active, input.button_large:active,
 input.exclusive_mini:active, input.exclusive_small:active, input.exclusive:active, input.exclusive_large:active,
@@ -281,17 +245,6 @@ a.exclusive_mini:active, a.exclusive_small:active, a.exclusive:active, a.exclusi
   background-position: left -100px;
 }
 
-/* classic buttons */
-input.button_mini, input.button_mini_disabled, input.exclusive_mini, input.exclusive_mini_disabled, a.button_mini, a.exclusive_mini, span.button_mini, span.exclusive_mini {
-  /*width: 30px;
-  background-image: url('../img/button-mini.png')*/
-}
-
-input.button_small, input.button_small_disabled, input.exclusive_small, input.exclusive_small_disabled, a.button_small, a.exclusive_small, span.button_small, span.exclusive_small {
-  /*width: 60px;
-  background-image: url('../img/button-small.png')*/
-}
-
 input.button_disabled, input.exclusive_disabled, span.exclusive {
   border: 1px solid #ccc;
   color: #999;
@@ -299,11 +252,6 @@ input.button_disabled, input.exclusive_disabled, span.exclusive {
   cursor: default;
 }
 
-input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled {
-  /*width: 180px;
-  background-image: url('../img/button-large.png')*/
-}
-
 .btn.disabled, .btn[disabled]:hover {
   opacity: 0.3;
 }
@@ -2972,14 +2920,6 @@ p.cheque-indent {
 #manufacturer .bottom-pagination-content, #manufacturer .top-pagination-content, #supplier .bottom-pagination-content, #supplier .top-pagination-content {
   min-height: 69px;
 }
-#manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall {
-  margin-right: 0;
-}
-@media (min-width: 1200px) {
-  #manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall {
-    margin-right: 201px;
-  }
-}
 #manufacturer .top-pagination-content.bottom-line, #supplier .top-pagination-content.bottom-line {
   border-bottom: 1px solid #d6d4d4;
 }

themes/default-bootstrap/css/jquery/footable.core.css

@@ -59,3 +59,16 @@
 .footable .footable-row-detail-value {
   display: table-cell;
 }
+.footable .footable-sortable .footable-sort-indicator:after {
+  float: right;
+  margin: 0px 0px 0 0;
+  content: "";
+  font-family: "FontAwesome";
+  display: block;
+}
+.footable .footable-sortable.footable-sorted .footable-sort-indicator:after {
+  content: "";
+}
+.footable .footable-sortable.footable-sorted-desc .footable-sort-indicator:after {
+  content: "";
+}

themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css

@@ -20,11 +20,11 @@
     min-width: 100%;
   }
 }
-#htmlcontent_home ul li.htmlcontent-item-4 {
+#htmlcontent_home ul li.htmlcontent-item-5 {
   width: 66.6667%;
 }
 @media (max-width: 479px) {
-  #htmlcontent_home ul li.htmlcontent-item-4 {
+  #htmlcontent_home ul li.htmlcontent-item-5 {
     width: 100%;
   }
 }

themes/default-bootstrap/discount.tpl

@@ -30,12 +30,12 @@
 <table class="discount table table-bordered footab">
 	<thead>
 		<tr>
-			<th class="discount_code first_item">{l s='Code'}</th>
-			<th class="discount_description item">{l s='Description'}</th>
+			<th data-sort-ignore="true" class="discount_code first_item">{l s='Code'}</th>
+			<th data-sort-ignore="true" class="discount_description item">{l s='Description'}</th>
 			<th class="discount_quantity item">{l s='Quantity'}</th>
-			<th data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
+			<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
 			<th data-hide="phone,tablet" class="discount_minimum item">{l s='Minimum'}</th>
-			<th data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
+			<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
 			<th data-hide="phone" class="discount_expiration_date last_item">{l s='Expiration date'}</th>
 		</tr>
 	</thead>
@@ -44,7 +44,7 @@
 		<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
 			<td class="discount_code">{$discountDetail.code}</td>
 			<td class="discount_description">{$discountDetail.name}</td>
-			<td class="discount_quantity">{$discountDetail.quantity_for_user}</td>
+			<td date-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td>
 			<td class="discount_value">
 				{if $discountDetail.id_discount_type == 1}
 					{$discountDetail.value|escape:'htmlall':'UTF-8'}%
@@ -56,7 +56,7 @@
 					-
 				{/if}
 			</td>
-			<td class="discount_minimum">
+			<td class="discount_minimum" date-value="{if $discountDetail.minimal == 0}0{else}{$discountDetail.minimal}{/if}">
 				{if $discountDetail.minimal == 0}
 					{l s='None'}
 				{else}
@@ -70,7 +70,7 @@
 					<i class="icon-remove icon"></i> {l s='No'}
 				{/if}
 			</td>
-			<td class="discount_expiration_date">{dateFormat date=$discountDetail.date_to}</td>
+			<td class="discount_expiration_date" date-value="{$discountDetail.date_to|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$discountDetail.date_to}</td>
 		</tr>
 	{/foreach}
 	</tbody>

themes/default-bootstrap/header.tpl

@@ -88,6 +88,7 @@
 <script src="{$js_dir}/jquery/highdpi.js"></script>
 <script src="{$js_dir}/jquery/jquery.bxslider.js"></script>
 <script src="{$js_dir}/jquery/footable.js"></script>
+<script src="{$js_dir}/jquery/footable.sort.js"></script>
 <script src="{$js_dir}/jquery/resonsive_utilites.js"></script>
 		{$HOOK_HEADER}
 	</head>

themes/default-bootstrap/history.tpl

@@ -36,13 +36,13 @@
 	<table id="order-list" class="table table-bordered footab">
 		<thead>
 			<tr>
-				<th class="first_item">{l s='Order reference'}</th>
+				<th class="first_item" data-sort-ignore="true">{l s='Order reference'}</th>
 				<th class="item">{l s='Date'}</th>
 				<th data-hide="phone" class="item">{l s='Total price'}</th>
-				<th data-hide="phone,tablet" class="item">{l s='Payment'}</th>
+				<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Payment'}</th>
 				<th class="item">{l s='Status'}</th>
-				<th data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
-				<th data-hide="phone,tablet" class="last_item">&nbsp;</th>
+				<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
+				<th data-sort-ignore="true" data-hide="phone,tablet" class="last_item">&nbsp;</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -52,10 +52,10 @@
 					{if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Products to download'}" title="{l s='Products to download'}" />{/if}
 					<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{Order::getUniqReferenceOf($order.id_order)}</a>
 				</td>
-				<td class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
-				<td class="history_price"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
+				<td data-value="{$order.date_add|regex_replace:"/[\-\:\ ]/":""}" class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
+				<td class="history_price" data-value="{$order.total_paid}"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
 				<td class="history_method">{$order.payment|escape:'htmlall':'UTF-8'}</td>
-				<td class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
+				<td data-value="{$order.id_order_state}" class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
 				<td class="history_invoice">
 				{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
 					<a class="link-button" href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html'}" title="{l s='Invoice'}" class="_blank"><i class="icon-file-text large"></i>{l s='PDF'}</a>
@@ -75,6 +75,21 @@
 		{/foreach}
 		</tbody>
 	</table>
+    <script type="text/javascript">
+		$(function () {
+            $('.sort-column').click(function (e) {
+                e.preventDefault();
+
+                //get the footable sort object
+                var footableSort = $('table').data('footable-sort');
+
+                //get the index we are wanting to sort by
+                var index = $(this).data('index');
+
+                footableSort.doSort(index, 'toggle');
+            });
+        });
+	</script>
 	<div id="block-order-detail" class="unvisible">&nbsp;</div>
 	{else}
 		<p class="alert alert-warning">{l s='You have not placed any orders.'}</p>