Fixed some template tags to work with django 1.6+ and added microformats

support for h-card

1 files changed, 20 insertions, 13 deletions

diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 19039d9..b214b4e 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -8,26 +8,26 @@
      <link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
      <meta name="ICBM" content="{{object.latitude}}, {{object.longitude}}" />
      <meta name="geo.position" content="{{object.latitude}}; {{object.longitude}}" />
-     <meta name="geo.placename" content="{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}"> 
-     <meta name="geo.region" content="{{object.country_iso}}{%if object.state_iso != None %}-{{object.state_iso}}{%endif%}">
+     <meta name="geo.placename" content="{% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state}}{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%}"> 
+     <meta name="geo.region" content="{{object.country.iso2}}{%if object.state.code != '' %}-{{object.state.code}}{%endif%}">
 {%endblock%}
 {%block htmlclass%}{% with object.template_name as t %}
 class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%if t == 2 or t == 3 %} dark{%endif%}"{%endwith%}{%endblock%}
 								
 				
 {% block primary %}		
-    <article role="main">
+    <article role="main" class="hentry h-entry">
         <header>
-            <h1>{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
-            <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-            <aside class="geo bl">
-                <span class="location" 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}}</a>, U.S.{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
-                <meta itemprop="latitude" content="{{object.latitude}}" />
-                <meta itemprop="longitude" content="{{object.longitude}}" /></span>
+            <h1 class="entry-title p-name">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
+            <time class="published updated dt-published" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+            <aside class="geo bl adr h-adr">
+                {% if object.country.name == "United States" %}<span class="locality p-locality">{{object.location.name|smartypants|safe}}</span>, <a class="region p-region" ref="/writing/united-states/1/" title="travel writing from the United States">{{object.state}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="country-name p-country-name" href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
+                <data class="p-latitude" value="{{object.latitude}}"></data>
+                <data class="p-longitude" value="{{object.longitude}}"></data>
                 {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
             </aside>
         </header>
-        <div class="post-body{% with object.template_name as t %}{%if t == 0 or t == 2 %}-single{%endif%}{%if t == 1 or t == 3 %}-double{%endif%}{%endwith%}">
+        <div class="e-content entry-content post-body{% with object.template_name as t %}{%if t == 0 or t == 2 %}-single{%endif%}{%if t == 1 or t == 3 %}-double{%endif%}{%endwith%}">
             {{object.body_html|safe|smartypants|widont}}
         </div>{%if object.template_name == 1 %}
         <div class="clearfix"></div>{%endif%}{%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
@@ -43,14 +43,21 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
         <nav id="page-navigation">
             <ul>{% if prev%}
                 <li id="next"><span class="bl">Previous:</span> 
-                    <a href="{{ prev.get_absolute_url }}" title=" {{prev.title}}">{{prev.title|safe}}</a>
+                    <a href="{{ prev.get_absolute_url }}" rel="prev" title=" {{prev.title}}">{{prev.title|safe}}</a>
                 </li>{%endif%}{% if next%}
                 <li id="prev"><span class="bl">Next:</span> 
-                    <a href="{{ next.get_absolute_url }}" title=" {{next.title}}">{{next.title|safe}}</a>
+                    <a href="{{ next.get_absolute_url }}" rel="next" title=" {{next.title}}">{{next.title|safe}}</a>
                 </li>{%endif%}
             </ul>
         </nav>{%endwith%}{%endwith%}
-        
+ {% load comments %}
+
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}fluent_comments/css/ajaxcomments.css" />
+<script src="{{MEDIA_URL}}js/jquery.js" type="text/javascript"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}fluent_comments/js/ajaxcomments.js"></script>
+
+{% render_comment_list for object %}
+{% render_comment_form for object %}       
         {%comment%}
         <section id="comments">
             <h4><a class="disqus-link-count" href="{{object.get_absolute_url}}#disqus_thread">Comments</a></h4>