self rt : refacto view helpers and revert css rules in global.css

library/ZendAfi/View/Helper/SearchResult/Advanced.php

@@ -20,24 +20,27 @@
  */
 
 
-class ZendAfi_View_Helper_SearchResult_Advanced extends ZendAfi_View_Helper_SearchResult_AbstractWidget {
+class ZendAfi_View_Helper_SearchResult_Advanced extends ZendAfi_View_Helper_BaseHelper {
   public function searchResult_Advanced($search_criteria) {
-    $class_prefix = 'advanced_search';
+    $class = 'advanced_search';
 
     $form = ZendAfi_Form_Search_Advanced::newWith($search_criteria->getCriteres());
     $form->setMethod('GET');
     $form->setAction($this->view->url(
-        ['module' => 'opac',
-        'controller' => 'recherche',
-        'action' => 'simple'],
-        null,
-        true));
+                                      ['module' => 'opac',
+                                       'controller' => 'recherche',
+                                       'action' => 'simple'],
+                                      null,
+                                      true));
 
-    $form->setAttrib('class', $class_prefix . '_form');
+    $form->setAttrib('class', $class . '_form');
 
-    return $this->_renderWidget($this->view->renderForm($form),
-                                $this->_('Options de recherche avancée'),
-                                $class_prefix);
+    $widget = (new Class_Entity())
+      ->setLabel($this->_('Options de recherche avancée'))
+      ->setClass('advanced_search')
+      ->setContent($this->view->renderForm($form));
+
+    return $this->view->toggleButton($widget);
   }
 }
 ?>
\ No newline at end of file

library/ZendAfi/View/Helper/SearchResult/Display.php

@@ -20,15 +20,15 @@
  */
 
 
-class ZendAfi_View_Helper_SearchResult_Display extends ZendAfi_View_Helper_SearchResult_AbstractSelectorWidget {
+class ZendAfi_View_Helper_SearchResult_Display extends ZendAfi_View_Helper_BaseHelper {
   public function searchResult_Display($search_criteria) {
-    return $this->_renderWidget('liste_format',
-                                $search_criteria->getFormat(),
-                                $search_criteria->getAvailableFormats(),
-                                $this->view->url(['controller' => 'recherche',
-                                                  'action' => 'simple',
-                                                  'liste_format' => null]),
-                                $this->_('Affichage'));
+    $instance = (new Class_Entity())
+      ->setKey('liste_format')
+      ->setLabel($this->_('Affichage'))
+      ->setValue($search_criteria->getFormat())
+      ->setAvailables($search_criteria->getAvailableFormats());
+
+    return $this->view->selectWidget($instance);
   }
 }
 ?>
\ No newline at end of file

library/ZendAfi/View/Helper/SearchResult/History.php

@@ -20,15 +20,17 @@
  */
 
 
-class ZendAfi_View_Helper_SearchResult_History extends ZendAfi_View_Helper_SearchResult_AbstractWidget {
-  public function searchResult_History($search_criteria) {
-    $class_prefix = 'history_search';
+class ZendAfi_View_Helper_SearchResult_History extends ZendAfi_View_Helper_BaseHelper {
+  public function searchResult_History() {
+    if(!($html = $this->view->historiqueRecherche()))
+      return '';
 
-    return ($html = $this->view->historiqueRecherche())
-      ? $this->_renderWidget($html,
-                             $this->_('Historique'),
-                             $class_prefix)
-      : '';
+    $widget = (new Class_Entity())
+      ->setLabel($this->_('Historique'))
+      ->setClass('history_search')
+      ->setContent($html);
+
+    return $this->view->toggleButton($widget);
   }
 }
 ?>
\ No newline at end of file

library/ZendAfi/View/Helper/SearchResult/Order.php

@@ -20,16 +20,18 @@
  */
 
 
-class ZendAfi_View_Helper_SearchResult_Order extends ZendAfi_View_Helper_SearchResult_AbstractSelectorWidget {
+class ZendAfi_View_Helper_SearchResult_Order extends ZendAfi_View_Helper_BaseHelper {
   public function searchResult_Order($search_criteria) {
     if (!$url = $search_criteria->getUrlCriteresWithoutTri())
       return;
 
-    return $this->_renderWidget('tri',
-                                $search_criteria->getTri(),
-                                $search_criteria->getListeTris(),
-                                $url,
-                                $this->_('Trier par'));
+    $instance = (new Class_Entity())
+      ->setKey('tri')
+      ->setLabel($this->_('Trier par'))
+      ->setValue($search_criteria->getTri())
+      ->setAvailables($search_criteria->getListeTris());
+
+    return $this->view->selectWidget($instance);
   }
 }
 ?>
\ No newline at end of file

library/ZendAfi/View/Helper/SearchResult/PageSize.php

@@ -20,15 +20,15 @@
  */
 
 
-class ZendAfi_View_Helper_SearchResult_PageSize extends ZendAfi_View_Helper_SearchResult_AbstractSelectorWidget {
+class ZendAfi_View_Helper_SearchResult_PageSize extends ZendAfi_View_Helper_BaseHelper {
   public function searchResult_PageSize($search_criteria) {
-    return $this->_renderWidget('page_size',
-                                $search_criteria->getPageSize(),
-                                $search_criteria->getAvailablePageSize(),
-                                $this->view->url(['controller' => 'recherche',
-                                                  'action' => 'simple',
-                                                  'page_size' => null]),
-                                $this->_('Nombre de résultats'));
+    $instance = (new Class_Entity())
+      ->setKey('page_size')
+      ->setLabel($this->_('Nombre de résultats'))
+      ->setValue($search_criteria->getPageSize())
+      ->setAvailables($search_criteria->getAvailablePageSize());
+
+    return $this->view->selectWidget($instance);
   }
 }
 ?>
\ No newline at end of file

library/ZendAfi/View/Helper/SearchResult/AbstractSelectorWidget.php → library/ZendAfi/View/Helper/SelectWidget.php

@@ -20,29 +20,32 @@
  */
 
 
-class ZendAfi_View_Helper_SearchResult_AbstractSelectorWidget extends ZendAfi_View_Helper_BaseHelper {
-  protected function _renderWidget($key, $value, $available_values, $url, $label) {
+class ZendAfi_View_Helper_SelectWidget extends ZendAfi_View_Helper_BaseHelper {
+  public function selectWidget($settings) {
+    if(!$settings)
+      return '';
+
+    $key = $settings->getKey();
     $url_str = $this->view->url(['controller' => 'recherche',
                                  'action' => 'simple',
                                  $key => null]);
 
     $onchange = "var format=$('#" . $key . "').val();document.location='" . $url_str . "/" . $key . "/'+format;";
 
-    $html = $this->view->tag('label', $label, ['for' => $key]) .
+    $html = $this->_tag('label', $settings->getLabel(), ['for' => $key]) .
       ' ' .
       $this->view->formSelect($key,
-                              $value,
+                              $settings->getValue(),
                               ['onchange' => $onchange,
                                'class' => 'bouton button'],
-                              $available_values);
+                              $settings->getAvailables());
 
-    return $this->view
-      ->tag('div',
-            $this->view->tag('form',
-                             $html,
-                             ['action' => $this->view->url()]),
-            ['class' => 'selector_widget',
-             'data-key' => $key]);
+    return $this->_tag('div',
+                       $this->_tag('form',
+                                   $html,
+                                   ['action' => $this->view->url()]),
+                       ['class' => 'selector_widget',
+                        'data-key' => $key]);
   }
 }
 ?>
\ No newline at end of file

library/ZendAfi/View/Helper/SearchResult/AbstractWidget.php → library/ZendAfi/View/Helper/ToggleButton.php

@@ -20,17 +20,22 @@
  */
 
 
-class ZendAfi_View_Helper_SearchResult_AbstractWidget extends ZendAfi_View_Helper_BaseHelper {
-  protected function _renderWidget($html, $button, $class_prefix) {
+class ZendAfi_View_Helper_ToggleButton extends ZendAfi_View_Helper_BaseHelper {
+  public function toggleButton($widget) {
+    if(!$widget)
+      return '';
+
+    $class = $widget->getClass() . '_widget';
     return $this->_tag('div',
                        $this->_tag('button',
-                                   $button,
+                                   $widget->getLabel(),
                                    ['class' => 'button bouton',
-                                    'onclick' => '$("[class*=\'_search_widget\']").not($(this).parent()).removeClass(\'show\');$(this).parent().toggleClass(\'show\');']) .
+                                    'onclick' => sprintf('$(\'.%s\').not($(this).parent()).removeClass(\'show\');$(this).parent().toggleClass(\'show\');',
+                                                         $class)]) .
                        $this->_tag('div',
-                                   $html,
+                                   $widget->getContent(),
                                    ['class' => 'widget_wrapper']),
-                       ['class' => $class_prefix . '_widget']);
+                       ['class' => $class]);
   }
 }
 ?>
\ No newline at end of file

public/opac/css/global.css

@@ -380,6 +380,8 @@ table.calendar_main {margin-left: auto; margin-right: auto}
     margin-bottom: 5px;
 }
 
+.boiteMilieu .contenu {overflow:hidden}
+
 /* Calendrier */
 .calendar_day_event_start {text-decoration: none;font-weight:bold;}
 .calendar_today_clickable {border-bottom: 1px solid}
@@ -763,7 +765,9 @@ input[type='url'] {border:1px solid #C8C8C8;}
 .bouton:not(div):visited {	
     font-size: 0.95em;	
     line-height:1.2em;
-    color: #5f5f5f;  
+    color: #5f5f5f;
+    background-color: #f0f0f0;
+    border: 1px solid #5f5f5f;
     cursor: pointer; 
     padding: 0.2em;
     margin: 0.2em;
@@ -1622,6 +1626,7 @@ body.abonne_multimedia-hold-view .actions a {
     margin: 5px 0px 5px 5px;
 }
 
+.resultats_page div.tri-recherche,
 .resultats_page div.nb-pages-recherche {
     float:right;
     clear:right;