dev #14141 fix html5 failure

library/ZendAfi/View/Helper/ListeNotices.php

@@ -34,7 +34,9 @@ class ZendAfi_View_Helper_ListeNotices extends ZendAfi_View_Helper_BaseHelper {
     $nombre_resultats = $search_result->getRecordsCount();
     $page = $criteres_recherche->getPage();
     $preferences = Class_Profil::getCurrentProfil()->getSearchResultSettings();
-    $preferences['liste_format'] = $search_result->getViewMode();
+
+    if($view_mode = $search_result->getViewMode())
+      $preferences['liste_format'] = $view_mode;
 
     $html = $this->_tag('div',
                         $this->_recordsList($notices, $preferences),

library/ZendAfi/View/Helper/ListeNotices/Mur.php

@@ -28,8 +28,7 @@ class ZendAfi_View_Helper_ListeNotices_Mur extends ZendAfi_View_Helper_ListeNoti
       $notices[] = $this->_notice_mur($notice, $preferences);
 
     return $this->_tag('div',
-                       implode($notices)
-                       . $this->_tag('div', null, ['class' => 'clear']),
+                       implode($notices),
                        ['class' => 'liste_mur']);
   }
 
@@ -118,9 +117,14 @@ class ZendAfi_View_Helper_ListeNotices_Mur extends ZendAfi_View_Helper_ListeNoti
 
 
   protected function barreDeLienAvis($url, $count, $title) {
-    if (0 < $count)
-      return '<li data-avis="true"><a href="' . $url .'" title="'.$this->_("Voir les ". $title ."").'"><span>'. sprintf('%02s', $count) . '</span></a></li>';
-    return '<li></li>';
+    if (!$count)
+      return '';
+
+    return $this->_tag('li',
+                       $this->view->tagAnchor($url,
+                                              $this->_tag('span', $count),
+                                              ['title' => $this->_('Voir les avis du document "%s"', $title)]),
+                       ['data-avis' => 'true']);
   }
 
 

library/ZendAfi/View/Helper/Search/Result.php

@@ -49,6 +49,38 @@ class ZendAfi_View_Helper_Search_Result extends ZendAfi_View_Helper_BaseHelper {
   }
 
 
+  protected function _orderDom() {
+    $html_result = $this->_getResultWidget();
+    $html_filters = $this->_getFilterWidgets();
+    $html_cvs = $this->_getCVSWidget();
+
+    $html =
+      $html_filters.
+      $html_result.
+      $html_cvs;
+
+    if($this->_settings['cvs_display_position']=='1')
+      $html=
+        $html_result.
+        $html_cvs.
+        $html_filters;
+
+    if($this->_settings['cvs_display_position']=='2' || $this->_settings['cvs_display_position']=='4')
+      $html=
+        $html_result.
+        $html_filters.
+        $html_cvs;
+
+    if($this->_settings['cvs_display_position']=='3')
+      $html=
+        $html_cvs.
+        $html_result.
+        $html_filters;
+
+    return $html . $this->_tag('div', '', ['class' => 'clear']);
+  }
+
+
   protected function _CVSTitle() {
     if(!$title = $this->_settings['cvs_autres_resultats'])
       return '';
@@ -142,7 +174,7 @@ class ZendAfi_View_Helper_Search_Result extends ZendAfi_View_Helper_BaseHelper {
     if(!$this->_settings['cvs_display_position'])
       return '';
 
-    $url = $this->_url($this->_criteria->getCVSUrlCriteresWithFacettes(),
+    $url = $this->view->url($this->_criteria->getCVSUrlCriteresWithFacettes(),
                        null,
                        true);
 
@@ -156,36 +188,4 @@ class ZendAfi_View_Helper_Search_Result extends ZendAfi_View_Helper_BaseHelper {
                        ['class' => sprintf('cvs_container position_%s',
                                            $this->_settings['cvs_display_position'])]);
   }
-
-
-  protected function _orderDom() {
-    $html_result = $this->_getResultWidget();
-    $html_filters = $this->_getFilterWidgets();
-    $html_cvs = $this->_getCVSWidget();
-
-    $html =
-      $html_filters.
-      $html_result.
-      $html_cvs;
-
-    if($this->_settings['cvs_display_position']=='1')
-      $html=
-        $html_result.
-        $html_cvs.
-        $html_filters;
-
-    if($this->_settings['cvs_display_position']=='2' || $this->_settings['cvs_display_position']=='4')
-      $html=
-        $html_result.
-        $html_filters.
-        $html_cvs;
-
-    if($this->_settings['cvs_display_position']=='3')
-      $html=
-        $html_cvs.
-        $html_result.
-        $html_filters;
-
-    return $html . $this->_tag('div', null, ['class' => 'clear']);
-  }
 }
\ No newline at end of file

tests/application/modules/telephone/controllers/TelephoneAbstractControllerTestCase.php

@@ -20,6 +20,7 @@
  */
 
 abstract class TelephoneAbstractControllerTestCase extends AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
 
   public function setUp() {
     parent::setUp();