diff options
Diffstat (limited to 'templates/archives')
| -rw-r--r-- | templates/archives/homepage.html | 4 | ||||
| -rw-r--r-- | templates/archives/map.html | 23 | ||||
| -rw-r--r-- | templates/archives/photos.html | 24 | ||||
| -rw-r--r-- | templates/archives/projects.html | 27 | ||||
| -rw-r--r-- | templates/archives/writing.html | 28 |
5 files changed, 45 insertions, 61 deletions
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 @@ <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{% if featured.country_name == "United States" %}{{featured.location_name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{featured.state_name}}</a>{%else%}{{featured.location_name|smartypants|safe}}, <a href="/writing/{{featured.country_name|slugify}}/1/" title="travel writing from {{featured.country_name}}">{{featured.country_name}}</a>{%endif%} <meta itemprop="latitude" content="{{featured.latitude}}" /> <meta itemprop="longitude" content="{{featured.longitude}}" /></span> - <time datetime="{{featured.pub_date|date:'c'}}">{{featured.pub_date|date:"m/d/y"}}</time> + <time datetime="{{featured.pub_date|date:'c'}}" pubdate>{{featured.pub_date|date:"m/d/y"}}</time> </p> <p class="hyphenate">{{featured.dek|safe}} <span class="button"><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More »</a></span> </p> @@ -28,4 +28,4 @@ </section> {% endblock %} -{% block js %}<script src="{{MEDIA_URL}}js/hyphenate.min.js" type="text/javascript"></script>{% endblock%}
\ No newline at end of file +{% block js %}<script src="{{MEDIA_URL}}js/hyphenate.min.js" type="text/javascript"></script>{% 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 %}<section id="page-header"> - <nav class="bl" id="page-nav"> - <ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> - <li><a href="/" itemprop="url" title="luxagraf homepage"><span itemprop="title">Home</span></a> →</li> - <li>Map</li> - </ul> - </nav> +{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> + <li><a href="/" itemprop="url" title="luxagraf homepage"><span itemprop="title">Home</span></a> →</li> + <li>Map</li> + </ul> + <section> + <h1 class="hide">Browse luxagraf by map</h1> + <div id="map-canvas"></div> + {% include 'includes/map_sidebar.html' %} </section> - <article> - <div id="map-canvas"> - </div> - <aside>{% include 'includes/map_sidebar.html' %} - </aside> - </article> -{% 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 %}<section id="page-header"> - <h1 class="hide">{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}</h1> - <nav class="bl"> - <ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> - <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> →</li> - {% if region %}{%if region.name == 'United States'%} <li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> →</li> - <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> →</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}<li>Photos </li>{%endif%} - </ul> - </nav> - </section> +{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> + <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> →</li> + {% if region %}{%if region.name == 'United States'%} <li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> →</li> + <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> →</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}<li>Photos </li>{%endif%} + </ul> + <section> + <h1 class="hide">{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}</h1> <ul id="photo-galleries">{% autopaginate object_list 18 %} {% for object in object_list %} <li> <div class="figure"> @@ -29,6 +26,7 @@ </div> </li>{% endfor %} </ul> - <nav id="pagination">{% paginate %} - </nav> -{% endblock %}
\ No newline at end of file + </section> + <div id="pagination">{% paginate %} + </div> +{% 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 %} -<article> - <nav class="bl" id="page-nav"> - <ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> - <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> → </li> - <li>Projects</li> - </ul> - </nav> - <h1 class="hide">Projects</h1> - <div class="top"><p class="col hyphenate">These are a few of the things that I use to inspire myself to do more. The truth is, just about <a href="http://www.youtube.com/watch?v=8r1CZTLk-Gk" title="Louis CK talking about how everything is amazing">everything is amazing</a> when viewed from the proper perspective. </p> - - <p class="col two hyphenate">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.</p></div> - <section id="projects-archive" class="archive"> {%for object in object_list %} +{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> + <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> → </li> + <li>Projects</li> + </ul> + <div class="top"> + <p class="col hyphenate">These are a few of the things that I use to inspire myself to do more. The truth is, just about <a href="http://www.youtube.com/watch?v=8r1CZTLk-Gk" title="Louis CK talking about how everything is amazing">everything is amazing</a> when viewed from the proper perspective. </p> + <p class="col two hyphenate">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.</p> + </div> + <section id="projects-archive" class="archive"> + <h1 class="hide">Projects</h1>{%for object in object_list %} <article> <h1><a href="{{object.get_absolute_url}}" title="{{object.title}}">{{object.title|safe}} {{object.subtitle|safe}}</a></h1> <div class="img"> @@ -27,8 +24,6 @@ <!--<span class="button"><a href="{{project.get_absolute_url}}">More »</a></span>--> </article> {% endfor %} </section> - -</article> {% endblock %} -{% block js %}<script src="/media/js/hyphenate.min.js" type="text/javascript"></script>{% endblock%}
\ No newline at end of file +{% block js %}<script src="/media/js/hyphenate.min.js" type="text/javascript"></script>{% 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 %}<section id="page-header"> - <h1 class="hide">{% if region %}Writings from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing {%endif%}</h1> - <nav class="bl"> - <ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> - <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> → </li> - {% if region %}{%if region.name == 'United States'%} <li><a href="/writing/" title="See all Writing" itemprop="url"><span itemprop="title">Writing</span></a> →</li> - <li itemprop="title">the United States</li>{%else%}<li><a href="/writing/" title="See all Writing" itemprop="url"><span>Writing</span></a> →</li> - <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>Writing </li>{%endif%} - </ul> - </nav> - </section> - <section id="writing-archive" class="archive"> {% autopaginate object_list 10 %} {% for object in object_list %} +{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> + <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> → </li> + {% if region %}{%if region.name == 'United States'%} <li><a href="/writing/" title="See all Writing" itemprop="url"><span itemprop="title">Writing</span></a> →</li> + <li itemprop="title">the United States</li>{%else%}<li><a href="/writing/" title="See all Writing" itemprop="url"><span>Writing</span></a> →</li> + <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>Writing </li>{%endif%} + </ul> + <section id="writing-archive" class="archive"> + <h1 class="hide">{% if region %}Writing Archive from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing Archive {%endif%}</h1>{% autopaginate object_list 10 %} {% for object in object_list %} <article> <h1><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h1> <div class="img"> @@ -28,15 +24,15 @@ <p class="location bl" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state_name}}</a>{%else%}{{object.location_name|smartypants|safe}}, <a href="/writing/{{object.country_name|slugify}}/1/" title="travel writing from {{object.country_name}}">{{object.country_name}}</a>{%endif%} <meta itemprop="latitude" content="{{object.latitude}}" /> <meta itemprop="longitude" content="{{object.longitude}}" /></p> - <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"m/d/y"}}</time> + <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"m/d/y"}}</time> </div> <p class="hyphenate">{{object.dek|safe}}</p> </article> {% endfor %} </section> - <nav id="pagination">{% paginate %} - </nav> + <div id="pagination">{% paginate %} + </div> {% endblock %} -{% block js %}<script src="{{MEDIA_URL}}js/hyphenate.min.js" type="text/javascript"></script>{% endblock%}
\ No newline at end of file +{% block js %}<script src="{{MEDIA_URL}}js/hyphenate.min.js" type="text/javascript"></script>{% endblock%} |