diff options
| author | luxagraf <sng@luxagraf.net> | 2011-01-20 12:25:33 -0500 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2011-01-20 12:25:33 -0500 |
| commit | 40fdd2a51a8ef3eaa9571970ca0cd440d60ce762 (patch) | |
| tree | 1b5ae42cba6d47c7be9725c1fdd0f9a7935f38dc /templates | |
| parent | 205fc827ef1dd21acc95139fca57651c9baccb2d (diff) | |
started work on nat parks proj css, plus changed GA scripts
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 6 | ||||
| -rw-r--r-- | templates/details/entry.html | 8 | ||||
| -rw-r--r-- | templates/details/national-parks.html | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/templates/base.html b/templates/base.html index ec35269..4abf87d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,12 +15,12 @@ type="application/rss+xml" title="RSS 2.0" href="http://feeds2.feedburner.com/luxagraf/blog"> - <link rel="stylesheet" + {%block stylesheet%}<link rel="stylesheet" href="{{MEDIA_URL}}css/base.css" - media="screen"> + media="screen">{%endblock%}{%comment%} <link rel="stylesheet" href="{{MEDIA_URL}}css/print.css" - media="print">{%block stylesheet%}{%endblock%} + media="print">{%endcomment%} <link rel="shortcut icon" href="http://media.luxagraf.net/img/favicon.ico" type="image/vnd.microsoft.icon"> diff --git a/templates/details/entry.html b/templates/details/entry.html index 7952b9f..473c910 100644 --- a/templates/details/entry.html +++ b/templates/details/entry.html @@ -3,14 +3,10 @@ {% 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%}{%if object.template_name == 2%}<link rel="stylesheet" +{%block stylesheet%}{%if object.template_name == 2 or object.template_name == 3 %}<link rel="stylesheet" href="{{MEDIA_URL}}css/dark.css" type="text/css" - media="screen">{%endif%} - {%if object.template_name == 3%}<link rel="stylesheet" - href="{{MEDIA_URL}}css/dark.css" - type="text/css" - media="screen">{%endif%}{%endblock%} + media="screen">{%else%}{{block.super}}{%endif%}{%endblock%} {% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %} diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html index 63a2d8e..7fa2873 100644 --- a/templates/details/national-parks.html +++ b/templates/details/national-parks.html @@ -3,11 +3,11 @@ {% block pagetitle %}Luxagraf | Projects | National Parks {% endblock %} {% block metadescription %}{% endblock %} -{% block extrahead %}<link rel="stylesheet" +{%block stylesheet%}<link rel="stylesheet" href="{{MEDIA_URL}}css/dark.css" - media="screen"> + type="text/css" + media="screen">{%endblock%} -{% endblock %} {%block bodyid%}id="projects-detail"{%endblock%} @@ -26,10 +26,10 @@ </section> <section id="parks">{% for object in object_list %} <article id="park-{{forloop.counter}}"> + <h1>{{object.name}}</h1> <div class="figure"> <img src="{{object.image.url}}" alt="{{object.title}}" /> </div> - <h1>{{object.name}}</h1> <div class="legend"> <h2>{{object.tag_line}}</h2> <ul class="buttons"> |