Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
0c6a5c7a
Commit
0c6a5c7a
authored
Aug 13, 2016
by
Thom Wiggers
📐
Browse files
Merge branch 'bugfix/wrongpolicydocuments' into 'master'
Correctly link to report documents See merge request
!32
parents
bacd7e5e
bc8fbc6a
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/documents/templates/documents/associationdocument.html
0 → 100644
View file @
0c6a5c7a
{% 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
View file @
0c6a5c7a
...
...
@@ -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/
policydocumen
t.html' with documents=docs.report name=_("Annual report") %}
{% include 'documents/
repor
t.html' with documents=docs.report name=_("Annual report") %}
{% endfor %}
</ul>
</div>
...
...
website/documents/templates/documents/policydocument.html
View file @
0c6a5c7a
{% 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
0 → 100644
View file @
0c6a5c7a
{% 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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment