widened site, created new photo layouts and prepped homepage redesign

2 files changed, 20 insertions, 18 deletions

diff --git a/design/templates/archives/gallery_list.html b/design/templates/archives/gallery_list.html
index 99252ef..91e04cb 100644
--- a/design/templates/archives/gallery_list.html
+++ b/design/templates/archives/gallery_list.html
@@ -33,6 +33,7 @@
     <article id="image-{{forloop.counter}}" class="photo-gallery">
         <a href="{{object.get_absolute_url}}" title="view images from {{ object.title }}">
                 <img sizes="(max-width: 1170px) 100vw"
+                     {{object.thumb}}
                      srcset="{% for size in object.thumb.sizes.all %}{%spaceless%}
                      {% get_image_by_size object.thumb size.width %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endspaceless%}{%endfor%}
                      {% for size in object.thumb.sizes.all %}{%spaceless%}{% if size.width > 720 and size.width < 2000 %}src="{% get_image_by_size object.thumb size.width %}"{%endif%}{%endspaceless%}{%endfor%} alt="{{object.title}}" {%if photo.is_portait %}class="v"{%endif%} ></a>
@@ -42,8 +43,8 @@
                 <span class="p-location h-adr adr post--location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
                     {% if object.location.state.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/photos/united-states/" title="all galleries from the United States">{{object.location.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.location.state.country.slug}}/" title="travel writing from {{object.location.state.country.name}}">{{object.state.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>
+                        {%if object.latitude%}<data itemprop="latitude" class="p-latitude" value="{{object.latitude}}">{{object.latitude}}</data>{%endif%}
+                        {%if object.longitude%}<data itemprop="longitude" class="p-longitude" value="{{object.longitude}}">{{object.longitude}}</data>{%endif%}
                     </span>
                 </span>
             {%if object.description%}<p>{{object.description|safe|smartypants|widont}}</p>{%endif%}
diff --git a/design/templates/archives/homepage-light.html b/design/templates/archives/homepage-light.html
index fe41b25..1d72862 100644
--- a/design/templates/archives/homepage-light.html
+++ b/design/templates/archives/homepage-light.html
@@ -47,16 +47,17 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size %} {{siz
    </section>
     <div class="homepage--about homepage--section">
         <h3 class="homepage--arc-header">About Luxagraf</h3>
-        <p>Luxagraf is my notebook. Something that, in an earlier age, I would have long ago lost in the backseat of a taxi. </p>
-        <p>Or something like that. It could just be a website. Except that I don&#8217;t do lists. And I&#8217;m not trying to make&nbsp;money off of it.</p><p>Whatever it is, whatever brought you here, I hope you enjoy it.</p> 
+        <p>Luxagraf is the notebook I use to record things for posterity. Something that, in an earlier age, you'd accidentally leave in the backseat of a taxi. Here it exists as long as there's energy to keep the internet on.</p>
+        <p>About us: We're currently exploring North America in our new home, a 1969 Dodge Travco RV.</p>
+        <p>We left our former home in Athens, GA in the autumn of 2016. We were most recently in <span class="p-location h-adr adr " itemprop="contentLocation" itemscope itemtype="http://schema.org/Place"> {% if location.location.state.country.name == "United States" %}<span class="p-locality locality">{{location.location.name|smartypants|safe}}</span>, {{location.location.state.code|safe}}{%else%}<span class="p-region">{{location.location.name|smartypants|safe}}</span>, {{location.location.state.country.name|safe}}</a>{%endif%}</span>. The map over there has a rough sketch of our route to date. You can read about our adventures in the <a href="/jrnl/">journal</a> section. </p> 
     </div>
     <div class="homepage--section">
-    <section class="archive homepage--archives">
-        <h1 class="homepage--arc-header">Most Popular</h1>
-        {% for object in homepage.popular.all %}
-        <article class="h-entry hentry" itemscope itemType="http://schema.org/Article">
+    <section class="homepage--bright archive homepage--arc-big">
+        <h1 class="homepage--arc-header">Most Recent</h1>
+        {% for object in recent %}
+        <article class="h-entry hentry {%cycle "odd" "even"%}" itemscope itemType="http://schema.org/Article">
             <div class="post--image">
-                <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_wide_url}}" alt="{{ object.title }}" class="u-photo post-image" itemprop="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>
             <h2 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></h2>
             <p class="p-author author hide" itemprop="author">Scott Gilbertson</p>
@@ -68,15 +69,14 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size %} {{siz
                         <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> 
+                </span>
             </p>
-        </article> {% endfor %}
-        <p><a href="/jrnl/" class="homepage--next">Read More</a></p>
+        </article>{% endfor %}
     </section>
-    <section class="homepage--bright archive">
-        <h1 class="homepage--arc-header">Most Recent</h1>
-        {% for object in recent %}{% if object.pk != homepage.featured.pk %}
-        <article class="h-entry hentry" itemscope itemType="http://schema.org/Article">
+    <section class="archive homepage--bright popular">
+        <h1 class="homepage--arc-header">Popular</h1>
+        <div class="arc-col">{% for object in homepage.popular.all %}
+        <article class="h-entry hentry {%cycle "odd" "even"%}" 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" itemprop="image" /></a>
             </div>
@@ -90,10 +90,11 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size %} {{siz
                         <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>
+                </span> 
             </p>
-        </article> {%endif%}{% endfor %}
+        </article> {% endfor %}</div>
     </section>
+        <p class="homepage--next"><a href="/jrnl/">Browse the Archives</a></p>
     </div>
 {% endblock %}