added topics to posts

5 files changed, 46 insertions, 7 deletions

diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html
index 03b2888..0f4af61 100644
--- a/templates/archives/homepage.html
+++ b/templates/archives/homepage.html
@@ -8,7 +8,7 @@
     <article>
         <section id="featured-article">
             <h1><a href="{{featured.get_absolute_url}}">{{featured.title|widont|smartypants|safe}}</a></h1>
-            <span class="byline"><time datetime="{{featured.pub_date}}">{{featured.pub_date|date:"F j, Y"}}</time> &bull; <span class="location">{% ifequal featured.location.state.country.name "United States" %}{{featured.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{featured.location.state.name}}</a>{%else%}{{featured.location.name|smartypants|safe}}, <a href="/writing/{{featured.location.state.country.slug}}/1/" title="travel writing from {{featured.location.state.country.name}}">{{featured.location.state.country.name}}</a>{%endifequal%}</span></span>
+            <aside class="meta"><span class="location">{% ifequal featured.location.state.country.name "United States" %}{{featured.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{featured.location.state.name}}</a>{%else%}{{featured.location.name|smartypants|safe}}, <a href="/writing/{{featured.location.state.country.slug}}/1/" title="travel writing from {{featured.location.state.country.name}}">{{featured.location.state.country.name}}</a>{%endifequal%}</span></aside>
             {{featured.lede|smartypants|widont|safe}}</p>
             <span><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More &raquo;</a></span>
        </section>
diff --git a/templates/archives/map.html b/templates/archives/map.html
index 0a90df9..b040b00 100644
--- a/templates/archives/map.html
+++ b/templates/archives/map.html
@@ -4,7 +4,7 @@
 {% load slugify_under  %}
 
 {% block pagetitle %}Luxagraf | Map and Trips{% endblock %}
-{% block metadescription %}Writing Archive, Luxagraf{% endblock %}
+{% block metadescription %}Browse luxagraf by map, see trip routes and discover essays and dispatches from around the world{% endblock %}
 
 {#==============================================
 Google Maps code
diff --git a/templates/archives/photos.html b/templates/archives/photos.html
index f44265d..b2ef4f7 100644
--- a/templates/archives/photos.html
+++ b/templates/archives/photos.html
@@ -2,8 +2,8 @@
 {% load typogrify %}
 {% load pagination_tags %}
 
-{% block pagetitle %}Luxagraf | {% if region %}Photos from {{region.name|title|smartypants|safe}}{%else%}Photos from Around the World {%endif%}{% endblock %}
-{% block metadescription %}Photo Archive, Luxagraf{% endblock %}
+{% block pagetitle %}Luxagraf | {% if region %}Photo Galleries: Images from {{region.name|title|smartypants|safe}}{%else%}Photo Galleries: Images from Around the World {%endif%}{% endblock %}
+{% block metadescription %}{% if region %}Photo Galleries from {{region.name|title|smartypants|safe}}{%else%}Photo Galleries: Images from Around the World {%endif%}{% endblock %}
 
 
 {%block bodyid%}id="photo-archive"{%endblock%}
@@ -13,7 +13,7 @@
             <h1>{% 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>
-                    <a href="{%comment%}{{object.get_absolute_url}}{%endcomment%}http://www.flickr.com/photos/luxagraf/sets/{{object.set_id}}/show/"><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>
                     <h3>{{object.set_title}}</h3>
                     <p>{{object.set_desc|truncatewords:30|smartypants|safe}}</p>
                 </li>{% endfor %}
diff --git a/templates/archives/topics.html b/templates/archives/topics.html
new file mode 100644
index 0000000..2e4802e
--- /dev/null
+++ b/templates/archives/topics.html
@@ -0,0 +1,39 @@
+{% extends 'base.html' %}
+{% load typogrify %}
+{% load pagination_tags %}
+
+{% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%}{% endblock %}
+{% block metadescription %}{% if region %}Travel writing, essays and dispatches from {{region.name|title|smartypants|safe}}{%else%}Travel writing, essays and dispatches from around the world{%endif%}{% endblock %}
+{%block bodyid%}id="writing"{%endblock%}
+
+
+{% block primary %}
+    <article>
+    <h1>{{topic.header}}</h1>
+    <span class="all-link"><a href="/writing/1/" title="see all writing">{ View All Writing }</a></span>
+    <ul id="writing-archive">
+    {% autopaginate object_list 10 %}
+    {% for object in object_list %}
+        <li>
+            <h3 class="title"><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h3>
+            
+            {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%}
+                
+            <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time> &bull; <span class="location">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%}</span>
+                    
+            <p class="intro">{{object.dek|safe}} <a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">Read&nbsp;it&nbsp;&raquo;</a></p>
+                    
+            
+        </li>
+    {% endfor %}
+    </ul>
+    
+    <section id="pagination">
+        <ul>{% paginate %}
+        </ul>
+    </section>
+    </article>
+{% endblock %}
+
+
+
diff --git a/templates/archives/writing.html b/templates/archives/writing.html
index a5717a6..91d0d6d 100644
--- a/templates/archives/writing.html
+++ b/templates/archives/writing.html
@@ -2,8 +2,8 @@
 {% load typogrify %}
 {% load pagination_tags %}
 
-{% block pagetitle %}Luxagraf | {% if region %}Writings from {{region.name|title|smartypants|safe}}{%else%}Writing Archive {%endif%}{% endblock %}
-{% block metadescription %}Writing Archive, Luxagraf{% endblock %}
+{% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%}{% endblock %}
+{% block metadescription %}{% if region %}Travel writing, essays and dispatches from {{region.name|title|smartypants|safe}}{%else%}Travel writing, essays and dispatches from around the world{%endif%}{% endblock %}
 {%block bodyid%}id="writing"{%endblock%}