diff --git a/_layouts/gallery-index.html b/_layouts/gallery-index.html index 47e8720..64becaa 100644 --- a/_layouts/gallery-index.html +++ b/_layouts/gallery-index.html @@ -1,59 +1,58 @@ ---- -layout: default ---- -
-
-
- {% if page.date %} - - {% endif %} -
-

- {{ page.title }} - -

- {% if page.end_date %} - 🕗 {{ page.date | date:"%d/%m/%Y" }} - {{ page.end_date | date:"%d/%m/%Y" }} - {% endif %} - -
-
- {{ content }} - {% if false != page.slideshow %} - [ slideshow ] - {% endif %} - {% if false != page.slideshow and page.map %} -  |  - {% endif %} - {% if page.map %} - [ map ] - {% 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 %} -

{{ site.mentioned_in }}

- - {% endif %} -
- {% for photo in page.photos %} - - - - {% endfor %} -
-
- {% if page.comments != false %} - {% include disqus.html %} - {% endif %} +--- +layout: default +--- +
+
+
+ {% if page.date %} + + {% endif %} +
+

+ {{ page.title }} + +

+ {% if page.end_date %} + 🕗 {{ page.date | date:"%d/%m/%Y" }} - {{ page.end_date | date:"%d/%m/%Y" }} + {% endif %} + +
+
+ {% if false != page.slideshow %} + [ slideshow ] + {% endif %} + {% if false != page.slideshow and page.map %} +  |  + {% endif %} + {% if page.map %} + [ map ] + {% 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 %} +

{{ site.mentioned_in }}

+ + {% endif %} +
+ {% for photo in page.photos %} + + + + {% endfor %} +
+
+ {% if page.comments != false %} + {% include disqus.html %} + {% endif %}
\ No newline at end of file diff --git a/_layouts/gallery-list.html b/_layouts/gallery-list.html index b3d239c..930efec 100644 --- a/_layouts/gallery-list.html +++ b/_layouts/gallery-list.html @@ -1,36 +1,36 @@ ---- -title: Galleries -layout: default ---- -
-

- 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. -

-
-
-{% 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 %} -
- - {{ gallery.title }} - {{ gallery.title }} - {% if gallery.date %}
- - {% if gallery.date_end %} - {{ gallery.date | date:"%B %-d" }} – {{ gallery.date_end | date:"%-d" }}, {{ gallery.date | date:"%Y" }} - {% else %} - {{ gallery.date | date:"%B %-d, %Y" }} - {% endif %} - - {% endif %} - -
- {% endunless %} -{% endfor %} +--- +title: Galleries +layout: default +--- +
+

+ 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. +

+
+
+{% 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 %} +
+ + {{ gallery.title }} + {{ gallery.title }} + {% if gallery.date %}
+ + {% if gallery.date_end %} + {{ gallery.date | date:"%B %-d" }} – {{ gallery.date_end | date:"%-d" }}, {{ gallery.date | date:"%Y" }} + {% else %} + {{ gallery.date | date:"%B %-d, %Y" }} + {% endif %} + + {% endif %} + +
+ {% endunless %} +{% endfor %}
\ No newline at end of file diff --git a/_layouts/gallery-photo.html b/_layouts/gallery-photo.html index 8dc1465..84118a9 100644 --- a/_layouts/gallery-photo.html +++ b/_layouts/gallery-photo.html @@ -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 %} -
-
-
- {% if photo.date %} - - {% endif %} - {% if photo.latitude %} - map - {% endif %} -
-
-

{{ content }}

- [ gallery ] -
-
    - {% if photo.previous %} -
    • - {% else %} -
  •  ← 
    • - {% endif %} - - {% if photo.next %} -
    • - {% else %} -
  •  → 
    • - {% endif %} -
-

- {{ photo.title }} -

-
-
- {% 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 %} -

- Photo: {{ photo.title }} -

- - {% if photo.description %} -
- {{ photo.description }} -
- {% endif %} -
-
-
-
-
-
Date
-
{{ photo.date | date:'%A, %B %d at %I:%M %p' | replace:' 0',' ' | replace:' AM',' am' | replace:' PM',' pm' }} - - {% if photo.aperture %} -
Camera
-
{{ photo.make }} {{ photo.model }}
- {% endif %} - - {% if photo.aperture %} -
Aperture
-
{{ photo.aperture }}
- {% endif %} - - {% if photo.aperture %} -
Exposure
-
{{ photo.exposure }}
- {% endif %} - - {% if sizes %} -
Sizes
-
- {% for size in sizes %} - {% if 0 < forloop.index0 %} · {% 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 %} - - - {% if height > 0 %} - - {% endif %} - {{ label }} - - {% endfor %} -
- {% endif %} -
-
- - {% if photo %} -
- - - - - map -
- {% endif %} - -
-
-
- {% if photo.next %} -
- -
- {% endif %} - - {% if photo.previous %} - - {% endif %} - - - -
-
-
-
+--- +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 %} +
+
+
+ {% if photo.date %} + + {% endif %} + {% if photo.latitude %} + map + {% endif %} +
+
+ [ gallery ] +
+
    + {% if photo.previous %} +
    • + {% else %} +
  •  ← 
    • + {% endif %} + + {% if photo.next %} +
    • + {% else %} +
  •  → 
    • + {% endif %} +
+

+ {{ photo.title }} +

+
+
+ {% 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 %} +

+ Photo: {{ photo.title }} +

+ + {% if photo.description %} +
+ {{ photo.description }} +
+ {% endif %} +
+
+
+
+
+
Date
+
{{ photo.date | date:'%A, %B %d at %I:%M %p' | replace:' 0',' ' | replace:' AM',' am' | replace:' PM',' pm' }} + + {% if photo.aperture %} +
Camera
+
{{ photo.make }} {{ photo.model }}
+ {% endif %} + + {% if photo.aperture %} +
Aperture
+
{{ photo.aperture }}
+ {% endif %} + + {% if photo.aperture %} +
Exposure
+
{{ photo.exposure }}
+ {% endif %} + + {% if sizes %} +
Sizes
+
+ {% for size in sizes %} + {% if 0 < forloop.index0 %} · {% 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 %} + + + {% if height > 0 %} + + {% endif %} + {{ label }} + + {% endfor %} +
+ {% endif %} +
+
+ + {% if photo.latitude %} +
+ + + + + map +
+ {% endif %} + +
+
+
+ {% if photo.next %} +
+ +
+ {% endif %} + + {% if photo.previous %} + + {% endif %} + + + +
+
+
+