Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various #37

Merged
merged 13 commits into from
Mar 22, 2015
Merged

Various #37

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
288cfcd
page layout when reporting a leaflet
richardjpope Mar 22, 2015
7a62214
can scroll page when over the map
richardjpope Mar 22, 2015
5ba0f00
zoom out one level from the bounds for the cosntituency for more context
richardjpope Mar 22, 2015
dadc58a
big number is clickable
richardjpope Mar 22, 2015
b53b835
added uplaoded data on constituency pages
richardjpope Mar 22, 2015
c84b959
resized and repositioned the party logo on leaflet pages
richardjpope Mar 22, 2015
946b0a6
hide footer on upload
richardjpope Mar 22, 2015
9586511
show message when no leaflets for a long time in a particular constit…
richardjpope Mar 22, 2015
de4ddd9
show message if no leaflets from a party of X days
richardjpope Mar 22, 2015
02195df
icons in mobile view
richardjpope Mar 22, 2015
228d39c
added CC0 licence
richardjpope Mar 22, 2015
6c4bb7a
home page
richardjpope Mar 22, 2015
d2e6968
missing alt text added
richardjpope Mar 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resized and repositioned the party logo on leaflet pages
  • Loading branch information
@richardjpope
richardjpope committed Mar 22, 2015
commit c84b959b6856161ccf4b966a0f857579cf7dff02
76 changes: 42 additions & 34 deletions electionleaflets/templates/leaflets/leaflet.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,33 +61,21 @@ <h1>
Leaflet #{{object.id}}
{% endif %}
</h1>
<section class="leaflet_information">
<div id="leaflet_description">
{% if object.description %}
{{ object.description|markdown }}
{% endif %}
</div>


{% if object.imprint %}
<div id="leaflet_imprint">
<h4>Promoter and Publisher details</h4>
<p>{{ object.imprint }}</p>
</div>
{% endif %}

{% if object.tags.all %}
<h4>Tags</h4>
<ul>
{% for t in object.tags.all %}
{% if t.slug %}
<li><a href="{% url "tag" t.slug %}">{{t.tag}}</a></li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</section>

{% if object.publisher_party %}
<section class="party">
{% if object.publisher_party and object.publisher_party.slug %}
<p>
Published by
<a href="{% url "party-view" object.publisher_party.slug%}">
<img src="http://openelectoralcommission.org.uk/party_images/{{ object.publisher_party.emblems.all.0.emblem_url }}" width="40px">
{{object.publisher_party.party_name}}
</a>
</p>
{% endif %}
</section>
{% endif %}

<section class="leaflet_images" aria-describedby=leaflet_description>
{% for image in object.images.all %}
<figure>
Expand All @@ -107,6 +95,34 @@ <h4>Tags</h4>
{% endfor%}
</section>

<section class="leaflet_information">
<div id="leaflet_description">
{% if object.description %}
{{ object.description|markdown }}
{% endif %}
</div>


{% if object.imprint %}
<div id="leaflet_imprint">
<h4>Promoter and Publisher details</h4>
<p>{{ object.imprint }}</p>
</div>
{% endif %}

{% if object.tags.all %}
<h4>Tags</h4>
<ul>
{% for t in object.tags.all %}
{% if t.slug %}
<li><a href="{% url "tag" t.slug %}">{{t.tag}}</a></li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</section>


<section class="leaflet_map">
<p>This leaflet was spotted by a volunteer
{% if object.constituency %}
Expand All @@ -133,14 +149,6 @@ <h3>Something interesting, dodgy or funny? Shout about it!</h3>

</section>

{% if object.publisher_party %}
<section class="party">
<img src="http://openelectoralcommission.org.uk/party_images/{{ object.publisher_party.emblems.all.0.emblem_url }}">
{% if object.publisher_party and object.publisher_party.slug %}
<p>Published by <a href="{% url "party-view" object.publisher_party.slug%}">{{object.publisher_party.party_name}}</a></p>
{% endif %}
</section>
{% endif %}
<section id="ReportAbuse">
<h3>Something wrong with this page?</h3>
<p>
Expand Down