diff --git a/com/models.py b/com/models.py index 47ae771d..1b39563a 100644 --- a/com/models.py +++ b/com/models.py @@ -167,7 +167,10 @@ class Weekmail(models.Model): }).content.decode('utf-8') def get_banner(self): - return "http://" + settings.SITH_URL + static("com/img/weekmail_banner.png") + return "http://" + settings.SITH_URL + static("com/img/weekmail_bannerA18.jpg") + + def get_footer(self): + return "http://" + settings.SITH_URL + static("com/img/weekmail_footerA18.jpg") def __str__(self): return "Weekmail %s (sent: %s) - %s" % (self.id, self.sent, self.title) diff --git a/com/templates/com/weekmail_renderer_html.jinja b/com/templates/com/weekmail_renderer_html.jinja index a713b028..c3e865be 100644 --- a/com/templates/com/weekmail_renderer_html.jinja +++ b/com/templates/com/weekmail_renderer_html.jinja @@ -10,16 +10,16 @@ img {
-

{{ weekmail.title }}

+

{{ weekmail.title }}

{% if weekmail.intro %} -

{% trans %}Intro{% endtrans %}

+

{% trans %}Intro{% endtrans %}

{{ weekmail.intro|markdown }} {% endif %} -

{% trans %}Table of content{% endtrans %}

+

{% trans %}Table of content{% endtrans %}

{%- for a in weekmail.articles.all() %} -

[{{ a.club }}] {{ a.title }}

+

[{{ a.club }}] {{ a.title }}

{{ a.content|markdown }} {%- endfor -%} {%- if weekmail.joke %} -

{% trans %}Joke{% endtrans %}

+

{% trans %}Joke{% endtrans %}

{{ weekmail.joke|markdown }} {% endif -%} {%- if weekmail.protip %} -

{% trans %}Pro tip{% endtrans %}

+

{% trans %}Pro tip{% endtrans %}

{{ weekmail.protip|markdown }} {% endif -%} {%- if weekmail.conclusion %} -

{% trans %}Final word{% endtrans %}

+

{% trans %}Final word{% endtrans %}

{{ weekmail.conclusion|markdown }} {% endif -%} - +
diff --git a/core/static/com/img/weekmail_bannerA18.jpg b/core/static/com/img/weekmail_bannerA18.jpg new file mode 100644 index 00000000..939649b4 Binary files /dev/null and b/core/static/com/img/weekmail_bannerA18.jpg differ diff --git a/core/static/com/img/weekmail_footerA18.jpg b/core/static/com/img/weekmail_footerA18.jpg new file mode 100644 index 00000000..8715d181 Binary files /dev/null and b/core/static/com/img/weekmail_footerA18.jpg differ