Merge branch 'weekmail' into 'master'

Weekmail images and colors

See merge request ae/Sith!143

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)

com/templates/com/weekmail_renderer_html.jinja

@@ -10,16 +10,16 @@ img {
 </style>
 <div style="background: #CBD1DD; padding: 0px 5%;">
     <div style="background: #F9FAFB;">
-        <h2 style="background: #304C83; color: #f9fafb">{{ weekmail.title }}</h2>
+        <h2 style="background: #000; color: #f9fafb">{{ weekmail.title }}</h2>
         <img src="{{ weekmail.get_banner() }}"
         id="OWATemporaryImageDivContainerBannerForOutlook"
         >
         {% if weekmail.intro %}
-        <h3 style="background: #E3A11C; color: #f9fafb">{% trans %}Intro{% endtrans %}</h3>
+        <h3 style="background: #000; color: #f9fafb">{% trans %}Intro{% endtrans %}</h3>
         {{ weekmail.intro|markdown }}
         {% endif %}
 
-        <h3 style="background: #E3A11C; color: #f9fafb">{% trans %}Table of content{% endtrans %}</h3>
+        <h3 style="background: #000; color: #f9fafb">{% trans %}Table of content{% endtrans %}</h3>
         <ul>
             {% for a in weekmail.articles.all() %}
             <li>[{{ a.club }}] {{ a.title }}</li>
@@ -27,25 +27,25 @@ img {
         </ul>
 
         {%- for a in weekmail.articles.all() %}
-        <h3 style="background: #E3A11C; color: #f9fafb">[{{ a.club }}] {{ a.title }}</h3>
+        <h3 style="background: #000; color: #f9fafb">[{{ a.club }}] {{ a.title }}</h3>
         {{ a.content|markdown }}
         {%- endfor -%}
 
         {%- if weekmail.joke %}
-        <h3 style="background: #E3A11C; color: #f9fafb">{% trans %}Joke{% endtrans %}</h3>
+        <h3 style="background: #000; color: #f9fafb">{% trans %}Joke{% endtrans %}</h3>
         {{ weekmail.joke|markdown }}
         {% endif -%}
 
         {%- if weekmail.protip %}
-        <h3 style="background: #E3A11C; color: #f9fafb">{% trans %}Pro tip{% endtrans %}</h3>
+        <h3 style="background: #000; color: #f9fafb">{% trans %}Pro tip{% endtrans %}</h3>
         {{ weekmail.protip|markdown }}
         {% endif -%}
 
         {%- if weekmail.conclusion %}
-        <h3 style="background: #E3A11C; color: #f9fafb">{% trans %}Final word{% endtrans %}</h3>
+        <h3 style="background: #000; color: #f9fafb">{% trans %}Final word{% endtrans %}</h3>
         {{ weekmail.conclusion|markdown }}
         {% endif -%}
-
+        <img src="{{ weekmail.get_footer() }}"
     </div>
 
 </div>