antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-AideContact-SAV' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-31 14:38:55 +01:00
commit f038f52798
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/tabs/AdminCustomerThreads.php
View File

@ -765,7 +765,7 @@ class AdminCustomerThreads extends AdminTab
$img_path = (isset($image_obj)?$image_obj->getExistingImgPath():'');
}
$output .= '
<div style="float:left;width:100px;margin-right:10px;margin-bottom:5px; text-align:center;">
<div class="product-box">
<a target="_blank" href="index.php?tab=AdminCatalog&id_product='.(int)($product['id_product']).'&updateproduct&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)($cookie->id_employee)).'" title="'.$this->l('View product').'">
<img width="62" src="'.(isset($img_path)?_THEME_PROD_DIR_.$img_path.'-small.jpg':'').'"/>
<p><b>#'.(int)($product['id_product']).'</b><br />'.mb_strimwidth($product['name'], 0, 55, "...").'</p>

22
css/admin.css
View File

@ -3557,6 +3557,20 @@ form.form-forward-message .button:focus{
.panel-message .more-info ul li{
line-height: 16px;
}
.panel-message .product-box{
float:left;
width:100px;
margin-right:10px;
margin-bottom:5px;
padding: 5px;
min-height: 152px;
text-align:center;
-moz-box-shadow: 1px 1px 2px 2px #cccccc;
-webkit-box-shadow: 1px 1px 2px 2px #ccc;
-ms-box-shadow: 1px 1px 2px 2px #cccccc;
-o-box-shadow: 1px 1px 2px 2px #cccccc;
box-shadow: 1px 1px 2px 2px #ccc;
}
.panel-message form label {
width: auto;
font-size: 14px;
@ -3628,14 +3642,6 @@ form.form-forward-message .button:focus{
.panel-answer div:not(.styled-select) {
width: 100%;
}
/*.panel-message select {
border: 1px solid #796dc7;
background-color: rgba(121,109,199,0.2);
}
.panel-message select.bg-rose {
border: 1px solid #e36ea2;
background: rgba(226,110,162,0.2);
}*/
.panel-answer textarea{
width: 670px;
height: 120px;