diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/archives/photos.html | 10 | ||||
| -rw-r--r-- | templates/archives/projects.html | 2 | ||||
| -rw-r--r-- | templates/base.html | 27 | ||||
| -rw-r--r-- | templates/details/entry.html | 6 | ||||
| -rw-r--r-- | templates/details/national-parks.html | 11 |
5 files changed, 32 insertions, 24 deletions
diff --git a/templates/archives/photos.html b/templates/archives/photos.html index 84cbf01..85bc498 100644 --- a/templates/archives/photos.html +++ b/templates/archives/photos.html @@ -21,12 +21,12 @@ <ul id="photo-galleries">{% autopaginate object_list 18 %} {% for object in object_list %} <li> <div class="figure"> - <a href="{{object.get_absolute_url}}"><img src="{{object.get_main_image}}" alt="{{ object.set_title }}"/></a> + <a href="{{object.get_absolute_url}}"><img src="{{object.get_main_image}}" alt="{{ object.set_title }}"/></a> + <span class="legend"> + <h3>{{object.set_title}}</h3> + <p>{{object.set_desc|truncatewords:30|smartypants|safe}}</p> + </span> </div> - <span class="legend"> - <h3>{{object.set_title}}</h3> - <p>{{object.set_desc|truncatewords:30|smartypants|safe}}</p> - </span> </li>{% endfor %} </ul> diff --git a/templates/archives/projects.html b/templates/archives/projects.html index 8efe6aa..2f0d607 100644 --- a/templates/archives/projects.html +++ b/templates/archives/projects.html @@ -20,7 +20,7 @@ <ul class="project-tease"> <li> <div class="tease"> - <h4><a href="{{project.get_absolute_url}}">{{project.title|safe}}{{project.subtitle|safe}}</a></h4> + <h3><a href="{{project.get_absolute_url}}">{{project.title|safe}}{{project.subtitle|safe}}</a></h3> <div class="lede hyphenate">{{project.lede|smartypants|safe}}</div> <span class="button"><a href="{{project.get_absolute_url}}">More »</a></span> diff --git a/templates/base.html b/templates/base.html index d41180c..3bff0fc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,20 +1,30 @@ + <!DOCTYPE html> +<!--[if gte IE 6]> + <![if IE 6]> + <html lang="en" class="ie ie6"> + <![endif]> + <![if IE 7]> + <html lang="en" class="ie ie7"> + <![endif]> + <![if gt IE 7]> + <html lang="en" class="ie ie8"> + <![endif]> +<![endif]--> +<!--[if !IE]> <--> <html lang="en"> -<head> +<!--> <![endif]--> + <head> <title>{% block pagetitle %}Luxagraf - Topografical Writings{% endblock %}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <!--[if IE]> <script src="{{MEDIA_URL}}js/html5.js"></script> <![endif]--> - - <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://feeds2.feedburner.com/luxagraf/blog"> - - <link rel="stylesheet" href="{{MEDIA_URL}}css/base.css" type="text/css" @@ -25,8 +35,6 @@ media="print"> {%block stylesheet%}{%endblock%} - <!--[if IE]><link rel="stylesheet" href="{{MEDIA_URL}}css/ie.css" type="text/css" media="screen, projection"><![endif]--> - <!--[if lte IE 6]><link rel="stylesheet" href="{{MEDIA_URL}}css/ie6.css" type="text/css" media="screen, projection"><![endif]--> <link rel="shortcut icon" href="http://media.luxagraf.net/img/favicon.ico" @@ -57,8 +65,7 @@ <body {%block bodyid%}{%endblock%}{%block bodyevents%}{%endblock%}> <header> <hgroup> - - <h1><a href="/" title="home">Luxagraf</a></h1> + <h1><a id="logo" href="/" title="home">Luxagraf</a></h1> <h2><a href="/about/" title="About Luxagraf">{a travelogue}</a></h2> </hgroup> <nav> @@ -104,4 +111,4 @@ pageTracker._trackPageview(); } catch(err) {}</script> </body> -</html>
\ No newline at end of file +</html> diff --git a/templates/details/entry.html b/templates/details/entry.html index 283c6af..2895756 100644 --- a/templates/details/entry.html +++ b/templates/details/entry.html @@ -22,11 +22,11 @@ <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="{%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 bodyid%}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 %} - <article> + <article id="writing-detail"> <header> <h1>{{object.title|smartypants|widont|safe}}</h1> <aside class="meta"> @@ -37,7 +37,7 @@ </aside> </header> - <div id="post-body" class="hyphenate"> + <div id="post-body"> {{object.body_html|smartypants|widont|safe}} </div> {%if object.template_name == 1 %}<div class="clearfix"></div>{%endif%} diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html index 4e1084e..5a5da40 100644 --- a/templates/details/national-parks.html +++ b/templates/details/national-parks.html @@ -4,11 +4,6 @@ {% block metadescription %}{% endblock %} {% block extrahead %} -<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" type="text/css" @@ -70,4 +65,10 @@ {% endblock %} +{% block js %} +<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> +{% endblock %}
\ No newline at end of file |