advanced search display update

diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index e5cc877ee28f1cfe68b523cd2b65c29ae7053069..3a17df021e0256d19946b1d1eb8601973aa2a255 100644 (file)
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -34,9 +34,9 @@ class HayAdvanceForm(SearchForm):
 #begin create field
 
     #to replace de basic search form field
-    q = forms.CharField(required=False, label=('Title'), widget=forms.TextInput(attrs={'type': 'search'}))
+    q = forms.CharField(required=False, label=('Title'), widget=forms.TextInput(attrs={'class': 'form-control','type': 'search'}))
 
-    location = forms.CharField(required=False, label=('Location'), widget=forms.TextInput(attrs={'type': 'search'}))
+    location = forms.CharField(required=False, label=('Location'), widget=forms.TextInput(attrs={'class': 'form-control','type': 'search'}))
 
     # to create a dynamic list of ethnic group
     def list_ethnic_group():
@@ -49,8 +49,8 @@ class HayAdvanceForm(SearchForm):
 
     ethnic_group = forms.CharField(required=False, label=('Population / social group'), widget=forms.Select(choices=list_ethnic_group()))
 
-    instruments = forms.CharField(required=False, label=('Instruments'), widget=forms.TextInput(attrs={'type': 'search'}))
-    collectors = forms.CharField(required=False, label=('Recordist'), widget=forms.TextInput(attrs={'type': 'search'}))
+    instruments = forms.CharField(required=False, label=('Instruments'), widget=forms.TextInput(attrs={'class': 'form-control','type': 'search'}))
+    collectors = forms.CharField(required=False, label=('Recordist'), widget=forms.TextInput(attrs={'class': 'form-control','type': 'search'}))
 
     #to create a dynamic list of publish year
     def list_recorded_year():
@@ -146,7 +146,7 @@ class HayAdvanceForm(SearchForm):
 
     physical_format = forms.CharField(required=False, label=('Physical Format'), widget=forms.Select(choices=list_physical_format()))
 
-    code = forms.CharField(required=False, label=('Code'), widget=forms.TextInput(attrs={'type': 'search'}))
+    code = forms.CharField(required=False, label=('Code'), widget=forms.TextInput(attrs={'class': 'form-control','type': 'search'}))
 #end
 
     def search(self):

diff --git a/telemeta/static/telemeta/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/telemeta/static/telemeta/css/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644 (file)
index 0000000..41a5b17
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-bg_flat_65_6a0307_40x100.png b/telemeta/static/telemeta/css/images/ui-bg_flat_65_6a0307_40x100.png
new file mode 100644 (file)
index 0000000..84bafde
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-bg_flat_65_6a0307_40x100.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-bg_flat_75_6a0307_40x100.png b/telemeta/static/telemeta/css/images/ui-bg_flat_75_6a0307_40x100.png
new file mode 100644 (file)
index 0000000..7e712a8
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-bg_flat_75_6a0307_40x100.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-bg_flat_75_ffffff_40x100.png b/telemeta/static/telemeta/css/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644 (file)
index 0000000..4599a5d
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-bg_flat_75_ffffff_40x100.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-bg_glass_55_6a0307_1x400.png b/telemeta/static/telemeta/css/images/ui-bg_glass_55_6a0307_1x400.png
new file mode 100644 (file)
index 0000000..0400683
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-bg_glass_55_6a0307_1x400.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-bg_glass_95_fef1ec_1x400.png b/telemeta/static/telemeta/css/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644 (file)
index 0000000..c131845
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-bg_glass_95_fef1ec_1x400.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-icons_222222_256x240.png b/telemeta/static/telemeta/css/images/ui-icons_222222_256x240.png
new file mode 100644 (file)
index 0000000..e9c8e16
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-icons_222222_256x240.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-icons_2e83ff_256x240.png b/telemeta/static/telemeta/css/images/ui-icons_2e83ff_256x240.png
new file mode 100644 (file)
index 0000000..f2bf838
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-icons_2e83ff_256x240.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-icons_cd0a0a_256x240.png b/telemeta/static/telemeta/css/images/ui-icons_cd0a0a_256x240.png
new file mode 100644 (file)
index 0000000..4937018
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-icons_cd0a0a_256x240.png differ

diff --git a/telemeta/static/telemeta/css/images/ui-icons_ffffff_256x240.png b/telemeta/static/telemeta/css/images/ui-icons_ffffff_256x240.png
new file mode 100644 (file)
index 0000000..4d66f59
Binary files /dev/null and b/telemeta/static/telemeta/css/images/ui-icons_ffffff_256x240.png differ

diff --git a/telemeta/static/telemeta/css/jquery-ui.css b/telemeta/static/telemeta/css/jquery-ui.css
index c28065724fa30a48b5ea2d4f0c6e9e130aa3d722..159ad9ae18a5d63b32dc2e0c7d073210e8129951 100644 (file)
--- a/telemeta/static/telemeta/css/jquery-ui.css
+++ b/telemeta/static/telemeta/css/jquery-ui.css
@@ -917,6 +917,33 @@ body .ui-tooltip {
        font-weight: normal;
        color: #ffffff;
 }
+
+/*added by afilsaime*/
+.ui-button.ui-state-default{
+       background:none;
+       background-color:white;
+       color:#6a0307;
+}
+
+.ui-button.ui-state-active {
+       background:none;
+       background-color:#6a0307;
+       color:white;
+       border-color:#6a0307;
+}
+
+li {
+       display:inline;
+}
+
+.ui-button.ui-state-hover {
+       background:none;
+       background-color:#6a0307;
+       color:white;
+       border-color:#6a0307;
+
+}
+
 .ui-state-active a,
 .ui-state-active a:link,
 .ui-state-active a:visited {

diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index cab075298e3ad5234faded8dbc700734e99e4d65..bde392c196880ea54c844c17bd9bd4462c28c20b 100644 (file)
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -6,18 +6,133 @@
 {% block title %}
 {% trans "Search" %}
 {% endblock %}
-
+{% block extra_stylesheets %}
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
+{% endblock %}
 {% block content %}
     <form method="get" action=".">
-        <table>
-            {{ form.as_table }}
-            <tr>
-                <td>&nbsp;</td>
-                <td>
-                    <input type="submit" value="{% trans "Search" %}">
-                </td>
-            </tr>
-        </table>
+        <div class="row">
+            <div class="col-md-5" id="left-form">
+                <div class="fieldWrapper">
+                    {{form.q.errors}}
+                    {{form.q.label_tag}}</br>
+                    {{form.q}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.location.errors}}
+                    {{form.location.label_tag}}</br>
+                    {{form.location}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.ethnic_group.errors}}
+                    {{form.ethnic_group.label_tag}}</br>
+                    {{form.ethnic_group}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.instruments.errors}}
+                    {{form.instruments.label_tag}}</br>
+                    {{form.instruments}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.year_published_from.errors}} {{form.year_published_to.errors}}
+                    <label>Year Published :</label></br>
+                    {{form.year_published_from}} - {{form.year_published_to}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.media_type.errors}}
+                    <label>Media Type :</label></br>
+                    <ul id="id_media_type" style="margin-left:-40px">
+                        {%ifequal query.media_type 'audio'%}
+                            <li><label for="id_media_type_0">no preference</label><input id="id_media_type_0" type="radio" value="1" name="media_type"></input></li>
+                            <li><label for="id_media_type_1">audio</label><input id="id_media_type_1" type="radio" value="audio" name="media_type" checked="checked"></input></li>
+                            <li><label for="id_media_type_2">video</label><input id="id_media_type_2" type="radio" value="video" name="media_type"></input></li>
+                        {%else%}
+                            {%ifequal query.media_type 'video'%}
+                                <li><label for="id_media_type_0">no preference</label><input id="id_media_type_0" type="radio" value="1" name="media_type"></input></li>
+                                <li><label for="id_media_type_1">audio</label><input id="id_media_type_1" type="radio" value="audio" name="media_type"></input></li>
+                                <li><label for="id_media_type_2">video</label><input id="id_media_type_2" type="radio" value="video" name="media_type" checked="checked"></input></li>
+                            {%else%}
+                                <li><label for="id_media_type_0">no preference</label><input id="id_media_type_0" type="radio" value="1" name="media_type" checked="checked"></input></li>
+                                <li><label for="id_media_type_1">audio</label><input id="id_media_type_1" type="radio" value="audio" name="media_type"></input></li>
+                                <li><label for="id_media_type_2">video</label><input id="id_media_type_2" type="radio" value="video" name="media_type"></input></li>
+                            {%endifequal%}
+                        {%endifequal%}
+                    </ul>
+
+                </div>
+                <div class="fieldWrapper">
+                    {{form.viewable_errors}}
+                    <label>Viewable : </label></br>
+                    <ul id="id_viewable" style="margin-left:-40px">
+                        {%ifequal query.viewable '2'%}
+                            <li><label for="id_viewable_0">no preference</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
+                            <li><label for="id_viewable_1">fichier dans le player + full</label><input id="id_viewable_1" type="radio" value="2" name="viewable" checked="checked"></input></li>
+                            <li><label for="id_viewable_2">fichier dans le player (j'ai un compte)</label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
+                        {%else%}
+                            {%ifequal query.viewable '3'%}
+                                <li><label for="id_viewable_0">no preference</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
+                                <li><label for="id_viewable_1">fichier dans le player + full</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
+                                <li><label for="id_viewable_2">fichier dans le player (j'ai un compte)</label><input id="id_viewable_2" type="radio" value="3" name="viewable" checked="checked"></input></li>
+                            {%else%}
+                                <li><label for="id_viewable_0">no preference</label><input id="id_viewable_0" type="radio" value="1" name="viewable" checked="checked"></input></li>
+                                <li><label for="id_viewable_1">fichier dans le player + full</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
+                                <li><label for="id_viewable_2">fichier dans le player (j'ai un compte) </label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
+                            {%endifequal%}
+                        {%endifequal%}
+                    </ul>
+                </div>
+            </div>
+            <div class="col-md-5" id="right-form" style="margin-left:13%">
+                <div class="fieldWrapper">
+                    {{form.collectors.errors}}
+                    {{form.collectors.label_tag}}</br>
+                    {{form.collectors}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.recorded_from_date.errors}} {{form.recorded_to_date.errors}}
+                    <label>Recording date:</label></br>
+                    {{form.recorded_from_date}} - {{form.recorded_to_date}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.item_status_errors}}
+                    <label>Item status : </label></br>
+                    <ul id="id_item_status" style="margin-left:-40px">
+                        {%ifequal query.item_status 'pub'%}
+                            <li><label for="id_item_status_0">no preference</label><input id="id_item_status_0" type="radio" value="1" name="item_status"></input></li>
+                            <li><label for="id_item_status_1">Published</label><input id="id_item_status_1" type="radio" value="pub" name="item_status" checked="checked"></input></li>
+                            <li><label for="id_item_status_2">Unpublished</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status"></input></li>
+                        {%else%}
+                            {%ifequal query.item_status 'unpub'%}
+                                <li><label for="id_item_status_0">no preference</label><input id="id_item_status_0" type="radio" value="1" name="item_status"></input></li>
+                                <li><label for="id_item_status_1">Published</label><input id="id_item_status_1" type="radio" value="pub" name="item_status"></input></li>
+                                <li><label for="id_item_status_2">Unpublished</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status" checked="checked"></input></li>
+                            {%else%}
+                                <li><label for="id_item_status_0">no preference</label><input id="id_item_status_0" type="radio" value="1" name="item_status" checked="checked"></input></li>
+                                <li><label for="id_item_status_1">Published</label><input id="id_item_status_1" type="radio" value="pub" name="item_status"></input></li>
+                                <li><label for="id_item_status_2">Unpublished</label><input id="id_item_status_2" type="radio" value="unpub" name="item_status"></input></li>
+                            {%endifequal%}
+                        {%endifequal%}
+                    </ul>
+                </div>
+                <div class="fieldWrapper">
+                    {{form.recording_context.errors}}
+                    {{form.recording_context.label_tag}}</br>
+                    {{form.recording_context}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.physical_format.errors}}
+                    {{form.physical_format.label_tag}}</br>
+                    {{form.physical_format}}
+                </div>
+                <div class="fieldWrapper">
+                    {{form.code.errors}}
+                    {{form.code.label_tag}}</br>
+                    {{form.code}}
+                </div>
+            </div>
+        </div></br>
+        <input type="submit" value="{% trans "Search" %}"/></br></br>
+
 
         {% if query %}
             <h1>{% trans "Results" %}</h1>
@@ -52,3 +167,26 @@
         {% endif %}
     </form>
 {% endblock %}
+{% block extra_javascript %}
+    <script src="{{ STATIC_URL }}telemeta/js/jquery.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/js/jquery-ui.min.js" type="text/javascript"></script>
+    <script>
+        $(document).ready(function() {
+            var nouvellesIcones = {
+                header : 'ui-icon-carat-1-e',
+                activeHeader : 'ui-icon-carat-1-s',
+
+
+            };
+
+            $("#accordeon").accordion({
+                collapsible : true,
+                icons : nouvellesIcones,
+            });
+            $( "#datepicker").datepicker();
+            $("#id_media_type").buttonset();
+            $("#id_viewable").buttonset();
+            $("#id_item_status").buttonset();
+        });
+    </script>
+{% endblock %}