Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

person thumbnail images in lists; place templates improved

  • Loading branch information...
commit 4642ae6828f276032d04bf016d06fe390956e476 1 parent 987d4fd
@evildmp authored
View
2  arkestra_utilities/static/arkestra/css/arkestra_lists.css
@@ -15,6 +15,8 @@ ul.entity-tree li {list-style: none;}
/* icons */
+ul.no-marker {list-style-type: none;}
+
ul.icons {
list-style: square url(/static/arkestra/images/default_styles/hand-right.png);
padding-left: 30px;
View
2  arkestra_utilities/templates/arkestra.html
@@ -51,7 +51,7 @@
<body {% block body_attributes %}{% endblock body_attributes %}>
{% cms_toolbar %}
- {% with placeholder_width=960 generic_main_width=523 sidebar_image_size="294x196" entity_image_size="445x384" entity_map_size="445x100" person_map_size="445x100" sidebar_map_size="296x100" person_image_size="460x460" lightbox_max_dimension=600 plugin_thumbnail_size="75x75" place_image_size="627x418" %}
+ {% with placeholder_width=960 generic_main_width=523 sidebar_image_size="294x196" entity_image_size="445x384" entity_map_size="445x100" person_map_size="445x100" sidebar_map_size="296x100" person_image_size="460x460" person_thumbnail_size="40x40" lightbox_max_dimension=600 plugin_thumbnail_size="75x75" place_image_size="627x418" place_map_size="294x182 "%}
{% block body_content %}
<div id="outer-wrapper">
{% block outer_wrapper_top %}{% endblock %}
View
10 contacts_and_people/templates/contacts_and_people/entity_contacts_and_people.html
@@ -32,7 +32,15 @@
{% if entity.get_key_people %}
<div class="">
<h{{ IN_BODY_HEADING_LEVEL }}>Key people</h{{ IN_BODY_HEADING_LEVEL }}>
- {% include "includes/entity_roles.html" %}
+ {% regroup entity.get_key_people by role as roles %}
+ <dl class="not-indented personlist">
+ {% for role in roles %}
+ <dt>{{ role.grouper }}</dt>
+ {% for person in role.list %}
+ {% thumbnail person.person.image.file person_thumbnail_size subject_location=person.person.image.subject_location crop as personimage %}
+ <dd class="row"><a href ="{{ person.person.get_absolute_url }}">{{person.person}}<img class="right" alt="" src="{{ personimage.url }}" /></a></dd>{% endfor %}
+ {% endfor %}
+ </dl>
</div>
{% endif %}
{% if initials_list %}
View
24 contacts_and_people/templates/contacts_and_people/place.html
@@ -20,13 +20,23 @@
{% include "arkestra/tabbed_menu.html" %}
{% block place_information %}
<div class="row columns3">
- <div class="column firstcolumn">
- <p class="subtitle">{{ place.summary|typogrify }}</p>
- {% if place.postcode or place.street %}
- <h2>Address</h2>
- {{ place.get_postal_address|join:"<br />" }}
- {% endif %}
- </div>
+ <div class="column firstcolumn">
+ <p class="subtitle">{{ place.summary|typogrify }}</p>
+ {% if place.postcode or place.street %}
+ <h2>Address</h2>
+ {{ place.get_postal_address|join:"<br />" }}
+ {% if place.map %}
+ <br />
+ <span class="image imageset map">
+ <a href="{{ place.get_absolute_url }}map/">
+ <img alt="map" src="http://maps.googleapis.com/maps/api/staticmap?center={{ place.latitude }},{{ place.longitude }}&zoom={{ place.zoom|add:"-4" }}&size={{ place_map_size }}&markers=color:red|{{ place.latitude }},{{ place.longitude }}&sensor=false" />
+ <span class="imageset-item-data image-title text">map &amp; directions</span>
+ <span class="link-arrow"></span>
+ </a>
+ </span>
+ {% endif %}
+ {% endif %}
+ </div>
<div class="column lastcolumn doublecolumn">
{% thumbnail place.image.file place_image_size subject_location=place.image.subject_location crop as image %}
{% if image %}<p><img src="{{ image.url }}" alt="" /></p>{% endif %}
View
7 contacts_and_people/templates/includes/entity_roles.html
@@ -1,7 +0,0 @@
-{% regroup entity.get_key_people by role as roles %}
-<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 %}
- {% endfor %}
-</dl>
View
7 contacts_and_people/templates/includes/people_with_roles.html
@@ -5,9 +5,12 @@
When provided with a list of people, then for each one will also display the best membership it can find.
{% endcomment %}
-<ul class="none">
+{% load thumbnail %}
+
+<ul class="personlist">
{% for person in people %}
- <li><a href="{{ person.get_absolute_url }}">{{ person }}</a><br />
+ {% thumbnail person.person.image.file person_thumbnail_size subject_location=person.person.image.subject_location crop as personimage %}
+ <li class="row"><a href="{{ person.get_absolute_url }}">{{ person }}<img class="right" alt="" src="{{ personimage.url }}" /></a><br />
{{ person.membership.role}}{% if entity != person.membership.entity %} ({% if entity.get_website != person.membership.entity.get_website and person.membership.entity.get_website %}<a href = "{{ person.membership.entity.get_website_url }}">{{ person.membership.entity.short_name }}</a>{% else %}{{ person.membership.entity.short_name }}{% endif %}){% endif %}
</li>
{% endfor %}
View
2  docs/using_arkestra/templates.rst
@@ -24,7 +24,9 @@ They are set using `{% with %}`/`{% endwith %}` around the `{% block body_conten
person_map_size="445x100" # map thumbnail image for persons
entity_image_size="445x384" # main entity image
person_image_size="384x384" # person's main image
+ person_thumbnail_size="40x40" # person's thumbnail image in lists
place_image_size="627x418" # a place's main image
+ place_map_size="294x182 # the small map on a place page
lightbox_max_dimension=600 # what's the biggest a lightbox can be?
plugin_thumbnail_size="75x75"
Please sign in to comment.
Something went wrong with that request. Please try again.