Recherche avancée

diff --git a/auf_savoirs_en_partage/media/js/sep.js b/auf_savoirs_en_partage/media/js/sep.js
index 09e5cdc..d3266d3 100644 (file)
--- a/auf_savoirs_en_partage/media/js/sep.js
+++ b/auf_savoirs_en_partage/media/js/sep.js
@@ -3,7 +3,7 @@
     $(document).ready(function() {
 
         //Register review form submition function
     $(document).ready(function() {
 
         //Register review form submition function

-        $("#show_publications").click(function() { 
+        $("#show_publications").click(function() {

             if($(".publications_autre").css('display') == 'none') {
                 $(".publications_autre").show();
             }
             if($(".publications_autre").css('display') == 'none') {
                 $(".publications_autre").show();
             }

@@ -12,6 +12,16 @@
             }
         });
 
             }
         });
 

+        $("#btnrechercheavance").click(function() {
+            if($("#rechercheavancee").css('display') == 'none') {
+                $("#rechercheavancee").show();
+            }
+            else {
+                $("#rechercheavancee").hide();
+            }
+                       return false;
+        });
+

         // Activer le datepicker sur les input de classe "date"
         $.datepicker.setDefaults($.datepicker.regional['fr']);
         $('input:text.date')
         // Activer le datepicker sur les input de classe "date"
         $.datepicker.setDefaults($.datepicker.regional['fr']);
         $('input:text.date')

diff --git a/auf_savoirs_en_partage/templates/chercheurs/index.html b/auf_savoirs_en_partage/templates/chercheurs/index.html
index cef65eb..40bb0f2 100644 (file)
--- a/auf_savoirs_en_partage/templates/chercheurs/index.html
+++ b/auf_savoirs_en_partage/templates/chercheurs/index.html
@@ -18,7 +18,7 @@
 <form method="get" action="">
     <table>
         {% with search_form as form %}
 <form method="get" action="">
     <table>
         {% with search_form as form %}

-        {% include "render_form.html" %}
+        {% include "render_search_form.html" %}

         {% endwith %}
         <tr><th></th><td><input type="submit" class="bouton" value="Rechercher" /></td></tr>
     </table>
         {% endwith %}
         <tr><th></th><td><input type="submit" class="bouton" value="Rechercher" /></td></tr>
     </table>

diff --git a/auf_savoirs_en_partage/templates/render_search_form.html b/auf_savoirs_en_partage/templates/render_search_form.html
new file mode 100644 (file)
index 0000000..647ea24
--- /dev/null
+++ b/auf_savoirs_en_partage/templates/render_search_form.html
@@ -0,0 +1,10 @@
+{% load form_tags %}
+
+{% form_field form.q %}
+
+<tr><td colspan="2"><a href="#" id="btnrechercheavance">Recherche avancée</a></td></tr>
+<tbody id="rechercheavancee" style="display:none;">
+{% for field in form %}
+       {% if field.name != 'q' %}{% include "render_field.html" %}{% endif %}
+{% endfor %}
+</tbody>

diff --git a/auf_savoirs_en_partage/templates/savoirs/actualite_index.html b/auf_savoirs_en_partage/templates/savoirs/actualite_index.html
index d7a0308..5b948ef 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/actualite_index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/actualite_index.html
@@ -15,7 +15,9 @@
 
 <form action="" method="get">
     <table>
 
 <form action="" method="get">
     <table>

-    {{ search_form.as_table }}
+        {% with search_form as form %}
+        {% include "render_search_form.html" %}
+        {% endwith %}

     <tr><th></th><td><input type="submit" value="Rechercher" /></td></tr>
     </table>
 </form>
     <tr><th></th><td><input type="submit" value="Rechercher" /></td></tr>
     </table>
 </form>

diff --git a/auf_savoirs_en_partage/templates/savoirs/appels_index.html b/auf_savoirs_en_partage/templates/savoirs/appels_index.html
index 72c3f24..399979a 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/appels_index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/appels_index.html
@@ -15,7 +15,9 @@
 
 <form action="" method="get">
     <table>
 
 <form action="" method="get">
     <table>

-    {{ search_form.as_table }}
+        {% with search_form as form %}
+        {% include "render_search_form.html" %}
+        {% endwith %}

     <tr><th></th><td><input type="submit" value="Rechercher" /></td></tr>
     </table>
 </form>
     <tr><th></th><td><input type="submit" value="Rechercher" /></td></tr>
     </table>
 </form>

diff --git a/auf_savoirs_en_partage/templates/savoirs/evenement_index.html b/auf_savoirs_en_partage/templates/savoirs/evenement_index.html
index 100e3c4..d23832a 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/evenement_index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/evenement_index.html
@@ -14,7 +14,9 @@
 
 <form action="" method="get">
     <table>
 
 <form action="" method="get">
     <table>

-        {{ search_form.as_table }}
+        {% with search_form as form %}
+        {% include "render_search_form.html" %}
+        {% endwith %}

         <tr><th></th><td><input type="submit" name="action" value="Rechercher" /></td></tr>
     </table>
 </form>
         <tr><th></th><td><input type="submit" name="action" value="Rechercher" /></td></tr>
     </table>
 </form>

diff --git a/auf_savoirs_en_partage/templates/savoirs/ressource_index.html b/auf_savoirs_en_partage/templates/savoirs/ressource_index.html
index 9878de4..6f8cfe2 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/ressource_index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/ressource_index.html
@@ -15,7 +15,9 @@
 
 <form action="" method="get">
     <table>
 
 <form action="" method="get">
     <table>

-    {{ search_form.as_table }}
+        {% with search_form as form %}
+        {% include "render_search_form.html" %}
+        {% endwith %}

     <tr><th></th><td><input type="submit" value="Rechercher" /></td></tr>
     </table>
 </form>
     <tr><th></th><td><input type="submit" value="Rechercher" /></td></tr>
     </table>
 </form>

diff --git a/auf_savoirs_en_partage/templates/sites/index.html b/auf_savoirs_en_partage/templates/sites/index.html
index 6656d74..a72e846 100644 (file)
--- a/auf_savoirs_en_partage/templates/sites/index.html
+++ b/auf_savoirs_en_partage/templates/sites/index.html
@@ -14,8 +14,10 @@
 
 <form method="get" action="">
     <table id="repertoire_recherche">
 
 <form method="get" action="">
     <table id="repertoire_recherche">

-    {{search_form.as_table}}
-    <tr><th></th><td><input type="submit" class="bouton" value="Rechercher" /></td></tr>
+        {% with search_form as form %}
+        {% include "render_search_form.html" %}
+        {% endwith %}
+               <tr><th></th><td><input type="submit" class="bouton" value="Rechercher" /></td></tr>

     </table>
 </form>
 
     </table>
 </form>