Download as
Browse Code »

Commit c9e366611b0c13242212b1623e4c1e7e89184b70

Authored by Matheus Figueiredo
1 parent 7db4081b
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

Adding CSS to search page

Showing 1 changed file with 56 additions and 61 deletions   Show diff stats
src/colab/deprecated/templates/search.html
  Diff comments   View file @c9e3666
... ... @@ -2,75 +2,70 @@
2 2 {% load i18n %}
3 3 {% load append_to_get %}
4 4 {% block main-content %}
5   - <h2>{% trans "Search" %}</h2>
6   - <span>
7   - {{ docs.numFound }} {% trans "documents found in" %}
8   - {{ docs.QTime|floatformat:3 }} {% trans "seconds" %}
9   - </span>
10   -
  5 + <div class="row">
  6 + <div class="col-lg-2">
  7 + <h2>{% trans "Search" %}</h2>
  8 + </div>
  9 + <span class="pull-right quiet">
  10 + {{ docs.numFound }} {% trans "documents found in" %}
  11 + {{ docs.QTime|floatformat:3 }} {% trans "seconds" %}
  12 + </span>
  13 + </div>
11 14 <hr/>
12 15  
13   - <div>
14   - <h3>{% trans "Filters" %}</h3>
  16 + <div class="row">
  17 + <div class="col-lg-2">
  18 + <h3>{% trans "Filters" %}</h3>
15 19  
16   - <h4>{% trans "Types" %}</h4>
17   -
18   - <ul>
19   - <li {% ifequal type "wiki" %} title="{% trans "Remove filter" %}" {% endifequal %}>
20   - <span>
21   - <img src="{{ STATIC_URL }}img/wiki.png">
22   - </span>
23   - <a href="{% ifnotequal type "wiki" %} {% append_to_get type='wiki' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Wiki" %}</a>
24   - </li>
25   - <li {% ifequal type "thread" %} title="{% trans "Remove filter" %}" {% endifequal %}>
26   - <span>
27   - <img src="{{ STATIC_URL }}img/thread.png">
28   - </span>
29   - <a href="{% ifnotequal type "thread" %} {% append_to_get type='thread' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Discussion" %}</a>
30   - </li>
31   - <li {% ifequal type "ticket" %} title="{% trans "Remove filter" %}" {% endifequal %}>
32   - <span>
33   - <img src="{{ STATIC_URL }}img/ticket.png">
34   - </span>
35   - <a href="{% ifnotequal type "ticket" %} {% append_to_get type='ticket' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Ticket" %}</a>
36   - </li>
37   - <li {% ifequal type "changeset" %} title="{% trans "Remove filter" %}" {% endifequal %}>
38   - <span>
39   - <img src="{{ STATIC_URL }}img/changeset.png">
40   - </span>
41   - <a href="{% ifnotequal type "changeset" %} {% append_to_get type='changeset' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Changeset" %}</a>
42   - </li>
43   - </ul>
44   - </div>
45   -
46   - <div>
47   - <ul>
48   - {% for doc in docs %}
49   - {% include "message-preview.html" %}
50   - {% empty %}
51   - <li>
52   - {% trans "No results for your search." %}
53   - </li>
54   - {% endfor %}
55   - </ul>
  20 + <h4>{% trans "Types" %}</h4>
56 21  
57   - <hr />
  22 + <ul class="none indent">
  23 + <li {% ifequal type "wiki" %} title="{% trans "Remove filter" %}" {% endifequal %}>
  24 + <span class="glyphicon glyphicon-file"></span>
  25 + <a href="{% ifnotequal type "wiki" %} {% append_to_get type='wiki' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Wiki" %}</a>
  26 + </li>
  27 + <li {% ifequal type "thread" %} title="{% trans "Remove filter" %}" {% endifequal %}>
  28 + <span class="glyphicon glyphicon-envelope"></span>
  29 + <a href="{% ifnotequal type "thread" %} {% append_to_get type='thread' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Discussion" %}</a>
  30 + </li>
  31 + <li {% ifequal type "ticket" %} title="{% trans "Remove filter" %}" {% endifequal %}>
  32 + <span class="glyphicon glyphicon-tag"></span>
  33 + <a href="{% ifnotequal type "ticket" %} {% append_to_get type='ticket' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Ticket" %}</a>
  34 + </li>
  35 + <li {% ifequal type "changeset" %} title="{% trans "Remove filter" %}" {% endifequal %}>
  36 + <span class="glyphicon glyphicon-align-right"></span>
  37 + <a href="{% ifnotequal type "changeset" %} {% append_to_get type='changeset' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Changeset" %}</a>
  38 + </li>
  39 + </ul>
  40 + </div>
58 41  
59   - {% if docs.numFound %}
60   - <div>
61   - <span>
62   - {% if docs.has_previous %}
63   - <a href="{% append_to_get p=docs.previous_page_number %}">{% trans "Previous" %}</a>
64   - {% endif %}
  42 + <div class="col-lg-10">
  43 + <ul class="none indent">
  44 + {% for doc in docs %}
  45 + {% include "message-preview.html" %}
  46 + {% empty %}
  47 + <li class="text-center">
  48 + {% trans "No results for your search." %}
  49 + </li>
  50 + {% endfor %}
  51 + </ul>
65 52  
  53 + {% if docs.numFound %}
  54 + <div>
66 55 <span>
67   - {% trans "Page" %} {{ docs.page_num }} {% trans "of" %} {{ docs.num_of_pages }}
68   - </span>
  56 + {% if docs.has_previous %}
  57 + <a href="{% append_to_get p=docs.previous_page_number %}">{% trans "Previous" %}</a>
  58 + {% endif %}
69 59  
70   - {% if docs.has_next %}
71   - <a href="{% append_to_get p=docs.next_page_number %}">{% trans "Next" %}</a>
72   - {% endif %}
73   - </span>
  60 + <span>
  61 + {% trans "Page" %} {{ docs.page_num }} {% trans "of" %} {{ docs.num_of_pages }}
  62 + </span>
  63 +
  64 + {% if docs.has_next %}
  65 + <a href="{% append_to_get p=docs.next_page_number %}">{% trans "Next" %}</a>
  66 + {% endif %}
  67 + </span>
  68 + </div>
74 69 </div>
75 70 {% endif %}
76 71 </div>
... ...