From 0b481fd7931c2ae20ca21f89a87f2ba6a6c01e10 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Tue, 16 Aug 2011 22:07:54 -0400 Subject: cleaned up html in archives, eliminated some nav and section tags --- templates/archives/homepage.html | 4 +- templates/archives/map.html | 23 +++++------- templates/archives/photos.html | 24 ++++++------ templates/archives/projects.html | 27 ++++++-------- templates/archives/writing.html | 28 ++++++-------- templates/base.html | 8 +++- templates/bin/map_sidebar.html | 48 ++++++++++++------------ templates/bin/recent_entries.html | 2 +- templates/details/about.html | 31 ++-------------- templates/details/code.html | 25 ++++--------- templates/details/contact.html | 67 +++++++++++++++------------------- templates/details/national-parks.html | 20 +++++----- templates/details/photo_galleries.html | 17 +++------ 13 files changed, 132 insertions(+), 192 deletions(-) (limited to 'templates') diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html index 8ee30e4..11cbf4b 100644 --- a/templates/archives/homepage.html +++ b/templates/archives/homepage.html @@ -12,7 +12,7 @@ {% if featured.country_name == "United States" %}{{featured.location_name|smartypants|safe}}, {{featured.state_name}}{%else%}{{featured.location_name|smartypants|safe}}, {{featured.country_name}}{%endif%}   - +

{{featured.dek|safe}} More »

@@ -28,4 +28,4 @@ {% endblock %} -{% block js %}{% endblock%} \ No newline at end of file +{% block js %}{% endblock%} diff --git a/templates/archives/map.html b/templates/archives/map.html index 1821fee..effe150 100644 --- a/templates/archives/map.html +++ b/templates/archives/map.html @@ -23,18 +23,13 @@ Google Maps code -{% block primary %}
- +{% block primary %} +
+

Browse luxagraf by map

+
+ {% include 'includes/map_sidebar.html' %}
-
-
-
- -
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/archives/photos.html b/templates/archives/photos.html index e31bd05..bc06f5c 100644 --- a/templates/archives/photos.html +++ b/templates/archives/photos.html @@ -8,16 +8,13 @@ {%block bodyid%}id="photo-archive"{%endblock%} -{% block primary %}
-

{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}

- -
+{% block primary %} +
+

{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}

    {% autopaginate object_list 18 %} {% for object in object_list %}
  • @@ -29,6 +26,7 @@
    • {% endfor %}
- -{% endblock %} \ No newline at end of file +
+ +{% endblock %} diff --git a/templates/archives/projects.html b/templates/archives/projects.html index da60af4..f266c08 100644 --- a/templates/archives/projects.html +++ b/templates/archives/projects.html @@ -5,19 +5,16 @@ {%block bodyid%}id="projects-page"{%endblock%} -{% block primary %} -
- -

Projects

-

These are a few of the things that I use to inspire myself to do more. The truth is, just about everything is amazing when viewed from the proper perspective.

- -

The projects on luxagraf are more or less goals I've created in effort to get my body in motion, because the difference between the mundane and the amazing is often simply motion. To move is to do, and to do is to live.

-
{%for object in object_list %} +{% block primary %} +
+

These are a few of the things that I use to inspire myself to do more. The truth is, just about everything is amazing when viewed from the proper perspective.

+

The projects on luxagraf are more or less goals I've created in effort to get my body in motion, because the difference between the mundane and the amazing is often simply motion. To move is to do, and to do is to live.

+
+
+

Projects

{%for object in object_list %} {% endfor %}
- -
{% endblock %} -{% block js %}{% endblock%} \ No newline at end of file +{% block js %}{% endblock%} diff --git a/templates/archives/writing.html b/templates/archives/writing.html index e880343..983b59a 100644 --- a/templates/archives/writing.html +++ b/templates/archives/writing.html @@ -7,18 +7,14 @@ {%block bodyid%}id="writing"{%endblock%} -{% block primary %}
-

{% if region %}Writings from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing {%endif%}

- -
-
{% autopaginate object_list 10 %} {% for object in object_list %} +{% block primary %} +
+

{% if region %}Writing Archive from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing Archive {%endif%}

{% autopaginate object_list 10 %} {% for object in object_list %} {% endfor %}
- + {% endblock %} -{% block js %}{% endblock%} \ No newline at end of file +{% block js %}{% endblock%} diff --git a/templates/base.html b/templates/base.html index a836845..8f07139 100644 --- a/templates/base.html +++ b/templates/base.html @@ -22,8 +22,11 @@ href="{{MEDIA_URL}}css/ie.css" media="screen"> - - {%block extrahead%}{%endblock%} + + + {%block extrahead%}{%endblock%}
@@ -35,6 +38,7 @@
  • Writing,
  • Photos,
    • +
  • Guides,
  • Map,
  • Projects,
  • Etc
    • diff --git a/templates/bin/map_sidebar.html b/templates/bin/map_sidebar.html index 635c522..e61852f 100644 --- a/templates/bin/map_sidebar.html +++ b/templates/bin/map_sidebar.html @@ -1,25 +1,23 @@ -{% load truncateletters %} -{% load slugify_under %} -
    -

    Trips

    - -

    Regions

    - - -

    Countries

    - - -
    \ No newline at end of file +{% load truncateletters %}{% load slugify_under %}
    +

    Trips

    + +

    Regions

    + + +

    Countries

    + + +
    diff --git a/templates/bin/recent_entries.html b/templates/bin/recent_entries.html index 0cf3034..f86d6f2 100644 --- a/templates/bin/recent_entries.html +++ b/templates/bin/recent_entries.html @@ -5,7 +5,7 @@   - +

    {%if object.thumbnail%}{%endif%}

    {{object.dek|safe}}

    diff --git a/templates/details/about.html b/templates/details/about.html index d0366d4..6dde0e9 100644 --- a/templates/details/about.html +++ b/templates/details/about.html @@ -5,43 +5,20 @@ {%block htmlclass%}class="single"{%endblock%} {%block bodyid%}id="about"{%endblock%} -{% block primary %}
    -

    About Luxagraf

    - -
    - +{% block primary %}

    About Luxagraf

    Luxagraf is written and published by Scott Gilbertson.

    Scott Gilbertson Photo by @lagsolo

    -

    Colophon

    Luxagraf is published using a custom content management system written with the GeoDjango framework. The site validates as HTML5 and uses @media rules to handle phones, iPads and the like. It should work in any modern web browser. If you have trouble, let me know.

    -

    I write in long hand because I am an old man and that's we roll. I make the clackity noise in BBEdit, the best text editor ever.

    -

    Currently photos are taken with a Panasonic GF1. In the past I have used a Panasonic LX2 and a Canon S45. Minimal processing is done with Adobe Lightroom and Photoshop. The photo gallery layout was inspired by the lovely Pictory photo showcase. Also note that while the writing is copyrighted to me, the photos are licensed under a Creative Commons attribution, share-alike license, which means you're free to use them so long as you attribute them to me.

    - - {%comment%} -
    {%for object in object_list %}{%if forloop.last %} - {{object.content|smartypants|safe}}{%endif%} {% endfor %} -
    - -
    -

    Colophon

    - me -
    {%for object in object_list %}{%if forloop.counter = 2 %} - {{object.content|smartypants|safe}}{%endif%} {% endfor %} -
    -
    - {%endcomment%}
    {% endblock %} diff --git a/templates/details/code.html b/templates/details/code.html index a593ae7..1697844 100644 --- a/templates/details/code.html +++ b/templates/details/code.html @@ -35,25 +35,16 @@ article[role="main"] a { color: #b53a04;} {% endblock %} {%block bodyid%}id="code"{%endblock%} -{% block primary %}
    -

    Code

    - -
    -
    - {% for object in object_list %} -
    -

    {{object.name}}

    -
    +{% block primary %} +
    {% for object in object_list %} +

    {{object.name}}

    {{object.body_html|smartypants|widont|safe}} -
    - {% endfor %} + {% endfor %}
    diff --git a/templates/details/contact.html b/templates/details/contact.html index 5956e51..ec47c34 100644 --- a/templates/details/contact.html +++ b/templates/details/contact.html @@ -5,42 +5,35 @@ {% block metadescription %}{% endblock %} {%block bodyid%}id="contact"{%endblock%} -{% block primary %}
    -

    Luxagraf: Contact

    - -
    -
    -
    -

    Contact Information

    -
    -
    -

    I'd love to hear what you think about the posts on luxagraf. If you use Twitter, send me a message: @luxagraf.

    -

    Then there's email. I'm not a big fan. Or rather I don't have the time to respond the way I would like to, which makes me like it less. So if you email me and don't hear back, or you do but it's five months later and you've entirely forgotten that you even emailed me in the first place, please don't take it personally.

    - -

    Please send your thoughts to:

    -

    - -

    -
    -
    +{% block primary %} +
    +

    Contact Information

    +
    +

    I'd love to hear what you think about the posts on luxagraf. If you use Twitter, send me a message: @luxagraf.

    +

    Then there's email. I'm not a big fan. Or rather I don't have the time to respond the way I would like to, which makes me like it less. So if you email me and don't hear back, or you do but it's five months later and you've entirely forgotten that you even emailed me in the first place, please don't take it personally.

    + +

    Please send your thoughts to:

    +

    + +

    +
    +
    {% endblock %} diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html index 16cfbf1..dc3f7fb 100644 --- a/templates/details/national-parks.html +++ b/templates/details/national-parks.html @@ -8,16 +8,13 @@ {% block htmlclass %}class="dark"{% endblock %} -{% block primary %}
    -

    The National Parks Project

    - -
    {% for object in object_list %} +{% block primary %} +
    +

    The National Parks Project

    {% for object in object_list %}

    {{object.name}}

    @@ -45,6 +42,7 @@
    {% endfor %} +
    {% endblock %} {% block js %} @@ -52,4 +50,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html index 6e4f4d5..e61c9b7 100644 --- a/templates/details/photo_galleries.html +++ b/templates/details/photo_galleries.html @@ -10,19 +10,14 @@ {%block bodyid%}class="image_gallery"{%endblock%} -{% block primary %}
    -

    Photos from {{object.set_title}}

    - -
    +{% block primary %}

    Use left/right arrow keys to navigate through photos

    - {%for photo in object.photos.all reversed %} +

    Photos from {{object.set_title}}

    {%for photo in object.photos.all reversed %}