Merge remote-tracking branch 'origin/master'

2018-05-23 17:56:14 +00:00 · 2018-05-23 17:56:14 +00:00 · 14658d922f
commit 14658d922f
parent 6891c62ce2 59b0bc0ab8
1 changed files with 4 additions and 1 deletions
--- a/ojusomap/templates/base.html
+++ b/ojusomap/templates/base.html
@ -144,7 +144,10 @@
        <div class="col-md-12">
          <ul class="linklist">
            <li><a href="{% url 'index' %}">Map of all case studies</a>
-            <li><a href="/about">About us</a>
+            {% get_flatpages '/about/' as all_pages %}
+            {% for page in all_pages %}
+              <li><a href="{{ page.url }}">{{ page.title }}</a></li>
+            {% endfor %}
            <li class="linklist-item--spacer">&copy; Ojuso 2018
          </ul>
        </div>