From 71ec593ecf26db24722a06f865727bd2e1d20c76 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Mon, 21 Oct 2019 14:09:08 +0300 Subject: [PATCH 1/2] News email new layout --- project/templates/news/news_email.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/project/templates/news/news_email.html b/project/templates/news/news_email.html index d14bd898..6fe14060 100644 --- a/project/templates/news/news_email.html +++ b/project/templates/news/news_email.html @@ -12,7 +12,6 @@ -
@@ -25,7 +24,7 @@
-
+
{{ title }}
{% if not image_url is None %} @@ -33,11 +32,13 @@
{% endif %} -
+
{{ description | safe }}
- +
+ Go to news +
-
GaultMillau © {{ year }}
+
GaultMillau © {{ year }}
- + \ No newline at end of file From cc5249674d4a3c0696f258aad5e3b07651b54c47 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Mon, 21 Oct 2019 14:39:23 +0300 Subject: [PATCH 2/2] merge migrations --- apps/tag/migrations/0004_merge_20191021_1138.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 apps/tag/migrations/0004_merge_20191021_1138.py diff --git a/apps/tag/migrations/0004_merge_20191021_1138.py b/apps/tag/migrations/0004_merge_20191021_1138.py new file mode 100644 index 00000000..6298ce4f --- /dev/null +++ b/apps/tag/migrations/0004_merge_20191021_1138.py @@ -0,0 +1,14 @@ +# Generated by Django 2.2.4 on 2019-10-21 11:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('tag', '0003_auto_20191018_0758'), + ('tag', '0003_tag_priority'), + ] + + operations = [ + ]