phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes from gm-148

Browse Source
This commit is contained in:
Kuroshini 2019-10-16 14:11:07 +03:00
parent b78c4f82fe
commit 40357c20b6
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/tag/migrations/0004_merge_20191021_1138.py Normal file
View File

@ -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 = [
]

1
apps/timetable/serialziers.py
View File

@ -78,6 +78,7 @@ class ScheduleCreateSerializer(ScheduleRUDSerializer):
establishment.schedule.add(instance) establishment.schedule.add(instance)
return instance return instance
class TimetableSerializer(serializers.ModelSerializer): class TimetableSerializer(serializers.ModelSerializer):
"""Serailzier for Timetable model.""" """Serailzier for Timetable model."""
weekday_display = serializers.CharField(source='get_weekday_display', weekday_display = serializers.CharField(source='get_weekday_display',

12
project/templates/news/news_email.html
View File

@ -7,7 +7,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700|PT+Serif&display=swap&subset=cyrillic" type="text/css"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700|PT+Serif&display=swap&subset=cyrillic" type="text/css">
<title>{{ title }}</title> <title>{{ title }}</title>
</head> </head>
<body style="box-sizing: border-box;margin: 0;font-family: 'Open Sans', sans-serif;font-size: 0.875rem;"> <body style="box-sizing: border-box;margin: 0;font-family: &quot;Open Sans&quot;, sans-serif;font-size: 0.875rem;">
<div style="dispaly: none"> <div style="dispaly: none">
</div> </div>
@ -24,19 +24,19 @@
</div> </div>
<div class="letter__sublogo" style="font-size: 21px;line-height: 1;letter-spacing: 0;color: #bcbcbc;text-transform: uppercase;">france</div> <div class="letter__sublogo" style="font-size: 21px;line-height: 1;letter-spacing: 0;color: #bcbcbc;text-transform: uppercase;">france</div>
</div> </div>
<div class="letter__title" style="font-family:"Open-Sans",sans-serif; font-size: 1.5rem;margin: 0 0 10px;padding: 0 0 6px;border-bottom: 4px solid #ffee29;"> <div class="letter__title" style="font-family:&quot;Open-Sans&quot;,sans-serif; font-size: 1.5rem;margin: 0 0 10px;padding: 0 0 6px;border-bottom: 4px solid #ffee29;">
<span class="letter__title-txt">{{ title }}</span> <span class="letter__title-txt">{{ title }}</span>
</div> </div>
{% if not image_url is None %} {% if not image_url is None %}
<div class="letter__image" style="width: 100%;margin: 0 0 1.25rem;max-height:260px;"> <div class="letter__image" style="width: 100%;margin: 0 0 1.25rem;max-height:260px;">
<img src="{{ image_url }}" alt="" class="letter__photo" style="display: block;width: 100%;height: 100%;"> <img src="{{ image_url }}" alt="" class="letter__photo" style="display: block; width: 100%;height: 100%;">
</div> </div>
{% endif %} {% endif %}
<div class="letter__text" style="margin: 0 0 30px; font-family:"Open-Sans",sans-serif; font-size: 14px; line-height: 21px;letter-spacing: -0.34px; overflow-x: hidden;"> <div class="letter__text" style="margin: 0 0 30px; font-family:&quot;Open-Sans&quot;,sans-serif; font-size: 14px; line-height: 21px;letter-spacing: -0.34px; overflow-x: hidden;">
{{ description | safe }} {{ description | safe }}
</div> </div>
<a href="https://{{ country_code }}.{{ domain_uri }}/news/{{ slug }}" style="text-decoration: none;" target="_blank"> <a href="https://{{ country_code }}.{{ domain_uri }}/news/{{ slug }}" style="text-decoration: none; display: block; text-align-center" target="_blank">
<div class="letter__button" style="display: block;margin: 30px auto;padding: 0;font-family: &quot;pt serif&quot: ;, sans-serif: ;font-size: 1.25rem;letter-spacing: 1px;text-align: center;color: #000;background: #ffee29;border: 2px solid #ffee29;text-transform: uppercase;min-width: 238px;height: 46px;background-color: #ffee29;"> <div class="letter__button" style="display: inline-block;margin: 30px auto;padding: 11px;font-size: 1.25rem;letter-spacing: 1px;text-align: center;color: #000;background: #ffee29;border: 2px solid #ffee29;text-transform: uppercase;min-width: 238px;background-color: #ffee29;">
Go to news Go to news
</div> </div>
</a> </a>