Add contacts

app/__init__.py

@@ -16,10 +16,10 @@
     pretty_date,
     pretty_number,
     remove_all_whitespace,
-    url_encode,
     replace_ext_ref,
     slugify,
     tna_html,
+    url_encode,
 )
 from config import Config, templates_config
 from flask import Flask

app/catalogue/routes.py

@@ -56,9 +56,8 @@ def render_record(id, record_data):
 
 
 def render_archive(id, record_data):
-    address_parts = []
+    address_parts = record_data["contact_info"]["address_line_1"] or []
     for address_part in [
-        "address_line_1",
         "town",
         "county",
         "country",

app/lib/template_filters.py

@@ -92,4 +92,4 @@ def remove_all_whitespace(s):
 
 
 def url_encode(s):
-    return urllib.parse.quote(s.replace("<br />", " "), safe='')
+    return urllib.parse.quote(s, safe="")

app/templates/catalogue/archive.html

@@ -72,6 +72,16 @@ <h2 class="tna-heading-l">Contact information</h2>
         <dt>Fax</dt>
         <dd>{{ data.contact_info.fax }}</dd>
         {% endif %}
+        {% if data.contact_info.contacts %}
+        <dt>Contacts</dt>
+        <dd>
+          <ul class="tna-ul tna-ul--plain">
+            {% for contact in data.contact_info.contacts %}
+            <li>{{ contact.first_name }} {{ contact.last_name }}{% if contact.job_title %} &mdash; {{ contact.job_title }}{% endif %}</li>
+            {% endfor %}
+          </ul>
+        </dd>
+        {% endif %}
       </dl>
     </aside>
   </div>