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 = '';

1348
modules/philea_magistor/AdminPhileaMagistor.php
View File

File diff suppressed because it is too large Load Diff