Merge branch 'bugfix/wrongpolicydocuments' into 'master'

Correctly link to report documents



See merge request !32

website/documents/templates/documents/associationdocument.html

+{% if documents %}
+<li class="post span3 has-overlay">
+    <div class="post-inner">
+        <div class="post-header">
+            <a href="portfolio-single-wide.html">
+                <!-- TODO create a more meaningful thumbnail -->
+                <img src="https://placehold.it/200x200" />
+            </a>
+        </div>
+        <div class="post-body">
+            <h2><a href="portfolio-single-wide.html">{{ name }} {{ year|stringformat:"d"|slice:"2:4" }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" }}</a></h2>
+        </div>
+        <div class="post-overlay">
+            <div class="post-overlay-meta">
+                <h2>{{ name }}</h2>
+                {{ year }} - {{ year | add:1 }}
+            </div>
+            <ul class="post-overlay-icons">
+                {% block icons %}{% endblock %}
+            </ul>
+        </div>
+    </div>
+</li>
+{% else %}
+<li class="post span3">
+    <div class="post-inner unknowncontainer">
+        <div class="post-header">
+            ?
+        </div>
+        <div class="post-body">
+            <h2>{{ name }} '{{ year | stringformat:"d" | slice:"2:4" }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" }}</h2>
+        </div>
+    </div>
+</li>
+{% endif %}
\ No newline at end of file

website/documents/templates/documents/index.html

@@ -38,7 +38,7 @@
         </ul>
         <ul class="portfolio-posts row" style='width:{{ assocation_docs_width }}px'>
             {% for year, docs in association_documents_years %}
-                {% include 'documents/policydocument.html' with documents=docs.report name=_("Annual report") %}
+                {% include 'documents/report.html' with documents=docs.report name=_("Annual report") %}
             {% endfor %}
         </ul>
     </div>

website/documents/templates/documents/policydocument.html

-{% if documents %}
-<li class="post span3 has-overlay">
-    <div class="post-inner">
-        <div class="post-header">
-            <a href="portfolio-single-wide.html">
-                <!-- TODO create a more meaningful thumbnail -->
-                <img src="https://placehold.it/200x200" />
-            </a>
-        </div>
-        <div class="post-body">
-            <h2><a href="portfolio-single-wide.html">{{ name }} {{ year|stringformat:"d"|slice:"2:4" }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" }}</a></h2>
-        </div>
-        <div class="post-overlay">
-            <div class="post-overlay-meta">
-                <h2>{{ name }}</h2>
-                {{ year }} - {{ year | add:1 }}
-            </div>
-            <ul class="post-overlay-icons">
-                {% for document in documents %}
-                <li>
-                    {% comment %}It might be better to make this less hard-coded..{% endcomment %}
-                    <a target="_blank"
-                    {% if forloop.first %}
-                        {% if forloop.last %}
-                            href="{% url 'documents:association-document' 'policy-document' year %}"
-                        {% else %}
-                            href="{% url 'documents:association-document' 'annual-report' year %}"
-                        {% endif %}
-                        class="overlay-icon-link"
-                    {% else %}
-                        href="{% url 'documents:association-document' 'financial-report' year %}"
-                        class="overlay-icon-euro"
-                    {% endif %}
-                    ></a>
-                </li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
+{% extends "documents/associationdocument.html" %}
+
+{% block icons %}
+<li>
+    <a target="_blank" href="{% url 'documents:association-document' 'policy-document' year %}" class="overlay-icon-link"></a>
 </li>
-{% else %}
-<li class="post span3">
-    <div class="post-inner unknowncontainer">
-        <div class="post-header">
-            ?
-        </div>
-        <div class="post-body">
-            <h2>{{ name }} '{{ year | stringformat:"d" | slice:"2:4" }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" }}</h2>
-        </div>
-    </div>
-</li>
-{% endif %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file

website/documents/templates/documents/report.html

+{% extends "documents/associationdocument.html" %}
+
+{% block icons %}
+{% for document in documents %}
+<li>
+    <a target="_blank"
+    {% if forloop.first %}
+        href="{% url 'documents:association-document' 'annual-report' year %}"
+        class="overlay-icon-link"
+    {% else %}
+        href="{% url 'documents:association-document' 'financial-report' year %}"
+        class="overlay-icon-euro"
+    {% endif %}
+    ></a>
+</li>
+{% endfor %}
+{% endblock %}
\ No newline at end of file