Permalink
Browse files

templates improvements; maps and lists

  • Loading branch information...
1 parent 615d9eb commit 987d4fddbe4f58946773f0c6066aaf155b3da6ae @evildmp committed Feb 14, 2013
View
8 arkestra_utilities/static/arkestra/css/arkestra_lists.css
@@ -148,6 +148,10 @@ ul.horizontal.grid li {
li.horizontal {float: left; list-style-type: none;}
+ul.index {
+ padding: 0;
+ }
+
ul.index li {
font-weight: bold;
display: inline;
@@ -205,7 +209,9 @@ ul.boxed li li {border: none;}
ul.boxed li dl {margin:0;}
dl dd {padding: 0; margin: 0 0 5px 10px;}
-dl dd.not-indented {padding: 0; margin-left: 0;}
+dl dd.not-indented,
+dl.not-indented dd
+ {padding: 0; margin-left: 0;}
/* for the sub column - the right hand column in some pages - that contains lists of links etc */
View
2 contacts_and_people/templates/contacts_and_people/entity_contacts_and_people.html
@@ -18,7 +18,7 @@
<div class="column firstcolumn">
<div class = "">
<h{{ IN_BODY_HEADING_LEVEL }}>Contact information</h{{ IN_BODY_HEADING_LEVEL }}>
- <dl>
+ <dl class="not-indented">
{% include "includes/key_contacts.html" %}
{% with entity_map_size as map_size %}
{% include "includes/contact_information.html" %}
View
10 contacts_and_people/templates/contacts_and_people/person.html
@@ -25,7 +25,7 @@
{% endif %}{% endblock pagetitle %}
{% block main_page_body %}
-{% thumbnail person.image.file person_image_size subject_location=person.image.subject_location crop as image %}
+ {% thumbnail person.image.file person_image_size subject_location=person.image.subject_location crop as image %}
{% with placeholder_width=person_description_width %}
{% block arkestra_content %}
{% include "arkestra/tabbed_menu.html" %}
@@ -34,10 +34,10 @@
<div class="column firstcolumn">
<div>
{% if building or address or location or access_note or email or phone.all %}<h{{ IN_BODY_HEADING_LEVEL }}>Contact information</h{{ IN_BODY_HEADING_LEVEL }}>
- <dl>
- {% with person_map_size as map_size %}
- {% include "includes/contact_information.html" %}
- {% endwith %}
+ <dl class="not-indented">
+ {% with person_map_size as map_size %}
+ {% include "includes/contact_information.html" %}
+ {% endwith %}
</dl>
{% endif %}
{% render_placeholder person.description %}
View
3 contacts_and_people/templates/includes/contact_information.html
@@ -27,7 +27,8 @@
<br />
{{ full_address|join:"<br />" }}
{% if building.map %}
- <span class="image imageset">
+ <br />
+ <span class="image imageset map">
<a href="{{ building.get_absolute_url }}">
<img alt="map" src="http://maps.googleapis.com/maps/api/staticmap?center={{ building.latitude }},{{ building.longitude }}&zoom={{ building.zoom|add:"-4" }}&size={{ map_size }}&markers=color:red|{{ building.latitude }},{{ building.longitude }}&sensor=false" />
<span class="imageset-item-data image-title text">map &amp; directions</span>
View
2 contacts_and_people/templates/includes/entity_roles.html
@@ -1,5 +1,5 @@
{% regroup entity.get_key_people by role as roles %}
-<dl>
+<dl class="not-indented">
{% for role in roles %}
<dt>{{ role.grouper }}</dt>
{% for person in role.list %}<dd><a href ="{{ person.person.get_absolute_url }}">{{person.person}}</a></dd>{% endfor %}
View
24 news_and_events/templates/includes/details.html
@@ -1,6 +1,6 @@
{% load events_tags %}
<div class = "">
- <dl>
+ <dl class="not-indented">
{% if event.parent %}
{% if event.parent.series %}
<dt>Part of the {{ event.type|lower }} series</dt>
@@ -47,14 +47,20 @@
{% endfor %}
{% endif %}
{% if event.building %}
- <dt>Venue {% if event.children_have_different_venues %}(unless otherwise indicated){% endif %}</dt>
- <dd>{{ event.building.get_postal_address|join:"<br />" }}</dd>
- {% if event.building.map %}
- <dt>Map & directions</dt>
- <dd class="not-indented">
- <a href ="{{event.building.get_absolute_url}}map"><img alt="map" src="http://maps.googleapis.com/maps/api/staticmap?center={{ event.building.latitude }},{{ event.building.longitude }}&zoom={{ event.building.zoom }}&size={{ sidebar_map_size }}&markers=color:red|{{ event.building.latitude }},{{ event.building.longitude }}&sensor=false" /></a>
- </dd>
- {% endif %}
+ <dt>Venue {% if event.children_have_different_venues %}(unless otherwise indicated){% endif %}</dt>
+ <dd>
+ {{ event.building.get_postal_address|join:"<br />" }}
+ {% if event.building.map %}
+ <br />
+ <span class="image imageset map">
+ <a href="{{event.building.get_absolute_url}}map">
+ <img alt="map" src="http://maps.googleapis.com/maps/api/staticmap?center={{ event.building.latitude }},{{ event.building.longitude }}&zoom={{ event.building.zoom|add:"-4" }}&size={{ sidebar_map_size }}&markers=color:red|{{ event.building.latitude }},{{ event.building.longitude }}&sensor=false" />
+ <span class="imageset-item-data image-title text">map &amp; directions</span>
+ <span class="link-arrow"></span>
+ </a>
+ </span>
+ {% endif %}
+ </dd>
{% endif %}
{% if event.precise_location %}
<dt>Location</dt>
View
2 news_and_events/templates/news_and_events/event.html
@@ -28,6 +28,7 @@
{% block main_page_body %}
{% with placeholder_width=generic_main_width %}
{% block arkestra_content %}
+ {% thumbnail event.image.file sidebar_image_size subject_location=event.image.subject_location crop as image %}
<div class="row columns3">
<div class="column firstcolumn doublecolumn">
{% block placeholder %}
@@ -36,7 +37,6 @@
</div>
<div class="column lastcolumn">
{% block image %}{% if not event.body.cmsplugin_set.all %}
- {% thumbnail event.image.file sidebar_image_size subject_location=event.image.subject_location as image %}
{% if image %}<div><img src="{{ image.url }}" /></div>{% endif %}{% endif %}
{% endblock image %}
{% include "includes/details.html" %}
View
4 news_and_events/templates/news_and_events/newsarticle.html
@@ -18,6 +18,7 @@
{% block main_page_body %}
+ {% thumbnail newsarticle.image.file sidebar_image_size subject_location=newsarticle.image.subject_location crop as image %}
{% with placeholder_width=generic_main_width %}
<div class="row columns3">
<div class="column firstcolumn doublecolumn">
@@ -27,10 +28,9 @@
</div>
<div class="column lastcolumn">
{% block image %}
- {% thumbnail newsarticle.image.file sidebar_image_size subject_location=newsarticle.image.subject_location as image %}
{% if image %}<div><img src="{{ image.url }}" /></div>{% endif %}
{% endblock image %}
- <dl>
+ <dl class="not-indented">
<dt>Published</dt>
<dd>{% date newsarticle.date %}</dd>
{% if newsarticle.please_contact.all %}
View
2 vacancies_and_studentships/templates/vacancies_and_studentships/studentship_base.html
@@ -28,7 +28,7 @@
{% thumbnail studentship.image.file 227x0 subject_location=studentship.image.subject_location as image %}
{% if image %}<div><img src="{{ image.url }}" /></div>{% endif %}
{% endblock image %}
- <dl>
+ <dl class="not-indented">
<dt>Closing date</dt>
<dd>{% date studentship.closing_date %}</dd>
{% if studentship.supervisors.all %}
View
2 vacancies_and_studentships/templates/vacancies_and_studentships/vacancy_base.html
@@ -28,7 +28,7 @@
{% thumbnail vacancy.image.file 227x0 subject_location=vacancy.image.subject_location as image %}
{% if image %}<div><img src="{{ image.url }}" /></div>{% endif %}
{% endblock image %}
- <dl> {% if vacancy.hosted_by %}
+ <dl class="not-indented"> {% if vacancy.hosted_by %}
<dt>Where</dt>
<dd><a href="{{ vacancy.hosted_by.get_absolute_url }}">{{ vacancy.hosted_by.short_name }}</a></dd>
{% endif %}

0 comments on commit 987d4fd

Please sign in to comment.