diff --git a/application/modules/admin/views/scripts/accueil/rechsimple.phtml b/application/modules/admin/views/scripts/accueil/rechsimple.phtml
index 4c490b05c35ef0e4a48af49d0e4ece34e244bb76..57f513ed60835eb131b201028638f6756b3a535e 100644
--- a/application/modules/admin/views/scripts/accueil/rechsimple.phtml
+++ b/application/modules/admin/views/scripts/accueil/rechsimple.phtml
@@ -1,145 +1,5 @@
-<center>
- <h1>Propriétés de la boîte de recherche simple</h1><br>
- <div class="formTable">
- <form method="post" action="<?php echo $this->url ?>">
-
- <fieldset>
- <legend>Affichage</legend>
- <table cellspacing="2">
-
- <tr>
- <td class="droite">Style de boite </td>
- <td class="gauche"><?php echo $this->combo_templates ?></td>
- </tr>
-
- <tr>
- <td class="droite">Largeur du champ de saisie </td>
- <td class="gauche"><?php echo $this->tagSlider("largeur",$this->preferences["largeur"],100,300,1) ?></td>
- </tr>
-
- </table>
- </fieldset>
- <br>
-
- <fieldset>
- <legend>Généralités</legend>
- <table cellspacing="2">
-
- <tr>
- <td class="droite">Titre </td>
- <td class="gauche"><input type="text" name="titre" size="55" value="<?php print($this->preferences["titre"]); ?>"></td>
- </tr>
-
- <tr>
- <td class="droite">Proposer la sélection de bibliothèques </td>
- <td class="gauche"><?php echo $this->formSelect("select_bib",$this->preferences["select_bib"],"",array("1" => "oui","0"=>"non")) ?></td>
- </tr>
-
- <?php
- if (Class_CodifAnnexe::countBy(['invisible' => 0]))
- {
- echo '<tr>';
- echo '<td class="droite">Proposer la sélection de sites</td>';
- echo '<td class="gauche">'.$this->formSelect("select_annexe",$this->preferences["select_annexe"],"",array("1" => "oui","0"=>"non")).'</td>';
- echo '</tr>';
- }
- ?>
-
- <tr>
- <td class="droite">Proposer la sélection de types de docs </td>
- <td class="gauche"><?php echo $this->formSelect("select_doc",$this->preferences["select_doc"],"",array("1" => "oui","0"=>"non")) ?></td>
- </tr>
-
- <tr>
- <td class="droite">Message du bouton pour rechercher </td>
- <td class="gauche"><input type="text" name="search_button" size="55" value="<?php print($this->preferences["search_button"]); ?>"></td>
- </tr>
-
- <tr>
- <td class="droite">Message au-dessus du champ de saisie </td>
- <td class="gauche"><input type="text" name="message" size="55" value="<?php print($this->preferences["message"]); ?>"></td>
- </tr>
-
- <tr>
- <td class="droite">Message d'exemple dans le champ de saisie </td>
- <td class="gauche"><input type="text" name="placeholder" size="55" value="<?php print($this->preferences["placeholder"]); ?>"></td>
- </tr>
-
- <tr>
- <td class="droite">Message au-dessous du champ de recherche </td>
- <td class="gauche"><input type="text" name="exemple" size="55" value="<?php print($this->preferences["exemple"]); ?>"></td>
- </tr>
-
-
- <tr>
- <td class="droite">Afficher le lien recherche avancée </td>
- <td class="gauche">
- <?php echo $this->formCheckbox('recherche_avancee',
- $this->preferences["recherche_avancee"],
- null,
- array('on', 'off')); ?>
- </td>
- </tr>
-
-
- <tr>
- <td class="droite">Tri du résultat de recherche </td>
- <td class="gauche">
- <?php echo $this->formSelect('tri',
- $this->preferences['tri'],
- '',
- (new Class_CriteresRecherche())->getListeTris()); ?>
- </td>
- </tr>
-
-
- <tr>
- <td class="droite">Basculer automatiquement sur le profil: </td>
- <td class="gauche">
- <?php
- echo $this->ComboProfils('ALL', 'ALL', $this->preferences['profil_redirect']);
- ?>
- </td>
- </tr>
-
- </table>
- </fieldset>
-
- <fieldset>
- <legend>Filtres</legend>
- <table cellspacing="2">
- <tr>
- <td class="droite">Type de document </td>
- <td class="gauche"><?php echo Class_Codification::getInstance()->getComboTypesDocs($this->preferences["type_doc"],"",true) ?></td>
- </tr>
- </table>
- </fieldset>
-
- <fieldset>
- <legend><?php echo $this->_('Domaines sélectionnables') ?></legend>
- <?php
- $ds = new ZendAfi_Form_Element_DomainSelect('domain_ids',
- ['label' => '',
- 'url' => Class_Url::assemble(['module' => 'opac',
- 'controller' => 'abonne',
- 'action' => 'viewable-domains-json'])]);
- $ds->setValue($this->preferences['domain_ids']);
- echo $ds->render();
- ?>
- <table>
- <tr>
- <td class="droite"><?php echo $this->_('Mode de sélection') ?></td>
- <td class="gauche">
- <?php
- echo $this->formRadioButtons('domain_select_style',
- $this->preferences['domain_select_style'],
- [Class_Systeme_ModulesAccueil_RechercheSimple::DOMAIN_SELECT_SELECT => $this->_('Sélection dans une liste déroulante'),
- Class_Systeme_ModulesAccueil_RechercheSimple::DOMAIN_SELECT_CHECKBOX => $this->_('Sélection multiple par cases à cocher')]);
- ?>
- </td>
- </tr>
- </table>
- </fieldset>
- <?php echo $this->formSubmit("Valider","Valider",array("class" => "bouton")) ?>
- </form>
- </div>
+<?php
+$form = ZendAfi_Form_Configuration_SearchWidget::newWith($this->preferences);
+$form->setAction($this->url);
+echo $this->renderForm($form);
+?>
diff --git a/library/Class/CodifThesaurus.php b/library/Class/CodifThesaurus.php
index 2be4f8956f5ed8d15a3f6286eaaed2812109eac8..c42b55c3222769643b7ca1c529bfcc371a180259 100644
--- a/library/Class/CodifThesaurus.php
+++ b/library/Class/CodifThesaurus.php
@@ -32,7 +32,6 @@ class CodifThesaurusLoader extends Storm_Model_Loader {
public function findThesaurusForCatalogue($catalogue_id) {
- xdebug_break();
return Class_CodifThesaurus::getLoader()
->findFirstBy(['id_origine'=> $catalogue_id,
'code' => Class_CodifThesaurus::fixedCodeOf('Domain')]);
diff --git a/library/Class/Codification.php b/library/Class/Codification.php
index 6e4d109eee1ea2a4b47a401b4db7adda87a1623d..adf46e4519da031c0e1b49282c638cbf18846308 100644
--- a/library/Class/Codification.php
+++ b/library/Class/Codification.php
@@ -69,8 +69,9 @@ class Class_Codification {
CODE_AVAILABILITY='V';
- protected $_nom_champs, $_nom_onglets;
-
+ protected
+ $_nom_champs,
+ $_nom_onglets;
public function getTypesDocs() {
@@ -78,33 +79,6 @@ class Class_Codification {
}
- public function getComboTypesDocs($valeur, $events='', $tous=false)
- {
- /*
- * Attention: utilisé dans la sélection type doc recherche simple et certains suppriment des types de
- * docs dans cosmogramme pour ne pas les avoir dans la liste des types de doc
- *
- */
- $data=fetchOne("select liste from variables where clef='types_docs'");
- if($events > "") $events=" ".$events;
- $combo='<select name="type_doc" '.$events.'>';
- if($tous == true) $combo.='<option value="">tous</option>';
- $v=explode(chr(13).chr(10),$data);
- for($i=0; $i<count($v); $i++)
- {
- $elem=explode(":",$v[$i]);
- if(trim($elem[0])>"")
- {
- if($valeur==$elem[0]) $selected=" selected"; else $selected="";
- $combo.='<option value="'.$elem[0].'"'.$selected.'>'.stripSlashes($elem[1]).'</option>';
- }
- }
- $combo.='</select>';
- return $combo;
- }
-
-
-
public function getCodesLibellesFacette($concatenated_facettes) {
return Class_Notice_RubriqueFacette::parseRubriquesFromPreferenceField($concatenated_facettes);
}
diff --git a/library/ZendAfi/Form/Configuration/SearchWidget.php b/library/ZendAfi/Form/Configuration/SearchWidget.php
new file mode 100644
index 0000000000000000000000000000000000000000..50e440d21fc1f37245b72e6184746ab88abbcd9e
--- /dev/null
+++ b/library/ZendAfi/Form/Configuration/SearchWidget.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+class ZendAfi_Form_Configuration_SearchWidget extends ZendAfi_Form {
+ public function init() {
+ parent::init();
+ $this
+ ->setAttrib('id',
+ 'configuration_searchWidget')
+ ->addElement('select',
+ 'boite',
+ ['label' => $this->_('Style de boite'),
+ 'multiOptions' => (
+ new Class_Profil_Templates(
+ Class_Profil::getCurrentProfil()))->toArray()])
+ ->addElement('slider',
+ 'largeur',
+ ['label' => $this->_('Largeur du champ de saisie'),
+ 'min' => 100,
+ 'max' => 300,
+ 'step' => 1])
+ ->addElement('text',
+ 'titre',
+ ['label' => $this->_('Titre'),
+ 'size' => '55'])
+ ->addElement('checkbox',
+ 'select_bib',
+ ['label' => $this->_('Proposer la sélection de bibliothèques'),
+ 'multiOptions' => [1,0]]);
+
+ if (Class_CodifAnnexe::countBy(['invisible' => 0])) {
+ $this->addElement('checkbox',
+ 'select_annexe',
+ ['label' => $this->_('Proposer la sélection de sites'),
+ 'multiOptions' => [1,0]]);
+ }
+
+ $this
+ ->addElement('checkbox',
+ 'select_doc',
+ ['label' => $this->_('Proposer la sélection de types de doc'),
+ 'multiOptions' => [1,0]])
+
+ ->addElement('text',
+ 'search_button',
+ ['label' => $this->_('Message du bouton pour rechercher'),
+ 'size' => 55])
+
+ ->addElement('text',
+ 'message',
+ ['label' => $this->_('Message au dessus du champ de saisie'),
+ 'size' => 55])
+
+ ->addElement('text',
+ 'placeholder',
+ ['label' => $this->_('Message d\'exemple dans le champ de saisie'),
+ 'size' => 55])
+
+ ->addElement('text',
+ 'exemple',
+ ['label' => $this->_('Message au-dessous du champ de recherche'),
+ 'size' => 55])
+
+ ->addElement('checkbox',
+ 'recherche_avancee',
+ ['label' => $this->_('Afficher le lien recherche avancée'),
+ 'multiOptions' => ['on', 'off']])
+
+ ->addElement('select',
+ 'tri',
+ ['label' => $this->_('Tri du résultat de recherche'),
+ 'multiOptions' => (new Class_CriteresRecherche())->getListeTris()])
+
+ ->addElement('comboProfils',
+ 'profil_redirect',
+ ['label' => $this->_('Basculer automatiquement sur le profil')])
+
+ ->addElement('select',
+ 'type_doc',
+ ['label' => $this->_('Type de document'),
+ 'multiOptions' => (['' => $this->_('Tous')] + Class_TypeDoc::allByIdLabel())])
+
+ ->addElement('domainSelect',
+ 'domain_ids',
+ ['label' => $this->_('Domaines sélectionnables'),
+ 'url' => Class_Url::assemble(['module' => 'opac',
+ 'controller' => 'abonne',
+ 'action' => 'viewable-domains-json'])])
+
+ ->addElement('radio',
+ 'domain_select_style',
+ ['label' => $this->_('Mode de sélection'),
+ 'multiOptions' => [Class_Systeme_ModulesAccueil_RechercheSimple::DOMAIN_SELECT_SELECT => $this->_('Sélection dans une liste déroulante'),
+ Class_Systeme_ModulesAccueil_RechercheSimple::DOMAIN_SELECT_CHECKBOX => $this->_('Sélection multiple par cases à cocher')]])
+
+ ->addDisplayGroup(['boite', 'largeur'],
+ 'display',
+ ['legend' => $this->_('Affichage')])
+
+ ->addDisplayGroup(['titre',
+ 'select_bib',
+ 'select_annexe',
+ 'select_doc',
+ 'search_button',
+ 'message',
+ 'placeholder',
+ 'exemple',
+ 'recherche_avancee',
+ 'tri',
+ 'profil_redirect'],
+ 'general',
+ ['legend' => $this->_('Généralités')])
+
+ ->addDisplayGroup(['type_doc'],
+ 'filters',
+ ['legend' => $this->_('Filtres')])
+
+ ->addDisplayGroup(['domain_ids',
+ 'domain_select_style'],
+ 'domains',
+ ['legend' => '']);
+
+
+
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/Form/Decorator/Slider.php b/library/ZendAfi/Form/Decorator/Slider.php
new file mode 100644
index 0000000000000000000000000000000000000000..27b2f4f1c1db3776caeaac22f44d2d0378c61d16
--- /dev/null
+++ b/library/ZendAfi/Form/Decorator/Slider.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+class ZendAfi_Form_Decorator_Slider extends Zend_Form_Decorator_Abstract {
+ /**
+ * @param string $content
+ * @return string
+ */
+ public function render($content) {
+ $widget = $this->_element
+ ->getView()
+ ->tagSlider($this->_element->getName(),
+ $this->_element->getValue(),
+ $this->_element->min,
+ $this->_element->max,
+ $this->_element->step
+ );
+ return $content . $widget;
+
+ }
+}
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/Form/Element/Slider.php b/library/ZendAfi/Form/Element/Slider.php
new file mode 100644
index 0000000000000000000000000000000000000000..5370a7885c6c95ebca179ed87a68a56ffdf269f3
--- /dev/null
+++ b/library/ZendAfi/Form/Element/Slider.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+class ZendAfi_Form_Element_Slider extends ZendAfi_Form_Element_XhtmlOnViewHelper {
+ protected
+ $_decorator_name = 'Slider';
+}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/TagRechercheSimple.php b/library/ZendAfi/View/Helper/TagRechercheSimple.php
index 3a99fc240bbe5259549c66d0441d8015eb68c37f..a00f7e155d72851dfe418f038ba14efaa8a4091f 100644
--- a/library/ZendAfi/View/Helper/TagRechercheSimple.php
+++ b/library/ZendAfi/View/Helper/TagRechercheSimple.php
@@ -159,7 +159,7 @@ class ZendAfi_View_Helper_TagRechercheSimple extends Zend_View_Helper_HtmlElemen
$domain_labels = [];
foreach($domains as $domain) {
if ($th = Class_CodifThesaurus::findThesaurusForCatalogue($domain->getId()))
- $domain_labels['H' . $th->getIdThesaurus()]= $th->getLibelle();
+ $domain_labels[$th->getFacetteIndex()]= $th->getLibelleFacette();
}
return $this->preferences['domain_select_style'] == Class_Systeme_ModulesAccueil_RechercheSimple::DOMAIN_SELECT_CHECKBOX