From 8d0a6618b5f7647369ed4e530be44bbdd8a80dfb Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Mon, 6 Apr 2015 15:48:03 -0400
Subject: added schema and opengraph metadata to pages

---
 design/templates/archives/writing.html | 20 +++++++++++---------
 design/templates/base.html             |  5 ++---
 design/templates/details/entry.html    | 29 ++++++++++++++++++++---------
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/design/templates/archives/writing.html b/design/templates/archives/writing.html
index a8c4634..7ad1853 100644
--- a/design/templates/archives/writing.html
+++ b/design/templates/archives/writing.html
@@ -15,20 +15,22 @@
     </ul>
     <main role="main" id="writing-archive" class="archive">
         <h1 class="hide">{% if region %}Journal entries from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Journal {%endif%}</h1>{% autopaginate object_list 24 %} {% for object in object_list %}
-        <article class="h-entry hentry {% cycle 'odd' 'even' %} {% cycle 'first' 'second' 'third' %}">
+        <article class="h-entry hentry {% cycle 'odd' 'even' %} {% cycle 'first' 'second' 'third' %}" itemscope itemType="http://schema.org/Article">
             <div class="post--image">
-                <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" class="u-photo post-image" /></a>
+                <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" class="u-photo post-image" itemprop="image" /></a>
             </div>
-            <h1 class="p-name entry-title post--title"><a href="{{object.get_absolute_url}}" class="u-url" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|safe|smartypants|widont}}</a></h1>
-            <p class="p-author author hide">Scott Gilbertson</p>
+            <h1 class="p-name entry-title post--title" itemprop="headline"><a href="{{object.get_absolute_url}}" class="u-url" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|safe|smartypants|widont}}</a></h1>
+            <p class="p-author author hide" itemprop="author"><span class="byline-author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Scott Gilbertson</span></span></p>
             <time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
             <p>
-                <span class="p-location h-adr adr post--location">
-                    {% if object.country.name == "United States" %}<span class="p-locality locality" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
-                    <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}"></data>
-                    <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}"></data>
+                <span class="p-location h-adr adr post--location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+                    {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
+                    <span style="display: none;" itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
+                        <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}">{{object.latitude}}</data>
+                        <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}">{{object.longitude}}</data>
+                    </span>
                 </span> &ndash;
-                <span class="p-summary hyphenate">
+                <span class="p-summary entry-summary hyphenate" itemprop="description">
                     {{object.dek|safe}}
                 </span>
             </p>
diff --git a/design/templates/base.html b/design/templates/base.html
index 4a8a182..adb1465 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -35,10 +35,9 @@
             <ul>
                 <li id="stories"><a href="/jrnl/" title="What we've been up to lately">Journal</a></li>
                 <li id="adventura"><a href="/adventures" title="Our past and current adventures">Adventures</a></li>
-                <!--<li id="field-notes"><a href="/field-notes/" title="Rough drafts and sketches">Field Notes</a></li>-->
                 <li id="photos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li>
-                <li id="maps"><a href="/map" title="Maps and miscellanea">Map</a></li>
-                <li id="projects" ><a href="/projects/" title="Luxagraf: Projects">Projects</a></li>
+                <li id="maps"><a href="/map" title="Maps">Map</a></li>
+                <li id="projects" ><a href="/projects/" title="Projects">Projects</a></li>
                 <li id="etc" class="last"><a href="/about" title="About Luxagraf">About</a></li>
             </ul>
         </nav>
diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index e91dd78..3f74ff5 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -11,6 +11,15 @@
      <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.iso2}}{%if object.state.code != '' %}-{{object.state.code}}{%endif%}">
+    <meta property="og:type" content="article" />
+    <meta property="og:title" content="{{object.title|safe}}" />
+    <meta property="og:url" content="{{object.get_absolute_url}}" />
+    <meta property="og:description" content="{{object.meta_description}" />
+    <meta property="article:published_time" content="{{object.pub_date|date:'F'}}" />
+    <meta property="article:author" content="Scott Gilbertson" />
+    <meta property="og:site_name" content="Luxagraf" />
+    <meta property="og:image" content="{{object.get_image_url}}" />
+    <meta property="og:locale" content="en_US" />
 {%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%}
@@ -18,19 +27,21 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
 				
 {% block primary %}		
     <main role="main">
-    <article class="h-entry hentry post--article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}">
+    <article class="h-entry hentry post--article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article">
             <header id="header" class="post--header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
-                <h1 class="p-name entry-title post--title">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
-                <time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-                <p class="p-author author hide" id="author">Scott Gilbertson</p>
-                <aside class="p-location h-adr adr post--location" >
-                    {% if object.country.name == "United States" %}<span class="p-locality locality" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name|safe}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name|safe}}</a>{%endif%}
-                    <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}"></data>
-                    <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}"></data>
+                <h1 class="p-name entry-title post--title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
+                <time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+            <p class="p-author author hide" itemprop="author"><span class="byline-author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Scott Gilbertson</span></span></p>
+                <aside class="p-location h-adr adr post--location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+                    {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name|safe}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name|safe}}</a>{%endif%}
+                    <span style="display: none;" itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
+                        <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}">{{object.latitude}}</data>
+                        <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}">{{object.longitude}}</data>
+                    </span>
                     {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %} &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>{%endif%}{%endwith%}
                 </aside>
             </header>
-        <div id="article" class="e-content entry-content post--body 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 id="article" class="e-content entry-content post--body 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%}" itemprop="articleBody">
             {{object.body_html|safe|smartypants|widont}}
         </div>
         </article>
-- 
cgit v1.2.3