Je sens que ça va gueuler...

Modif Aide de vue FormControlGroup : 
- Rendu particulier des checkbox : case à cocher avant label ; sur une ligne (cf. unicaen.css).
- Refactorisation : extraction de méthodes.

public/css/unicaen.css

@@ -195,6 +195,16 @@ div.multicheckbox label input[type=radio] {
 
 
 
+.form-group input[type="checkbox"] {
+    display: inline;
+    vertical-align: text-bottom;
+    margin-right: 5px;
+}
+.form-group label {
+    display: inline;
+}
+
+
 .loading {
     background-image: url('//gest.unicaen.fr/images/ajax-loader-h.gif');
     background-repeat: no-repeat;

src/UnicaenApp/Form/View/Helper/FormControlGroup.php

@@ -6,8 +6,8 @@ use UnicaenApp\Exception\LogicException;
 use UnicaenApp\Form\Element\Date;
 use UnicaenApp\Form\Element\DateInfSup;
 use UnicaenApp\Form\Element\SearchAndSelect;
-use Zend\Form\Element;
 use Zend\Form\Element\Button;
+use Zend\Form\Element\Checkbox;
 use Zend\Form\Element\MultiCheckbox;
 use Zend\Form\ElementInterface;
 use Zend\Form\View\Helper\AbstractHelper;
@@ -60,13 +60,8 @@ class FormControlGroup extends AbstractHelper
      */
     public function render(ElementInterface $element, $pluginClass = 'formElement')
     {
-        if (!$element instanceof Button) {
-            $class = $element->getAttribute('class');
-            $labelClass = array_key_exists('class', $tmp = (array)$element->getLabelAttributes()) ? $tmp['class'] : '';
-            $element
-                ->setAttribute('class', $class . ' form-control')
-                ->setLabelAttributes(['class' => $labelClass . ' control-label']);
-        }
+        $this->normalizeElement($element);
+
         if ($element instanceof Date) {
             $helper = $this->getView()->plugin('formDate');
 
@@ -78,81 +73,137 @@ class FormControlGroup extends AbstractHelper
             return $helper($element);
         }
 
-        if (!$pluginClass) {
-            $pluginClass = 'formElement';
+        $input = $this->inputHtml($element, $pluginClass);
+
+        $label = $this->labelHtml($element);
+
+        $clearButton = $this->addClearButton ?
+            '<span class="input-group-btn"><button class="btn btn-default btn-xs" type="button" title="Vider" onclick="$(this).siblings(\':input\').val(null).focus();"><span class="glyphicon glyphicon-remove"></span></button></span>' :
+            null;
+
+        $helpContentBefore = null;
+        if (!empty($this->helpContent['before'])) {
+            $helpContentBefore = sprintf('<p class="help-block help-block-before">%s<p>', $this->helpContent['before']);
+        }
+        $helpContentAfter = null;
+        if (!empty($this->helpContent['after'])) {
+            $helpContentAfter = sprintf('<p class="help-block help-block-after">%s<p>', $this->helpContent['after']);
         }
 
-        if ($element instanceof SearchAndSelect) {
-            /** @var FormSearchAndSelect $helper */
-            $helper = $this->getView()->plugin('formSearchAndSelect');
-            $helper->setAutocompleteMinLength(2);
-            $input = $helper($element);
-        } else {
-            if (is_string($pluginClass)) {
-                $helper = $this->getView()->plugin($pluginClass);
-                $input = $helper($element);
-            } elseif ($pluginClass instanceof \Zend\Form\View\Helper\AbstractHelper) {
-                $input = $pluginClass($element);
-            } else {
-                throw new LogicException('Attribut $pluginClass incorrect');
+        $errors = $this->errorsHtml($element);
+
+        $class = [];
+        $class[] = $this->addClearButton ? 'input-group' : null;
+        $class[] = $errors ? 'has-error' : null;
+        $class = implode(' ', $class);
+
+        $divContent = $this->assembleDivContent($element, $label, $helpContentBefore, $input, $clearButton, $helpContentAfter, $errors);
+
+        $html = <<<EOT
+<div class="form-group $class">
+    $divContent
+</div>
+EOT;
+
+        return $html;
     }
 
+    private function normalizeElement(ElementInterface $element)
+    {
+        if (! $element instanceof Button) {
+            $class = $element->getAttribute('class');
+            $labelClass = array_key_exists('class', $tmp = (array)$element->getLabelAttributes()) ? $tmp['class'] : '';
+            $element
+                ->setAttribute('class', $class . ' form-control')
+                ->setLabelAttributes(['class' => $labelClass . ' control-label']);
         }
+    }
+
+    private function labelHtml(ElementInterface $element)
+    {
+        $html = '';
 
-        $label = null;
         if ($this->includeLabel && $element->getLabel() && !$element instanceof Button) {
             $helper = $this->getView()->plugin('formLabel');
-            $label = $helper($element);
+            $html = $helper($element);
         }
 
         if ($element->hasAttribute('info_icon')) {
             $info = $element->getAttribute('info_icon');
-            $label .= sprintf(
+            $html .= sprintf(
                 '&nbsp;<span data-toggle="tooltip" data-placement="bottom" class="info-icon glyphicon glyphicon-info-sign" title="%s"></span>',
                 $info);
         }
 
-        if ($element instanceof MultiCheckbox) {
-            $input = '<div class="multicheckbox">' . $input . '</div>';
+        return $html;
     }
 
-        $button = $this->addClearButton ?
-            '<span class="input-group-btn"><button class="btn btn-default btn-xs" type="button" title="Vider" onclick="$(this).siblings(\':input\').val(null).focus();"><span class="glyphicon glyphicon-remove"></span></button></span>' :
-            null;
+    private function inputHtml(ElementInterface $element, $pluginClass = 'formElement')
+    {
+        if (! $pluginClass) {
+            $pluginClass = 'formElement';
+        }
 
-        $helpContentBefore = null;
-        if (!empty($this->helpContent['before'])) {
-            $helpContentBefore = sprintf('<p class="help-block help-block-before">%s<p>', $this->helpContent['before']);
+        if ($element instanceof SearchAndSelect) {
+            /** @var FormSearchAndSelect $helper */
+            $helper = $this->getView()->plugin('formSearchAndSelect');
+            $helper->setAutocompleteMinLength(2);
+            $html = $helper($element);
+        } else {
+            if (is_string($pluginClass)) {
+                $helper = $this->getView()->plugin($pluginClass);
+                $html = $helper($element);
+            } elseif ($pluginClass instanceof \Zend\Form\View\Helper\AbstractHelper) {
+                $html = $pluginClass($element);
+            } else {
+                throw new LogicException('Argument $pluginClass incorrect');
             }
-        $helpContentAfter = null;
-        if (!empty($this->helpContent['after'])) {
-            $helpContentAfter = sprintf('<p class="help-block help-block-after">%s<p>', $this->helpContent['after']);
         }
 
-        $errors = null;
+        if ($element instanceof MultiCheckbox) {
+            $html = '<div class="multicheckbox">' . $html . '</div>';
+        }
+
+        return $html;
+    }
+
+    private function errorsHtml(ElementInterface $element)
+    {
+        $html = '';
+
         if ($element->getMessages() && $this->getIncludeErrors()) {
             /** @var FormElementErrors $helper */
             $helper = $this->getView()->plugin('formElementErrors');
-            $errors = $helper($element, ['class' => 'error text-danger']);
+            $html = $helper($element, ['class' => 'error text-danger']);
         }
 
-        $class = [];
-        $class[] = $this->addClearButton ? 'input-group' : null;
-        $class[] = $errors ? 'has-error' : null;
-        $class = implode(' ', $class);
+        return $html;
+    }
 
-        $format = <<<EOT
-<div class="form-group $class">
+    private function assembleDivContent(ElementInterface $element, $label, $helpContentBefore, $input, $button, $helpContentAfter, $errors)
+    {
+        if ($element instanceof Checkbox && ! $element instanceof MultiCheckbox) {
+            $html = <<<EOT
+    $helpContentBefore
+    $input
+    $label
+    $button
+    $helpContentAfter
+    $errors
+EOT;
+        }
+        else {
+            $html = <<<EOT
     $label
     $helpContentBefore
     $input
     $button
     $helpContentAfter
     $errors
-</div>
 EOT;
+        }
 
-        return $format;
+        return $html;
     }
 
     /**