From eb3f49331e2ed0c1373ac78ce6935f2370b9e968 Mon Sep 17 00:00:00 2001 From: "luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f" Date: Sat, 12 Jun 2010 18:25:46 +0000 Subject: added hyphenation support and changed to justified text for homepage and writing archives. Also eliminated ifequal and ifnotequal template tags --- templates/archives/homepage.html | 10 +++++---- templates/archives/photos.html | 4 ++-- templates/archives/projects.html | 4 +++- templates/archives/topics.html | 2 +- templates/archives/writing.html | 11 ++++----- templates/base.html | 8 +++---- templates/details/entry.html | 30 ++++++++++++------------- templates/details/national-parks.html | 12 ++++------ templates/details/photo.html | 10 ++++----- templates/details/photo_galleries.html | 6 ++--- templates/includes/map_entry_list_template.html | 2 +- templates/includes/recent_entries.html | 15 ++++++++----- templates/includes/recent_entries_template.html | 7 +++--- 13 files changed, 63 insertions(+), 58 deletions(-) (limited to 'templates') diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html index 7003943..2436795 100644 --- a/templates/archives/homepage.html +++ b/templates/archives/homepage.html @@ -12,12 +12,12 @@

{{featured.title|smartypants|widont|safe}}

- {% ifequal featured.location.state.country.name "United States" %}{{featured.location.name|smartypants|safe}}, {{featured.location.state.name}}{%else%}{{featured.location.name|smartypants|safe}}, {{featured.location.state.country.name}}{%endifequal%}   + {% if featured.location.state.country.name == "United States" %}{{featured.location.name|smartypants|safe}}, {{featured.location.state.name}}{%else%}{{featured.location.name|smartypants|safe}}, {{featured.location.state.country.name}}{%endif%}  

-

{{featured.dek|safe}}

- More » +

{{featured.dek|safe}}

+ More »
{{ object.title }} @@ -48,3 +48,4 @@ +{% block js %}{% endblock%} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 351df30..320b114 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,7 +5,7 @@ @@ -16,16 +16,16 @@ {%block stylesheet%}{%endblock%} - + {%endifequal%} - {%ifequal object.template_name 3%}{%endif%} + {%if object.template_name == 3%}{%endifequal%}{%endblock%} + media="screen">{%endif%}{%endblock%} {% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %} @@ -18,11 +18,11 @@ - - + + {%endblock%} -{%block bodyid%}id="writing-detail" class="{%ifequal object.template_name 0%}single"{%endifequal%}{%ifequal object.template_name 2%}single"{%endifequal%}{%ifequal object.template_name 1%}double"{%endifequal%}{%ifequal object.template_name 3%}double"{%endifequal%}{%endblock%} +{%block bodyid%}id="writing-detail" class="{%if object.template_name == 0 %}single"{%endif%}{%if object.template_name == 2%}single"{%endif%}{%if object.template_name == 1 %}double"{%endif%}{%if object.template_name == 3 %}double"{%endif%}{%endblock%} {% block primary %} @@ -30,21 +30,21 @@

{{object.title|smartypants|widont|safe}}

-
+
{{object.body_html|smartypants|widont|safe}}
- {%ifequal object.template_name 1%}
{%endifequal%} - {%ifequal object.template_name 3%}
{%endifequal%} + {%if object.template_name == 1 %}
{%endif%} + {%if object.template_name == 3 %}
{%endif%}

About {{object.title|smartypants|safe}}

-

Posted , from {{object.location.name|smartypants|safe}}, {%ifequal object.location.state.country.name 'United States'%}{{object.location.state.name|smartypants|safe}}{% else %}{{object.location.state.country.name}}{%endifequal%}. +

Posted , from {{object.location.name|smartypants|safe}}, {%if object.location.state.country.name == 'United States'%}{{object.location.state.name|smartypants|safe}}{% else %}{{object.location.state.country.name}}{%endif%}. Follow along on Twitter or by subscribing to the RSS Feed. For more about me, see the about page. To get in touch please use the contact form or leave a comment below.

diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html index 0ba0636..4e1084e 100644 --- a/templates/details/national-parks.html +++ b/templates/details/national-parks.html @@ -4,17 +4,13 @@ {% block metadescription %}{% endblock %} {% block extrahead %} - - - + + + - - - - diff --git a/templates/details/photo.html b/templates/details/photo.html index 22adeb9..200995f 100644 --- a/templates/details/photo.html +++ b/templates/details/photo.html @@ -1,8 +1,8 @@ {% extends 'base.html' %} {% load typogrify %} {% block pagetitle %}Luxagraf | {{object.title|title|smartypants|safe}}{% endblock %} -{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% endblock %} -{% block date %}{{object.pub_date|date:"F j, Y"}}{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}{% endblock %} +{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% endblock %} +{% block date %}{{object.pub_date|date:"F j, Y"}}{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endif%}{% endblock %} @@ -12,9 +12,9 @@ {% block primary %} {{object.title}} - {% ifnotequal object.description 'None' %} + {% if object.description != 'None' %}

{{ object.description|smartypants|widont|safe }}

- {%endifnotequal %} + {%endif %}

Other Sizes: Large and Original

@@ -72,7 +72,7 @@
Camera:
-
{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}
+
{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}
Aperture:
{%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}
Shutter Speed:
diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html index 8c1e097..04e1088 100644 --- a/templates/details/photo_galleries.html +++ b/templates/details/photo_galleries.html @@ -16,7 +16,7 @@ @@ -81,9 +81,9 @@