diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index d91b03276..069024fe0 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -25,9 +25,10 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab .double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px} /*BUTTON*/ -.button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; +.button{ + background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top; + background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent; - border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;} .button[disabled=disabled]{color:#8C8C8C} .button.bt-icon { display:inline-block; margin-bottom:7px;} diff --git a/admin-dev/themes/default/template/customer_threads/message.tpl b/admin-dev/themes/default/template/customer_threads/message.tpl index 6748fb659..3e939261f 100644 --- a/admin-dev/themes/default/template/customer_threads/message.tpl +++ b/admin-dev/themes/default/template/customer_threads/message.tpl @@ -45,43 +45,60 @@ {/if} -
+
{if !empty($message.id_customer) && empty($message.employee_name)} - {l s='Customer ID:'} - +
+
{l s='Customer ID:'} : +
{$message.id_customer} {l s='view'} -
+ +
+
{/if} + +
+
{l s='Sent on:'} :
+
{$message.date_add}
+ +
- {l s='Sent on:'} {$message.date_add}
{if empty($message.employee_name)} - {l s='Browser:'} {$message.user_agent}
+
+
{l s='Browser:'} :
+
{$message.user_agent}
+
{/if} {if !empty($message.file_name) && $file_name} - {l s='File attachment'} - +
{l s='File attachment'} :
+
{l s='view'} -
+ +
+ {/if} {if !empty($message.id_order) && empty($message.employee_name)} - {l s='Order #'} - +
+
{l s='Order #'} :
+
{$message.id_order} {l s='view'} -
+
+
{/if} {if !empty($message.id_product) && empty($message.employee_name)} - {l s='Product #'} - +
+
{l s='Product #'} :
+
{$message.id_product} {l s='view'} -
+
+
{/if} -
- -
+ + {l s='Subject:'}
+ {else} -
+ @@ -136,12 +161,10 @@ {if empty($message.employee_name)} -

- -

{/if} diff --git a/admin-dev/themes/default/template/customer_threads/view.tpl b/admin-dev/themes/default/template/customer_threads/view.tpl index 0592c9d02..7522e8c8e 100644 --- a/admin-dev/themes/default/template/customer_threads/view.tpl +++ b/admin-dev/themes/default/template/customer_threads/view.tpl @@ -40,7 +40,7 @@

- + {l s='Forward this discussion to an employee:'}
- +

@@ -223,7 +223,7 @@ {assign var=count_ko value=count($orders_ko)} {if $count_ko}
-

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

+

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

diff --git a/admin-dev/themes/default/template/performance/form.tpl b/admin-dev/themes/default/template/performance/form.tpl index 115bf8972..0505b4b27 100644 --- a/admin-dev/themes/default/template/performance/form.tpl +++ b/admin-dev/themes/default/template/performance/form.tpl @@ -70,7 +70,7 @@ {if $key == 'memcachedServers'}