Commit ba3909bbcbbd76969bfa98ea4b7d211d4fe26e6b
1 parent
b871f179
Exists in
master
and in
79 other branches
Chenge templates directory
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Showing
4 changed files
with
107 additions
and
107 deletions
Show diff stats
| @@ -0,0 +1,71 @@ | @@ -0,0 +1,71 @@ | ||
| 1 | +{% load i18n tz highlight %} | ||
| 2 | + | ||
| 3 | +{% if result.fullname or result.modified or result.modified_by %} | ||
| 4 | + <div class="quiet"> | ||
| 5 | + {% if result.modified %} | ||
| 6 | + <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span> | ||
| 7 | + {% endif %} | ||
| 8 | + | ||
| 9 | + {% if result.modified_by %} | ||
| 10 | + <span class="pull-left">{% trans "by" %} | ||
| 11 | + {% if result.modified_by_url %} | ||
| 12 | + <a href="{{ result.modified_by_url }}"> | ||
| 13 | + {% else %} | ||
| 14 | + <span> | ||
| 15 | + {% endif %} | ||
| 16 | + | ||
| 17 | + {% if query %} | ||
| 18 | + {% highlight result.modified_by with query %} | ||
| 19 | + {% else %} | ||
| 20 | + {{ result.modified_by }} | ||
| 21 | + {% endif %} | ||
| 22 | + | ||
| 23 | + {% if result.modified_by_url %} | ||
| 24 | + </a> | ||
| 25 | + {% else %} | ||
| 26 | + </span> | ||
| 27 | + {% endif %} | ||
| 28 | + </span> | ||
| 29 | + {% else %} | ||
| 30 | + <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span> | ||
| 31 | + {% endif %} | ||
| 32 | + </div> | ||
| 33 | +{% endif %} | ||
| 34 | + | ||
| 35 | +{% if result.title %} | ||
| 36 | + <a href="{{ result.url }} | ||
| 37 | + {% if result.type == 'thread' and result.latest_message_pk %} | ||
| 38 | + #msg-{{ result.latest_message_pk }} | ||
| 39 | + {% elif result.type == 'thread' and result.pk %} | ||
| 40 | + #msg-{{ result.pk }} | ||
| 41 | + {% endif %}" | ||
| 42 | + | ||
| 43 | + {% if result.latest_description %} | ||
| 44 | + title="{{ result.latest_description|escape|truncatechars:150 }}" | ||
| 45 | + {% elif result.description %} | ||
| 46 | + title="{{ result.description|escape|truncatechars:150 }}" | ||
| 47 | + {% endif %}> | ||
| 48 | + <span class="subject"> | ||
| 49 | + <!-- a striptags filter was raising an error here because using with highlight --> | ||
| 50 | + {% if query %} | ||
| 51 | + {% highlight result.title with query max_length "1000" %} | ||
| 52 | + {% else %} | ||
| 53 | + {{ result.title }} | ||
| 54 | + {% endif %} | ||
| 55 | + </span> | ||
| 56 | + </a> | ||
| 57 | +{% endif %} | ||
| 58 | + | ||
| 59 | +{% if result.description %} | ||
| 60 | + <!-- a striptags filter was raising an error here because using with highlight --> | ||
| 61 | + <span class="quiet"> - {% if query %} | ||
| 62 | + {% highlight result.description with query max_length "110" %} | ||
| 63 | + {% else %} | ||
| 64 | + {% if result.latest_description %} | ||
| 65 | + {{ result.latest_description|striptags|escape|truncatechars:110 }} | ||
| 66 | + {% elif result.description %} | ||
| 67 | + {{ result.description|striptags|escape|truncatechars:110 }} | ||
| 68 | + {% endif %} | ||
| 69 | + {% endif %} | ||
| 70 | + </span> | ||
| 71 | +{% endif %} |
| @@ -0,0 +1,36 @@ | @@ -0,0 +1,36 @@ | ||
| 1 | + {% load i18n %} | ||
| 2 | + {% for listname, description, latest, most_relevant, number_of_users in lists %} | ||
| 3 | + {% if latest or most_relevant %} | ||
| 4 | + <div class="row"> | ||
| 5 | + <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> | ||
| 6 | + <h4>{% trans 'latest'|title %}</h4> | ||
| 7 | + <hr /> | ||
| 8 | + {% for thread in latest %} | ||
| 9 | + {% include "discussion-message-preview.html" with result=thread.latest_message %} | ||
| 10 | + <hr /> | ||
| 11 | + {% endfor %} | ||
| 12 | + <div class="text-right"> | ||
| 13 | + <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread"> | ||
| 14 | + {% trans "see all discussions" %} | ||
| 15 | + </a> | ||
| 16 | + </div> | ||
| 17 | + </div> | ||
| 18 | + | ||
| 19 | + <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> | ||
| 20 | + <h4>{% trans 'most relevant'|title %}</h4> | ||
| 21 | + <hr /> | ||
| 22 | + {% for thread in most_relevant %} | ||
| 23 | + {% include "discussion-message-preview.html" with result=thread %} | ||
| 24 | + <hr /> | ||
| 25 | + {% endfor %} | ||
| 26 | + <div class="text-right"> | ||
| 27 | + <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread"> | ||
| 28 | + {% trans "see all discussions" %} | ||
| 29 | + </a> | ||
| 30 | + </div> | ||
| 31 | + </div> | ||
| 32 | + </div> | ||
| 33 | + | ||
| 34 | + | ||
| 35 | + {% endif %} | ||
| 36 | + {% endfor %} |
templates/discussion-message-preview.html
| @@ -1,71 +0,0 @@ | @@ -1,71 +0,0 @@ | ||
| 1 | -{% load i18n tz highlight %} | ||
| 2 | - | ||
| 3 | -{% if result.fullname or result.modified or result.modified_by %} | ||
| 4 | - <div class="quiet"> | ||
| 5 | - {% if result.modified %} | ||
| 6 | - <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span> | ||
| 7 | - {% endif %} | ||
| 8 | - | ||
| 9 | - {% if result.modified_by %} | ||
| 10 | - <span class="pull-left">{% trans "by" %} | ||
| 11 | - {% if result.modified_by_url %} | ||
| 12 | - <a href="{{ result.modified_by_url }}"> | ||
| 13 | - {% else %} | ||
| 14 | - <span> | ||
| 15 | - {% endif %} | ||
| 16 | - | ||
| 17 | - {% if query %} | ||
| 18 | - {% highlight result.modified_by with query %} | ||
| 19 | - {% else %} | ||
| 20 | - {{ result.modified_by }} | ||
| 21 | - {% endif %} | ||
| 22 | - | ||
| 23 | - {% if result.modified_by_url %} | ||
| 24 | - </a> | ||
| 25 | - {% else %} | ||
| 26 | - </span> | ||
| 27 | - {% endif %} | ||
| 28 | - </span> | ||
| 29 | - {% else %} | ||
| 30 | - <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span> | ||
| 31 | - {% endif %} | ||
| 32 | - </div> | ||
| 33 | -{% endif %} | ||
| 34 | - | ||
| 35 | -{% if result.title %} | ||
| 36 | - <a href="{{ result.url }} | ||
| 37 | - {% if result.type == 'thread' and result.latest_message_pk %} | ||
| 38 | - #msg-{{ result.latest_message_pk }} | ||
| 39 | - {% elif result.type == 'thread' and result.pk %} | ||
| 40 | - #msg-{{ result.pk }} | ||
| 41 | - {% endif %}" | ||
| 42 | - | ||
| 43 | - {% if result.latest_description %} | ||
| 44 | - title="{{ result.latest_description|escape|truncatechars:150 }}" | ||
| 45 | - {% elif result.description %} | ||
| 46 | - title="{{ result.description|escape|truncatechars:150 }}" | ||
| 47 | - {% endif %}> | ||
| 48 | - <span class="subject"> | ||
| 49 | - <!-- a striptags filter was raising an error here because using with highlight --> | ||
| 50 | - {% if query %} | ||
| 51 | - {% highlight result.title with query max_length "1000" %} | ||
| 52 | - {% else %} | ||
| 53 | - {{ result.title }} | ||
| 54 | - {% endif %} | ||
| 55 | - </span> | ||
| 56 | - </a> | ||
| 57 | -{% endif %} | ||
| 58 | - | ||
| 59 | -{% if result.description %} | ||
| 60 | - <!-- a striptags filter was raising an error here because using with highlight --> | ||
| 61 | - <span class="quiet"> - {% if query %} | ||
| 62 | - {% highlight result.description with query max_length "110" %} | ||
| 63 | - {% else %} | ||
| 64 | - {% if result.latest_description %} | ||
| 65 | - {{ result.latest_description|striptags|escape|truncatechars:110 }} | ||
| 66 | - {% elif result.description %} | ||
| 67 | - {{ result.description|striptags|escape|truncatechars:110 }} | ||
| 68 | - {% endif %} | ||
| 69 | - {% endif %} | ||
| 70 | - </span> | ||
| 71 | -{% endif %} |
templates/discussion.html
| @@ -1,36 +0,0 @@ | @@ -1,36 +0,0 @@ | ||
| 1 | - {% load i18n %} | ||
| 2 | - {% for listname, description, latest, most_relevant, number_of_users in lists %} | ||
| 3 | - {% if latest or most_relevant %} | ||
| 4 | - <div class="row"> | ||
| 5 | - <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> | ||
| 6 | - <h4>{% trans 'latest'|title %}</h4> | ||
| 7 | - <hr /> | ||
| 8 | - {% for thread in latest %} | ||
| 9 | - {% include "discussion-message-preview.html" with result=thread.latest_message %} | ||
| 10 | - <hr /> | ||
| 11 | - {% endfor %} | ||
| 12 | - <div class="text-right"> | ||
| 13 | - <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread"> | ||
| 14 | - {% trans "see all discussions" %} | ||
| 15 | - </a> | ||
| 16 | - </div> | ||
| 17 | - </div> | ||
| 18 | - | ||
| 19 | - <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> | ||
| 20 | - <h4>{% trans 'most relevant'|title %}</h4> | ||
| 21 | - <hr /> | ||
| 22 | - {% for thread in most_relevant %} | ||
| 23 | - {% include "discussion-message-preview.html" with result=thread %} | ||
| 24 | - <hr /> | ||
| 25 | - {% endfor %} | ||
| 26 | - <div class="text-right"> | ||
| 27 | - <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread"> | ||
| 28 | - {% trans "see all discussions" %} | ||
| 29 | - </a> | ||
| 30 | - </div> | ||
| 31 | - </div> | ||
| 32 | - </div> | ||
| 33 | - | ||
| 34 | - | ||
| 35 | - {% endif %} | ||
| 36 | - {% endfor %} |