Download as
Browse Code »

Commit 232e9e6ae7b4a78d86b957132c676800ba50b03c

Authored by Luan
1 parent 435408a4
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Minor fixes and adding a collapse icon on search filters

Showing 2 changed files with 15 additions and 3 deletions   Show diff stats
src/search/templates/search/search.html
  Diff comments   View file @232e9e6
... ... @@ -9,6 +9,7 @@
9 9  
10 10 <script type="text/javascript">
11 11 $(function () {
  12 +
12 13 $('#datepicker_since, #datepicker_until').datetimepicker({
13 14 pickTime: false,
14 15 {% if use_language and date_format %}
... ... @@ -16,6 +17,14 @@
16 17 format: '{{ date_format }}',
17 18 {% endif %}
18 19 });
  20 +
  21 + $('#collapseFilters').on('hide.bs.collapse', function() {
  22 + $('.collapse-icon-controller').toggleClass('glyphicon-collapse-down glyphicon-collapse-up');
  23 + });
  24 + $('#collapseFilters').on('show.bs.collapse', function() {
  25 + $('.collapse-icon-controller').toggleClass('glyphicon-collapse-down glyphicon-collapse-up');
  26 + });
  27 +
19 28 });
20 29 </script>
21 30 {% endblock %}
... ... @@ -41,7 +50,7 @@
41 50  
42 51 <div class="row">
43 52  
44   - <form class="col-xs-12 col-sm-12 col-md-12 hidden-lg" action="{% url "haystack_search" %}">
  53 + <form class="col-xs-12 col-sm-12 hidden-md hidden-lg" action="{% url "haystack_search" %}">
45 54 <div class="input-group">
46 55 <input type="text" class="form-control" name="q" placeholder="{% trans "Search here" %}"
47 56 {% if request.GET.q %}value="{{ request.GET.q }}"{% endif %} />
... ... @@ -64,7 +73,10 @@
64 73 <div class="panel panel-default">
65 74 <div class="panel-heading subject">
66 75 <a data-toggle="collapse" data-parent="#accordion" href="#collapseFilters">
67   - <h4 class="panel-title">{% trans "Filters" %}</h4>
  76 + <h4 class="panel-title">
  77 + {% trans "Filters" %}
  78 + <span class="glyphicon glyphicon-collapse-down pull-right collapse-icon-controller"></span>
  79 + </h4>
68 80 </a>
69 81 </div>
70 82 <div id="collapseFilters" class="panel-collapse collapse">
... ...
src/templates/base.html
  Diff comments   View file @232e9e6
... ... @@ -86,7 +86,7 @@
86 86 <li><a href="/report">{% trans "View Tickets" %}</a></li>
87 87 </ul>
88 88 </li>
89   - <li>
  89 + <li class="hidden-lg hidden-md">
90 90 <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
91 91 </li>
92 92 </ul>
... ...