diff --git a/colab_spb/migrations/0001_initial.py b/colab_spb/migrations/0001_initial.py new file mode 100644 index 0000000..a3a22e9 --- /dev/null +++ b/colab_spb/migrations/0001_initial.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('gitlab', '0001_initial'), + ('super_archives', '0002_mailinglist_is_private'), + ('noosfero', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='CommunityAssociations', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('community', models.ForeignKey(to='noosfero.NoosferoCommunity', null=True)), + ('group', models.ForeignKey(to='gitlab.GitlabGroup', null=True)), + ('mail_list', models.ForeignKey(to='super_archives.MailingList', null=True)), + ], + options={ + }, + bases=(models.Model,), + ), + ] diff --git a/colab_spb/templates/discussion-message-preview.html b/colab_spb/templates/discussion-message-preview.html index ecab598..9571892 100644 --- a/colab_spb/templates/discussion-message-preview.html +++ b/colab_spb/templates/discussion-message-preview.html @@ -1,34 +1,36 @@ {% load i18n tz highlight %} {% if result.fullname or result.modified or result.modified_by %} -
- {% if result.modified %} - {{ result.modified|localtime|timesince }} {% trans "ago" %} - - {% endif %} - - {% if result.modified_by %} - {% trans "by" %} - {% if result.modified_by_url %} - - {% else %} - +
+
+ {% if result.modified %} + {{ result.modified|localtime|timesince }} {% trans "ago" %} - {% endif %} - {% if query %} - {% highlight result.modified_by with query %} - {% else %} - {{ result.modified_by }} - {% endif %} + {% if result.modified_by %} + {% trans "by" %} + {% if result.modified_by_url %} + + {% else %} + + {% endif %} - {% if result.modified_by_url %} - - {% else %} + {% if query %} + {% highlight result.modified_by with query %} + {% else %} + {{ result.modified_by }} + {% endif %} + + {% if result.modified_by_url %} + + {% else %} + + {% endif %} + {% else %} + {% trans "by" %} {% trans "Anonymous" %} {% endif %} - - {% else %} - {% trans "by" %} {% trans "Anonymous" %} - {% endif %} +
{% endif %} @@ -58,14 +60,16 @@ {% if result.description %} - - {% if query %} - {% highlight result.description with query max_length "110" %} - {% else %} - {% if result.latest_description %} - {{ result.latest_description|striptags|escape|truncatechars:110 }} - {% elif result.description %} - {{ result.description|striptags|escape|truncatechars:110 }} - {% endif %} - {% endif %} - +
+ - {% if query %} + {% highlight result.description with query max_length "110" %} + {% else %} + {% if result.latest_description %} + {{ result.latest_description|striptags|escape|truncatechars:110 }} + {% elif result.description %} + {{ result.description|striptags|escape|truncatechars:110 }} + {% endif %} + {% endif %} + +
{% endif %} diff --git a/colab_spb/templates/discussion.html b/colab_spb/templates/discussion.html index 7662c5a..8017d7e 100644 --- a/colab_spb/templates/discussion.html +++ b/colab_spb/templates/discussion.html @@ -4,10 +4,8 @@