Browse files

Minor template updates

  • Loading branch information...
1 parent 53ed19c commit 3d03b835ac68509de70385e35e3a5501c4a8a774 @brianglass committed Dec 6, 2010
View
BIN communication/__init__.pyc
Binary file not shown.
View
BIN content/__init__.pyc
Binary file not shown.
View
BIN graph/__init__.pyc
Binary file not shown.
View
BIN graph/models.pyc
Binary file not shown.
View
10 templates/Event.html
@@ -1,4 +1,12 @@
-{% extends "ContentBase.html" %}
+{% extends "Place.html" %}
+
+{% block map %}
+ {% if contentItem.place %}
+ {% with contentItem.place as contentItem %}
+ <iframe class="gmap" width="300" height="300" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q={{ contentItem.address1 }},+{{ contentItem.city }},+{{ contentItem.state }},+{{ contentItem.postal_code }}&amp;sll={{ contentItem.gps.y }},{{ contentItem.gps.x }}&amp;ie=UTF8&amp;hq=&amp;hnear={{ contentItem.address1 }},+{{ contentItem.city }},+{{ contentItem.state }},+{{ contentItem.postal_code }}&amp;z=11&amp;output=embed"></iframe>
+ {% endwith %}
+ {% endif %}
+{% endblock map %}
{% block attachments %}
{{ block.super }}
View
17 templates/Home.html
@@ -7,13 +7,26 @@
{% endblock %}
{% block content %}
+ {% comment %}
{% getContent "/father-joe/" as news %}
{% renderContent news.allContent.0 %}
+ {% endcomment %}
+
+ {% getContent "/news/" as news %}
+ {% for story in news.allContent|slice:"2" %}
+ {% renderContent story %}
+ {% endfor %}
+
+ {% comment %}
+ {% getContent "/news/2010/10/19/st-paul-charity-golf-outing" as golf %}
+ {% renderContent golf %}
+ {% endcomment %}
{% getContent "/events/church-calendar" as calendar %}
{% for day,occur in calendar.occurrencesForRollingMonth %}
- {% if forloop.first %}
+ {% ifequal forloop.counter0 0 %}
{% renderContent occur.0.event %}
- {% endif %}
+ {% endifequal %}
{% endfor %}
+
{% endblock %}
View
4 templates/Photograph_element.html
@@ -1,7 +1,7 @@
{% if embed %}
- <img src="{{ element.get_thumbnail_url }}" alt="{{ element.description }}" title="{{ element.title }}" />
+ <img src="{{ element.get_thumbnail_url }}" alt="{{ element.description }}" title="{{ element.caption }}" />
{% else %}
- <img src="{{ element.get_display_url }}" rel="#overlay{{ element.id }}" alt="{{ element.description }}" title="{{ element.title }}" />
+ <img src="{{ element.get_display_url }}" rel="#overlay{{ element.id }}" alt="{{ element.description }}" title="{{ element.caption }}" />
<div class="simple_overlay" id="overlay{{ element.id }}">
<!-- large image -->
View
7 templates/Place.html
@@ -20,10 +20,13 @@
<div class="date">{{ contentItem.publish_start|date:"D, M d, Y" }}</div>
{% endif %}
{% if user.is_authenticated %}
- <div class="edit"><a href="{% url admin:content_story_change contentItem.id %}">edit</a></div>
+ <div class="edit"><a href="{% url admin:events_event_change contentItem.id %}">edit</a></div>
{% endif %}
- <iframe class="gmap" width="300" height="300" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q={{ contentItem.address1 }},+{{ contentItem.city }},+{{ contentItem.state }},+{{ contentItem.postal_code }}&amp;sll={{ contentItem.gps.y }},{{ contentItem.gps.x }}&amp;ie=UTF8&amp;hq=&amp;hnear={{ contentItem.address1 }},+{{ contentItem.city }},+{{ contentItem.state }},+{{ contentItem.postal_code }}&amp;z=11&amp;output=embed"></iframe>
+ {% block map %}
+ <iframe class="gmap" width="300" height="300" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q={{ contentItem.address1 }},+{{ contentItem.city }},+{{ contentItem.state }},+{{ contentItem.postal_code }}&amp;sll={{ contentItem.gps.y }},{{ contentItem.gps.x }}&amp;ie=UTF8&amp;hq=&amp;hnear={{ contentItem.address1 }},+{{ contentItem.city }},+{{ contentItem.state }},+{{ contentItem.postal_code }}&amp;z=11&amp;output=embed"></iframe>
+ {% endblock map %}
+
{{ contentItem.body_text|safe }}
</div>
{% endblock content %}
View
2 templates/VideoEmbeddable_element.html
@@ -1,3 +1,4 @@
+{% if not embed %}
{% ifequal element.video_type "youtube" %}
<object width="500" height="401">
<param name="movie" value="{{ element.video_url }}"></param>
@@ -11,3 +12,4 @@
</embed>
</object>
{% endifequal %}
+{% endif %}
View
6 templates/_content_embed.html
@@ -2,12 +2,12 @@
{% load typogrify %}
<h2><a href="{{ contentItem.get_absolute_url }}">{{ contentItem.title|typogrify }}</a></h2>
-{% if contentItem.elements.all.count %}
- <a href="{{ contentItem.get_absolute_url }}">{% renderElement contentItem.elements.all.0 %}</a>
+{% if contentItem.publishedElements.count %}
+ <a href="{{ contentItem.get_absolute_url }}">{% renderElement contentItem.publishedElements.0 %}</a>
{% endif %}
{% if contentItem.author %}
<div class="author">by {{ contentItem.author }}</div>
{% endif %}
<div class="date">published {{ contentItem.publish_start|date:"l, M d, Y" }}</div>
-{{ contentItem.body_text|truncatewords_html:"50"|smartypants|safe }}
+{{ contentItem.body_text|truncatewords_html:"30"|smartypants|safe }}
<p><a href="{{ contentItem.get_absolute_url }}">Read more…</a></p>

0 comments on commit 3d03b83

Please sign in to comment.