summaryrefslogtreecommitdiff
path: root/templates/details
diff options
context:
space:
mode:
Diffstat (limited to 'templates/details')
-rw-r--r--templates/details/entry.html30
-rw-r--r--templates/details/national-parks.html12
-rw-r--r--templates/details/photo.html10
-rw-r--r--templates/details/photo_galleries.html6
4 files changed, 27 insertions, 31 deletions
diff --git a/templates/details/entry.html b/templates/details/entry.html
index 9bd8535..db378a7 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -1,16 +1,16 @@
{% extends 'base.html' %}
{% load typogrify %}
-{% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% 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 pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% 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 %}
-{%block stylesheet%}{%ifequal object.template_name 2%}<link rel="stylesheet"
- href="{{media_url}}css/dark.css"
+{%block stylesheet%}{%if object.template_name == 2%}<link rel="stylesheet"
+ href="{{MEDIA_URL}}css/dark.css"
type="text/css"
- media="screen">{%endifequal%}
- {%ifequal object.template_name 3%}<link rel="stylesheet"
- href="{{media_url}}css/dark.css"
+ media="screen">{%endif%}
+ {%if object.template_name == 3%}<link rel="stylesheet"
+ href="{{MEDIA_URL}}css/dark.css"
type="text/css"
- media="screen">{%endifequal%}{%endblock%}
+ media="screen">{%endif%}{%endblock%}
{% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
@@ -18,11 +18,11 @@
<link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
<meta name="ICBM" content="{{object.latitude}}, {{object.longitude}}" />
<meta name="geo.position" content="{{object.latitude}}; {{object.longitude}}" />
- <meta name="geo.placename" content="{% 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%}">
- <meta name="geo.region" content="{% ifequal object.location.state.country.name "United States" %}{{object.location.state.country.iso2}}-{{object.location.state.iso2}}{%else%}{{object.location.state.country.iso2}}{% endifequal%}">
+ <meta name="geo.placename" content="{% 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%}">
+ <meta name="geo.region" content="{% if object.location.state.country.name == "United States" %}{{object.location.state.country.iso2}}-{{object.location.state.iso2}}{%else%}{{object.location.state.country.iso2}}{% endif%}">
{%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 @@
<header>
<h1>{{object.title|smartypants|widont|safe}}</h1>
<aside class="meta">
- <section class="geo">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%} <span class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span></section>
+ <section class="geo">{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%} <span class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span></section>
{%comment%}<span class="topics">Topics: {%for topic in object.topics.all%}<a href="{{topic.get_absolute_url}}" title="view more {{topic.name}} posts">{{topic.name}}</a>{%if forloop.last%}{%else%}, {%endif%}{% endfor %}</span>{%endcomment%}
</aside>
</header>
- <div id="post-body">
+ <div id="post-body" class="hyphenate">
{{object.body_html|smartypants|widont|safe}}
</div>
- {%ifequal object.template_name 1%}<div class="clearfix"></div>{%endifequal%}
- {%ifequal object.template_name 3%}<div class="clearfix"></div>{%endifequal%}
+ {%if object.template_name == 1 %}<div class="clearfix"></div>{%endif%}
+ {%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
<section id="post-metadata">
<h4 class="hide">About {{object.title|smartypants|safe}}</h4>
- <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%ifequal object.location.state.country.name 'United States'%}<a href="/maps/#{{object.location.state.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}{{object.location.state.country.name}}{%endifequal%}.
+ <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%if object.location.state.country.name == 'United States'%}<a href="/maps/#{{object.location.state.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}{{object.location.state.country.name}}{%endif%}.
Follow along on <a href="http://twitter.com/luxagraf" title="twitter" rel="me">Twitter</a> or by subscribing to the <a href="http://feeds.feedburner.com/luxagraf/blog" title="writing RSS 2.0 feed">RSS Feed</a>. For more about me, see the <a href="/about/" title="about luxagraf">about page</a>. To get in touch please use the <a href="/contact/" title="contact me">contact form</a> or leave a comment below.</p>
</section>
<section id="page-navigation">
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 %}
-<script type="text/javascript" src="/media/js/jquery.js"></script>
-<script src="http://documentcloud.github.com/underscore/underscore-min.js" type="text/javascript"></script>
-<script src="/media/js/natparks.js" type="text/javascript"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/underscore-min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/natparks.js" ></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-
-
-
-
<link rel="stylesheet"
- href="{{media_url}}css/dark.css"
+ href="{{MEDIA_URL}}css/dark.css"
type="text/css"
media="screen">
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"}}<span class="small byline">{% 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%}</span>{% 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"}}<span class="small byline">{% 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%}</span>{% endblock %}
@@ -12,9 +12,9 @@
{% block primary %}
<a href="http://flickr.com/photos/luxagraf/{{object.flickr_id}}/" title="View {{object.flickr_title}} on Flickr.com"><img class="flickr-image" src="{{ object.get_medium_url }}" alt="{{object.title}}" title="{{object.title}}" /></a>
- {% ifnotequal object.description 'None' %}
+ {% if object.description != 'None' %}
<p>{{ object.description|smartypants|widont|safe }}</p>
- {%endifnotequal %}
+ {%endif %}
<p>Other Sizes: <a href="{{object.get_large_url}}" title="see large image">Large</a> and
<a href="http://flickr.com/photo_zoom.gne?id={{object.flickr_id}}&size=o" title="see original image">Original</a></p>
@@ -72,7 +72,7 @@
<dl class="sidebar meta">
<dt>Camera:</dt>
- <dd>{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd>
+ <dd>{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd>
<dt>Aperture:</dt>
<dd>{%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}</dd>
<dt>Shutter Speed:</dt>
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 @@
<link rel="stylesheet"
- href="{{media_url}}css/photos.css"
+ href="{{MEDIA_URL}}css/photos.css"
type="text/css"
media="screen">
@@ -81,9 +81,9 @@
<div class="meta" style="display: none;">
<dl>
<dt>Camera:</dt>
- <dd>{% ifequal photo.exif_make 'Canon'%}{{photo.exif_model}}{%endifequal%}{% ifequal photo.exif_model 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endifequal%}{%ifequal photo.exif_model 'DMC-GF1' %}<a href="http://amzn.to/cLQozJ" title="Buy on Amazon">{{photo.exif_make}} {{photo.exif_model}}</a>{%endifequal%}</dd>
+ <dd>{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}<a href="http://amzn.to/cLQozJ" title="Buy on Amazon">{{photo.exif_make}} {{photo.exif_model}}</a>{%endif%}</dd>
<dt>Lens: </dt>
- <dd>{%ifequal photo.exif_lens 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endifequal%}{%ifequal photo.exif_lens 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endifequal%}{%ifequal photo.exif_lens '' %}Built-in{%endifequal%}</dd>
+ <dd>{%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endif%}{%if photo.exif_lens =='' %}Built-in{%endif%}</dd>
<dt>Exposure</dt>
<dd>{{photo.exif_exposure}}</dd>
<dt>Aperture</dt>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-16 05:35:20 +0000