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

Merge branch 'ticket-philea2'

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-21 16:07:27 +02:00
commit 1efd60b9d0
2 changed files with 676 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/helpers/HelperForm.php
View File

@ -432,7 +432,7 @@ class HelperForm{
$disabled = ((isset($p['disabled']) && $p['disabled']) ? 'disabled="disabled"' : ''); $disabled = ((isset($p['disabled']) && $p['disabled']) ? 'disabled="disabled"' : '');
$this->_html .= '<label' . (isset($p['class']) && $p['class'] ? ' class="' . $p['class'] . '"' : '') . '>'.$p['label'].'</label> $this->_html .= '<label' . (isset($p['class']) && $p['class'] ? ' class="' . $p['class'] . '"' : '') . '>'.$p['label'].'</label>
<div class="margin-form' . (isset($p['class']) && $p['class'] ? ' ' . $p['class'] : '') . '"> <div class="margin-form' . (isset($p['class']) && $p['class'] ? ' ' . $p['class'] : '') . '">
<div class="styled-select"> <div class="styled-select '.(isset($p['class-select']) && $p['class-select'] ? ' ' . $p['class-select'] : '').'">
<select ' . $disabled . ' id="'.$p['name'].'" name="'.$p['name'].'">'; <select ' . $disabled . ' id="'.$p['name'].'" name="'.$p['name'].'">';
foreach($p['options'] as $opt) { foreach($p['options'] as $opt) {
$selected = ''; $selected = '';

8
modules/philea_magistor/AdminPhileaMagistor.php
View File

@ -244,7 +244,7 @@ class AdminPhileaMagistor extends AdminTab {
border-bottom: 1px solid #DEDEDE; border-bottom: 1px solid #DEDEDE;
color: #000; color: #000;
height: auto; height: auto;
padding: 5px 4px 10px 6px; padding: 5px 4px 10px 4px;
} }
.table tr td[id*=ART] p, .table tr td[id*=ART] p,
.table tr td[id*=CDC] p{ .table tr td[id*=CDC] p{
@ -348,7 +348,8 @@ class AdminPhileaMagistor extends AdminTab {
'legend' => $this->l('Philea'), 'legend' => $this->l('Philea'),
'inputs' => array( 'inputs' => array(
array( array(
'type' => 'select', 'type' => 'select-styled',
'class-select' => 'bg-purple-light',
'name' => 'id_sale', 'name' => 'id_sale',
'label' => $this->l('Select a sale'), 'label' => $this->l('Select a sale'),
'options' => $id_sale_options, 'options' => $id_sale_options,
@ -710,7 +711,8 @@ class AdminPhileaMagistor extends AdminTab {
'legend' => $this->l('Archives'), 'legend' => $this->l('Archives'),
'inputs' => array( 'inputs' => array(
array( array(
'type' => 'select', 'type' => 'select-styled',
'class-select' => 'bg-purple-light',
'name' => 'id_sale_unarchive', 'name' => 'id_sale_unarchive',
'label' => $this->l('Désarchiver une vente'), 'label' => $this->l('Désarchiver une vente'),
'options' => $archives_options, 'options' => $archives_options,