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

Merge branch 'ticket-AssociateProducts' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-05 17:51:08 +02:00
commit 6e515c5207
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adm/tabs/AdminProducts.php
View File

@ -2099,6 +2099,12 @@ class AdminProducts extends AdminTab
if ($obj->id)
$currentIndex .= '&id_product='.$obj->id;
if($cookie->id_employee == 1) {
echo '<style type="text/css">
@import "'.__PS_BASE_URI__.'css/custom_admin.css";
</style>';
}
echo '
<h3>'.$this->l('Current product:').' <span id="current_product" style="font-weight: normal;">'.$this->l('no name').'</span></h3>
<script type="text/javascript">
@ -3548,7 +3554,7 @@ class AdminProducts extends AdminTab
$image_obj = new Image((int)$img['id_image']);
$accesorie_img_path = (isset($image_obj)?$image_obj->getExistingImgPath():'');
}
echo (!empty($accesorie_img_path)?'<img src="'._THEME_PROD_DIR_.$accesorie_img_path.'-small.jpg" /> ':'').htmlentities($accessory['name'], ENT_COMPAT, 'UTF-8').(!empty($accessory['reference']) ? ' ('.$accessory['reference'].')' : '').' <span onclick="delAccessory('.$accessory['id_product'].');" style="cursor: pointer;"><img src="../img/admin/delete.gif" class="middle" alt="" /></span><br />';
echo '<div>'.(!empty($accesorie_img_path)?'<img src="'._THEME_PROD_DIR_.$accesorie_img_path.'-small.jpg" /> ':'').htmlentities($accessory['name'], ENT_COMPAT, 'UTF-8').(!empty($accessory['reference']) ? ' ('.$accessory['reference'].')' : '').' <span onclick="delAccessory('.$accessory['id_product'].');" style="cursor: pointer;"><img src="../img/admin/delete.gif" class="middle" alt="" /></span></div><br />';
}
echo '</div>
<input type="hidden" name="inputAccessories" id="inputAccessories" value="';

23
css/custom_admin.css
View File

@ -89,3 +89,26 @@ input[type="file"], textarea, select {
color:#000;
}
.div_report h3 {text-align:center;}
.tab-row .tab {
padding: 10px 8px!important;
background: rgba(86,84,133,0.3)!important;
}
.tab-row .tab.selected{
background: #565485!important;
padding: 10px 8px!important;
}
.tab-row .tab.selected a{
color: #fff!important;
}
.tab-page{
background: #F1F1F1!important;
}
.tab-page#step7 fieldset,
.tab-page#step8 fieldset{
background: rgba(86,84,133,0.3);
}
.categories-treeview{
background-color:rgba(86,84,133,0.3)!important;
}

12
override/classes/Helper.php
View File

@ -55,14 +55,14 @@ class Helper extends HelperCore {
';
$html .= '
<div style="background-color:#F4E6C9; width:99%;padding:5px 0 5px 5px;">
<a href="#" id="collapse_all" >'.$trads['Collapse All'].'</a>
- <a href="#" id="expand_all" >'.$trads['Expand All'].'</a>
<div class="categories-treeview" style="background-color:#F4E6C9; width:99%;padding:10px;">
<a href="#" id="collapse_all" class="button">'.$trads['Collapse All'].'</a>
- <a href="#" id="expand_all" class="button">'.$trads['Expand All'].'</a>
'.(!$use_radio ? '
- <a href="#" id="check_all" >'.$trads['Check All'].'</a>
- <a href="#" id="uncheck_all" >'.$trads['Uncheck All'].'</a>
- <a href="#" id="check_all" class="button">'.$trads['Check All'].'</a>
- <a href="#" id="uncheck_all" class="button">'.$trads['Uncheck All'].'</a>
' : '').'
- <a id="toggle_display" style="cursor: pointer;" >'.$trads['Toggle'].'</a>
- <img src="../img/admin/details.gif"/> <a id="toggle_display" style="cursor: pointer;" >'.$trads['Toggle'].'</a>
</div>
';