diff options
Diffstat (limited to 'design')
22 files changed, 28 insertions, 22 deletions
diff --git a/design/templates/archives/guide.html b/design/templates/archives/guide.html index 27ac756..e6e3f97 100644 --- a/design/templates/archives/guide.html +++ b/design/templates/archives/guide.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% load pagination_tags %} {% block pagetitle %}Luxagraf | {% if region %}Travel Guide {{region.name|title|smartypants|safe}}{%else%} Travel Guides, Tips, Tricks and Recommendations {%endif%} Page {{page}}{% endblock %} diff --git a/design/templates/archives/homepage.html b/design/templates/archives/homepage.html index 692b21c..789616c 100644 --- a/design/templates/archives/homepage.html +++ b/design/templates/archives/homepage.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {%block bodyid%}id="home"{%endblock%} {% block primary %}<section class="archive">{% for object in object_list %}{% if forloop.counter == 1 %} diff --git a/design/templates/archives/map.html b/design/templates/archives/map.html index 5b495af..550a898 100644 --- a/design/templates/archives/map.html +++ b/design/templates/archives/map.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% load truncateletters %} {% load slugify_under %} {% block pagetitle %}Luxagraf | Map and Trips{% endblock %} diff --git a/design/templates/archives/map_data.html b/design/templates/archives/map_data.html index aa1bbe7..d235c8e 100644 --- a/design/templates/archives/map_data.html +++ b/design/templates/archives/map_data.html @@ -1,4 +1,4 @@ -{% load typogrify %} +{% load typogrify_tags %} {% load truncateletters %} var map = L.map('map-inner-canvas') diff --git a/design/templates/archives/photos.html b/design/templates/archives/photos.html index bc06f5c..e8d5ea6 100644 --- a/design/templates/archives/photos.html +++ b/design/templates/archives/photos.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% load pagination_tags %} {% block pagetitle %}Luxagraf | {% if region %}Photo Galleries: Images from {{region.name|title|smartypants|safe}}{%else%}Photo Galleries: Images from Around the World {%endif%} Page {{page}}{% endblock %} diff --git a/design/templates/archives/projects.html b/design/templates/archives/projects.html index f266c08..6b865af 100644 --- a/design/templates/archives/projects.html +++ b/design/templates/archives/projects.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}Luxagraf | Projects {% endblock %} {% block metadescription %}Travel Themes and Experiments {% endblock %} diff --git a/design/templates/archives/writing.html b/design/templates/archives/writing.html index dc8ea66..4ed8f44 100644 --- a/design/templates/archives/writing.html +++ b/design/templates/archives/writing.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% load pagination_tags %} {% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%} Page {{page}}{% endblock %} diff --git a/design/templates/bin/recent_entries.html b/design/templates/bin/recent_entries.html index 9bf6b28..6d08971 100644 --- a/design/templates/bin/recent_entries.html +++ b/design/templates/bin/recent_entries.html @@ -1 +1 @@ -{% load typogrify %} +{% load typogrify_tags %} diff --git a/design/templates/details/5x5.html b/design/templates/details/5x5.html index a9bdd63..fc6b187 100644 --- a/design/templates/details/5x5.html +++ b/design/templates/details/5x5.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}Luxagraf | Projects | 5x5 - Interviews from the road {% endblock %} {% block metadescription %}{% endblock %} diff --git a/design/templates/details/about.html b/design/templates/details/about.html index 026d408..d39992b 100644 --- a/design/templates/details/about.html +++ b/design/templates/details/about.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}Luxagraf | About{% endblock %} {% block metadescription %}About: Luxagraf is written and published by Scott Gilbertson. Writing is done in BBEdit, published with GeoDjango. Photos taken with a Panasonic GF1.{% endblock %} {%block htmlclass%}class="single"{%endblock%} diff --git a/design/templates/details/babyvideos.html b/design/templates/details/babyvideos.html index 80b41ab..a91136c 100644 --- a/design/templates/details/babyvideos.html +++ b/design/templates/details/babyvideos.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}Luxagraf | {{object.title}}{% endblock %} {% block extrahead %} <style> diff --git a/design/templates/details/code.html b/design/templates/details/code.html index 1697844..8b72a18 100644 --- a/design/templates/details/code.html +++ b/design/templates/details/code.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}Luxagraf | Projects | Code and Other Experiments {% endblock %} {%block htmlclass%}class="single"{%endblock%} {% block metadescription %}Browser extentsions to block comments on onlineathens.com{% endblock %} diff --git a/design/templates/details/contact.html b/design/templates/details/contact.html index ec47c34..889b9bb 100644 --- a/design/templates/details/contact.html +++ b/design/templates/details/contact.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {%block htmlclass%}class="single"{%endblock%} {% block pagetitle %}Luxagraf: Email{% endblock %} {% block metadescription %}{% endblock %} diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html index 5784831..19039d9 100644 --- a/design/templates/details/entry.html +++ b/design/templates/details/entry.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Writing{%comment%}{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}{%endcomment%}{% endblock %} @@ -28,7 +28,7 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en </aside> </header> <div class="post-body{% with object.template_name as t %}{%if t == 0 or t == 2 %}-single{%endif%}{%if t == 1 or t == 3 %}-double{%endif%}{%endwith%}"> - {{object.body_html|smartypants|widont|safe}} + {{object.body_html|safe|smartypants|widont}} </div>{%if object.template_name == 1 %} <div class="clearfix"></div>{%endif%}{%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%} {%comment%} diff --git a/design/templates/details/guide.html b/design/templates/details/guide.html index c5dc80f..a749083 100644 --- a/design/templates/details/guide.html +++ b/design/templates/details/guide.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}){% endblock %} diff --git a/design/templates/details/national-parks.html b/design/templates/details/national-parks.html index 8c90f84..e17bd72 100644 --- a/design/templates/details/national-parks.html +++ b/design/templates/details/national-parks.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}Luxagraf | Projects | National Parks {% endblock %} {% block metadescription %}{% endblock %} diff --git a/design/templates/details/page.html b/design/templates/details/page.html index 8a79e2c..74c75bd 100644 --- a/design/templates/details/page.html +++ b/design/templates/details/page.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% block pagetitle %}Luxagraf | {{object.title}}{% endblock %} {% block metadescription %}{{object.metadescription}}{% endblock %} {%block htmlclass%}class="single"{%endblock%} diff --git a/design/templates/details/photo.html b/design/templates/details/photo.html index 200995f..e477c73 100644 --- a/design/templates/details/photo.html +++ b/design/templates/details/photo.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% 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%}{%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 %} @@ -82,4 +82,4 @@ </dl> </div> </div> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/design/templates/details/photo_galleries.html b/design/templates/details/photo_galleries.html index cdaf2c2..d992af4 100644 --- a/design/templates/details/photo_galleries.html +++ b/design/templates/details/photo_galleries.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load typogrify %} +{% load typogrify_tags %} {% load number_to_word %} {% block pagetitle %}{{object.set_title}} - Luxagraf, Photos{% endblock %} diff --git a/design/templates/gis/admin/google.js b/design/templates/gis/admin/google.js index a7d1467..3ecb766 100644 --- a/design/templates/gis/admin/google.js +++ b/design/templates/gis/admin/google.js @@ -1,2 +1,2 @@ {% extends "gis/admin/openlayers.js" %}
-{% block base_layer %}new OpenLayers.Layer.Google("Google Base Layer", {'type': G_NORMAL_MAP, 'sphericalMercator' : true});{% endblock %}
\ No newline at end of file +{% block base_layer %}new OpenLayers.Layer.Google("Google Base Layer", {'type': G_NORMAL_MAP, 'sphericalMercator' : true});{% endblock %}
diff --git a/design/templates/gis/admin/osm.html b/design/templates/gis/admin/osm.html new file mode 100644 index 0000000..e27526a --- /dev/null +++ b/design/templates/gis/admin/osm.html @@ -0,0 +1,2 @@ +{% extends "gis/admin/openlayers.html" %} +{% block openlayers %}{% include "gis/admin/osm_extra.js" %}{% endblock %} diff --git a/design/templates/gis/admin/osm_extra.js b/design/templates/gis/admin/osm_extra.js new file mode 100644 index 0000000..774be47 --- /dev/null +++ b/design/templates/gis/admin/osm_extra.js @@ -0,0 +1,4 @@ +{% extends "gis/admin/openlayers.js" %} +{% block base_layer %} +new OpenLayers.Layer.XYZ( "ESRI", "http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/${z}/${y}/${x}", {sphericalMercator: true} ); +{% endblock %} |