summaryrefslogtreecommitdiff
path: root/design/templates
diff options
context:
space:
mode:
Diffstat (limited to 'design/templates')
-rw-r--r--design/templates/admin/insert_images.html1
-rw-r--r--design/templates/archives/gallery_list.html5
-rw-r--r--design/templates/archives/homepage-light.html33
-rw-r--r--design/templates/details/entry.html30
-rw-r--r--design/templates/details/photo_gallery.html6
-rw-r--r--design/templates/lib/img_cluster.html1
-rw-r--r--design/templates/lib/img_picfull.html4
-rw-r--r--design/templates/lib/img_picwide.html6
8 files changed, 59 insertions, 27 deletions
diff --git a/design/templates/admin/insert_images.html b/design/templates/admin/insert_images.html
index caaa790..7602525 100644
--- a/design/templates/admin/insert_images.html
+++ b/design/templates/admin/insert_images.html
@@ -99,6 +99,7 @@ $(function(){
<li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-class="picfull" class="insert" href="">column width</a></li>
<li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-class="picwide" data-caption="true" class="insert" href="">full width cap</a></li>
<li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-class="picfull" data-caption="true" class="insert" href="">column width cap</a></li>
+ <li><a data-src="{% get_image_by_size image 'admin_insert' %}" data-class="cluster pic" class="insert" href="">cluster</a></li>
<li><a href="/admin/photos/luximage/{{image.pk}}/change/">Edit Image</a></li>
</ul>
</div>
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 %}
diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 494f926..a2b6873 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -7,7 +7,6 @@
{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}
{%block extrahead%}
<link rel="canonical" href="https://luxagraf.net{{object.get_absolute_url}}" />
- <link rel="amphtml" href="https://luxagraf.net{{object.get_absolute_url}}.amp" />
<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%}">
@@ -86,6 +85,35 @@ class="{%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%if t ==
{%endif%}
{% endblock %}
{% block js %}
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<symbol id="icon-external" viewBox="0 0 12 12">
+<title>external</title>
+<path fill="#FFF" stroke="#fff" stroke-width="10" d="m43,35H5v60h60V57M45,5v10l10,10-30,30 20,20 30-30 10,10h10V5z"/>
+</svg>
+<!--Fallback -->
+ external
+</symbol>
+</defs>
+</svg>
+<script src="/media/js/lightbox.js" type="text/javascript"></script>
+<script>
+var opts= {
+ //nextOnClick: false,
+ captions: true,
+ onload: function(){
+ var im = document.getElementById("jslghtbx-contentwrapper");
+ var link = im.appendChild(document.createElement('a'))
+ link.href = im.firstChild.src;
+ link.innerHTML= "open ";
+ link.target = "_blank";
+ link.setAttribute('class', 'p-link');
+ im.appendChild(link);
+ }
+};
+var lightbox = new Lightbox();
+lightbox.load(opts);
+</script>
{% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %}
<script src="/media/js/leaflet-master/leaflet-mod.js"></script>
<script src="/media/js/detail.min.js"></script>
diff --git a/design/templates/details/photo_gallery.html b/design/templates/details/photo_gallery.html
index bf2db6d..be25326 100644
--- a/design/templates/details/photo_gallery.html
+++ b/design/templates/details/photo_gallery.html
@@ -34,16 +34,16 @@
Your browser does not support the <code>video</code> element.
</video>
{% else %}
- <img sizes="(max-width: 1170px) 100vw"
+ <img sizes="(max-width: 1140px) 100vw, (min-width: 1141px) 1140px"
srcset="{% for size in photo.sizes.all %}{%spaceless%}
{% get_image_by_size photo size.width %} {{size.width}}w{% if forloop.last%}"{%else%},{%endif%}{%endspaceless%} {%endfor%}
- {% for size in photo.sizes.all %}{%spaceless%}{% if size.width > 720 and size.width < 2000 %}src="{% get_image_by_size photo size.width %}"{%endif%}{%endspaceless%}{%endfor%} alt="{% if photo.alt %}{{photo.alt}}{%else%}{{photo.title}}{%endif%}" {%if photo.is_portait %}class="v"{%endif%} >
+ {% for size in photo.sizes.all %}{%spaceless%}{% if size.width > 720 and size.width < 2000 %}src="{% get_image_by_size photo size.width %}"{%endif%}{%endspaceless%}{%endfor%} alt="{% if photo.alt %}{{photo.alt}}{%else%}{{photo.title}}{%endif%}" p="{{photo.is_portait}}" {%if photo.is_portait %}class="v"{%endif%} >
{%endif%}{% if not photo.is_video %}</a>{%endif%}
<figcaption class="figcaption">
<div class="caption" id="id-{{photo.id}}">
<h3 class="figcaption--title">{{photo.title}}</h3>
<time class="figcaption--date" datetime="{{photo.exif_date|date:'c'}}">{{photo.exif_date|date:"M j, Y"}}</time>
- {% if object.is_public %}<a class="map-link" href="#" data-latitude="{{photo.latitude}}" data-longitude="{{photo.longitude}}" data-imgid="id-{{photo.id}}">Map</a>{%endif%}
+ {% if object.is_public %}{%if object.latitude %}<a class="map-link" href="#" data-latitude="{{photo.latitude}}" data-longitude="{{photo.longitude}}" data-imgid="id-{{photo.id}}">Map</a>{%endif%}{%endif%}
{%if photo.caption%}<p class="figcaption--desc">{{photo.caption|safe}}</p> {%endif%}
</div>
<div class="photo-options">
diff --git a/design/templates/lib/img_cluster.html b/design/templates/lib/img_cluster.html
new file mode 100644
index 0000000..b1ed854
--- /dev/null
+++ b/design/templates/lib/img_cluster.html
@@ -0,0 +1 @@
+{% load get_image_by_size %}<a href="{%get_image_by_size image "original"%} " title="view larger image"><img class="{{cluster_class}}" src="{% for size in image.sizes.all%}{%if size.name == cluster_class %}{% 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%}></a>
diff --git a/design/templates/lib/img_picfull.html b/design/templates/lib/img_picfull.html
index 7e9c23e..f2afdce 100644
--- a/design/templates/lib/img_picfull.html
+++ b/design/templates/lib/img_picfull.html
@@ -2,8 +2,8 @@
{% if caption %}
<figure class="picfull">{%endif%}
<img class="picfull" sizes="(max-width: 680px) 100vw, (min-width: 681) 680px"
-srcset="{% for size in image.sizes.all%}{% get_image_by_size image size %} {{size}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}
-{% for size in image.sizes.all%}{%if forloop.first %}src="{% get_image_by_size image size %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}">
+srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.long_edge %} {{size.long_edge}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}
+{% for size in image.sizes.all%}{%if forloop.first %}src="{% get_image_by_size image size.long_edge %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}">
{% if caption %}<figcaption>{{image.caption|safe}}</figcaption>
</figure>
{% endif %}
diff --git a/design/templates/lib/img_picwide.html b/design/templates/lib/img_picwide.html
index 4e96951..b98bb9b 100644
--- a/design/templates/lib/img_picwide.html
+++ b/design/templates/lib/img_picwide.html
@@ -1,9 +1,9 @@
{% load get_image_by_size %}
{% if caption or exif %}
<figure class="picwide">{%endif%}
-<img class="picwide" sizes="(max-width: 1140px) 100vw, (min-width: 1141px) 1140px"
-srcset="{% for size in image.sizes.all%}{% get_image_by_size image size %} {{size}}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 %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}">
+<img class="picwide" sizes="(max-width: 1140px) 100vw, (min-width: 1281px) 1280px"
+srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.long_edge %} {{size.long_edge}}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.long_edge %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}">
{% if caption or exif %}<figcaption>{% endif %}{% if caption %}{{image.caption|safe}}{% endif %}{% if exif %} | <small>Camera: {{image.exif_make}} {{image.exif_model}} with {{image.exif_lens}}</small>{% endif %}{% if caption or exif %}</figcaption>
</figure>
{% endif %}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-04-15 16:08:26 +0000