Commit 7ea861281d3d505aea49e4c3a1c30bd93beaeb3f
1 parent
abde9ee8
Exists in
master
and in
79 other branches
Fixed html in templates and added new migrations
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Showing
4 changed files
with
66 additions
and
38 deletions
Show diff stats
| ... | ... | @@ -0,0 +1,28 @@ |
| 1 | +# -*- coding: utf-8 -*- | |
| 2 | +from __future__ import unicode_literals | |
| 3 | + | |
| 4 | +from django.db import models, migrations | |
| 5 | + | |
| 6 | + | |
| 7 | +class Migration(migrations.Migration): | |
| 8 | + | |
| 9 | + dependencies = [ | |
| 10 | + ('gitlab', '0001_initial'), | |
| 11 | + ('super_archives', '0002_mailinglist_is_private'), | |
| 12 | + ('noosfero', '0001_initial'), | |
| 13 | + ] | |
| 14 | + | |
| 15 | + operations = [ | |
| 16 | + migrations.CreateModel( | |
| 17 | + name='CommunityAssociations', | |
| 18 | + fields=[ | |
| 19 | + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | |
| 20 | + ('community', models.ForeignKey(to='noosfero.NoosferoCommunity', null=True)), | |
| 21 | + ('group', models.ForeignKey(to='gitlab.GitlabGroup', null=True)), | |
| 22 | + ('mail_list', models.ForeignKey(to='super_archives.MailingList', null=True)), | |
| 23 | + ], | |
| 24 | + options={ | |
| 25 | + }, | |
| 26 | + bases=(models.Model,), | |
| 27 | + ), | |
| 28 | + ] | ... | ... |
colab_spb/templates/discussion-message-preview.html
| 1 | 1 | {% load i18n tz highlight %} |
| 2 | 2 | |
| 3 | 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> | |
| 4 | + <div class="message-discussion"> | |
| 5 | + <div class="quiet"> | |
| 6 | + {% if result.modified %} | |
| 7 | + <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span> | |
| 15 | 8 | {% endif %} |
| 16 | 9 | |
| 17 | - {% if query %} | |
| 18 | - {% highlight result.modified_by with query %} | |
| 19 | - {% else %} | |
| 20 | - {{ result.modified_by }} | |
| 21 | - {% endif %} | |
| 10 | + {% if result.modified_by %} | |
| 11 | + <span class="pull-left">{% trans "by" %} | |
| 12 | + {% if result.modified_by_url %} | |
| 13 | + <a href="{{ result.modified_by_url }}"> | |
| 14 | + {% else %} | |
| 15 | + <span> | |
| 16 | + {% endif %} | |
| 22 | 17 | |
| 23 | - {% if result.modified_by_url %} | |
| 24 | - </a> | |
| 25 | - {% else %} | |
| 18 | + {% if query %} | |
| 19 | + {% highlight result.modified_by with query %} | |
| 20 | + {% else %} | |
| 21 | + {{ result.modified_by }} | |
| 22 | + {% endif %} | |
| 23 | + | |
| 24 | + {% if result.modified_by_url %} | |
| 25 | + </a> | |
| 26 | + {% else %} | |
| 27 | + </span> | |
| 28 | + {% endif %} | |
| 26 | 29 | </span> |
| 30 | + {% else %} | |
| 31 | + <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span> | |
| 27 | 32 | {% endif %} |
| 28 | - </span> | |
| 29 | - {% else %} | |
| 30 | - <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span> | |
| 31 | - {% endif %} | |
| 33 | + </div> | |
| 32 | 34 | </div> |
| 33 | 35 | {% endif %} |
| 34 | 36 | |
| ... | ... | @@ -58,14 +60,16 @@ |
| 58 | 60 | |
| 59 | 61 | {% if result.description %} |
| 60 | 62 | <!-- 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> | |
| 63 | + <div class="message-discussion"> | |
| 64 | + <span class="quiet"> - {% if query %} | |
| 65 | + {% highlight result.description with query max_length "110" %} | |
| 66 | + {% else %} | |
| 67 | + {% if result.latest_description %} | |
| 68 | + {{ result.latest_description|striptags|escape|truncatechars:110 }} | |
| 69 | + {% elif result.description %} | |
| 70 | + {{ result.description|striptags|escape|truncatechars:110 }} | |
| 71 | + {% endif %} | |
| 72 | + {% endif %} | |
| 73 | + </span> | |
| 74 | + <div> | |
| 71 | 75 | {% endif %} | ... | ... |
colab_spb/templates/discussion.html
| ... | ... | @@ -4,10 +4,8 @@ |
| 4 | 4 | <div class="row"> |
| 5 | 5 | <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> |
| 6 | 6 | <h4>{% trans 'latest'|title %}</h4> |
| 7 | - <hr /> | |
| 8 | 7 | {% for thread in latest %} |
| 9 | 8 | {% include "discussion-message-preview.html" with result=thread.latest_message %} |
| 10 | - <hr /> | |
| 11 | 9 | {% endfor %} |
| 12 | 10 | <div class="text-right"> |
| 13 | 11 | <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread"> |
| ... | ... | @@ -18,10 +16,8 @@ |
| 18 | 16 | |
| 19 | 17 | <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12"> |
| 20 | 18 | <h4>{% trans 'most relevant'|title %}</h4> |
| 21 | - <hr /> | |
| 22 | 19 | {% for thread in most_relevant %} |
| 23 | 20 | {% include "discussion-message-preview.html" with result=thread %} |
| 24 | - <hr /> | |
| 25 | 21 | {% endfor %} |
| 26 | 22 | <div class="text-right"> |
| 27 | 23 | <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread"> | ... | ... |
colab_spb/views.py
| ... | ... | @@ -43,7 +43,7 @@ def get_list(request): |
| 43 | 43 | if len(context['lists']) == 0: |
| 44 | 44 | message = ("Não foi possível encontrada lista de discussão" |
| 45 | 45 | " associada a está comunidade, para mais" |
| 46 | - " detalhes contacte o administrador.") | |
| 46 | + " detalhes contate o administrador.") | |
| 47 | 47 | return HttpResponse(message, status=404) |
| 48 | 48 | |
| 49 | 49 | return render(request, "discussion.html", context) | ... | ... |