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

// add new stylesheet view customer and fix table extensible

Browse Source
This commit is contained in:
vKham committed 2011-12-28 14:32:35 +00:00
1 parent 986c148e32
commit e74e5389cd
7 files changed
+129 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/admin.css
+1 -1
View File
@@ -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} .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} 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;} 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} 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;} .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;} .double_select select{width:300px;height:160px;}
admin-dev/themes/template/customers/view.tpl
+92 -47
View File
@@ -54,9 +54,11 @@
}); });
} }
</script> </script>
<fieldset style="width:400px;float: left"> <div id="container-customer">
<div style="float: right">
<div class="info-customer-left">
<div style="float: right">
<a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}"> <a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}">
<img src="../img/admin/edit.gif" /> <img src="../img/admin/edit.gif" />
</a> </a>
@@ -72,9 +74,9 @@
{l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='never'}{/if}<br /> {l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='never'}{/if}<br />
{if $count_better_customers != '-'}{l s='Rank: #'} {$count_better_customers}<br />{/if} {if $count_better_customers != '-'}{l s='Rank: #'} {$count_better_customers}<br />{/if}
{if $shop_is_feature_active}{l s='Shop:'} {$name_shop}<br />{/if} {if $shop_is_feature_active}{l s='Shop:'} {$name_shop}<br />{/if}
</fieldset> </div>
<fieldset style="width:300px;float:left;margin-left:50px"> <div class="info-customer-right">
<div style="float: right"> <div style="float: right">
<a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}"> <a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}">
<img src="../img/admin/edit.gif" /> <img src="../img/admin/edit.gif" />
@@ -100,23 +102,24 @@
{/if} {/if}
</div> </div>
{/if} {/if}
</fieldset>
</div>
<div class="clear"></div>
<div class="separation"></div>
<div class="clear">&nbsp;</div> <div>
<h2>
<fieldset style="height:190px">
<legend>
<img src="../img/admin/cms.gif" /> {l s='Add a private note'} <img src="../img/admin/cms.gif" /> {l s='Add a private note'}
</legend> </h2>
<p>{l s='This note will be displayed to all the employees but not to the customer.'}</p> <p>{l s='This note will be displayed to all the employees but not to the customer.'}</p>
<form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note"> <form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note">
<textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br /> <textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br />
<input type="submit" id="submitCustomerNote" class="button" value="{l s=' Save '}" style="float:left;margin-top:5px" disabled="disabled" /> <input type="submit" id="submitCustomerNote" class="button" value="{l s=' Save '}" style="float:left;margin-top:5px" disabled="disabled" />
<span id="note_feedback" style="float:left;margin:10px 0 0 10px"></span> <span id="note_feedback" style="margin:10px 0 0 10px"></span>
</form> </form>
</fieldset> </div>
<div class="clear"></div>
<div class="clear">&nbsp;</div> <div class="separation"></div>
<h2>{l s='Messages'} ({count($messages)})</h2> <h2>{l s='Messages'} ({count($messages)})</h2>
@@ -153,9 +156,14 @@
<h2>{l s='Groups'} ({count($groups)})</h2> <h2>{l s='Groups'} ({count($groups)})</h2>
{if $groups AND count($groups)} {if $groups AND count($groups)}
<table cellspacing="0" cellpadding="0" class="table"> <table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
<colgroup>
<col width="10px"></col>
<col width=""></col>
<col width="70px"></col>
</colgroup>
<tr> <tr>
<th class="center">{l s='ID'}</th> <th height="39px" class="right">{l s='ID'}</th>
<th class="center">{l s='Name'}</th> <th class="center">{l s='Name'}</th>
<th class="center">{l s='Actions'}</th> <th class="center">{l s='Actions'}</th>
</tr> </tr>
@@ -175,28 +183,37 @@
{if $orders AND count($orders)} {if $orders AND count($orders)}
{assign var=count_ok value=count($orders_ok)} {assign var=count_ok value=count($orders_ok)}
{if $count_ok} {if $count_ok}
<div style="float:left;margin-right:20px"> <div>
<h3 style="color:green;font-weight:700"> <h3 style="color:green;font-weight:700">
{l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok} {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok}
</h3> </h3>
<table cellspacing="0" cellpadding="0" class="table float"> <table cellspacing="0" cellpadding="0" class="table" style="width:100%; text-align:left;">
<colgroup>
<col width="10px"></col>
<col width="100px"></col>
<col width="100px"></col>
<col width=""></col>
<col width="50px"></col>
<col width="80px"></col>
<col width="70px"></col>
</colgroup>
<tr> <tr>
<th class="center">{l s='ID'}</th> <th height="39px" class="center">{l s='ID'}</th>
<th class="center">{l s='Date'}</th> <th class="left">{l s='Date'}</th>
<th class="center">{l s='Products'}</th> <th class="left">{l s='Payment'}</th>
<th class="center">{l s='Total paid'}</th> <th class="left">{l s='State'}</th>
<th class="center">{l s='Payment'}</th> <th class="left">{l s='Products'}</th>
<th class="center">{l s='State'}</th> <th class="left">{l s='Total paid'}</th>
<th class="center">{l s='Actions'}</th> <th class="center">{l s='Actions'}</th>
</tr> </tr>
{foreach $orders_ok AS $key => $order} {foreach $orders_ok AS $key => $order}
<tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}'"> <tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}'">
<td class="center">{$order['id_order']}</td> <td class="center">{$order['id_order']}</td>
<td>{$order['date_add']}</td> <td>{$order['date_add']}</td>
<td align="right">{$order['nb_products']}</td>
<td align="right">{$order['total_paid_real']}</td>
<td>{$order['payment']}</td> <td>{$order['payment']}</td>
<td>{$order['order_state']}</td> <td>{$order['order_state']}</td>
<td align="right">{$order['nb_products']}</td>
<td align="right">{$order['total_paid_real']}</td>
<td align="center"><a href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}"><img src="../img/admin/details.gif" /></a></td> <td align="center"><a href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}"><img src="../img/admin/details.gif" /></a></td>
</tr> </tr>
{/foreach} {/foreach}
@@ -206,9 +223,9 @@
<div class="clear">&nbsp;</</div> <div class="clear">&nbsp;</</div>
{assign var=count_ko value=count($orders_ko)} {assign var=count_ko value=count($orders_ko)}
{if $count_ko} {if $count_ko}
<div style="float:left;margin-right:20px"> <div>
<h3 style="color:red;font-weight:700">{l s='Invalid orders:'} {$count_ko}</h3> <h3 style="color:red;font-weight:700">{l s='Invalid orders:'} {$count_ko}</h3>
<table cellspacing="0" cellpadding="0" class="table float"> <table cellspacing="0" cellpadding="0" class="table">
<tr> <tr>
<th class="center">{l s='ID'}</th> <th class="center">{l s='ID'}</th>
<th class="center">{l s='Date'}</th> <th class="center">{l s='Date'}</th>
@@ -240,9 +257,15 @@
{if $products AND count($products)} {if $products AND count($products)}
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
<h2>{l s='Products'} ({count($products)})</h2> <h2>{l s='Products'} ({count($products)})</h2>
<table cellspacing="0" cellpadding="0" class="table"> <table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
<colgroup>
<col width="50px"></col>
<col width=""></col>
<col width="60px"></col>
<col width="70px"></col>
</colgroup>
<tr> <tr>
<th class="center">{l s='Date'}</th> <th height="39px" class="center">{l s='Date'}</th>
<th class="center">{l s='Name'}</th> <th class="center">{l s='Name'}</th>
<th class="center">{l s='Quantity'}</th> <th class="center">{l s='Quantity'}</th>
<th class="center">{l s='Actions'}</th> <th class="center">{l s='Actions'}</th>
@@ -261,9 +284,17 @@
<h2>{l s='Addresses'} ({count($addresses)})</h2> <h2>{l s='Addresses'} ({count($addresses)})</h2>
{if count($addresses)} {if count($addresses)}
<table cellspacing="0" cellpadding="0" class="table"> <table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
<colgroup>
<col width="120px"></col>
<col width="120px"></col>
<col width=""></col>
<col width="100px"></col>
<col width="170px"></col>
<col width="70px"></col>
</colgroup>
<tr> <tr>
<th>{l s='Company'}</th> <th height="39px">{l s='Company'}</th>
<th>{l s='Name'}</th> <th>{l s='Name'}</th>
<th>{l s='Address'}</th> <th>{l s='Address'}</th>
<th>{l s='Country'}</th> <th>{l s='Country'}</th>
@@ -276,7 +307,7 @@
<td>{$address['firstname']} {$address['lastname']}</td> <td>{$address['firstname']} {$address['lastname']}</td>
<td>{$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']}</td> <td>{$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']}</td>
<td>{$address['country']}</td> <td>{$address['country']}</td>
<td> <td class="right">
{if $address['phone']} {if $address['phone']}
{$address['phone']} {$address['phone']}
{if $address['phone_mobile']}<br />{$address['phone_mobile']}{/if} {if $address['phone_mobile']}<br />{$address['phone_mobile']}{/if}
@@ -324,23 +355,30 @@
{/if} {/if}
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
<div style="float:left"> <div>
<h2>{l s='Carts'} ({count($carts)})</h2> <h2>{l s='Carts'} ({count($carts)})</h2>
{if $carts AND count($carts)} {if $carts AND count($carts)}
<table cellspacing="0" cellpadding="0" class="table"> <table cellspacing="0" cellpadding="0" class="table" style="width:100%">
<colgroup>
<col width="50px"></col>
<col width="150px"></col>
<col width=""></col>
<col width="70px"></col>
<col width="50px"></col>
</colgroup>
<tr> <tr>
<th class="center">{l s='ID'}</th> <th height="39px" class="center">{l s='ID'}</th>
<th class="center">{l s='Date'}</th> <th class="center">{l s='Date'}</th>
<th class="center">{l s='Total'}</th>
<th class="center">{l s='Carrier'}</th> <th class="center">{l s='Carrier'}</th>
<th class="center">{l s='Total'}</th>
<th class="center">{l s='Actions'}</th> <th class="center">{l s='Actions'}</th>
</tr> </tr>
{foreach $carts AS $key => $cart} {foreach $carts AS $key => $cart}
<tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}'"> <tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}'">
<td class="center">{$cart['id_cart']}</td> <td class="center">{$cart['id_cart']}</td>
<td>{$cart['date_add']}</td> <td>{$cart['date_add']}</td>
<td align="right">{$cart['total_price']}</td>
<td>{$cart['name']}</td> <td>{$cart['name']}</td>
<td align="right">{$cart['total_price']}</td>
<td align="center"><a href="index.php?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}"><img src="../img/admin/details.gif" /></a></td> <td align="center"><a href="index.php?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}"><img src="../img/admin/details.gif" /></a></td>
</tr> </tr>
{/foreach} {/foreach}
@@ -370,13 +408,20 @@
{* Last connections *} {* Last connections *}
{if count($connections)} {if count($connections)}
<h2>{l s='Last connections'}</h2> <h2>{l s='Last connections'}</h2>
<table cellspacing="0" cellpadding="0" class="table"> <table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
<colgroup>
<col width="150px"></col>
<col width="100px"></col>
<col width="100px"></col>
<col width=""></col>
<col width="150px"></col>
</colgroup>
<tr> <tr>
<th style="width: 200px">{l s='Date'}</th> <th height="39px;">{l s='Date'}</th>
<th style="width: 100px">{l s='Pages viewed'}</th> <th>{l s='Pages viewed'}</th>
<th style="width: 100px">{l s='Total time'}</th> <th>{l s='Total time'}</th>
<th style="width: 100px">{l s='Origin'}</th> <th>{l s='Origin'}</th>
<th style="width: 100px">{l s='IP Address'}</th> <th>{l s='IP Address'}</th>
</tr> </tr>
{foreach $connections as $connection} {foreach $connections as $connection}
<tr> <tr>
@@ -407,7 +452,7 @@
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
<div class="clear">&nbsp;</div>
{/if} {/if}
{/block} {/block}
</div>
<div class="clear">&nbsp;</div>
controllers/admin/AdminCarriersController.php
+1 -1
View File
@@ -90,7 +90,7 @@ class AdminCarriersControllerCore extends AdminController
), ),
'type' => 'bool', 'type' => 'bool',
'orderby' => false, 'orderby' => false,
'width' => 25 'width' => 150
), ),
'position' => array( 'position' => array(
'title' => $this->l('Position'), 'title' => $this->l('Position'),
controllers/admin/AdminCountriesController.php
+1 -1
View File
@@ -93,7 +93,7 @@ class AdminCountriesControllerCore extends AdminController
), ),
'call_prefix' => array( 'call_prefix' => array(
'title' => $this->l('Call prefix'), 'title' => $this->l('Call prefix'),
'width' => 40, 'width' => 150,
'align' => 'center', 'align' => 'center',
'callback' => 'displayCallPrefix' 'callback' => 'displayCallPrefix'
), ),
controllers/admin/AdminShopUrlController.php
+2 -2
View File
@@ -47,7 +47,7 @@ class AdminShopUrlControllerCore extends AdminController
), ),
'shop_name' => array( 'shop_name' => array(
'title' => $this->l('Shop name'), 'title' => $this->l('Shop name'),
'width' => 70 'width' => 150
), ),
'domain' => array( 'domain' => array(
'title' => $this->l('Domain'), 'title' => $this->l('Domain'),
@@ -71,7 +71,7 @@ class AdminShopUrlControllerCore extends AdminController
'type' => 'bool', 'type' => 'bool',
'orderby' => false, 'orderby' => false,
'filter_key' => 'main', 'filter_key' => 'main',
'width' => 50, 'width' => 100,
), ),
'active' => array( 'active' => array(
'title' => $this->l('Enabled'), 'title' => $this->l('Enabled'),
controllers/admin/AdminStatesController.php
+1 -2
View File
@@ -57,13 +57,12 @@ class AdminStatesControllerCore extends AdminController
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
'width' => 140,
'filter_key' => 'a!name' 'filter_key' => 'a!name'
), ),
'iso_code' => array( 'iso_code' => array(
'title' => $this->l('ISO code'), 'title' => $this->l('ISO code'),
'align' => 'center', 'align' => 'center',
'width' => 50 'width' => 75
), ),
'zone' => array( 'zone' => array(
'title' => $this->l('Zone'), 'title' => $this->l('Zone'),
css/admin.css
+31
View File
@@ -2153,3 +2153,34 @@ div#scrollTop a:hover{
#content #customers .warn {margin:10px 0 0 0;} #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 {background-color:#ABDFF7;border:1px solid #ccc;float:left;margin:5px;padding:5px;}
#customers li .button {display:block;margin-top: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;
}