diff options
| author | luxagraf <sng@luxagraf.net> | 2011-01-20 11:31:33 -0600 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2011-01-20 11:31:33 -0600 |
| commit | 5a358a9ad5fc93c0db894e5e075b992f8b4e0cbd (patch) | |
| tree | 51b75c02f8a2467443956f9ed63c998fdd1ff31d /templates/details | |
| parent | d594e5dac52b2c3c4b8e462aa6f2c11d30165d28 (diff) | |
| parent | 40fdd2a51a8ef3eaa9571970ca0cd440d60ce762 (diff) | |
Merge branch 'master' of http://git.luxagraf.net/luxagraf
Conflicts:
apps/blog/models.py
Diffstat (limited to 'templates/details')
| -rw-r--r-- | templates/details/entry.html | 8 | ||||
| -rw-r--r-- | templates/details/national-parks.html | 8 |
2 files changed, 6 insertions, 10 deletions
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"> |