From: afilsaime Date: Mon, 18 May 2015 14:36:45 +0000 (+0200) Subject: advanced search display update X-Git-Tag: 1.6a^2~15^2~53 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=69086fb32f17a28e96b17160654b78c9a6b0d5d0;p=telemeta.git advanced search display update --- diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py index e5cc877e..3a17df02 100644 --- 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 index 00000000..41a5b17f 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 index 00000000..84bafde1 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 index 00000000..7e712a8b 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 index 00000000..4599a5d8 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 index 00000000..0400683f 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 index 00000000..c1318457 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 index 00000000..e9c8e16a 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 index 00000000..f2bf8388 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 index 00000000..49370189 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 index 00000000..4d66f596 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 c2806572..159ad9ae 100644 --- 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 cab07529..bde392c1 100644 --- a/telemeta/templates/search/advanceSearch.html +++ b/telemeta/templates/search/advanceSearch.html @@ -6,18 +6,133 @@ {% block title %} {% trans "Search" %} {% endblock %} - +{% block extra_stylesheets %} + +{% endblock %} {% block content %}
- - {{ form.as_table }} - - - - -
  - -
+
+
+
+ {{form.q.errors}} + {{form.q.label_tag}}
+ {{form.q}} +
+
+ {{form.location.errors}} + {{form.location.label_tag}}
+ {{form.location}} +
+
+ {{form.ethnic_group.errors}} + {{form.ethnic_group.label_tag}}
+ {{form.ethnic_group}} +
+
+ {{form.instruments.errors}} + {{form.instruments.label_tag}}
+ {{form.instruments}} +
+
+ {{form.year_published_from.errors}} {{form.year_published_to.errors}} +
+ {{form.year_published_from}} - {{form.year_published_to}} +
+
+ {{form.media_type.errors}} +
+
    + {%ifequal query.media_type 'audio'%} +
    • +
    • +
    • + {%else%} + {%ifequal query.media_type 'video'%} +
    • +
    • +
    • + {%else%} +
    • +
    • +
    • + {%endifequal%} + {%endifequal%} +
+ +
+
+ {{form.viewable_errors}} +
+
    + {%ifequal query.viewable '2'%} +
    • +
    • +
    • + {%else%} + {%ifequal query.viewable '3'%} +
    • +
    • +
    • + {%else%} +
    • +
    • +
    • + {%endifequal%} + {%endifequal%} +
+
+
+
+
+ {{form.collectors.errors}} + {{form.collectors.label_tag}}
+ {{form.collectors}} +
+
+ {{form.recorded_from_date.errors}} {{form.recorded_to_date.errors}} +
+ {{form.recorded_from_date}} - {{form.recorded_to_date}} +
+
+ {{form.item_status_errors}} +
+
    + {%ifequal query.item_status 'pub'%} +
    • +
    • +
    • + {%else%} + {%ifequal query.item_status 'unpub'%} +
    • +
    • +
    • + {%else%} +
    • +
    • +
    • + {%endifequal%} + {%endifequal%} +
+
+
+ {{form.recording_context.errors}} + {{form.recording_context.label_tag}}
+ {{form.recording_context}} +
+
+ {{form.physical_format.errors}} + {{form.physical_format.label_tag}}
+ {{form.physical_format}} +
+
+ {{form.code.errors}} + {{form.code.label_tag}}
+ {{form.code}} +
+
+

+

+ {% if query %}

{% trans "Results" %}

@@ -52,3 +167,26 @@ {% endif %}
{% endblock %} +{% block extra_javascript %} + + + +{% endblock %}