From a4d3fd61c22a54b910f22d060cb8d9360381dbae Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 22 Feb 2015 17:49:14 +0100 Subject: Search templates refactoring --- chimere/static/chimere/css/styles.css | 4 ++++ chimere/static/chimere/js/jquery.chimere.js | 2 +- chimere/templates/search/search.html | 28 +++++++++------------------- chimere/templates/search/search_js.html | 21 +++++++++++++++++++++ 4 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 chimere/templates/search/search_js.html diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 5d7f177..a8efa7f 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -756,6 +756,10 @@ table.inline-table td input[type=file]{ margin-right: auto; } +#haystack-search .action-label{ + display:none; +} + #search-box{ position:absolute; z-index:200; diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 844ec1c..195b43b 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2014 Étienne Loks +/* Copyright (C) 2008-2015 Étienne Loks This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html index b0c7045..95d3937 100644 --- a/chimere/templates/search/search.html +++ b/chimere/templates/search/search.html @@ -4,22 +4,7 @@ var do_you_mean = "{% trans 'Do you mean: ' %}"; var end_do_you_mean = "{% trans '?' %}"; {% if query %} - +{% include "search/search_js.html" %}
    {% for result in page.object_list %} @@ -33,19 +18,24 @@ $(function(){
{% if page.has_previous or page.has_next %}
- {% if page.has_previous %}{% trans "Previous" %}{% endif %} - {% if page.has_next %}{% trans "More results..." %}{% endif %} +
{% endif %} {% else %}
- +
+ -- cgit v1.2.3