From: Emilie Date: Fri, 21 Oct 2016 15:39:58 +0000 (+0200) Subject: Task #290: Brief > add style X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9b7a4bcdd0a56cc373e66a4dd3859612ac8abed1;p=mezzo.git Task #290: Brief > add style --- diff --git a/app/organization/magazine/migrations/0014_brief_style.py b/app/organization/magazine/migrations/0014_brief_style.py new file mode 100644 index 00000000..cc9753c8 --- /dev/null +++ b/app/organization/magazine/migrations/0014_brief_style.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-21 15:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-magazine', '0013_auto_20161013_2353'), + ] + + operations = [ + migrations.AddField( + model_name='brief', + name='style', + field=models.CharField(choices=[('grey', 'grey'), ('yellow', 'yellow'), ('black', 'black')], default='', max_length=16, verbose_name='style'), + preserve_default=False, + ), + ] diff --git a/app/organization/magazine/models.py b/app/organization/magazine/models.py index 302d7be5..fad057f2 100644 --- a/app/organization/magazine/models.py +++ b/app/organization/magazine/models.py @@ -16,6 +16,11 @@ from organization.media.models import * from organization.core.models import * from organization.magazine.apps import * +BRIEF_STYLE_CHOICES = [ + ('grey', _('grey')), + ('yellow', _('yellow')), + ('black', _('black')) +] class Article(BlogPost, SubTitled): @@ -47,6 +52,7 @@ class ArticlePlaylist(PlaylistRelated): class Brief(Displayable, RichText): + style = models.CharField(_('style'), max_length=16, choices=BRIEF_STYLE_CHOICES) text_button = models.CharField(blank=True, max_length=150, null=False, verbose_name=_('text button')) external_content = models.URLField(blank=True, max_length=1000, null=False, verbose_name=_('external content')) diff --git a/app/templates/magazine/brief/inc/brief_card.html b/app/templates/magazine/brief/inc/brief_card.html index efe6b363..2953f969 100644 --- a/app/templates/magazine/brief/inc/brief_card.html +++ b/app/templates/magazine/brief/inc/brief_card.html @@ -1,11 +1,11 @@ {% load i18n mezzanine_tags %}
- + {{ content.content_object.style }} +
{% trans 'Brief !' %}
-

{{content.content_object.title }}

{{content.content_object.content|richtext_filters|safe|truncatechars_html:150 }}