Download as
Browse Code »

Commit 91e6f9e2d6df42cfce6a58af660cc76d1835f39d

Authored by Macartur Sousa
1 parent e7efcb5d
Exists in master and in 4 other branches community_association, gitlab_activity_view, handle_community_signals, removing_namespace

Added message view theme 

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Signed-off-by: Alexandre Barbosa <alexandrealmeidabarbosa@gmail.com>
Showing 3 changed files with 81 additions and 22 deletions   Show diff stats
colab_spb/views.py
  Diff comments   View file @91e6f9e
... ... @@ -2,12 +2,13 @@ from django.shortcuts import render
2 2 from django.utils.translation import ugettext as _
3 3 from colab.super_archives.models import MailingList, Thread
4 4 from colab.accounts.utils import mailman
  5 +from colab.accounts.models import User
5 6  
6 7 def get_list(request):
7 8 list_name = None
8 9 MAX = 0
9 10 if request.GET.get('list_name'):
10   - list_name = request.GET['list_name']
  11 + list_name = request.GET['list_name'].title()
11 12 if request.GET.get('MAX'):
12 13 MAX = request.GET['MAX']
13 14  
... ...
templates/discussion-message-preview.html 0 → 100644
  Diff comments   View file @91e6f9e
... ... @@ -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 %}
... ...
templates/discussion.html
  Diff comments   View file @91e6f9e
1   -
2 1 {% load i18n %}
3   - <h2>{% trans 'Groups'|title %}</h2>
4   - <hr/>
5   -
6 2 {% for listname, description, latest, most_relevant, number_of_users in lists %}
7 3 {% if latest or most_relevant %}
8   - <h3><b>{{ listname|title|lower }} {% if description %} ({{ description }}){% endif %}</b></h3>
9   - <div class="btn-group btn-group-sm">
10   - <a href="#" class="btn btn-default" disabled="disabled">{% blocktrans %}{{ number_of_users }} members{% endblocktrans %}</a>
11   - {% if proxy.trac %}
12   - <a href="/wiki/grupos/{{ listname }}" class="btn btn-default">Wiki</a>
13   - {% endif %}
14   - </div>
15   - <hr/>
16   -
17 4 <div class="row">
18 5 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
19 6 <h4>{% trans 'latest'|title %}</h4>
20   - <ul class="message-list">
  7 + <hr />
21 8 {% for thread in latest %}
22   - {% include "message-preview.html" with result=thread.latest_message %}
  9 + {% include "discussion-message-preview.html" with result=thread.latest_message %}
  10 + <hr />
23 11 {% endfor %}
24   - </ul>
25 12 <div class="text-right">
26 13 <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread">
27   - {% trans "more..." %}
  14 + {% trans "see all discussions" %}
28 15 </a>
29 16 </div>
30 17 </div>
31 18  
32 19 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
33 20 <h4>{% trans 'most relevant'|title %}</h4>
34   - <ul class="message-list">
  21 + <hr />
35 22 {% for thread in most_relevant %}
36   - {% include "message-preview.html" with result=thread %}
  23 + {% include "discussion-message-preview.html" with result=thread %}
  24 + <hr />
37 25 {% endfor %}
38   - </ul>
39 26 <div class="text-right">
40 27 <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread">
41   - {% trans "more..." %}
  28 + {% trans "see all discussions" %}
42 29 </a>
43 30 </div>
44 31 </div>
... ...