diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 6fa7fee63..47e655569 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -18,7 +18,7 @@ fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font .Bloc {background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em} legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left} input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;} -select { border:1px solid #ccc; color: #666666; font-size: 12px;} +select { border:1px solid #ccc; font-size: 12px;} select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA} .header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;} .double_select select{width:300px;height:160px;} diff --git a/admin-dev/themes/template/customers/view.tpl b/admin-dev/themes/template/customers/view.tpl index 67b47dbbd..a8a3cc5b5 100644 --- a/admin-dev/themes/template/customers/view.tpl +++ b/admin-dev/themes/template/customers/view.tpl @@ -54,9 +54,11 @@ }); } - -
-
+ +
+ +
+
@@ -72,9 +74,9 @@ {l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='never'}{/if}
{if $count_better_customers != '-'}{l s='Rank: #'} {$count_better_customers}
{/if} {if $shop_is_feature_active}{l s='Shop:'} {$name_shop}
{/if} -
+ -
+
@@ -100,23 +102,24 @@ {/if}
{/if} -
+ + +
+
-
 
- -
- +
+

{l s='Add a private note'} - +

{l s='This note will be displayed to all the employees but not to the customer.'}


- +
-
- -
 
+ +
+

{l s='Messages'} ({count($messages)})

@@ -153,9 +156,14 @@

{l s='Groups'} ({count($groups)})

{if $groups AND count($groups)} - +
+ + + + + - + @@ -175,28 +183,37 @@ {if $orders AND count($orders)} {assign var=count_ok value=count($orders_ok)} {if $count_ok} -
+

{l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok}

-
{l s='ID'}{l s='ID'} {l s='Name'} {l s='Actions'}
+
+ + + + + + + + + - - - - - - + + + + + + {foreach $orders_ok AS $key => $order} - - + + {/foreach} @@ -206,9 +223,9 @@
  {assign var=count_ko value=count($orders_ko)} {if $count_ko} -
+

{l s='Invalid orders:'} {$count_ko}

-
{l s='ID'}{l s='Date'}{l s='Products'}{l s='Total paid'}{l s='Payment'}{l s='State'}{l s='ID'}{l s='Date'}{l s='Payment'}{l s='State'}{l s='Products'}{l s='Total paid'} {l s='Actions'}
{$order['id_order']} {$order['date_add']}{$order['nb_products']}{$order['total_paid_real']} {$order['payment']} {$order['order_state']}{$order['nb_products']}{$order['total_paid_real']}
+
@@ -240,9 +257,15 @@ {if $products AND count($products)}
 

{l s='Products'} ({count($products)})

-
{l s='ID'} {l s='Date'}
+
+ + + + + + - + @@ -261,9 +284,17 @@

{l s='Addresses'} ({count($addresses)})

{if count($addresses)} -
{l s='Date'}{l s='Date'} {l s='Name'} {l s='Quantity'} {l s='Actions'}
+
+ + + + + + + + - + @@ -276,7 +307,7 @@ -
{l s='Company'}{l s='Company'} {l s='Name'} {l s='Address'} {l s='Country'}{$address['firstname']} {$address['lastname']} {$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']} {$address['country']} + {if $address['phone']} {$address['phone']} {if $address['phone_mobile']}
{$address['phone_mobile']}{/if} @@ -324,23 +355,30 @@ {/if}
 
-
+

{l s='Carts'} ({count($carts)})

{if $carts AND count($carts)} - +
+ + + + + + + - + - + {foreach $carts AS $key => $cart} - + {/foreach} @@ -370,13 +408,20 @@ {* Last connections *} {if count($connections)}

{l s='Last connections'}

-
{l s='ID'}{l s='ID'} {l s='Date'}{l s='Total'} {l s='Carrier'}{l s='Total'} {l s='Actions'}
{$cart['id_cart']} {$cart['date_add']}{$cart['total_price']} {$cart['name']}{$cart['total_price']}
+
+ + + + + + + - - - - - + + + + + {foreach $connections as $connection} @@ -407,7 +452,7 @@ {/foreach}
{l s='Date'}{l s='Pages viewed'}{l s='Total time'}{l s='Origin'}{l s='IP Address'}{l s='Date'}{l s='Pages viewed'}{l s='Total time'}{l s='Origin'}{l s='IP Address'}
-
 
{/if} {/block} - +
+
 
diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index e807810d8..7313ca1a7 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -90,7 +90,7 @@ class AdminCarriersControllerCore extends AdminController ), 'type' => 'bool', 'orderby' => false, - 'width' => 25 + 'width' => 150 ), 'position' => array( 'title' => $this->l('Position'), diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index 5daefa685..f1f379035 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -93,7 +93,7 @@ class AdminCountriesControllerCore extends AdminController ), 'call_prefix' => array( 'title' => $this->l('Call prefix'), - 'width' => 40, + 'width' => 150, 'align' => 'center', 'callback' => 'displayCallPrefix' ), diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 609a52118..6b62a367c 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -47,7 +47,7 @@ class AdminShopUrlControllerCore extends AdminController ), 'shop_name' => array( 'title' => $this->l('Shop name'), - 'width' => 70 + 'width' => 150 ), 'domain' => array( 'title' => $this->l('Domain'), @@ -71,7 +71,7 @@ class AdminShopUrlControllerCore extends AdminController 'type' => 'bool', 'orderby' => false, 'filter_key' => 'main', - 'width' => 50, + 'width' => 100, ), 'active' => array( 'title' => $this->l('Enabled'), diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php index f2cbf70e0..82c7a8517 100644 --- a/controllers/admin/AdminStatesController.php +++ b/controllers/admin/AdminStatesController.php @@ -57,13 +57,12 @@ class AdminStatesControllerCore extends AdminController ), 'name' => array( 'title' => $this->l('Name'), - 'width' => 140, 'filter_key' => 'a!name' ), 'iso_code' => array( 'title' => $this->l('ISO code'), 'align' => 'center', - 'width' => 50 + 'width' => 75 ), 'zone' => array( 'title' => $this->l('Zone'), diff --git a/css/admin.css b/css/admin.css index 579ceccab..96ff28fb6 100644 --- a/css/admin.css +++ b/css/admin.css @@ -2153,3 +2153,34 @@ div#scrollTop a:hover{ #content #customers .warn {margin:10px 0 0 0;} #customers li {background-color:#ABDFF7;border:1px solid #ccc;float:left;margin:5px;padding:5px;} #customers li .button {display:block;margin-top:5px;} + + +/*container-customer*/ +#container-customer { + background-color:#EBEDF4; + border:1px solid #CCCED7; + color: #585A69; + padding:10px; +} + +#container-customer h2 { +color:#000; +font-weight:normal; +} + +#container-customer .info-customer-left { + float:left; + width:47%; + min-height:120px; + border-right:1px solid #fff; + padding-right:15px; +} + +#container-customer .info-customer-right { + float:left; + width:49%; + border-left:1px solid #ccc; + min-height:120px; + padding-left:15px; + +}