diff --git a/.gitignore b/.gitignore index 04f5aaf..c079f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /private /.jekyll-metadata +/_asset +/_site /_python /_php /Gemfile.lock diff --git a/_config.yml b/_config.yml index 871e86d..e42bca0 100644 --- a/_config.yml +++ b/_config.yml @@ -45,4 +45,5 @@ photo_sizes: - [96, 96] exclude: - LICENSE -- README \ No newline at end of file +- README +array: [] \ No newline at end of file diff --git a/_includes/gallery.html b/_includes/gallery.html index 98a61a5..567efe4 100644 --- a/_includes/gallery.html +++ b/_includes/gallery.html @@ -5,6 +5,11 @@ [ gallery ]
{% endunless %} {% for photo in photos %} - Photo: {{ photo.title }} + {% if false != gallery.slideshow %} + {% capture url %}{{ include.gallery }}/slideshow.html#{{ photo.name }}{% endcapture %} + {% else %} + {% capture url %}{{ photo.url }}{% endcapture %} + {% endif %} + Photo: {{ photo.title }} {% endfor %} \ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index ffdc6cf..853dd4e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -49,7 +49,7 @@ superSearch({ searchFile: '/blog/atom.xml' }); - } + } diff --git a/_layouts/gallery-index.html b/_layouts/gallery-index.html index fefb4e2..c7f23dd 100644 --- a/_layouts/gallery-index.html +++ b/_layouts/gallery-index.html @@ -45,7 +45,12 @@ layout: default
{% for photo in page.photos %} - diff --git a/_layouts/gallery-photo.html b/_layouts/gallery-photo.html index 84118a9..8ace4a4 100644 --- a/_layouts/gallery-photo.html +++ b/_layouts/gallery-photo.html @@ -51,10 +51,14 @@ layout: default {% else %} {% assign file='640w' %} {% endif %} + {% if false != page.slideshow %} + {% capture url %}slideshow.html#{{ photo.name }}{% endcapture %} + {% else %} + {% capture url %}{{ photo_url }}~{{ file }}.jpg{% endcapture %} + {% endif %}

- Photo: {{ photo.title }} + Photo: {{ photo.title }}

- {% if photo.description %}
{{ photo.description }} diff --git a/_layouts/gallery-slideshow.html b/_layouts/gallery-slideshow.html index c22c9a6..4d81bb7 100644 --- a/_layouts/gallery-slideshow.html +++ b/_layouts/gallery-slideshow.html @@ -43,8 +43,10 @@

{{ page.title }}

+{% assign photo_names = site.array %} {% for photo in page.photos %}
+ {% assign photo_names = photo_names | push:photo.name %} {% capture photo_url %}{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name }}{% endcapture %} {% if photo.width %} {% assign width=photo.width %} @@ -52,17 +54,18 @@ {% assign width=640 %} {% endif %} {% assign sizes=''|split:'' %} + {% assign height=width %} + {% assign file='640w' %} + {% assign label='640x360' %} {% for size in site.photo_sizes %} {% if size[0] == width %} {% assign height=size[1] %} + {% if width != 640 %} + {% capture label %}{{ width }}x{{ height }}{% endcapture %} + {% assign file=label %} + {% endif %} {% endif %} - {% endfor %} - {% capture label %}{{ width }}x{{ height }}{% endcapture %} - {% if width == 640 %} - {% assign file='640w' %} - {% else %} - {% assign file=label %} - {% endif %} + {% endfor %} {{ photo.title }} @@ -178,7 +181,6 @@ dom.addEvent('click', function (e) { openPhotoSwipe(i); - e.preventDefault(); }); @@ -190,8 +192,14 @@ mdom : imgdom }); }); - - openPhotoSwipe(0); + + index = 0 + var photos = ['{{ photo_names | join:"', '" }}']; + if (window.location.hash) { + var hash = window.location.hash.substring(1) + index = Math.max(photos.indexOf(hash), 0) + } + openPhotoSwipe(index) });