From b4459e39a491a1921725c9c01752401fbcc10b7e Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Wed, 9 Oct 2013 09:43:04 +0200
Subject: [PATCH] // Orders WIP

---
 admin-dev/themes/default/css/admin-theme.css  | 49 ++++++++++---------
 admin-dev/themes/default/css/admin-theme.sass |  5 +-
 .../controllers/orders/helpers/view/view.tpl  |  6 +--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 029c14989..8002199f6 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -8268,7 +8268,7 @@ tr.highlighted td {
 /* line 649, admin-theme.sass */
 .tree i {
   font-size: 1.3em; }
-/* line 653, admin-theme.sass */
+/* line 651, admin-theme.sass */
 .tree .tree-item-name, .tree .tree-folder-name {
   padding: 0 5px;
   -webkit-border-radius: 6px;
@@ -8277,17 +8277,17 @@ tr.highlighted td {
   -o-border-radius: 6px;
   border-radius: 6px;
   font-weight: normal; }
-/* line 657, admin-theme.sass */
+/* line 655, admin-theme.sass */
 .tree .tree-item-name:hover, .tree .tree-folder-name:hover {
   background-color: #eeeeee;
   cursor: pointer; }
-/* line 660, admin-theme.sass */
+/* line 658, admin-theme.sass */
 .tree .tree-selected {
   background-color: #a4dcf5; }
-/* line 662, admin-theme.sass */
+/* line 660, admin-theme.sass */
 .tree .tree-selected i.tree-dot {
   background-color: #1ba6e5; }
-/* line 664, admin-theme.sass */
+/* line 662, admin-theme.sass */
 .tree i.tree-dot {
   display: inline-block;
   position: relative;
@@ -8300,60 +8300,61 @@ tr.highlighted td {
   -ms-border-radius: 6px;
   -o-border-radius: 6px;
   border-radius: 6px; }
-/* line 672, admin-theme.sass */
+/* line 670, admin-theme.sass */
 .tree .tree-item-disable, .tree .tree-folder-name-disable {
   color: #cccccc; }
-/* line 674, admin-theme.sass */
+/* line 672, admin-theme.sass */
 .tree .tree-item-disable:hover, .tree .tree-folder-name-disable:hover {
   color: #cccccc;
   background-color: none; }
 
-/* line 678, admin-theme.sass */
+/* line 676, admin-theme.sass */
 .nav-tabs {
   border-bottom: none; }
-/* line 680, admin-theme.sass */
+/* line 678, admin-theme.sass */
 .nav-tabs li a {
-  font-size: 1.2em;
+  font-size: 1.1em;
+  font-family: "Ubuntu", sans-serif;
   text-transform: uppercase;
   font-weight: 300; }
-/* line 685, admin-theme.sass */
+/* line 684, admin-theme.sass */
 .nav-tabs li.active a, .nav-tabs li.active a:hover {
   background-color: white; }
 
-/* line 688, admin-theme.sass */
+/* line 687, admin-theme.sass */
 .tree-actions {
   padding-bottom: 4px;
   display: inline-block; }
 
-/* line 693, admin-theme.sass */
+/* line 692, admin-theme.sass */
 .tt-query {
   border-bottom-right-radius: 3px !important;
   border-top-right-radius: 3px !important; }
 
-/* line 695, admin-theme.sass */
+/* line 694, admin-theme.sass */
 .tt-dropdown-menu {
   background-color: white;
   border: solid 1px #cccccc;
   font-size: 0.9em;
   text-transform: none; }
 
-/* line 700, admin-theme.sass */
+/* line 699, admin-theme.sass */
 .tt-suggestions {
   padding: 0 6px;
   -webkit-box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px;
   box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; }
 
-/* line 703, admin-theme.sass */
+/* line 702, admin-theme.sass */
 .tt-suggestion p {
   border-bottom: solid 1px #cccccc;
   margin: 0 !important;
   padding: 0 !important; }
 
-/* line 707, admin-theme.sass */
+/* line 706, admin-theme.sass */
 .tt-suggestion:last-child p {
   border-bottom: none; }
 
-/* line 711, admin-theme.sass */
+/* line 710, admin-theme.sass */
 .tagify-container {
   background-color: white;
   padding: 2px 6px;
@@ -8367,10 +8368,10 @@ tr.highlighted td {
   border: solid 1px #cccccc;
   -webkit-box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset;
   box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; }
-/* line 719, admin-theme.sass */
+/* line 718, admin-theme.sass */
 .tagify-container span {
   float: left; }
-/* line 721, admin-theme.sass */
+/* line 720, admin-theme.sass */
 .tagify-container > span {
   display: inline-block;
   padding: 3px 5px;
@@ -8379,26 +8380,26 @@ tr.highlighted td {
   border: 1px solid #1ba6e5;
   background-color: #60c1ed;
   color: white; }
-/* line 729, admin-theme.sass */
+/* line 728, admin-theme.sass */
 .tagify-container > span > a {
   padding-left: 5px;
   color: #1ba6e5;
   text-decoration: none;
   font-weight: bold; }
-/* line 734, admin-theme.sass */
+/* line 733, admin-theme.sass */
 .tagify-container > input {
   margin-top: 2px;
   border: 0 none;
   width: 100px;
   -webkit-box-shadow: none;
   box-shadow: none; }
-/* line 739, admin-theme.sass */
+/* line 738, admin-theme.sass */
 .tagify-container > input:focus {
   outline: 0;
   -webkit-box-shadow: none;
   box-shadow: none; }
 
-/* line 744, admin-theme.sass */
+/* line 743, admin-theme.sass */
 li.sortable-placeholder {
   border: 1px dashed #cccccc;
   background-color: #bbbbbb;
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index a97b7e623..f0e74f868 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -648,8 +648,6 @@ tr.highlighted td
 		margin-right: 4px
 	i
 		font-size: 1.3em
-	//.tree-folder
-	//.tree-item
 	.tree-item-name, .tree-folder-name
 		padding: 0 5px
 		+border-radius(6px)
@@ -678,7 +676,8 @@ tr.highlighted td
 .nav-tabs
 	border-bottom: none
 	li a
-		font-size: 1.2em
+		font-size: 1.1em
+		font-family: $headings-font-family
 		text-transform: uppercase
 		font-weight: 300
 	li.active
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index 554eb4f54..ce570cb64 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -67,10 +67,10 @@
 				<span class="title">{l s='Date'}<br /><small>sous-titre</small></span>
 				<span class="value">{dateFormat date=$order->date_add full=false}</span>
 			</div>
-			<div class="col-lg-3 box-stats color1" >
+			<div class="col-lg-3 box-stats color2" >
 				<i class="icon-comments"></i>
 				<span class="title">{l s='Messages'}<br /><small>sous-titre</small></span>
-				<span class="value">{sizeof($messages)}</span>
+				<!-- <span class="value">{sizeof($messages)}</span> -->
 				<span class="value"><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a></span>
 			</div>
 			<div class="col-lg-3 box-stats color1" >
@@ -97,7 +97,7 @@
 						<i class="icon-chevron-left"></i>
 						{l s='Prev'}
 						</a>
-					{l s='Order'} : <strong>{$order->reference}</strong>
+					{l s='Order'} : <strong>#{$order->id} - {$order->reference}</strong>
 					<a class="btn btn-default pull-right" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}" {if !$nextOrder}disabled{/if}>
 						{l s='Next'}
 						<i class="icon-chevron-right"></i>