diff options
Diffstat (limited to 'design')
| -rw-r--r-- | design/templates/archives/homepage-light.html | 15 | ||||
| -rw-r--r-- | design/templates/base.html | 2 | ||||
| -rw-r--r-- | design/templates/details/entry.html | 2 | ||||
| -rw-r--r-- | design/templates/jrnl/entry_list.html (renamed from design/templates/archives/jrnl.html) | 1 | ||||
| -rw-r--r-- | design/templates/lib/img_archive.html | 6 |
5 files changed, 15 insertions, 11 deletions
diff --git a/design/templates/archives/homepage-light.html b/design/templates/archives/homepage-light.html index e9bc241..7aaf1aa 100644 --- a/design/templates/archives/homepage-light.html +++ b/design/templates/archives/homepage-light.html @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load get_image_by_size %} {% load typogrify_tags %} {% block sitename %} <head itemscope itemtype="http://schema.org/WebSite"> @@ -22,15 +21,17 @@ <figure class="post-image"> <a href="{{object.get_absolute_url}}" title="{{object.title}}">{%with image=homepage.featured_image%} <img class="u-photo" itemprop="image" sizes="(max-width: 960px) 100vw" -srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}{% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.name %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}">{%endwith%} - </a> + srcset="{{image.get_srcset}}" + src="{{image.get_src}}" + alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}"> + </a>{%endwith%} <figcaption> <div class="hero-text-wrapper"> <h2 class="p-name entry-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}}</a></h2> <p class="p-author author hide" itemprop="author">Scott Gilbertson</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 class="post-summary"> - <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>, {{object.state.name}}, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, {{object.country.name}}{%endif%}</span> + <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>, {{object.state_name}}}, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location_name|smartypants|safe}}</span>, {{object.country_name}}{%endif%}</span> <span class="p-summary" itemprop="description"> {{homepage.tag_line|safe|smartypants}} </span> @@ -45,7 +46,7 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} <h1 class="homepage-section-header">About Luxagraf</h1> <img src="/media/img/usa-resize.svg" alt="map of travels" class="homepage-map-img" /> <p>After nearly two years exploring the U.S. in our home, a 1969 Dodge Travco RV, we left the states to spend the winter in Mexico.</p> - <p>We left our former home in Athens, GA in the Spring of 2017. 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 <span class="addafter"><span class="subcontent">above</span></span> has a rough sketch of our route to date. You can read about our adventures in the <a href="/jrnl/">journal</a> section. There's more about us on the <a href="/about">about page</a> </p> + <p>We left our former home in Athens, GA in the Spring of 2017. We were most recently in <span class="p-location h-adr adr " itemprop="contentLocation" itemscope itemtype="http://schema.org/Place"> {% if location.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.country_name|safe}}</a>{%endif%}</span>. The map <span class="addafter"><span class="subcontent">above</span></span> has a rough sketch of our route to date. You can read about our adventures in the <a href="/jrnl/">journal</a> section. There's more about us on the <a href="/about">about page</a> </p> </section> <section class="recent-popular"> <div class="recent"> @@ -63,7 +64,7 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} <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="post-summary"> <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%} + {% 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> </p> </article> {% endfor %} @@ -84,7 +85,7 @@ srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} <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="post-summary"> <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%} + {% 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> </p> </article> {% endfor %} diff --git a/design/templates/base.html b/design/templates/base.html index a96d76e..d0d1618 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -40,7 +40,7 @@ <li id="laverdad"><a href="/jrnl/" title="What we've been up to lately">Journal</a></li> <!--<li id="nota"><a href="/field-notes/" title="Quick notes and images from the road">Notes</a></li> <li id="fotos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li>i--> - <li id="maps"><a href="/map" title="Maps">Map</a></li> + <!--<li id="maps"><a href="/map" title="Maps">Map</a></li>--> <li id="about"><a href="/about" title="About Luxagraf">About</a></li> <li id="etc" class="last"><a href="/projects/" title="the less visible portions of the iceberg">More</a></li> </ul> diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html index ad98274..2804da3 100644 --- a/design/templates/details/entry.html +++ b/design/templates/details/entry.html @@ -9,7 +9,7 @@ <link rel="canonical" href="https://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.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}}" /> diff --git a/design/templates/archives/jrnl.html b/design/templates/jrnl/entry_list.html index c95215e..d58bd05 100644 --- a/design/templates/archives/jrnl.html +++ b/design/templates/jrnl/entry_list.html @@ -1,6 +1,5 @@ {% extends 'base.html' %} {% load typogrify_tags %} -{% load get_image_by_size %} {% load pagination_tags %} {% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %} diff --git a/design/templates/lib/img_archive.html b/design/templates/lib/img_archive.html index 2d00e78..22b0cce 100644 --- a/design/templates/lib/img_archive.html +++ b/design/templates/lib/img_archive.html @@ -1,2 +1,6 @@ {% load get_image_by_size %} -<img sizes="(max-width: 728px) 100vw, (min-width: 729px) 520px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}{% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.name%}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" data-jslghtbx="{%get_image_by_size image "original"%}" data-jslghtbx-group="group" {% if caption%}data-jslghtbx-caption="{{image.caption}}"{%endif%}> +<img sizes="(max-width: 728px) 100vw, (min-width: 729px) 520px" + srcset="{{image.get_featured_jrnl}} 520w, {{image.get_picwide_sm}} 720w" + src="{{image.get_featured_jrnl}}" + alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" + data-jslghtbx="{{image.get_image_by_size}}" data-jslghtbx-group="group" {% if caption%}data-jslghtbx-caption="{{image.caption}}"{%endif%}> |