diff --git a/VERSIONS_HOTLINE/41765 b/VERSIONS_HOTLINE/41765
new file mode 100644
index 0000000000000000000000000000000000000000..37d6140b7f45df48adc59643cea217d553e5c0db
--- /dev/null
+++ b/VERSIONS_HOTLINE/41765
@@ -0,0 +1 @@
+ - ticket #41765 : Administration : correction du paramétrage de la boîte "Nuage de tags"
\ No newline at end of file
diff --git a/application/modules/admin/views/scripts/accueil/tags.phtml b/application/modules/admin/views/scripts/accueil/tags.phtml
index fb65970265aa7990823dbb7641b9414bfd1e862b..0da9bd2c6b7c3fd8ca3ca6473346af3fb7349f88 100644
--- a/application/modules/admin/views/scripts/accueil/tags.phtml
+++ b/application/modules/admin/views/scripts/accueil/tags.phtml
@@ -1,4 +1,4 @@
-<?php
+<?php
echo '<script src="'.URL_ADMIN_JS.'drag_and_drop.js'.'" type="text/javascript"> </script>';
echo '<script src="'.URL_ADMIN_JS.'selection_champs.js'.'" type="text/javascript"> </script>';
echo '<link rel="stylesheet" type="text/css" media="screen" href="'.URL_ADMIN_CSS.'drag_and_drop.css" />';
@@ -6,77 +6,72 @@ echo $this->tagSelectionChamps("libelles");
?>
<center>
-<h1>Propriétés d'affichage du nuage de tags</h1><br>
-<div class="formTable">
- <form method="post" action="<?php echo $this->url ?>">
-
+ <h1>Propriétés d'affichage du nuage de tags</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>
-
- </table>
+ <legend>Affichage</legend>
+ <table cellspacing="2">
+
+ <tr>
+ <td class="droite">Style de boite </td>
+ <td class="gauche"><?php echo $this->combo_templates ?></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="message" size="52" value="<?php print($this->preferences["message"]); ?>"></td>
- </tr>
- <tr>
- <td class="droite" valign="top">Types de notices </td>
- <td class="gauche">
- <?php
+ <legend>Généralités</legend>
+ <table cellspacing="2">
+ <tr>
+ <td class="droite">Titre </td>
+ <td class="gauche"><input type="text" name="message" size="52" value="<?php print($this->preferences["message"]); ?>"></td>
+ </tr>
+ <tr>
+ <td class="droite" valign="top">Types de notices </td>
+ <td class="gauche">
+ <?php
echo $this->formSelect("notices",
$this->preferences["notices"],
"",
array("0" => "Toutes",
"1" => "Les nouveautés",
"2" => "Les plus consultées"));
- ?>
- </td>
- </tr>
- <td class="droite" valign="top">Types de tags </td>
- <?php
- $data=$this->tagSelectionChamps("type_tags",$this->preferences["type_tags"]); echo $data["codes_dispo"];
- echo '<td class="gauche">';
- echo $data["liste_codes"].$data["champ_libelle"].$data["bloc_saisie"];
- ?>
- </td>
- </tr>
- <tr>
- <td class="droite">Domaine </td>
- <td class="gauche">
- <?php echo $this->formSelect("id_catalogue",
- $this->preferences["id_catalogue"],
- null,
- $this->catalogues) ?>
- </td>
- </tr>
- </table>
+ ?>
+ </td>
+ </tr>
+ <td class="droite" valign="top">Types de tags </td>
+ <td class="gauche"><?php echo $this->tagSelectionChamps("type_tags", $this->preferences["type_tags"]);?></td>
+ </tr>
+ <tr>
+ <td class="droite">Domaine </td>
+ <td class="gauche">
+ <?php echo $this->formSelect("id_catalogue",
+ $this->preferences["id_catalogue"],
+ null,
+ $this->catalogues) ?>
+ </td>
+ </tr>
+ </table>
</fieldset>
-
- <br>
+
+ <br>
<fieldset>
- <legend>Limites</legend>
- <table cellspacing="2">
- <tr>
- <td class="droite">Nombre de notices à analyser </td>
- <td class="gauche"><input type="text" name="limite" size="4" value="<?php print($this->preferences["limite"]); ?>"></td>
- </tr>
- <tr>
- <td class="droite">Nombre de tags à afficher dans le nuage </td>
- <td class="gauche"><input type="text" name="nombre" size="4" value="<?php print($this->preferences["nombre"]); ?>"></td>
- </tr>
- </table>
+ <legend>Limites</legend>
+ <table cellspacing="2">
+ <tr>
+ <td class="droite">Nombre de notices à analyser </td>
+ <td class="gauche"><input type="text" name="limite" size="4" value="<?php print($this->preferences["limite"]); ?>"></td>
+ </tr>
+ <tr>
+ <td class="droite">Nombre de tags à afficher dans le nuage </td>
+ <td class="gauche"><input type="text" name="nombre" size="4" value="<?php print($this->preferences["nombre"]); ?>"></td>
+ </tr>
+ </table>
</fieldset>
- <?php echo $this->formSubmit("Valider","Valider",array("class" => "bouton")) ?>
- </form>
- </div>
+ <?php echo $this->formSubmit("Valider","Valider",array("class" => "bouton")) ?>
+ </form>
+ </div>
diff --git a/tests/application/modules/admin/controllers/AccueilControllerTagsTest.php b/tests/application/modules/admin/controllers/AccueilControllerTagsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1031db60b04b3a2ea03a08d7cff4493842a359e
--- /dev/null
+++ b/tests/application/modules/admin/controllers/AccueilControllerTagsTest.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, 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 AccueilControllerTagsDispatchTest extends Admin_AbstractControllerTestCase {
+ public function setUp() {
+ parent::setUp();
+ $this->dispatch('/admin/accueil/tags?config=accueil&id_profil=1&id_module=1&type_module=TAGS');
+ }
+
+
+ /** @test */
+ public function tagSelectionChampsShouldBePresent() {
+ $this->assertXPathContentContains('//h4', 'Facettes disponibles');
+ }
+}
+?>
\ No newline at end of file