Merge branch 'ticket-philea2'

2016-10-21 16:07:27 +02:00 · 2016-10-21 16:07:27 +02:00 · 1efd60b9d0
commit 1efd60b9d0
parent 8c4141e9f7 06a303fb6a
2 changed files with 676 additions and 674 deletions
--- a/adm/helpers/HelperForm.php
+++ b/adm/helpers/HelperForm.php
@ -432,7 +432,7 @@ class HelperForm{
 		$disabled = ((isset($p['disabled']) && $p['disabled']) ? 'disabled="disabled"' : '');
 		$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="styled-select">
+				<div class="styled-select '.(isset($p['class-select']) && $p['class-select'] ? ' ' . $p['class-select'] : '').'">
 					<select ' . $disabled . ' id="'.$p['name'].'" name="'.$p['name'].'">';
 			foreach($p['options'] as $opt) {
 				$selected = '';
--- a/modules/philea_magistor/AdminPhileaMagistor.php
+++ b/modules/philea_magistor/AdminPhileaMagistor.php