From 508651ba5adeb36fe3133629781b98d19ef4336e Mon Sep 17 00:00:00 2001 From: vKham Date: Tue, 27 Dec 2011 17:05:08 +0000 Subject: [PATCH] //add stylesheet page commande, fix table extensible git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11808 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/default/admin.css | 4 +- .../themes/template/orders/_documents.tpl | 8 +- .../themes/template/orders/_shipping.tpl | 15 ++- admin-dev/themes/template/orders/view.tpl | 119 +++++++++++------- controllers/admin/AdminGroupsController.php | 2 +- .../admin/AdminSearchEnginesController.php | 4 +- controllers/admin/AdminSlipController.php | 5 +- controllers/admin/AdminStatusesController.php | 4 +- .../admin/AdminWebserviceController.php | 5 +- css/admin.css | 26 ++++ 10 files changed, 125 insertions(+), 67 deletions(-) diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 7b3f30281..6fa7fee63 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -14,7 +14,7 @@ ul li {color:#585A69;} /*FORM*/ label {color:#585a69;text-shadow:0 1px 0#fff;} -fieldset{background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em} +fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font-size:1.1em;margin:0;padding:1em} .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;} @@ -118,7 +118,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} background: #ececec url(bg-degrade-table.png) repeat-x scroll left top; /*background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC); background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;*/ - font-size:13px; text-align:left;} + font-size:13px; text-align:left; color:#333;} .table tr th.right { text-align:center;} .table tr td{border-bottom:1px solid #ccc;color:#333;font-size:12px;padding: 4px 4px 4px 6px;} .table tr:hover td{background:#fff1b5} diff --git a/admin-dev/themes/template/orders/_documents.tpl b/admin-dev/themes/template/orders/_documents.tpl index 1229a739a..f4a61c908 100644 --- a/admin-dev/themes/template/orders/_documents.tpl +++ b/admin-dev/themes/template/orders/_documents.tpl @@ -1,11 +1,11 @@ - - + + - - + + diff --git a/admin-dev/themes/template/orders/_shipping.tpl b/admin-dev/themes/template/orders/_shipping.tpl index acbb7b080..0c9dfcf7b 100644 --- a/admin-dev/themes/template/orders/_shipping.tpl +++ b/admin-dev/themes/template/orders/_shipping.tpl @@ -1,12 +1,19 @@
{l s='Date'}{l s='Document'}{l s='Date'}{l s='Document'} {l s='Number'}{l s='Amount'}{l s='Amount'}
++ + + + + + - + - + - - + + diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl index c14499eb3..d6974acb0 100755 --- a/admin-dev/themes/template/orders/view.tpl +++ b/admin-dev/themes/template/orders/view.tpl @@ -60,38 +60,47 @@
{$HOOK_INVOICE}

'; {/if} -
-
+
+
{if (count($invoices_collection))} - {l s='View invoice'} {l s='View invoice'} + {l s='View invoice'} {l s='View invoice'} {else} {l s='No invoice'} {l s='No invoice'} {/if} - - + | {if ($currentState->delivery || $order->delivery_number)} - {l s='View delivery slip'} {l s='View delivery slip'} + {l s='View delivery slip'} {l s='View delivery slip'} {else} {l s='No delivery slip'} {l s='No delivery slip'} {/if} - - - {l s='Print order'} {l s='Print order'} -
-
-
    -
  • {l s='Date'}: {dateFormat date=$order->date_add full=true} |
    • -
  • {sizeof($messages)} {if (sizeof($messages) > 1)}{l s='messages'}{else}{l s='message'}{/if} |
    • -
  • {sizeof($products)} {if (sizeof($products) > 1)}{l s='products'}{else}{l s='product'}{/if} |
    • -
  • {l s='Total'}: {displayPrice price=$order->total_paid_tax_incl currency=$currency->id}
    • -
+ | + {l s='Print order'} {l s='Print order'}
+
+
+
{l s='Date'}:
+
{dateFormat date=$order->date_add full=true}
+ |
+
+
{if (sizeof($messages) > 1)}{l s='messages'}{else}{l s='message'}{/if}:
+
{sizeof($messages)}
+ |
+
+
{if (sizeof($products) > 1)}{l s='products'}{else}{l s='product'}{/if}:
+
{sizeof($products)}
+ |
+
+
{l s='Total'}:
+
{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}
+
-
- -
+
+ +
-
+
-
+
{l s='Date:'}{l s='Date:'} {l s='Type'}{l s='Carrier'}{l s='Carrier'} {l s='Weight'}{l s='Shipping cost'}{l s='Tracking number'}{l s='Shipping cost'}{l s='Tracking number'}
+
+ + + + + + {foreach from=$history item=row key=key} {if ($key == 0)} - + {else} - + {/if} {/foreach} @@ -126,7 +141,7 @@ {if $customer->id}
-
+
{l s='Customer information'} {$customer->firstname} {$customer->lastname} ({l s='#'}{$customer->id})
({$customer->email})

@@ -152,7 +167,7 @@ {if (sizeof($sources))}
-
+
{l s='Sources'}
    3}style="height: 200px; overflow-y: scroll; width: 360px;"{/if}> {foreach from=$sources item=source} @@ -175,9 +190,9 @@ -
    +
    -
    +
    {l s='Documents'} {* Include document template *} @@ -186,7 +201,7 @@
    -
    +
    {l s='Payment'} {if !$order->valid} @@ -212,14 +227,24 @@
{dateFormat date=$row['date_add'] full=true} {$row['ostate_name']|stripslashes} {if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}{dateFormat date=$row['date_add'] full=true}
{dateFormat date=$row['date_add'] full=true} {$row['ostate_name']|stripslashes} {if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else} {/if}{dateFormat date=$row['date_add'] full=true}
+ + + + + + + + + + - + - - - - + + + + @@ -324,11 +349,11 @@
-
+
{l s='Shipping'}
- {l s='Recycled package:'} + {l s='Recycled package:'} {if $order->recyclable} {else} @@ -336,7 +361,7 @@ {/if}
- {l s='Gift wrapping:'} + {l s='Gift wrapping:'} {if $order->gift}
@@ -359,7 +384,7 @@
-
+
{l s='Merchandise returns'} {if $order->getReturn()|count > 0} @@ -408,17 +433,17 @@
-
+
-
+
-
+
{l s='Shipping address'}{l s='Shipping address'} {if $can_edit} -
-

+

+

{foreach from=$customer_addresses item=address} @@ -480,7 +505,7 @@ {l s='Products'}{l s='Products'}

{if $can_edit} - {if !$order->hasBeenDelivered()}{/if} + {if !$order->hasBeenDelivered()}{/if}
{l s='Date'}{l s='Date'} {l s='Payment method'}{l s='Transaction ID'}{l s='Amount'}{l s='Invoice'} {l s='Transaction ID'}{l s='Amount'}{l s='Invoice'}