// add stylesheet stats, commandes, new icon back to list
This commit is contained in:
vKham
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.2 KiB |
@@ -36,12 +36,15 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<div style="background-color:#F4E6C9; width:99%;padding:5px 0 5px 5px;">
|
||||
<a href="#" id="collapse_all" >{$categories.trads['Collapse All']}</a>
|
||||
- <a href="#" id="expand_all" >{$categories.trads['Expand All']}</a>
|
||||
<div class="category-filter">
|
||||
<span><a href="#" id="collapse_all" >{$categories.trads['Collapse All']}</a>
|
||||
|</span>
|
||||
<span><a href="#" id="expand_all" >{$categories.trads['Expand All']}</a>
|
||||
{if !$categories.use_radio}
|
||||
- <a href="#" id="check_all" >{$categories.trads['Check All']}</a>
|
||||
- <a href="#" id="uncheck_all" >{$categories.trads['Uncheck All']}</a>
|
||||
|</span>
|
||||
<span></span><a href="#" id="check_all" >{$categories.trads['Check All']}</a>
|
||||
|</span>
|
||||
<span></span><a href="#" id="uncheck_all" >{$categories.trads['Uncheck All']}</a></span>
|
||||
{/if}
|
||||
{if $categories.use_search}
|
||||
<span style="margin-left:20px">
|
||||
|
||||
@@ -361,8 +361,8 @@
|
||||
{
|
||||
var html = '<ul>';
|
||||
$.each(res.customers, function() {
|
||||
html += '<li><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a> - '+this.birthday+'<br/>';
|
||||
html += '<a href="mailto:'+this.email+'">'+this.email+'<br />';
|
||||
html += '<li class="customerCard"><div class="customerName"><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a> - '+this.birthday+'</div>';
|
||||
html += '<div class="customerEmail"><a href="mailto:'+this.email+'">'+this.email+'</div>';
|
||||
html += '<a onclick="setupCustomer('+ this.id_customer+');" href="#" class="id_customer">{l s='Choose'}</a></li>';
|
||||
});
|
||||
html += '</ul>';
|
||||
@@ -780,7 +780,7 @@
|
||||
</script>
|
||||
<fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
|
||||
<p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" />
|
||||
<a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new customer'}</a></p>
|
||||
<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p>
|
||||
<div id="customers">
|
||||
</div>
|
||||
</fieldset><br />
|
||||
@@ -802,7 +802,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div id="products_err" class="warn" style="display:none;"></div>
|
||||
<div style="clear:both;float:left;width:600px;">
|
||||
<div>
|
||||
<table class="table" id="customer_cart">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -818,7 +818,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div style="float:right">
|
||||
<div>
|
||||
<p><label for="id_currency">{l s='Currency:'}</label>
|
||||
<script type="text/javascript">
|
||||
{foreach from=$currencies item='currency'}
|
||||
@@ -840,11 +840,12 @@
|
||||
</select>
|
||||
</p>
|
||||
</div>
|
||||
<div id="carts" style="margin: 20px 0;clear:both;float:left;">
|
||||
<div class="separation"></div>
|
||||
<div id="carts">
|
||||
<p><a href="#" id="show_old_carts"></a></p>
|
||||
<div id="old_carts_orders">
|
||||
<div id="nonOrderedCarts" style="clear:both;float:left;">
|
||||
<h2>{l s='Carts:'}</h2>
|
||||
<div id="nonOrderedCarts">
|
||||
<h3>{l s='Carts:'}</h3>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -858,8 +859,8 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div id="lastOrders" style="float:left;margin-left:20px;">
|
||||
<h2>{l s='Orders:'}</h2>
|
||||
<div id="lastOrders">
|
||||
<h3>{l s='Orders:'}</h3>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -885,7 +886,7 @@
|
||||
<p>
|
||||
<label>{l s='Search a voucher:'} </label>
|
||||
<input type="text" id="voucher" value="" />
|
||||
<a class="fancybox" href="{$link->getAdminLink('AdminDiscounts')}&adddiscount&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a>
|
||||
<a class="fancybox button" href="{$link->getAdminLink('AdminDiscounts')}&adddiscount&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a>
|
||||
</p>
|
||||
<div class="margin-form">
|
||||
<table class="table" id="voucher_list">
|
||||
@@ -904,25 +905,23 @@
|
||||
<div id="vouchers_err" class="warn"></div>
|
||||
</fieldset>
|
||||
<br />
|
||||
<fieldset id="address_part" class="width2" style="display:none;">
|
||||
<fieldset id="address_part" style="display:none;">
|
||||
<legend><img src="../img/t/AdminAddresses.gif" />{l s='Addresses'}</legend>
|
||||
<div id="address_delivery" style="clear:both;float:left;">
|
||||
<p><b>{l s='Delivery:'}</b></p>
|
||||
<div id="address_delivery">
|
||||
<h3>{l s='Delivery:'}</h3>
|
||||
<select id="id_address_delivery" name="id_address_delivery">
|
||||
</select>
|
||||
<div id="address_delivery_detail">
|
||||
</div>
|
||||
</div>
|
||||
<div id="address_invoice" style="float:left; margin-left:10px;">
|
||||
<p><b>{l s='Invoice:'}</b></p>
|
||||
<div id="address_invoice">
|
||||
<h3>{l s='Invoice:'}</h3>
|
||||
<select id="id_address_invoice" name="id_address_invoice">
|
||||
</select>
|
||||
<div id="address_invoice_detail">
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<p><a class="fancybox" id="new_address" href="{$link->getAdminLink('AdminAddresses')}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new address'}</a></p>
|
||||
</div>
|
||||
<a class="fancybox button" id="new_address" href="{$link->getAdminLink('AdminAddresses')}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new address'}</a>
|
||||
</fieldset>
|
||||
<br />
|
||||
<fieldset id="carriers_part" style="display:none;">
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
<div class="Associations">
|
||||
<h4>{l s='Associations'}</h4>
|
||||
<div class="separation"></div>
|
||||
<div id="no_default_category" style="font-weight: bold;display: none;">
|
||||
<div id="no_default_category" class="hint">
|
||||
{l s='Please check a category in order to select the default category.'}
|
||||
</div>
|
||||
<table>
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
<td style="padding-bottom:5px;">{$currency->prefix}<input type="text" name="additional_shipping_cost"
|
||||
value="{$product->additional_shipping_cost}" />{$currency->suffix}
|
||||
{if $country_display_tax_label}{l s='tax excl.'}{/if}
|
||||
<p>{l s='Carrier tax will be applied.'}</p>
|
||||
<p class="preference_description">{l s='Carrier tax will be applied.'}</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -3309,12 +3309,12 @@ class AdminProductsControllerCore extends AdminController
|
||||
$color_by_default = '#BDE5F8';
|
||||
|
||||
$this->fieldsDisplay = array(
|
||||
'attributes' => array('title' => $this->l('Attributes'), 'align' => 'center', 'width' => 70),
|
||||
'price' => array('title' => $this->l('Impact'), 'type' => 'price', 'align' => 'center', 'width' => 70),
|
||||
'weight' => array('title' => $this->l('Weight'), 'align' => 'center', 'width' => 70),
|
||||
'reference' => array('title' => $this->l('Reference'), 'align' => 'center', 'width' => 70),
|
||||
'ean13' => array('title' => $this->l('EAN13'), 'align' => 'center', 'width' => 70),
|
||||
'upc' => array('title' => $this->l('UPC'), 'align' => 'center', 'width' => 70)
|
||||
'attributes' => array('title' => $this->l('Attributes'), 'align' => 'left', 'width' => 70),
|
||||
'price' => array('title' => $this->l('Impact'), 'type' => 'price', 'align' => 'left', 'width' => 70),
|
||||
'weight' => array('title' => $this->l('Weight'), 'align' => 'left', 'width' => 70),
|
||||
'reference' => array('title' => $this->l('Reference'), 'align' => 'left', 'width' => 70),
|
||||
'ean13' => array('title' => $this->l('EAN13'), 'align' => 'left', 'width' => 70),
|
||||
'upc' => array('title' => $this->l('UPC'), 'align' => 'left', 'width' => 70)
|
||||
);
|
||||
|
||||
$product_download = new ProductDownload($id_product_download);
|
||||
@@ -3850,8 +3850,8 @@ class AdminProductsControllerCore extends AdminController
|
||||
_PS_JS_DIR_.'admin-categories-tree.js',
|
||||
_PS_JS_DIR_.'/jquery/ui/jquery.ui.progressbar.min.js'
|
||||
));
|
||||
|
||||
$this->addCSS(_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.css');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+25
-2
@@ -811,7 +811,7 @@ tr.deleted td {
|
||||
color: #00529B;
|
||||
background: #BDE5F8 url(../img/admin/icon-info.png) no-repeat 6px 5px;
|
||||
border-radius:3px;
|
||||
min-height:32px;
|
||||
min-height:15px;
|
||||
}
|
||||
.hint p {
|
||||
color: #00529B;
|
||||
@@ -1842,15 +1842,27 @@ div.progressBarImage
|
||||
#menu .submenu_size .submenu { display: none; position:absolute}
|
||||
#menu .submenu_size:hover > .submenu { display: block; }
|
||||
.submenu li{float:none;clear:left;}
|
||||
|
||||
#fancybox-content { text-align:left;}
|
||||
/*customer_form*/
|
||||
.blocTitle {background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
|
||||
#customers { display:block; position:relative;}
|
||||
#customer_form #fieldset_0 { text-align:left;}
|
||||
#customer_part #customers ul {
|
||||
float:left;
|
||||
}
|
||||
#customer_part #customers ul li {
|
||||
background-color:#fff;
|
||||
display:inline;
|
||||
list-style-type: none;
|
||||
float:left;
|
||||
margin:10px;
|
||||
}
|
||||
border:1px solid #ccc;
|
||||
padding:5px;
|
||||
width:200px;
|
||||
}
|
||||
#customer_part #customers ul li div.customerName { font-size:13px;}
|
||||
|
||||
#customer_part #customers ul li .id_customer {
|
||||
font-weight:bold;
|
||||
color:green;
|
||||
@@ -1864,6 +1876,17 @@ div.progressBarImage
|
||||
#vouchers_part #vouchers_err {
|
||||
display:none;
|
||||
}
|
||||
|
||||
/*address_part*/
|
||||
#address_part #address_delivery, #address_part #address_invoice { width:400px; float:left;}
|
||||
#address_part #address_delivery h3, #address_part #address_invoice h3 { margin-top:0;}
|
||||
#address_part #address_delivery {border-right:1px solid #cccccc;}
|
||||
#address_part #address_invoice { border-left: 1px solid #ffffff; padding-left:20px;}
|
||||
#address_part #address_delivery_detail, #address_invoice #address_invoice_detail { font-size:12px; color:#585A69; padding:10px 0;}
|
||||
#address_part a#new_address {clear:both; float:left; margin:20px 0;}
|
||||
|
||||
|
||||
|
||||
#loader_container {
|
||||
display:none;
|
||||
z-index: 100;
|
||||
|
||||
@@ -175,7 +175,7 @@ class StatsProduct extends ModuleGraph
|
||||
<p>'.$this->l('Conversion rate:').' '.number_format($totalViewed ? $totalBought / $totalViewed : 0, 2).'</p>
|
||||
<center>'.$this->engine(array('layers' => 2, 'type' => 'line', 'option' => '1-'.$id_product)).'</center>
|
||||
<br />
|
||||
<p><a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1&exportType=1"><img src="../img/admin/asterisk.gif" />'.$this->l('CSV Export').'</a></p>';
|
||||
<p><a class="button export-csv" href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1&exportType=1"><span>'.$this->l('CSV Export').'</span></a></p>';
|
||||
if ($hasAttribute = $product->hasAttributes() && $totalBought)
|
||||
$this->html .= '<h3 class="space">'.$this->l('Attribute sales distribution').'</h3><center>'.$this->engine(array('type' => 'pie', 'option' => '3-'.$id_product)).'</center><br />
|
||||
<p><a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1&exportType=2"><img src="../img/admin/asterisk.gif" />'.$this->l('CSV Export').'</a></p><br />';
|
||||
|
||||
Reference in New Issue
Block a user