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

Improve generation of gallery lists with listing of mentioning posts, start to apply

Browse Source
This commit is contained in:
Rik Veenboer
2016-01-19 22:45:02 +00:00
parent a7f1170458
commit 0d0edee3a7
25 changed files with 94 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
_config.yml
View File

@@ -17,10 +17,13 @@ headers: [187b6ae, 54773b7, eae28bd]
# pagination # pagination
paginate: 15 paginate: 15
# translations
all_posts: 'Alle # posts →' all_posts: 'Alle # posts →'
read_more: '» Verder lezen...' read_more: '» Verder lezen...'
previous_page: '← Vorige pagina' previous_page: '← Vorige pagina'
next_page: 'Volgende pagina →' next_page: 'Volgende pagina →'
mentioned_in: 'Komt voor in:'
# other # other
gems: [jekyll-paginate] gems: [jekyll-paginate]

29
_layouts/gallery-list.html
View File

@@ -1,6 +1,8 @@
--- ---
layout: default layout: default
--- ---
{% assign url = page.url | split:'/' %}
{% assign gallery = url[2] %}
<section itemscope itemtype="http://schema.org/ImageGallery"> <section itemscope itemtype="http://schema.org/ImageGallery">
<header> <header>
<div class="timeline"></div> <div class="timeline"></div>
@@ -9,7 +11,32 @@ layout: default
</h1> </h1>
</header> </header>
<section class="post-content"> <section class="post-content">
{{ content }} <p>{{ content }}</p>
{% if false != page.slideshow %}
<a href="slideshow.html">[ slideshow ]</a>
{% endif %}
{% if false != page.slideshow and false != page.map %}
&nbsp;|&nbsp;
{% endif %}
{% if false != page.map %}
<a href="map.html">[ map ]</a>
{% endif %}
{% include gallery_list.html gallery=gallery %}
{% capture list %}
{% for post in site.posts %}
{% if post.content contains gallery %}
<li>
<a href="{{ post.url }}">{{ post.title }}</a>
</li>
{% endif %}
{% endfor %}
{% endcapture %}
{% if list %}
<p>{{ site.mentioned_in }}</p>
<ul>
{{ list }}
</ul>
{% endif %}
</section> </section>
{% if false != page.comments %} {% if false != page.comments %}
{% include disqus.html %} {% include disqus.html %}

25
_scripts/generate-gallery.php
View File

@@ -332,12 +332,17 @@ $oConsole
// Write gallery index // Write gallery index
$oOutput->write('<comment>index</comment>'); $oOutput->write('<comment>index</comment>');
$aLinks = []; $aMatter = [
if ($bSlideshow) { 'layout' => 'gallery-list',
$aLinks[] = '<a href="slideshow.html">[ slideshow ]</a>'; 'title' => empty($aGallery['title']) ? '' : $aGallery['title'],
'highlight_photo' => empty($sHighlight) ? $aPhotos[0]['id'] : $sHighlight,
'date' => $oDate->format('Y-m-d')
];
if (!$bSlideshow) {
$aMatter['slideshow'] = false;
} }
if ($bMap) { if (!$bMap) {
$aLinks[] = '<a href="map.html">[ map ]</a>'; $aMatter['map'] = false;
} }
$aMatter = [ $aMatter = [
'layout' => 'gallery-list', 'layout' => 'gallery-list',
@@ -349,15 +354,7 @@ $oConsole
$aMatter['end_date'] = $oEndDate->format('Y-m-d'); $aMatter['end_date'] = $oEndDate->format('Y-m-d');
} }
$sContents = sprintf( $sContents = empty($aGallery['description']) ? '' : $aGallery['description'];
<<<EOF
<div itemprop="description">
<p>%s</p>
%s
</div>
{%% include gallery_list.html gallery='%s' %%}
EOF
, (empty($aGallery['description']) ? '' : $aGallery['description']), implode('&nbsp;|&nbsp;', $aLinks), $sGallery);
file_put_contents( file_put_contents(
$sRenderPath . '/index.html', $sRenderPath . '/index.html',
'---' . "\n" . yamlDump($aMatter) . '---' . "\n" . $sContents '---' . "\n" . yamlDump($aMatter) . '---' . "\n" . $sContents

7
gallery/2013-dundee/index.html
View File

@@ -3,9 +3,4 @@ layout: gallery-list
title: Dundee title: Dundee
highlight_photo: 236a633 highlight_photo: 236a633
date: 2013-11-24 date: 2013-11-24
--- ---
<div itemprop="description">
<p></p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2013-dundee' %}

7
gallery/2013-edinburgh/index.html
View File

@@ -4,9 +4,4 @@ title: Edinburgh
highlight_photo: 8018b99 highlight_photo: 8018b99
date: 2013-09-17 date: 2013-09-17
end_date: 2013-12-07 end_date: 2013-12-07
--- ---
<div itemprop="description">
<p></p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2013-edinburgh' %}

10
gallery/2015-christmas-holidays-beach/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: christmas-holidays-2014-beach title: 'Christmas Holidays: beach'
highlight_photo: 1c46802 highlight_photo: 1c46802
date: 2015-01-02 date: 2015-01-02
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-christmas-holidays-beach' %}

9
gallery/2015-christmas-holidays-dwingelderveld/index.html
View File

@@ -1,11 +1,6 @@
--- ---
layout: gallery-list layout: gallery-list
title: christmas-holidays-2014-dwingelderveld title: 'Christmas Holidays: Dwingelderveld'
highlight_photo: cedffdd highlight_photo: cedffdd
date: 2014-12-31 date: 2014-12-31
--- ---
<div itemprop="description">
<p></p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2015-christmas-holidays-dwingelderveld' %}

10
gallery/2015-christmas-holidays/index.html
View File

@@ -1,12 +1,8 @@
--- ---
layout: gallery-list layout: gallery-list
title: title: Christmas Holidays
highlight_photo: 0093145 highlight_photo: 0093145
date: 2015-12-25 date: 2015-12-25
end_date: 2016-01-01 end_date: 2016-01-01
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-christmas-holidays' %}

9
gallery/2015-spain-barcelona-stores/index.html
View File

@@ -1,12 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: spain-2015-barcelona-stores title: 'Spain: Barcelona stores'
highlight_photo: 3b2ca50 highlight_photo: 3b2ca50
date: 2015-07-03 date: 2015-07-03
end_date: 2015-07-04 end_date: 2015-07-04
--- ---
<div itemprop="description">
<p></p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2015-spain-barcelona-stores' %}

9
gallery/2015-spain-portrait/index.html
View File

@@ -1,12 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: spain-2015-portrait title: 'Spain: portret'
highlight_photo: 4a34012 highlight_photo: 4a34012
date: 2015-06-27 date: 2015-06-27
end_date: 2015-07-02 end_date: 2015-07-02
--- ---
<div itemprop="description">
<p></p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2015-spain-portrait' %}

9
gallery/2015-spain-sitges/index.html
View File

@@ -1,12 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: spain-2015-sitges title: 'Spain: Sitges'
highlight_photo: 263f3b7 highlight_photo: 263f3b7
date: 2015-06-28 date: 2015-06-28
end_date: 2015-07-02 end_date: 2015-07-02
--- ---
<div itemprop="description">
<p></p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2015-spain-sitges' %}

9
gallery/2015-spain-tarragona/index.html
View File

@@ -1,11 +1,6 @@
--- ---
layout: gallery-list layout: gallery-list
title: spain-2015-tarragona title: 'Spain: Tarragona'
highlight_photo: c2c8f99 highlight_photo: c2c8f99
date: 2015-06-27 date: 2015-06-27
--- ---
<div itemprop="description">
<p></p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2015-spain-tarragona' %}

10
gallery/2015-summer-aberdeen-tolbooth/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: summer-2015-aberdeen-tolbooth title: 'Summer: Aberdeen tolbooth'
highlight_photo: a581ec2 highlight_photo: a581ec2
date: 2015-07-18 date: 2015-07-18
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-summer-aberdeen-tolbooth' %}

10
gallery/2015-summer-aberdeen/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: summer-2015-aberdeen title: 'Summer: Aberdeen'
highlight_photo: fa4baea highlight_photo: fa4baea
date: 2015-07-18 date: 2015-07-18
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-summer-aberdeen' %}

10
gallery/2015-summer-dunnottar-castle/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: summer-2015-dunnottar-castle title: 'Summer: Dunnottar castle'
highlight_photo: 368a126 highlight_photo: 368a126
date: 2015-07-18 date: 2015-07-18
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-summer-dunnottar-castle' %}

10
gallery/2015-summer-holidays/index.html
View File

@@ -1,12 +1,8 @@
--- ---
layout: gallery-list layout: gallery-list
title: summer-holidays-2015 title: Summer Holidays
highlight_photo: ce3abd3 highlight_photo: ce3abd3
date: 2015-08-01 date: 2015-08-01
end_date: 2015-08-08 end_date: 2015-08-08
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-summer-holidays' %}

10
gallery/2015-visit-sanne-fife-anstruther/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: visit-sanne-2015-fife-anstruther title: 'Visit Sanne: Anstruther'
highlight_photo: 933253f highlight_photo: 933253f
date: 2015-08-23 date: 2015-08-23
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-visit-sanne-fife-anstruther' %}

10
gallery/2015-visit-sanne-fife-pittenweem/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: visit-sanne-2015-fife-pittenweem title: 'Visit Sanne: Pittenweem'
highlight_photo: 97b3176 highlight_photo: 97b3176
date: 2015-08-23 date: 2015-08-23
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-visit-sanne-fife-pittenweem' %}

10
gallery/2015-visit-sanne-highlands-distillery/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: visit-sanne-2015-highlands-distillery title: 'Visit Sanne: Dalwhinnie'
highlight_photo: 1702ed6 highlight_photo: 1702ed6
date: 2015-08-22 date: 2015-08-22
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-visit-sanne-highlands-distillery' %}

10
gallery/2015-visit-sanne-highlands-hike/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: visit-sanne-2015-highlands-hike title: 'Visit Sanne: highland hike'
highlight_photo: 7b382b1 highlight_photo: 7b382b1
date: 2015-08-22 date: 2015-08-22
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-visit-sanne-highlands-hike' %}

8
gallery/2015-visit-sanne-highlands-perth/index.html
View File

@@ -3,9 +3,5 @@ layout: gallery-list
title: visit-sanne-2015-highlands-perth title: visit-sanne-2015-highlands-perth
highlight_photo: b4aeee4 highlight_photo: b4aeee4
date: 2015-08-22 date: 2015-08-22
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-visit-sanne-highlands-perth' %}

10
gallery/2015-visit-sanne/index.html
View File

@@ -1,12 +1,8 @@
--- ---
layout: gallery-list layout: gallery-list
title: visit-sanne-2015 title: Visit Sanne
highlight_photo: 1016c64 highlight_photo: 1016c64
date: 2015-08-21 date: 2015-08-21
end_date: 2015-08-23 end_date: 2015-08-23
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-visit-sanne' %}

10
gallery/2015-whisky-poker/index.html
View File

@@ -1,11 +1,7 @@
--- ---
layout: gallery-list layout: gallery-list
title: whisky-poker title: Whisky & Poker
highlight_photo: ca11f73 highlight_photo: ca11f73
date: 2015-06-20 date: 2015-06-20
--- map: false
<div itemprop="description"> ---
<p></p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2015-whisky-poker' %}

6
gallery/2016-peugeot-206-leak/index.html
View File

@@ -5,8 +5,4 @@ highlight_photo: 3c7d11d
date: 2016-01-09 date: 2016-01-09
ignore: true ignore: true
--- ---
<div itemprop="description"> Best even schrikken als de regen een indrukwekkende kring olie om je auto heen spoelt.
<p>Best even schrikken als de regen een indrukwekkende kring olie om je auto heen spoelt.</p>
<a href="slideshow.html">[ slideshow ]</a>
</div>
{% include gallery_list.html gallery='2016-peugeot-206-leak' %}

6
gallery/2016-seat-ibiza-scrap/index.html
View File

@@ -4,8 +4,4 @@ title: Seat Ibiza to Scrap
highlight_photo: 4fda888 highlight_photo: 4fda888
date: 2016-01-19 date: 2016-01-19
--- ---
<div itemprop="description"> Mijn Seat zwaait mij (letterlijk) uit als deze achterop de dieplader richting de schroter wordt getild.
<p>Mijn Seat zwaait mij (letterlijk) uit als deze achterop de dieplader richting de schroter wordt getild.</p>
<a href="slideshow.html">[ slideshow ]</a>&nbsp;|&nbsp;<a href="map.html">[ map ]</a>
</div>
{% include gallery_list.html gallery='2016-seat-ibiza-scrap' %}