From 58b3901940045e4aa70cea57dc5b0ca8459c8a10 Mon Sep 17 00:00:00 2001
From: sawall <github@sawall.org>
Date: Fri, 10 Oct 2014 17:28:06 -0500
Subject: [PATCH] got basic galleria example working, fixes #1

---
 README.md                                     |  2 +-
 .../static/js/galleria.classic.min.js         |  2 +-
 .../templates/{index.html => album.html}      | 75 ++++++++-----------
 3 files changed, 32 insertions(+), 47 deletions(-)
 rename examples/themes/galleria/templates/{index.html => album.html} (66%)

diff --git a/README.md b/README.md
index 3022789..946a4b7 100644
--- a/README.md
+++ b/README.md
@@ -90,5 +90,5 @@ For more on creating Pelican generator plugins, see the [Pelican plugin document
 ##Credits
 * Around 2/3 of the core Python code is ported from
   [Sigal v0.8.0](http://sigal.saimon.org/) by Simon Conseil.
-* Heavily leverages Pelican, Jinja2, Colorbox, and Galleria.
+* Heavily leverages Pelican, PIL, Jinja2, Colorbox, and Galleria.
 * Pelican generator plugin implementation and integration by Scott Boone (sawall@github).
\ No newline at end of file
diff --git a/examples/themes/galleria/static/js/galleria.classic.min.js b/examples/themes/galleria/static/js/galleria.classic.min.js
index 30c5880..26af934 100644
--- a/examples/themes/galleria/static/js/galleria.classic.min.js
+++ b/examples/themes/galleria/static/js/galleria.classic.min.js
@@ -1 +1 @@
-!function(i){Galleria.addTheme({name:"classic",author:"Galleria",css:"galleria.classic.css",defaults:{transition:"slide",thumbCrop:"height",_toggleInfo:true},init:function(t){Galleria.requires(1.33,"This version of Classic theme requires Galleria 1.3.3 or later");this.addElement("info-link","info-close");this.append({info:["info-link","info-close"]});var e=this.$("info-link,info-close,info-text"),s=Galleria.TOUCH;this.$("loader,counter").show().css("opacity",.4);if(!s){this.addIdleState(this.get("image-nav-left"),{left:-50});this.addIdleState(this.get("image-nav-right"),{right:-50});this.addIdleState(this.get("counter"),{opacity:0})}if(t._toggleInfo===true){e.bind("click:fast",function(){e.toggle()})}else{e.show();this.$("info-link, info-close").hide()}this.bind("thumbnail",function(t){if(!s){i(t.thumbTarget).css("opacity",.6).parent().hover(function(){i(this).not(".active").children().stop().fadeTo(100,1)},function(){i(this).not(".active").children().stop().fadeTo(400,.6)});if(t.index===this.getIndex()){i(t.thumbTarget).css("opacity",1)}}else{i(t.thumbTarget).css("opacity",this.getIndex()?1:.6).bind("click:fast",function(){i(this).css("opacity",1).parent().siblings().children().css("opacity",.6)})}});var n=function(t){i(t.thumbTarget).css("opacity",1).parent().siblings().children().css("opacity",.6)};this.bind("loadstart",function(i){if(!i.cached){this.$("loader").show().fadeTo(200,.4)}window.setTimeout(function(){n(i)},s?300:0);this.$("info").toggle(this.hasInfo())});this.bind("loadfinish",function(i){this.$("loader").fadeOut(200)})}})}(jQuery);
\ No newline at end of file
+!function(i){Galleria.addTheme({name:"classic",author:"Galleria",css:"../css/galleria.classic.css",defaults:{transition:"slide",thumbCrop:"height",_toggleInfo:true},init:function(t){Galleria.requires(1.33,"This version of Classic theme requires Galleria 1.3.3 or later");this.addElement("info-link","info-close");this.append({info:["info-link","info-close"]});var e=this.$("info-link,info-close,info-text"),s=Galleria.TOUCH;this.$("loader,counter").show().css("opacity",.4);if(!s){this.addIdleState(this.get("image-nav-left"),{left:-50});this.addIdleState(this.get("image-nav-right"),{right:-50});this.addIdleState(this.get("counter"),{opacity:0})}if(t._toggleInfo===true){e.bind("click:fast",function(){e.toggle()})}else{e.show();this.$("info-link, info-close").hide()}this.bind("thumbnail",function(t){if(!s){i(t.thumbTarget).css("opacity",.6).parent().hover(function(){i(this).not(".active").children().stop().fadeTo(100,1)},function(){i(this).not(".active").children().stop().fadeTo(400,.6)});if(t.index===this.getIndex()){i(t.thumbTarget).css("opacity",1)}}else{i(t.thumbTarget).css("opacity",this.getIndex()?1:.6).bind("click:fast",function(){i(this).css("opacity",1).parent().siblings().children().css("opacity",.6)})}});var n=function(t){i(t.thumbTarget).css("opacity",1).parent().siblings().children().css("opacity",.6)};this.bind("loadstart",function(i){if(!i.cached){this.$("loader").show().fadeTo(200,.4)}window.setTimeout(function(){n(i)},s?300:0);this.$("info").toggle(this.hasInfo())});this.bind("loadfinish",function(i){this.$("loader").fadeOut(200)})}})}(jQuery);
\ No newline at end of file
diff --git a/examples/themes/galleria/templates/index.html b/examples/themes/galleria/templates/album.html
similarity index 66%
rename from examples/themes/galleria/templates/index.html
rename to examples/themes/galleria/templates/album.html
index 4bda703..23f1260 100644
--- a/examples/themes/galleria/templates/index.html
+++ b/examples/themes/galleria/templates/album.html
@@ -1,39 +1,26 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+{% extends "base.html" %}
 
-    <title>{{ album.title|striptags }}</title>
-    <meta name="description" content="">
-    <meta name="author" content="{{ author }}">
-    <meta name="viewport" content="width=device-width">
+{#
+    A head block must be defined in the Pelican theme's base.html prior to
+    closing the HTML head tag so that the siglican stylesheets and javascript
+    can be added. simply adding:
+        {% block head %}{% endblock %} 
+    just before the head closer is sufficient.
+#}
 
-    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Molengo">
-    <link rel="stylesheet" href="{{ theme.url }}/css/galleria.classic.css">
-    <link rel="stylesheet" href="{{ theme.url }}/css/style.min.css">
-    <!--[if lt IE 9]>
-        <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-  </head>
-  <body>
+{% block head %}
+    {{ super() }}
+    <link rel="stylesheet" href="{{ SIGLICAN_THEME_URL }}/css/style.min.css">
+{% endblock %}
+
+{% block content %}
     <div class="container">
       <header>
-        <h1><a href="{{ album.index_url }}">{{ index_title }}</a></h1>
+        <h1><a href="{{ SIGLICAN_ALBUM.index_url }}">{{ index_title }}</a></h1>
 
-        {% if settings.links %}
-        <nav id="menu">
-          <ul>
-            {% for title, link in settings.links %}
-            <li><a href="{{ link }}">{{ title }}</a></li>
-            {% endfor %}
-          </ul>
-        </nav>
-        {% endif %}
-
-        {% if album.breadcrumb %}
+        {% if SIGLICAN_ALBUM.breadcrumb %}
         <h2>
-          {%- for url, title in album.breadcrumb -%}
+          {%- for url, title in SIGLICAN_ALBUM.breadcrumb -%}
           <a href="{{ url }}">{{ title }}</a>
           {%- if not loop.last %} » {% endif -%}
           {% endfor -%}
@@ -43,11 +30,11 @@
       </header>
 
       <div id="main" role="main">
-        {% if album.albums %}
+        {% if SIGLICAN_ALBUM.albums %}
         <div id="albums">
           <!-- <h1>Albums</h1> -->
           <ul>
-            {% for alb in album.albums %}
+            {% for alb in SIGLICAN_ALBUM.albums %}
             <li><a href="{{ alb.url }}">
               <img src="{{ alb.thumbnail }}" class="album_thumb" alt="{{ alb.name }}" title="{{ alb.name }}" /></a>
               <span class="album_title">{{ alb.title }}</span>
@@ -57,7 +44,7 @@
         </div>
         {% endif %}
 
-        {% if album.medias %}
+        {% if SIGLICAN_ALBUM.medias %}
           {% macro img_description(media) -%}
             {%- if media.big %}<a href='{{ media.big }}'>Full size</a>{% endif %}
             {% if media.description %}<br>{{ media.description }}{% endif %}
@@ -74,7 +61,7 @@
             {% endif %}
           {%- endmacro %}
         <div id="gallery">
-          {% for media in album.medias %}
+          {% for media in SIGLICAN_ALBUM.medias %}
             {% if media.type == "image" %}
               <a href="{{ media.filename }}">
                 <img src="{{ media.thumbnail }}" alt="{{ media.filename }}"
@@ -96,7 +83,7 @@
         </div>
         {% endif %}
 
-        {% if album.zip %}
+        {% if SIGLICAN_ALBUM.zip %}
         <div id="additionnal-infos" class="row">
           <p>
             <a href="{{ album.zip }}"
@@ -105,9 +92,9 @@
         </div>
         {% endif %}
 
-        {% if album.description %}
+        {% if SIGLICAN_ALBUM.description %}
         <div id="description">
-          {{ album.description }}
+          {{ SIGLICAN_ALBUM.description }}
         </div>
         {% endif %}
       </div>
@@ -118,12 +105,12 @@
       </footer>
     </div>
 
-    {% if album.medias %}
+    {% if SIGLICAN_ALBUM.medias %}
     <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-    <script>!window.jQuery && document.write(unescape('%3Cscript src="{{ theme.url }}/js/jquery-1.11.1.min.js"%3E%3C/script%3E'))</script>
-    <script src="{{ theme.url }}/js/galleria-1.3.5.min.js"></script>
-    <script src="{{ theme.url }}/js/galleria.classic.min.js"></script>
-    <script src="{{ theme.url }}/js/galleria.history.min.js"></script>
+    <script>!window.jQuery && document.write(unescape('%3Cscript src="{{ SIGLICAN_THEME_URL }}/js/jquery-1.11.1.min.js"%3E%3C/script%3E'))</script>
+    <script src="{{ SIGLICAN_THEME_URL }}/js/galleria-1.3.5.min.js"></script>
+    <script src="{{ SIGLICAN_THEME_URL }}/js/galleria.classic.min.js"></script>
+    <script src="{{ SIGLICAN_THEME_URL }}/js/galleria.history.min.js"></script>
     <script>
     Galleria.configure({
         imageCrop: false,
@@ -140,6 +127,4 @@
 
     </script>
     {% endif %}
-    {% include 'analytics.html' %}
-  </body>
-</html>
+{% endblock %}