From 12d5904ace1bfea284d3ffb52aed72dbb4f26a6f Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Sat, 23 Mar 2013 16:11:50 +0000
Subject: [PATCH] Adaptation resultat recherche pour skin CASQY

---
 .../scripts/recherche/resultatRecherche.phtml |  5 ++--
 library/ZendAfi/View/Helper/ListeNotices.php  | 13 +++++------
 public/opac/css/global.css                    | 23 +++++++++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
index a885830f8bf..80eb1cec8d6 100644
--- a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
+++ b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml
@@ -12,10 +12,11 @@ if ($this->is_pertinence) {
 }
 
 $this->openBoite($titre);
-
-print($this->texte_selection);
 ?>
 
+<div class="criteres_recherche"><?php echo $this->texte_selection ?></div>
+
+
 <div class="recherche_actions">
 	<span>
 	<?php 
diff --git a/library/ZendAfi/View/Helper/ListeNotices.php b/library/ZendAfi/View/Helper/ListeNotices.php
index 11b85f9d59f..1c0d4b48f44 100644
--- a/library/ZendAfi/View/Helper/ListeNotices.php
+++ b/library/ZendAfi/View/Helper/ListeNotices.php
@@ -52,19 +52,17 @@ class ZendAfi_View_Helper_ListeNotices extends ZendAfi_View_Helper_BaseHelper {
 		}
 
 		// Nombre de resultats et n° de page
-		$html.='<table><tr><td align="left" width="100%">';
+		$html.='<div class="resultats_page"><div><span>';
 		if(!intval($page)) $page=1;
     if(!$nombre_resultats) $html.= $this->translate()->_('Aucune notice trouvée');
     if($nombre_resultats == 1) $html.=$this->translate()->_('1 notice trouvée');
     if($nombre_resultats > 1) $html.=sprintf($nombre_resultats.' %s',$this->translate()->_('notices trouvées'));
-		$html.='</td>';
+		$html.='</span>';
 
 		// combo tri
 		if($url)	{
 			$onchange="var tri=$('#tri').val();document.location='".$url.(strpos($url, '?') ? '&' : '?')."tri='+tri;";
-			$html.='<td align="right">Trier&nbsp;par </td>';
-			$html.='<td style="padding-right:10px">';
-
+			$html.='<span style="text-align="right">Trier&nbsp;par';
 			$html.=$this->view->formSelect('tri', 
 																		 $tri, 
 																		 ['onchange' => $onchange], 
@@ -74,10 +72,11 @@ class ZendAfi_View_Helper_ListeNotices extends ZendAfi_View_Helper_BaseHelper {
 																			'annee desc' => $this->view->_('Année de publication'),
 																			'type_doc,alpha_titre' => $this->view->_('Type de document'),
 																			'date_creation desc' => $this->view->_('Date de nouveauté')]);
+			$html .= '</span>';
 		}
 
-		$html.=' <td align="right">page&nbsp;'.$page.'</td>';
-    $html.='</td></tr></table>';
+		$html.=' <span>page&nbsp;'.$page.'</span>';
+    $html.='</div></div>';
     if(!$nombre_resultats) return $html;
 
     // Liste en fonction du format
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index a3eee4891ee..626b1aa2d62 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -1169,6 +1169,29 @@ body.abonne_multimedia-hold-view .actions a {
 }
 
 
+.liste_notices .resultats_page {
+		display: table;
+		width: 100%;
+		margin: 5px 0px;
+}
+
+.liste_notices .resultats_page div {
+		display: table-row;
+}
+
+.liste_notices .resultats_page span {
+		display: table-cell;
+}
+
+.liste_notices .resultats_page span:first-child + span {
+		text-align: right;
+		padding-right: 20px;
+}
+
+.liste_notices .resultats_page span:first-child + span select {
+		margin-left: 5px;
+}
+
 .liste_mur {
 		float: left;
 }
-- 
GitLab