Permalink
Browse files

fixed issues #47 and #51

  • Loading branch information...
1 parent b92d77d commit 552e57684979874985fd72e20370499dbbf396ee @evildmp committed Oct 12, 2012
@@ -36,7 +36,7 @@
{% 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>
{% include "includes/address.html" %}
- {% if address %}{% include "includes/precise_location.html" %}{% endif %}
+ {% if full_address %}{% include "includes/precise_location.html" %}{% endif %}
{% include "includes/access_notes.html" %}
{% include "includes/email.html" %}
{% include "includes/phone_contacts.html" %}
@@ -1,4 +1,4 @@
-{% if entity.access_note %}
+{% if access_note %}
<dt>Please note</dt>
- <dd>{{ entity.access_note }}</dd>
+ <dd>{{ access_note }}</dd>
{% endif %}
@@ -5,7 +5,7 @@
<br />
{{ full_address|join:"<br />" }}
{% if building.map %}<p><a href="{{ building.get_absolute_url }}">map &amp; directions<br />
- <img alt="map" src="http://maps.googleapis.com/maps/api/staticmap?center={{ building.latitude }},{{ building.longitude }}&zoom={{ building.zoom }}&size={{ entity_image_size }}&markers=color:red|{{ building.latitude }},{{ building.longitude }}&sensor=false" />
+ <img alt="map" src="http://maps.googleapis.com/maps/api/staticmap?center={{ building.latitude }},{{ building.longitude }}&zoom={{ building.zoom }}&size={{ person_entity_map_size }}&markers=color:red|{{ building.latitude }},{{ building.longitude }}&sensor=false" />
</a></p>{% endif %}
</dd>
{% endif %}
@@ -1,4 +1,4 @@
-{% if location %}
+{% if precise_location %}
<dt>Location</dt>
- <dd>{{ location }}</dd>
+ <dd>{{ precise_location }}</dd>
{% endif %}
@@ -128,11 +128,11 @@ def person(request, slug, active_tab=""):
email = contact.email
phone = contact.phone_contacts.all()
- if person.override_entity or person.please_contact:
- location = None
+ if person.please_contact:
+ precise_location = None
else:
- location = person.precise_location
- access_note = person.access_note
+ precise_location = person.precise_location
+ access_note = person.access_note
if home_role:
description = ", ".join((home_role.__unicode__(), entity.__unicode__()))
@@ -220,7 +220,7 @@ def person(request, slug, active_tab=""):
"template": template, # from entity
"building": building,
"email": email, # from person or please_contact
- "location": location, # from person, or None
+ "precise_location": precise_location, # from person, or None
"contact": contact, # from person or please_contact
"phone": phone,
"full_address" : person.get_full_address,

0 comments on commit 552e576

Please sign in to comment.