Skip to content
Snippets Groups Projects

Hotline#15778 keep liste format in pager

Merged Ghost User requested to merge hotline#15778_keep_liste_format_in_pager into hotline_6.50
Compare and
+ 61
31
Preferences
Compare changes
Files
@@ -27,39 +27,39 @@ if ($this->is_pertinence) {
} else {
echo $this->tagCriteresRecherche($this->criteres_recherche);
}
if ($this->show_domain_browser)
echo $this->renderDomainBrowser($this->current_domain,
echo $this->renderDomainBrowser($this->current_domain,
$this->domain_id_module,
$this->domain_preferences);
?>
<div class="recherche_actions">
<span>
<?php
echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlRetourRechercheInitiale(), null, true),
sprintf('&raquo; %s',
<?php
echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlRetourRechercheInitiale(), null, true),
sprintf('&raquo; %s',
$this->_('Retour à la recherche initiale')));?>
</span>
</span>
<?php if ($this->url_retour_notice) { ?>
<span>
<?php
echo $this->tagAnchor($this->url_retour_notice,
sprintf('&raquo; %s',
<?php
echo $this->tagAnchor($this->url_retour_notice,
sprintf('&raquo; %s',
$this->_('Retour à la notice'))); ?>
</span>
<?php } ?>
<span>
<?php echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlNouvelleRecherche(), null, true),
<?php echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlNouvelleRecherche(), null, true),
'&raquo; '.$this->_('Nouvelle recherche')); ?>
</span>
<span>
<?php if ((int)$preferences['suggestion_achat'] == 1)
echo $this->tagAnchor(['controller' => 'abonne', 'action' => 'suggestion-achat'],
echo $this->tagAnchor(['controller' => 'abonne', 'action' => 'suggestion-achat'],
'&raquo; '.$this->_('Suggérer un achat'));?>
</span>
</span>
</div>
</div>
@@ -71,19 +71,20 @@ if (!isset($tags)) $tags=[];
?>
<?php
$html_liste_notices = $this->listeNotices($this->liste,
$nombre,
$page_cours,
$preferences,
<?php
$html_liste_notices = $this->listeNotices($this->liste,
$nombre,
$page_cours,
$preferences,
$this->criteres_recherche);
$html_pager = $this->pager($nombre,
$preferences["liste_nb_par_page"],
$page_cours,
array_merge($this->criteres_recherche->getUrlRetourListe(),
$html_pager = $this->pager($nombre,
$preferences["liste_nb_par_page"],
$page_cours,
array_merge($this->criteres_recherche->getUrlRetourListe(),
['controller' => 'recherche',
'action' => 'simple']));
'action' => 'simple',
'liste_format' => $preferences['liste_format']]));
$html_nuage_tags = '<div class="facette_outer" style="margin-left:10px;margin-top:17px">'.
($preferences["facettes_message"] ? ('<h2>'.$preferences["facettes_message"].'</h2>') : '').
@@ -100,16 +101,16 @@ if (!isset($tags)) $tags=[];
<div style="width:100%" class="conteneur_simple">
<?php
<?php
$html_result='<div class="resultat_recherche">'.
(!$preferences['cvs_autres_resultats'] == ''
? '<h1>'.$preferences['cvs_autres_resultats'].'</h1>'
(!$preferences['cvs_autres_resultats'] == ''
? '<h1>'.$preferences['cvs_autres_resultats'].'</h1>'
: '').
$html_liste_notices.$html_pager.
'</div>';
?>
<?php
<?php
$html_filters = '';
if ($hasFacettes || $hasTags) {
$html_filters .= '<div class="filtre_recherche">';
@@ -119,7 +120,7 @@ if (!isset($tags)) $tags=[];
$html_filters.= '</div>';
}
?>
<?php
<?php
$html_cvs='';
if ($this->accessCVS)
$html_cvs .= '<div class="cvs_container position_'.$preferences['cvs_display_position'].'" style="display:none">'.
@@ -127,14 +128,13 @@ if (!isset($tags)) $tags=[];
'</div>';
?>
<?php
<?php
echo $this->Search_Result($preferences, $html_result, $html_filters, $html_cvs);
?>
<div class="clear"></div>
</div>
<?php Class_ScriptLoader::getInstance()
->addOPACScript('recherche')
->addSkinStyleSheet('recherche'); ?>