Update "Event" and "News" archive to reflect new designs.

diff --git a/templates/events/archive.html b/templates/events/archive.html
index 5af7949651c9bbdcdc2f2115b757642e4a281a62..993ba17e713b11a62dc0afd2c1779e3d17881935 100644 (file)
--- a/templates/events/archive.html
+++ b/templates/events/archive.html
@@ -3,16 +3,27 @@
 {%block title%}{{title}}{%endblock%}
 {%block contents%}
 
-<h1>{{title}}</h1>
+<h1>{{title}} <i class="fas fa-calendar-alt"></i></h1>
 {%for eventblock in eventblocks%}
 {%if eventblocks|length > 1%}<h2><a name="{{eventblock.anchor|slugify}}">{{eventblock.name}}</a></h2>{%endif%}
 <p>
 <em><strong>Note:</strong> The PostgreSQL Global Development Group does not endorse any
 events run by third parties. No guarantee of the quality of events is offered
-whatsoever.  For information on <a href="/community/recognition/#conferences">Community Conference Recognition</a>, please review the guidelines <a href="/community/recognition/#conferences">here</a>.</em>
+whatsoever.</em>
 </p>
+{% if eventblock.name == 'Community Events' %}
+<p>
+  <img src="/media/img/PostgreSQL_Badge1.svg" class="community" alt="PostgreSQL Community Event">
+  indicates that an event is recognised under the <a href="/community/recognition/#conferences">community event guidelines</a> and is directly helping the PostgreSQL community.
+</p>
+{% endif %}
 {%for event in eventblock.events %}
-<div><a href="/about/event/{{event.id}}/">{{event.title}}</a></div>
+<div>
+  {% if event.badged %}
+    <img src="/media/img/PostgreSQL_Badge1.svg" class="community" alt="PostgreSQL Community Event">
+  {% endif %}
+  <a href="/about/event/{{event.id}}/">{{event.title}}</a>
+</div>
 <div>Date: <strong>{{event.displaydate|safe}}</strong></div>
 <div>Location: <strong>{{event.locationstring}}</strong></div>
 {%if event.language%}<div>Language: <strong>{{event.language}}</strong></div>{%endif%}

diff --git a/templates/news/item.html b/templates/news/item.html
index 3f6641694885154d10e271346987bb3a8f94b56e..1ca14c635c395137ca980d219696c19f9b18f77c 100644 (file)
--- a/templates/news/item.html
+++ b/templates/news/item.html
@@ -10,6 +10,6 @@
 website. We apologise for any formatting issues caused by the migration.</em></p>
 {%endif%}
 {%for t in obj.tags.all%}
-<span class="newstag"><a href="/about/newsarchive/{{t.urlname}}/">{{t.name}}</a></span>
+<span class="newstag"><a class="btn btn-primary" href="/about/newsarchive/{{t.urlname}}/">{{t.name}}</a></span>
 {%endfor%}
 {%endblock%}

diff --git a/templates/news/newsarchive.html b/templates/news/newsarchive.html
index ed1f6f2b2cf31da3894918d1a4a0a8636aa63404..980a302a332bbc7b794144e26f08616db8baa54f 100644 (file)
--- a/templates/news/newsarchive.html
+++ b/templates/news/newsarchive.html
@@ -2,14 +2,14 @@
 {%load markup%}
 {%block title%}News archive{%if tag%} - {{tag.name}}{%endif%}{%endblock%}
 {%block contents%}
-<h1>News archive{%if tag%} - {{tag.name}}{%endif%}</h1>
+<h1>News archive{%if tag%} - {{tag.name}}{%endif%} <i class="far fa-newspaper"></i></h1>
 
 <p>
-{%for t in newstags%}<span class="newstag"><a href="/about/newsarchive/{{t.urlname}}/">{{t.name}}</a></span> {%endfor%}
+{%for t in newstags%}<span class="newstag"><a class="btn btn-primary" href="/about/newsarchive/{{t.urlname}}/">{{t.name}}</a></span> {%endfor%}
 </p>
 
 {%for obj in news %}
-<h2><a href="/about/news/{{obj.id}}/">{{obj.title}}</a></h2>
+<h2 class="news"><a href="/about/news/{{obj.id}}/">{{obj.title}}</a></h2>
 <div class="newsdate">Posted on <strong>{{obj.displaydate}}</strong> by {{ obj.org.name }}</div>
 {{obj.content|markdown|striptags|truncatewords:20}}
 <p><a href="/about/news/{{obj.id}}/">Read more...</a></p>