From 5f0b95bcf83d9156b44123614b7cc78286ddb3cb Mon Sep 17 00:00:00 2001 From: vKham Date: Tue, 3 Jan 2012 17:18:29 +0000 Subject: [PATCH] // change view carts --- .../themes/default/template/carts/view.tpl | 45 +++++++++--------- .../template/customer_threads/message.tpl | 10 ++-- .../template/customer_threads/view.tpl | 2 +- .../default/template/customers/view.tpl | 2 +- .../themes/default/template/groups/view.tpl | 23 ++++----- .../template/products/informations.tpl | 6 +-- .../template/referrers/form_settings.tpl | 9 ++-- classes/Hook.php | 4 +- .../admin/AdminAddressesController.php | 2 +- css/admin.css | 34 +++++++------ img/admin/basket.png | Bin 0 -> 1627 bytes img/admin/vcard.png | Bin 0 -> 642 bytes 12 files changed, 70 insertions(+), 67 deletions(-) create mode 100755 img/admin/basket.png create mode 100755 img/admin/vcard.png diff --git a/admin-dev/themes/default/template/carts/view.tpl b/admin-dev/themes/default/template/carts/view.tpl index 9a28a1666..8d153494a 100755 --- a/admin-dev/themes/default/template/carts/view.tpl +++ b/admin-dev/themes/default/template/carts/view.tpl @@ -28,16 +28,17 @@ {block name="override_tpl"} -

{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"} {l s='from'} {$cart->date_upd}

+
+

{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}{l s='from'} {$cart->date_upd}

+
-
-
-
- {l s='Customer information'} - +
+

{l s='Customer information'}

+ {if $customer->id} - getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname} {l s='#'}{$customer->id}
- {$customer->email}

+ {$customer->firstname} {$customer->lastname} + {l s='#'}{$customer->id}
+ {$customer->email}

{l s='Account registered:'} {dateFormat date=$customer->date_add}
{l s='Valid orders placed:'} {$customer_stats.nb_orders}
{l s='Total paid since registration:'} {displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}
@@ -45,30 +46,29 @@ {l s='Guest not registered'} {/if} -
-
-
- {l s='Order information'} - +
+

{l s='Order information'}

+ {if $order->id} {l s='Order #'}{$order->id|string_format:"%06d"}

{l s='Made on:'} {dateFormat date=$order->date_add}



{else} {l s='No order created from this cart'} -

{l s='Create an order with this cart'}

+

{l s='Create an order with this cart'}

{/if} -

-
- {l s='Products'}{l s='Cart summary'} -
- +
+ + +

{l s='Products'}{l s='Cart summary'}

+
+
- + @@ -183,8 +183,9 @@ {/if}
{l s='According to the group of this customer, prices are printed:'} {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if} -
+ -
 
{/block} + + \ No newline at end of file diff --git a/admin-dev/themes/default/template/customer_threads/message.tpl b/admin-dev/themes/default/template/customer_threads/message.tpl index 3e939261f..bd45db20f 100644 --- a/admin-dev/themes/default/template/customer_threads/message.tpl +++ b/admin-dev/themes/default/template/customer_threads/message.tpl @@ -28,8 +28,8 @@ {if !$email} -
- +
+ {if !empty($message.employee_name)} {$PS_SHOP_NAME} {$PS_SHOP_NAME} - {$message.employee_name} @@ -192,10 +192,12 @@ {/if} - + -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/admin-dev/themes/default/template/customer_threads/view.tpl b/admin-dev/themes/default/template/customer_threads/view.tpl index 7522e8c8e..54f3bc2d7 100644 --- a/admin-dev/themes/default/template/customer_threads/view.tpl +++ b/admin-dev/themes/default/template/customer_threads/view.tpl @@ -142,7 +142,7 @@ {$message} {/foreach} -
 
+ diff --git a/admin-dev/themes/default/template/customers/view.tpl b/admin-dev/themes/default/template/customers/view.tpl index 7810bcd36..6efe6350a 100644 --- a/admin-dev/themes/default/template/customers/view.tpl +++ b/admin-dev/themes/default/template/customers/view.tpl @@ -63,7 +63,7 @@ - + {$customer->firstname} {$customer->lastname}
diff --git a/admin-dev/themes/default/template/groups/view.tpl b/admin-dev/themes/default/template/groups/view.tpl index 9f96a6ab1..2566c9506 100755 --- a/admin-dev/themes/default/template/groups/view.tpl +++ b/admin-dev/themes/default/template/groups/view.tpl @@ -28,12 +28,11 @@ {block name="override_tpl"} -
- {l s='Name:'} {$group->name[$language->id]} -
 
- {l s='Discount:'} {$group->reduction} {l s='%'} -
 
- {l s='Current category discount:'} +
+
    +
  • {l s='Name:'} {$group->name[$language->id]}
    • +
  • {l s='Discount:'} {$group->reduction} {l s='%'}
    • +
  • {l s='Current category discount:'} {if !$categorieReductions} {l s='None'} {else} @@ -46,16 +45,18 @@ {/foreach}
   {l s='Product'} {l s='UP'} {l s='Qty'}
{/if} -
 
- {l s='Price display method:'} + + +
  • {l s='Price display method:'} {if $group->price_display_method} {l s='Tax excluded'} {else} {l s='Tax included'} {/if} -
     
    - {l s='Show prices:'} {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if} -
     
    +
    • +
  • {l s='Show prices:'} {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if} +
    • +

    {l s='Customer members of this group'}

    {$customerList} diff --git a/admin-dev/themes/default/template/products/informations.tpl b/admin-dev/themes/default/template/products/informations.tpl index d76f24b02..709e04a1d 100644 --- a/admin-dev/themes/default/template/products/informations.tpl +++ b/admin-dev/themes/default/template/products/informations.tpl @@ -66,15 +66,15 @@
    -
    -

    {l s='Direct traffic can be quite consuming. You should consider enabling it only if you have a strong database server and a strong need for it.'}

    -
    +
    -

    {l s='Indexation'}

    +

    {l s='Indexation'}

    {l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can refresh this index by clicking on the button above. Be aware that it may take a long time and it is only needed if you modified or added a referrer and if you want your changes to be retroactive.'}

    -
    +
    -

    {l s='Cache'}

    +

    {l s='Cache'}

    {l s='For you to sort and filter your data, it is cached. You can refresh the cache by clicking on the button above.'}

    diff --git a/classes/Hook.php b/classes/Hook.php index 8e2d1f253..af252ae39 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -379,7 +379,9 @@ class HookCore extends ObjectModel $output .= '
    - ' + ' .$moduleInstance->displayName.' diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index d2bd432be..a4bb20e4c 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -53,7 +53,7 @@ class AdminAddressesControllerCore extends AdminController 'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'), 'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'), 'address1' => array('title' => $this->l('Address')), - 'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 50), + 'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 80), 'city' => array('title' => $this->l('City'), 'width' => 150), 'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countriesArray, 'filter_key' => 'cl!id_country')); diff --git a/css/admin.css b/css/admin.css index d201d73c0..9fa4c4f41 100644 --- a/css/admin.css +++ b/css/admin.css @@ -269,6 +269,7 @@ input, textarea, option { input[type="text"], input[type="password"], input[type="file"], textarea { padding: 2px 4px; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset; } input[type="text"], input[type="password"], input[type="file"], textarea, select, option { @@ -2170,6 +2171,11 @@ div#scrollTop a:hover{ #container-customer h2 { color:#000; font-weight:normal; +margin:0; +} + +#container-customer h2 img { +margin-right:5px; } #container-customer .info-customer-left { @@ -2189,6 +2195,14 @@ font-weight:normal; } +#container-customer .info-customer-left h2, +#container-customer .info-customer-right h2 { +margin-bottom:7px; +} + +#container-customer a { + +} /*infoCustomer*/ .infoCustomer {} @@ -2196,21 +2210,5 @@ font-weight:normal; .infoCustomer dl dt {font-weight:bold; float:left; padding-right:5px;} .infoCustomer dl dd { margin:0; padding:0;} - -#ajax_running { - display: none; - position: fixed; - top: 0; - left: 40%; - z-index: 10000; - background-color: #FFF1A8; - border: 1px solid #FFD96F; - color: #000; - font-weight: bold; - font-size: 14px; - padding: 5px 20px; - border-radius: 0 0 3px 3px; - -webkit-border-bottom-left-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - width: 300px; -} \ No newline at end of file +/*container-carts*/ +#container-carts { background-color:#EBEDF4; border:1px solid #CCCED7; padding:10px;} diff --git a/img/admin/basket.png b/img/admin/basket.png new file mode 100755 index 0000000000000000000000000000000000000000..edd35f199ea1e6820b8784720d8f6b0e6ba09e2e GIT binary patch literal 1627 zcmV-h2Bi6kP)bK;!uvYw;mB_SMO+qja^JwpUqX#Z!-lk6986kuO2yg>KbeU z@E{Oob0U*|>RV~Fb3qw1*|X7oOs_?w`yS`ifh~8?T-({bO5Y1!+PZH zs&?c&{P$5UF@jY$wi3?F1%lT3vcav-6QnetjS)KfJbr~y)j-%}K9dwMy$QbX$Ua{5K@MZV~bUU-K+%4kx z?p0|2>;p)g2pJY=77@HfARD~DxVU&REtj7JK&+^!=vuloGkx=`TcK+jEl^>Df?w>J zIOgrZpN}Hgl+NSpEy)OJQ39P74R2l;#*cj(mbq;x-<^XEp?e5JfX-RK@jRL?{)D@C z@7_3aDoEW%C|XoasQ_+&5>?ZRSY z8BDB%|K#V0=scDzS&R)EH{sm5bLi^oI$K&=T0q;B2>|YoD=LQf?cWbslE73ucoj|7 zOq9oH-)rk{0 zTvEckcubh^b_PUNR5V}umE9cFO}kKex&!wp%RO%&#(t+C4b4Qm_T;b;$t~VV(&4wI z;_9#)hpTVnL%I(B=Nj@P4jb36pGg09GXSH>vW$5t^N3Cj-(K|L#zP+KlLM$+Eg`6- zfEdPfm4l0c`1BJ{?8w2o7a~ zXcHi5Za9s?6<^w9KF#9ei*-7EBgU069S%foz!dhA05nZ|XmdE`rKZg{j>*L!GMmm> zR$8+TJvKo$FgiNg#7vr_z)k%Xlmjk{HaneEGqW@oML)(2T|p#_l9CdZ3p&j{Fizqp zAfeT3avh4I7&P%QswUnH+$_f$814Wt!Eqni3bGt9wHPU5V*#HO4#DMe!9pcZQY9#w0xQKX6V{*U znCW1;m`V&$QYq!JJ%78gprN6`_~z&5$2C6Ra2^_+ z-cwLur1(G}z#K4Q2Eb2=6(t-Fw~daBATcSCoJNHrDMsF4B2%9URaZm)Z9K7_?PWTc zE~b+X=Zn#=KaK%|h4Jz6w!y)Hm$OzZhi7Mj5lWiQ$_R&@y9%OVrAG6_lg2vzvHdJ0 zUG!oio#cRHty3Q)Qvt}`-Q7P73=HfQ$neUXY!)^MjE4~n1>;UjM)q_#$?@!PI$a0_ zgCL#o`~6p^10XdvHvUHMf|Inkkl>3^t6VI7#}6Tzi}Yw(r~4Tk9Q>}jy1K=D|Bri; zu}&gMI!RjW-9H!kn7!fuBI#x6*X#q2dz4yYwb~x*&qZTS5{{)`^}qgaIH!$!+5r9* ZU;wlJF)FC-vR42A002ovPDHLkV1i>N1=Iil literal 0 HcmV?d00001 diff --git a/img/admin/vcard.png b/img/admin/vcard.png new file mode 100755 index 0000000000000000000000000000000000000000..b8a9fea4cfd7eb7fe7f98032eeae955608692162 GIT binary patch literal 642 zcmV-|0)737P)LnAlbF}f{C64AD50RDWx z6iZlI`-V3jqN3{EjT`~aFnQ}H4z?e05o}`6cP3rC6#e7#|D3f=uD0YXFZPYiYvJ4| z-+D)9VG0A5t&qKzbaTFZvC%o0+*y-Yyk1!o#EuQzUHDm+dYjXV$y6aToJb^Zzj&w{ z8hfOyG{~vYge+vPBonEL**Ocm#W}WtvrQ*<{B@9{&Ij@~^6-{-Qzp-mA9eP6ImzmM c&VK|L01%Kt#mW9DMgRZ+07*qoM6N<$f_qsSYybcN literal 0 HcmV?d00001