Add extra_label_class see BT#10849

ofaj
jmontoyaa 10 years ago
parent e0b1cdb26b
commit e2fc32c55d
  1. 4
      app/Resources/public/css/themes/rainbow/default.css
  2. 13
      main/inc/lib/extra_field.lib.php
  3. 2
      main/inc/lib/formvalidator/FormValidator.class.php
  4. 9
      main/inc/lib/pear/HTML/QuickForm.php
  5. 4
      main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
  6. 6
      main/inc/lib/pear/HTML/QuickForm/select.php
  7. 8
      search.php

@ -413,4 +413,8 @@ footer a:hover{
width: 100%;
text-align: center;
}
}
.red_underline {
color: red;
}

@ -385,8 +385,14 @@ class ExtraField extends Model
*
* @return array|bool
*/
public function addElements($form, $itemId = 0, $exclude = [], $filter = false, $useTagAsSelect = false, $showOnlyThisFields = array())
{
public function addElements(
$form,
$itemId = 0,
$exclude = [],
$filter = false,
$useTagAsSelect = false,
$showOnlyThisFields = array()
) {
if (empty($form)) {
return false;
}
@ -1162,7 +1168,7 @@ class ExtraField extends Model
}
}
}
$group = array();
$group = array();
$group[] = $form->createElement(
'select',
'extra_'.$field_details['variable'],
@ -1590,6 +1596,7 @@ EOF;
}
}
}
$return = array();
$return['jquery_ready_content'] = $jquery_ready_content;

@ -128,7 +128,7 @@ EOT;
{
return '
<div class="form-group {error_class}">
<label {label-for} class="col-sm-2 control-label" >
<label {label-for} class="col-sm-2 control-label {extra_label_class}" >
<!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
{label}
</label>

@ -673,6 +673,13 @@ class HTML_QuickForm extends HTML_Common
return $elementObject;
} // end func addElement
public function getElements()
{
return $this->_elements;
}
// }}}
// {{{ insertElementBefore()
@ -1065,7 +1072,7 @@ class HTML_QuickForm extends HTML_Common
}
}
}
return $el;
}

@ -281,6 +281,8 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
$name = $element->getName();
$label = $element->getLabel();
$labelForId = $element->getAttribute('id');
$extraLabelClass = $element->getAttribute('extra_label_class');
$icon = $element->getIconToHtml();
if (is_array($label)) {
@ -311,6 +313,7 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
}
$html = str_replace('{label-for}', $labelFor, $html);
$html = str_replace('{icon}', $icon, $html);
$html = str_replace('{extra_label_class}', $extraLabelClass, $html);
if ($required) {
$html = str_replace('<!-- BEGIN required -->', '', $html);
@ -340,6 +343,7 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
$html = preg_replace('/\s*<!-- BEGIN label_(\S+) -->.*<!-- END label_\1 -->\s*/is', '', $html);
}
return $html;
} // end func _prepareTemplate

@ -84,8 +84,6 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
if (isset($attributes['placeholder'])) {
$addBlank = $attributes['placeholder'];
}
}
$columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null;
$this->setColumnsSize($columnsSize);
@ -448,6 +446,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
return $this->getFrozenHtml();
} else {
$tabs = $this->_getTabs();
$strHtml = '';
if ($this->getComment() != '') {
@ -463,6 +462,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
$this->setName($myName);
}
$strHtml .= $tabs . '<select ' . $attrString . ">\n";
$strValues = is_array($this->_values)? array_map('strval', $this->_values): array();
@ -629,7 +629,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
case FormValidator::LAYOUT_HORIZONTAL:
return '
<div class="form-group {error_class}">
<label {label-for} class="col-sm-'.$size[0].' control-label" >
<label {label-for} class="col-sm-'.$size[0].' control-label {extra_label_class}" >
<!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
{label}
</label>

@ -27,6 +27,14 @@ $extraField = new ExtraField('session');
$extraFieldValue = new ExtraFieldValue('session');
$extra = $extraField->addElements($form, '', [], true, true);
$extra = $extraField->addElements($form, '', [], true, true, array('heures-disponibilite-par-semaine'));
$elements = $form->getElements();
$variables = ['theme', 'domaine', 'competenceniveau', 'filiere'];
foreach ($elements as $element) {
$element->setAttribute('extra_label_class', 'red_underline');
}
$htmlHeadXtra[] ='<script>
$(document).ready(function(){
'.$extra['jquery_ready_content'].'

Loading…
Cancel
Save