rik/blog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problem in gallery generator plugin

Browse Source
This commit is contained in:
Rik Veenboer
2016-06-05 21:25:51 +01:00
parent c3affdd0c3
commit 3a7a11e6cf
3 changed files with 238 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
_layouts/gallery-index.html
View File

@@ -1,59 +1,58 @@
---
layout: default
---
<section itemscope itemtype="http://schema.org/ImageGallery">
<header>
<div class="timeline">
{% if page.date %}
<time datetime="{{ page.date | date_to_xmlschema }}" title="{{ page.date | date_to_xmlschema }}"><strong>{{ page.date|date:"%b %d"|upcase }}</strong><br />{{ page.date|date:"%Y" }}</time>
{% endif %}
</div>
<h1>
<a href="/{{ site.baseurl }}{{ page.url }}"><span itemprop="name">{{ page.title }}</span></a>
<small class="print-only" itemprop="datePublished" content="{{ page.date|date:'%F') }}">{{ page.date|date:'%A, %B %d, %Y' }}</small>
</h1>
{% if page.end_date %}
<span class="date-range">&#x1f557; {{ page.date | date:"%d/%m/%Y" }} - {{ page.end_date | date:"%d/%m/%Y" }}</span>
{% endif %}
</header>
<section class="post-content">
{{ content }}
{% if false != page.slideshow %}
<a href="slideshow.html">[ slideshow ]</a>
{% endif %}
{% if false != page.slideshow and page.map %}
&nbsp;|&nbsp;
{% endif %}
{% if page.map %}
<a href="map.html">[ map ]</a>
{% endif %}
{% assign items = ''|split:'' %}
{% for p in site.posts %}
{% if p.content contains page.gallery %}
{% assign items = items | push:p %}
{% endif %}
{% endfor %}
{% assign size=items | size %}
{% if size > 0 %}
<p>{{ site.mentioned_in }}</p>
<ul>
{% for item in items %}
<li><a href="{{ item.url }}">{{ item.title }}</a></li>
{% endfor %}
</ul>
{% endif %}
<div class="list-gallery">
{% for photo in page.photos %}
<span itemprop="image" itemscope itemtype="http://schema.org/Photograph">
<a href="/{{ site.baseurl }}/{{ photo.url }}" itemprop="url">
<img alt="Photo: {{ photo.title }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name }}~200x200.jpg" title="{{ photo.title }}" width="200" />
</a>
</span>
{% endfor %}
</div>
</section>
{% if page.comments != false %}
{% include disqus.html %}
{% endif %}
---
layout: default
---
<section itemscope itemtype="http://schema.org/ImageGallery">
<header>
<div class="timeline">
{% if page.date %}
<time datetime="{{ page.date | date_to_xmlschema }}" title="{{ page.date | date_to_xmlschema }}"><strong>{{ page.date|date:"%b %d"|upcase }}</strong><br />{{ page.date|date:"%Y" }}</time>
{% endif %}
</div>
<h1>
<a href="/{{ site.baseurl }}{{ page.url }}"><span itemprop="name">{{ page.title }}</span></a>
<small class="print-only" itemprop="datePublished" content="{{ page.date|date:'%F') }}">{{ page.date|date:'%A, %B %d, %Y' }}</small>
</h1>
{% if page.end_date %}
<span class="date-range">&#x1f557; {{ page.date | date:"%d/%m/%Y" }} - {{ page.end_date | date:"%d/%m/%Y" }}</span>
{% endif %}
</header>
<section class="post-content">
{% if false != page.slideshow %}
<a href="slideshow.html">[ slideshow ]</a>
{% endif %}
{% if false != page.slideshow and page.map %}
&nbsp;|&nbsp;
{% endif %}
{% if page.map %}
<a href="map.html">[ map ]</a>
{% endif %}
{% assign items = ''|split:'' %}
{% for p in site.posts %}
{% if p.content contains page.gallery %}
{% assign items = items | push:p %}
{% endif %}
{% endfor %}
{% assign size=items | size %}
{% if size > 0 %}
<p>{{ site.mentioned_in }}</p>
<ul>
{% for item in items %}
<li><a href="{{ item.url }}">{{ item.title }}</a></li>
{% endfor %}
</ul>
{% endif %}
<div class="list-gallery">
{% for photo in page.photos %}
<span itemprop="image" itemscope itemtype="http://schema.org/Photograph">
<a href="/{{ site.baseurl }}/{{ photo.url }}" itemprop="url">
<img alt="Photo: {{ photo.title }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name }}~200x200.jpg" title="{{ photo.title }}" width="200" />
</a>
</span>
{% endfor %}
</div>
</section>
{% if page.comments != false %}
{% include disqus.html %}
{% endif %}
</section>

70
_layouts/gallery-list.html
View File

@@ -1,36 +1,36 @@
---
title: Galleries
layout: default
---
<section>
<p>
Naast foto's die bij bepaalde activiteiten horen, kom ik vaak situaties tegen die ik de moeite waard vind om op beeld vast te leggen. Wist je dat ik de meeste foto's op dit blog met de camera op mijn HTC One S of OnePlus One maak? Geloof het of niet, maar zelfs sommige van de prachtige panorama's boven elke pagina zijn daarvan afkomstig. Natuurlijk vul ik mijn eigen foto's aan met exemplaren van anderen.
</p>
</section>
<section>
{% for gallery in page.galleries %}
{% unless gallery.ignore %}
{% if gallery.highlight %}
{% assign highlight=gallery.highlight %}
{% else %}
{% assign photo=gallery.photos | first %}
{% assign highlight=photo.name %}
{% endif %}
<div style="display: inline-block; height: 274px; margin: 8px 10px 0 0; text-align: center; width: 200px;">
<a href="/{{ site.baseurl }}/gallery/{{ gallery.gallery }}/" style="text-decoration:none;">
<img alt="{{ gallery.title }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ gallery.gallery }}/{{ highlight }}~200x200.jpg" title="{{ gallery.title }}" width="200" style="border-radius:4px;" />
<span style="text-decoration:underline;">{{ gallery.title }}</span>
{% if gallery.date %}<br />
<small>
{% if gallery.date_end %}
{{ gallery.date | date:"%B %-d" }} &ndash; {{ gallery.date_end | date:"%-d" }}, {{ gallery.date | date:"%Y" }}
{% else %}
{{ gallery.date | date:"%B %-d, %Y" }}
{% endif %}
</small>
{% endif %}
</a>
</div>
{% endunless %}
{% endfor %}
---
title: Galleries
layout: default
---
<section>
<p>
Naast foto's die bij bepaalde activiteiten horen, kom ik vaak situaties tegen die ik de moeite waard vind om op beeld vast te leggen. Wist je dat ik de meeste foto's op dit blog met de camera op mijn HTC One S of OnePlus One maak? Geloof het of niet, maar zelfs sommige van de prachtige panorama's boven elke pagina zijn daarvan afkomstig. Natuurlijk vul ik mijn eigen foto's aan met exemplaren van anderen.
</p>
</section>
<section>
{% for gallery in page.galleries %}
{% unless gallery.ignore %}
{% if gallery.highlight %}
{% assign highlight=gallery.highlight %}
{% else %}
{% assign photo=gallery.photos | first %}
{% assign highlight=photo.name %}
{% endif %}
<div style="display: inline-block; height: 274px; margin: 8px 10px 0 0; text-align: center; width: 200px;">
<a href="/{{ site.baseurl }}/gallery/{{ gallery.gallery }}/" style="text-decoration:none;">
<img alt="{{ gallery.title }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ gallery.gallery }}/{{ highlight }}~200x200.jpg" title="{{ gallery.title }}" width="200" style="border-radius:4px;" />
<span style="text-decoration:underline;">{{ gallery.title }}</span>
{% if gallery.date %}<br />
<small>
{% if gallery.date_end %}
{{ gallery.date | date:"%B %-d" }} &ndash; {{ gallery.date_end | date:"%-d" }}, {{ gallery.date | date:"%Y" }}
{% else %}
{{ gallery.date | date:"%B %-d, %Y" }}
{% endif %}
</small>
{% endif %}
</a>
</div>
{% endunless %}
{% endfor %}
</section>

293
_layouts/gallery-photo.html
View File

@@ -1,147 +1,146 @@
---
layout: default
---
{% assign photo=page.photo %}
{% capture photo_url %}{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name }}{% endcapture %}
{% capture gallery_url %}/{{ site.baseurl }}/gallery/{{ page.gallery }}{% endcapture %}
<section itemscope itemtype="http://schema.org/Photograph">
<header>
<div class="timeline">
{% if photo.date %}
<time datetime="{{ photo.date | date_to_xmlschema }}" title="{{ photo.date | date_to_xmlschema }}"><strong>{{ photo.date | date:"%b %d" | upcase }}</strong><br />{{ photo.date | date:"%Y" }}</time>
{% endif %}
{% if photo.latitude %}
<a href="https://maps.google.com/maps?hl=en&amp;ll={{ photo.latitude }},{{ photo.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="49" src="https://maps.googleapis.com/maps/api/staticmap?center={{ photo.latitude }},{{ photo.longitude }}&amp;zoom=9&amp;size=98x98&amp;sensor=false" title="{{ photo.title }}" width="49" /></a>
{% endif %}
</div>
<section class="post-content">
<p>{{ content }}</p>
<a href="{{ gallery_url }}/">[ gallery ]</a>
</section>
<ul style="margin-top: 0;">
{% if photo.previous %}
<li><a href="{{ gallery_url }}/{{ photo.previous }}.html" rel="prev">&nbsp;&larr;&nbsp;</a></li>
{% else %}
<li><span class="noanchor">&nbsp;&larr;&nbsp;</span></li>
{% endif %}
{% if photo.next %}
<li><a href="{{ gallery_url }}/{{ photo.next }}.html" rel="next">&nbsp;&rarr;&nbsp;</a></li>
{% else %}
<li><span class="noanchor">&nbsp;&rarr;&nbsp;</span></li>
{% endif %}
</ul>
<h1>
<span itemprop="name">{{ photo.title }}</span>
</h1>
</header>
<section class="post-content">
{% if photo.width %}
{% assign max_width=photo.width %}
{% else %}
{% assign max_width=640 %}
{% endif %}
{% assign sizes=''|split:'' %}
{% for size in site.photo_sizes %}
{% if size[0] <= max_width %}
{% assign sizes=sizes | push:size %}
{% endif %}
{% endfor %}
{% if photo.width == 200 %}
{% assign file='200x200' %}
{% else %}
{% assign file='640w' %}
{% endif %}
<p style="text-align: center;">
<a href="{{ photo_url }}~{{ file }}.jpg"><img alt="Photo: {{ photo.title }}" src="{{ photo_url }}~{{ file }}.jpg" style="max-width:630px;" /></a>
</p>
{% if photo.description %}
<div itemprop="description">
{{ photo.description }}
</div>
{% endif %}
</section>
<div class="meta">
<div class="meta-properties">
<div>
<dl style="margin-top:0;">
<dt>Date</dt>
<dd itemprop="dateCreated" content="{{ photo.date | date:'%FT%TZ' }}">{{ photo.date | date:'%A, %B %d at %I:%M %p' | replace:' 0',' ' | replace:' AM',' am' | replace:' PM',' pm' }}
{% if photo.aperture %}
<dt>Camera</dt>
<dd>{{ photo.make }} {{ photo.model }}</dd>
{% endif %}
{% if photo.aperture %}
<dt>Aperture</dt>
<dd>{{ photo.aperture }}</dd>
{% endif %}
{% if photo.aperture %}
<dt>Exposure</dt>
<dd>{{ photo.exposure }}</dd>
{% endif %}
{% if sizes %}
<dt>Sizes</dt>
<dd>
{% for size in sizes %}
{% if 0 < forloop.index0 %}&nbsp;&middot;&nbsp;{% endif %}
{% assign width=size[0] %}
{% assign height=size[1] %}
{% capture label %}{{ width }}x{{ height }}{% endcapture %}
{% if width == 640 %}
{% assign label='640' %}
{% assign file='640w' %}
{% else %}
{% capture label %}{{ width }}x{{ height }}{% endcapture %}
{% assign file=label %}
{% endif %}
<span itemprop="image" itemscope itemtype="http://schema.org/ImageObject">
<meta itemprop="width" content="{{ width }}" />
{% if height > 0 %}
<meta itemprop="height" content="{{ height }}" />
{% endif %}
<a href="{{ photo_url }}~{{ file }}.jpg" itemprop="contentUrl">{{ label }}</a>
</span>
{% endfor %}
</dd>
{% endif %}
</dl>
</div>
{% if photo %}
<div class="map" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
<meta itemprop="latitude" content="{{ photo.latitude }}" />
<meta itemprop="longitude" content="{{ photo.longitude }}" />
</span>
<a href="https://maps.google.com/maps?hl=en&amp;ll={{ photo.latitude }},{{ photo.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="173" src="https://maps.googleapis.com/maps/api/staticmap?center={{ photo.latitude }},{{ photo.longitude }}&amp;zoom=13&amp;size=280x173&amp;markers=size:mid%7Ccolor:orange%7C{{ photo.latitude }},{{ photo.longitude }}&amp;sensor=false" title="{{ photo.title }}" width="280" /></a>
</div>
{% endif %}
<div style="clear:left;"></div>
</div>
<div class="meta-navigate screen-only">
{% if photo.next %}
<div style="float:right;">
<a href="{{ gallery_url }}/{{ photo.next }}.html" rel="next">Next &raquo;</a>
</div>
{% endif %}
{% if photo.previous %}
<div style="float:left;">
<a href="{{ gallery_url }}/{{ photo.previous }}.html" rel="prev">&laquo; Previous</a>
</div>
{% endif %}
<div style="padding:0 120px;">
<a href="./" rel="contents">Gallery List</a>
</div>
<div style="clear:both;"></div>
</div>
</div>
</section>
---
layout: default
---
{% assign photo=page.photo %}
{% capture photo_url %}{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name }}{% endcapture %}
{% capture gallery_url %}/{{ site.baseurl }}/gallery/{{ page.gallery }}{% endcapture %}
<section itemscope itemtype="http://schema.org/Photograph">
<header>
<div class="timeline">
{% if photo.date %}
<time datetime="{{ photo.date | date_to_xmlschema }}" title="{{ photo.date | date_to_xmlschema }}"><strong>{{ photo.date | date:"%b %d" | upcase }}</strong><br />{{ photo.date | date:"%Y" }}</time>
{% endif %}
{% if photo.latitude %}
<a href="https://maps.google.com/maps?hl=en&amp;ll={{ photo.latitude }},{{ photo.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="49" src="https://maps.googleapis.com/maps/api/staticmap?center={{ photo.latitude }},{{ photo.longitude }}&amp;zoom=9&amp;size=98x98&amp;sensor=false" title="{{ photo.title }}" width="49" /></a>
{% endif %}
</div>
<section class="post-content">
<a href="{{ gallery_url }}/">[ gallery ]</a>
</section>
<ul style="margin-top: 0;">
{% if photo.previous %}
<li><a href="{{ gallery_url }}/{{ photo.previous }}.html" rel="prev">&nbsp;&larr;&nbsp;</a></li>
{% else %}
<li><span class="noanchor">&nbsp;&larr;&nbsp;</span></li>
{% endif %}
{% if photo.next %}
<li><a href="{{ gallery_url }}/{{ photo.next }}.html" rel="next">&nbsp;&rarr;&nbsp;</a></li>
{% else %}
<li><span class="noanchor">&nbsp;&rarr;&nbsp;</span></li>
{% endif %}
</ul>
<h1>
<span itemprop="name">{{ photo.title }}</span>
</h1>
</header>
<section class="post-content">
{% if photo.width %}
{% assign max_width=photo.width %}
{% else %}
{% assign max_width=640 %}
{% endif %}
{% assign sizes=''|split:'' %}
{% for size in site.photo_sizes %}
{% if size[0] <= max_width %}
{% assign sizes=sizes | push:size %}
{% endif %}
{% endfor %}
{% if photo.width == 200 %}
{% assign file='200x200' %}
{% else %}
{% assign file='640w' %}
{% endif %}
<p style="text-align: center;">
<a href="{{ photo_url }}~{{ file }}.jpg"><img alt="Photo: {{ photo.title }}" src="{{ photo_url }}~{{ file }}.jpg" style="max-width:630px;" /></a>
</p>
{% if photo.description %}
<div itemprop="description">
{{ photo.description }}
</div>
{% endif %}
</section>
<div class="meta">
<div class="meta-properties">
<div>
<dl style="margin-top:0;">
<dt>Date</dt>
<dd itemprop="dateCreated" content="{{ photo.date | date:'%FT%TZ' }}">{{ photo.date | date:'%A, %B %d at %I:%M %p' | replace:' 0',' ' | replace:' AM',' am' | replace:' PM',' pm' }}
{% if photo.aperture %}
<dt>Camera</dt>
<dd>{{ photo.make }} {{ photo.model }}</dd>
{% endif %}
{% if photo.aperture %}
<dt>Aperture</dt>
<dd>{{ photo.aperture }}</dd>
{% endif %}
{% if photo.aperture %}
<dt>Exposure</dt>
<dd>{{ photo.exposure }}</dd>
{% endif %}
{% if sizes %}
<dt>Sizes</dt>
<dd>
{% for size in sizes %}
{% if 0 < forloop.index0 %}&nbsp;&middot;&nbsp;{% endif %}
{% assign width=size[0] %}
{% assign height=size[1] %}
{% capture label %}{{ width }}x{{ height }}{% endcapture %}
{% if width == 640 %}
{% assign label='640' %}
{% assign file='640w' %}
{% else %}
{% capture label %}{{ width }}x{{ height }}{% endcapture %}
{% assign file=label %}
{% endif %}
<span itemprop="image" itemscope itemtype="http://schema.org/ImageObject">
<meta itemprop="width" content="{{ width }}" />
{% if height > 0 %}
<meta itemprop="height" content="{{ height }}" />
{% endif %}
<a href="{{ photo_url }}~{{ file }}.jpg" itemprop="contentUrl">{{ label }}</a>
</span>
{% endfor %}
</dd>
{% endif %}
</dl>
</div>
{% if photo.latitude %}
<div class="map" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
<meta itemprop="latitude" content="{{ photo.latitude }}" />
<meta itemprop="longitude" content="{{ photo.longitude }}" />
</span>
<a href="https://maps.google.com/maps?hl=en&amp;ll={{ photo.latitude }},{{ photo.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="173" src="https://maps.googleapis.com/maps/api/staticmap?center={{ photo.latitude }},{{ photo.longitude }}&amp;zoom=13&amp;size=280x173&amp;markers=size:mid%7Ccolor:orange%7C{{ photo.latitude }},{{ photo.longitude }}&amp;sensor=false" title="{{ photo.title }}" width="280" /></a>
</div>
{% endif %}
<div style="clear:left;"></div>
</div>
<div class="meta-navigate screen-only">
{% if photo.next %}
<div style="float:right;">
<a href="{{ gallery_url }}/{{ photo.next }}.html" rel="next">Next &raquo;</a>
</div>
{% endif %}
{% if photo.previous %}
<div style="float:left;">
<a href="{{ gallery_url }}/{{ photo.previous }}.html" rel="prev">&laquo; Previous</a>
</div>
{% endif %}
<div style="padding:0 120px;">
<a href="./" rel="contents">Gallery List</a>
</div>
<div style="clear:both;"></div>
</div>
</div>
</section>