Merge branch 'pr/292'

sigal/settings.py

@@ -64,6 +64,7 @@ _DEFAULT_CONFIG = {
     'piwik': {'tracker_url': '', 'site_id': 0},
     'plugin_paths': [],
     'plugins': [],
+    'site_logo': '',
     'show_map': False,
     'source': '',
     'theme': 'colorbox',

sigal/templates/sigal.conf.py

@@ -222,6 +222,13 @@ ignore_files = []
 # The default is 3 columns (176px).
 # colorbox_column_size = 3
 
+# Site Logo - Use a logo file in the sidebar
+# Only for colorbox currently, it could be adapted for other themes
+# You must place the logo file into the theme's static images folder, which
+# can be done using 'files_to_copy':
+# files_to_copy = (('extra/logo.png', 'static/logo.png'))
+# site_logo = 'logo.png'
+
 # --------
 # Plugins
 # --------

sigal/themes/colorbox/templates/base.html

@@ -20,7 +20,13 @@
     <div class="container">
       <div class="three columns">
         <div class="sidebar">
-          <h1><a href="{{ album.index_url }}">{{ index_title }}</a></h1>
+          <h1><a href="{{ album.index_url }}">
+          {% if settings.site_logo %}
+          <img src="{{ theme.url }}/{{ settings.site_logo }}" alt="{{ index_title }}">
+          {% else %}
+          {{ index_title }}
+          {% endif %}
+          </a></h1>
           {% if settings.links %}
           <nav id="menu">
             <ul>