dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//add stylesheet page commande, fix table extensible

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11808 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vKham
2011-12-27 17:05:08 +00:00
parent 8f88afd9bc
commit 508651ba5a
10 changed files with 125 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+2 -2
View File
@@ -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}
admin-dev/themes/template/orders/_documents.tpl
+4 -4
View File
@@ -1,11 +1,11 @@
<table class="table" width="100%;" cellspacing="0" cellpadding="0" id="documents_table">
<thead>
<tr>
<th style="width:20%">{l s='Date'}</th>
<th style="width:25%">{l s='Document'}</th>
<th style="width:10%">{l s='Date'}</th>
<th style="">{l s='Document'}</th>
<th style="width:20%">{l s='Number'}</th>
<th>{l s='Amount'}</th>
<th style="width:42px"></th>
<th style="width:10%">{l s='Amount'}</th>
<th style="width:1%"></th>
</tr>
</thead>
<tbody>
admin-dev/themes/template/orders/_shipping.tpl
+11 -4
View File
@@ -1,12 +1,19 @@
<table class="table" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
<colgroup>
<col width="10%"></col>
<col width="15%"></col>
<col width=""></col>
<col width="10%"></col>
<col width="20%"></col>
</colgroup>
<thead>
<tr>
<th style="width:30%">{l s='Date:'}</th>
<th>{l s='Date:'}</th>
<th>{l s='Type'}</th>
<th style="width:20%">{l s='Carrier'}</th>
<th>{l s='Carrier'}</th>
<th>{l s='Weight'}</th>
<th style="width:15%">{l s='Shipping cost'}</th>
<th style="width:30%">{l s='Tracking number'}</th>
<th>{l s='Shipping cost'}</th>
<th>{l s='Tracking number'}</th>
</tr>
</thead>
<tbody>
admin-dev/themes/template/orders/view.tpl
+72 -47
View File
@@ -60,38 +60,47 @@
<div style="float: right; margin: -40px 40px 10px 0;">{$HOOK_INVOICE}</div><br class="clear" />';
{/if}
<fieldset style="width:98%; margin-bottom: 10px;">
<div style="width:50%; float: left;">
<div class="bloc-command">
<div class="button-command">
{if (count($invoices_collection))}
<a href="pdf.php?id_order={$order->id}&pdf" target="_blank"><img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}</a>
<a class="button" href="pdf.php?id_order={$order->id}&pdf" target="_blank"><img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}</a>
{else}
<img src="../img/admin/charged_ko.gif" alt="{l s='No invoice'}" /> {l s='No invoice'}
{/if}
-
|
{if ($currentState->delivery || $order->delivery_number)}
<a href="pdf.php?id_order={$order->id}&delivery" target="_blank"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
<a class="button" href="pdf.php?id_order={$order->id}&delivery" target="_blank"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
{else}
<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
{/if}
-
<a href="javascript:window.print()"><img src="../img/admin/printer.gif" alt="{l s='Print order'}" title="{l s='Print order'}" /> {l s='Print order'}</a>
</div>
<div style="width:50%; float: left;text-align:right;">
<ul style="margin:0;padding:0;list-style-type:none;">
<li style="display: inline;">{l s='Date'}: <b>{dateFormat date=$order->date_add full=true}</b> |</li>
<li style="display: inline;"><b>{sizeof($messages)}</b> {if (sizeof($messages) > 1)}{l s='messages'}{else}{l s='message'}{/if} |</li>
<li style="display: inline;"><span id="product_number" style="font-weight: bold;">{sizeof($products)}</b> {if (sizeof($products) > 1)}{l s='products'}{else}{l s='product'}{/if} |</li>
<li style="display: inline;">{l s='Total'}: <span class="total_paid" style="font-weight: bold;">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</span></li>
</ul>
|
<a class="button" href="javascript:window.print()"><img src="../img/admin/printer.gif" alt="{l s='Print order'}" title="{l s='Print order'}" /> {l s='Print order'}</a>
</div>
<div class="metadata-command">
<dl>
<dt>{l s='Date'}: </dt>
<dd>{dateFormat date=$order->date_add full=true}</dd>
|</dl>
<dl>
<dt>{if (sizeof($messages) > 1)}{l s='messages'}{else}{l s='message'}{/if}: </dt>
<dd>{sizeof($messages)}</dd>
|</dl>
<dl>
<dt>{if (sizeof($products) > 1)}{l s='products'}{else}{l s='product'}{/if}: </dt>
<dd>{sizeof($products)}</dd>
|</dl>
<dl>
<dt>{l s='Total'}: </dt>
<dd>{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
</dl>
<div class="clear"></div>
</fieldset>
<div style="width: 98%">
</div>
</div>
<div class="container-command">
<!-- Left column -->
<div style="width: 48%; float:left;">
<div style="width: 49%; float:left;">
<!-- Change status form -->
<form action="{$currentIndex}&viewOrder&token={$smarty.get.token}" method="post" style="text-align:center;">
<form action="{$currentIndex}&viewOrder&token={$smarty.get.token}" method="post">
<select id="id_order_state" name="id_order_state">
{foreach from=$states item=state}
<option value="{$state['id_order_state']}" {if $state['id_order_state'] == $currentState->id}selected="selected"{/if}>{$state['name']|stripslashes}</option>
@@ -103,21 +112,27 @@
<br />
<!-- History of status -->
<table cellspacing="0" cellpadding="0" class="table" style="width: 100%;">
<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;">
<colgroup>
<col width="1%"></col>
<col width=""></col>
<col width="20%"></col>
<col width="20%"></col>
</colgroup>
{foreach from=$history item=row key=key}
{if ($key == 0)}
<tr>
<th>{dateFormat date=$row['date_add'] full=true}</th>
<th><img src="../img/os/{$row['id_order_state']}.gif" /></th>
<th>{$row['ostate_name']|stripslashes}</th>
<th>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</th>
<th>{dateFormat date=$row['date_add'] full=true}</th>
</tr>
{else}
<tr class="{if ($key % 2)}alt_row{/if}">
<td>{dateFormat date=$row['date_add'] full=true}</td>
<td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
<td>{$row['ostate_name']|stripslashes}</td>
<td>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else}&nbsp;{/if}</td>
<td>{dateFormat date=$row['date_add'] full=true}</td>
</tr>
{/if}
{/foreach}
@@ -126,7 +141,7 @@
{if $customer->id}
<!-- Customer informations -->
<br />
<fieldset style="width: 100%;">
<fieldset>
<legend><img src="../img/admin/tab-customers.gif" /> {l s='Customer information'}</legend>
<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
(<a href="mailto:{$customer->email}">{$customer->email}</a>)<br /><br />
@@ -152,7 +167,7 @@
<!-- Sources block -->
{if (sizeof($sources))}
<br />
<fieldset style="width: 100%;">
<fieldset>
<legend><img src="../img/admin/tab-stats.gif" /> {l s='Sources'}</legend>
<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll; width: 360px;"{/if}>
{foreach from=$sources item=source}
@@ -175,9 +190,9 @@
<!-- END Left column -->
<!-- Right column -->
<div style="width: 48%; float:right;">
<div style="width: 49%; float:right;">
<!-- Documents block -->
<fieldset style="width: 100%">
<fieldset>
<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
{* Include document template *}
@@ -186,7 +201,7 @@
<br />
<!-- Payments block -->
<fieldset style="width: 100%;">
<fieldset>
<legend><img src="../img/admin/money.gif" /> {l s='Payment'}</legend>
{if !$order->valid}
@@ -212,14 +227,24 @@
<form id="formAddPayment" method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<table class="table" width="100%" cellspacing="0" cellpadding="0">
<colgroup>
<col width="10%"></col>
<col width=""></col>
<col width="20%"></col>
<col width="10%"></col>
<col width="10%"></col>
<col width="1%"></col>
</colgroup>
<thead>
<tr>
<th style="width:28%">{l s='Date'}</th>
<th>{l s='Date'}</th>
<th>{l s='Payment method'}</th>
<th style="width:15%">{l s='Transaction ID'}</th>
<th style="width:25%">{l s='Amount'}</th>
<th style="width:15%">{l s='Invoice'}</th>
<th style="width:10%">&nbsp;</th>
<th>{l s='Transaction ID'}</th>
<th>{l s='Amount'}</th>
<th>{l s='Invoice'}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@@ -324,11 +349,11 @@
<br />
<!-- Shipping block -->
<fieldset style="width: 100%">
<fieldset>
<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
<div class="clear" style="float: left; margin-right: 10px;">
<span class="bold">{l s='Recycled package:'}</span>
<span>{l s='Recycled package:'}</span>
{if $order->recyclable}
<img src="../img/admin/enabled.gif" />
{else}
@@ -336,7 +361,7 @@
{/if}
</div>
<div style="float: left;">
<span class="bold">{l s='Gift wrapping:'}</span>
<span>{l s='Gift wrapping:'}</span>
{if $order->gift}
<img src="../img/admin/enabled.gif" />
</div>
@@ -359,7 +384,7 @@
<br />
<!-- Return block -->
<fieldset style="width: 100%">
<fieldset>
<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend>
{if $order->getReturn()|count > 0}
@@ -408,17 +433,17 @@
<div class="clear" style="margin-bottom: 10px;"></div>
</div>
<div style="width: 98%">
<div class="container-command">
<!-- Addresses -->
<div style="width: 48%; float:left;"></contact>
<div style="width: 49%; float:left;"></contact>
<!-- Shipping address -->
<fieldset style="width: 100%;">
<fieldset>
<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
{if $can_edit}
<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}">
<div style="margin-bottom:5px;border-bottom:1px solid black;">
<p style="text-align:center;">
<div style="margin-bottom:5px;">
<p>
<select name="id_address">
{foreach from=$customer_addresses item=address}
<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
@@ -440,15 +465,15 @@
</fieldset>
</div>
<div style="width: 48%; float:right;"></contact>
<div style="width: 49%; float:right;"></contact>
<!-- Invoice address -->
<fieldset style="width: 100%;">
<fieldset>
<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
{if $can_edit}
<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}">
<div style="margin-bottom:5px;border-bottom:1px solid black;">
<p style="text-align:center;">
<div style="margin-bottom:5px;">
<p>
<select name="id_address">
{foreach from=$customer_addresses item=address}
<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
@@ -480,7 +505,7 @@
<legend><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Products'}</legend>
<div style="float:left;width: 100%;">
{if $can_edit}
{if !$order->hasBeenDelivered()}<div style="float: left;"><a href="#" class="add_product"><img src="../img/admin/add.gif" alt="{l s='Add a product'}" /> {l s='Add a product'}</a></div>{/if}
{if !$order->hasBeenDelivered()}<div style="float: left;"><a href="#" class="add_product button"><img src="../img/admin/add.gif" alt="{l s='Add a product'}" /> {l s='Add a product'}</a></div>{/if}
<div style="float: right; margin-right: 10px" id="refundForm">
<!--
<a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Proceed a standard refund'}" /> {l s='Proceed a standard refund'}</a>
controllers/admin/AdminGroupsController.php
+1 -1
View File
@@ -72,7 +72,7 @@ class AdminGroupsControllerCore extends AdminController
),
'show_prices' => array(
'title' => $this->l('Show prices'),
'width' => 25,
'width' => 120,
'align' => 'center',
'type' => 'bool',
'callback' => 'printShowPricesIcon',
controllers/admin/AdminSearchEnginesController.php
+2 -2
View File
@@ -46,8 +46,8 @@ class AdminSearchEnginesControllerCore extends AdminController
$this->fieldsDisplay = array(
'id_search_engine' => array('title' => $this->l('ID'), 'width' => 25),
'server' => array('title' => $this->l('Server'), 'width' => 200),
'getvar' => array('title' => $this->l('GET variable'), 'width' => 40)
'server' => array('title' => $this->l('Server')),
'getvar' => array('title' => $this->l('GET variable'), 'width' => 100)
);
$this->fields_form = array(
controllers/admin/AdminSlipController.php
+2 -3
View File
@@ -40,12 +40,11 @@ class AdminSlipControllerCore extends AdminController
),
'id_order' => array(
'title' => $this->l('ID Order'),
'width' => 75,
'align' => 'center'
'align' => 'left'
),
'date_add' => array(
'title' => $this->l('Date issued'),
'width' => 60,
'width' => 150,
'type' => 'date',
'align' => 'right'
)
controllers/admin/AdminStatusesController.php
+2 -2
View File
@@ -75,7 +75,7 @@ class AdminStatusesControllerCore extends AdminController
'1' => 'enabled.gif',
'0' => 'disabled.gif'
),
'width' => 25,
'width' => 190,
'type' => 'bool',
'orderby' => false
),
@@ -92,7 +92,7 @@ class AdminStatusesControllerCore extends AdminController
),
'template' => array(
'title' => $this->l('E-mail template'),
'width' => 100
'width' => 120
)
);
controllers/admin/AdminWebserviceController.php
+3 -2
View File
@@ -50,11 +50,12 @@ class AdminWebserviceControllerCore extends AdminController
'align' => 'center',
'active' => 'status',
'type' => 'bool',
'orderby' => false
'orderby' => false,
'width' => 32
),
'description' => array(
'title' => $this->l('Key description'),
'align' => 'center',
'align' => 'left',
'orderby' => false
)
);
css/admin.css
+26
View File
@@ -2124,6 +2124,32 @@ div#scrollTop a:hover{
#conditions #condition_list select { float:left; margin-right:10px; width: 200px;}
#conditions #condition_list a { float:left;}
/*commandes*/
.container-command {width:100%}
.bloc-command {background-color:#F8F8F8; margin-bottom:10px;}
.button-command {float:right; padding:10px;}
/*history status*/
.history-status { border-radius:0;}
.history-status tr th {
background: #eee none;
}
.metadata-command {}
.metadata-command dl {
float:left;
margin-left:10px;
}
.metadata-command dl dt, .metadata-command dl dd {
color:#color: #585A69;
float:left;
margin:0;
padding-right:10px;
}
.metadata-command dl dd {
font-weight:bold;
}
#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;}