Reorganize breadcrumb

sigal/themes/colorbox/templates/album.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% block content %}
-  {% include 'breadcrumb.html' %}
   {% set numbers = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine"] %}
   {% set column_size = settings.colorbox_column_size %}
   {% set nb_columns = (9 / column_size)|int %}
@@ -68,11 +67,6 @@
   </div>
   {% endif %}
 
-  {% if album.description %}
-  <div id="description" class="row">
-    {{ album.description }}
-  </div>
-  {% endif %}
 {% endblock %}
 
 {% block footer %}

sigal/themes/colorbox/templates/album_list.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% block content %}
-  {% include 'breadcrumb.html' %}
   {% set numbers = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine"] %}
   {% set column_size = settings.colorbox_column_size %}
   {% set nb_columns = (9 / column_size)|int %}
@@ -20,10 +19,4 @@
     </div>
     {% endif%}
   {% endfor %}
-
-  {% if album.description %}
-  <div id="description" class="row">
-    {{ album.description }}
-  </div>
-  {% endif %}
 {% endblock %}

sigal/themes/colorbox/templates/base.html

@@ -31,10 +31,26 @@
         </div>
       </div>
       <div id="main" role="main" class="nine columns offset-by-three">
+        <header>
+          {% if album.breadcrumb %}
+            <h2>
+              {% for url, title in album.breadcrumb %}
+                <a href="{{ url }}">{{ title }}</a>{% if not loop.last %} » {% endif %}
+              {% endfor -%}
+            </h2>
+            <hr>
+          {% endif %}
+        </header>
+
         {% block content %}{% endblock %}
+
+        {% if album.description %}
+          <div id="description" class="row">
+            {{ album.description }}
+          </div>
+        {% endif %}
       </div>
     </div>
-
     {% block footer %}{% endblock %}
     {% include 'piwik.html' %}
   </body>

sigal/themes/colorbox/templates/breadcrumb.html

@@ -1,10 +0,0 @@
-  <header>
-    {% if album.breadcrumb %}
-    <h2>
-      {% for url, title in album.breadcrumb %}
-      <a href="{{ url }}">{{ title }}</a>{% if not loop.last %} » {% endif %}
-      {% endfor -%}
-    </h2>
-    <hr>
-    {% endif %}
-  </header>

sigal/themes/galleria/templates/album.html

@@ -26,9 +26,8 @@
 
         {% if album.zip %}
         <div id="additionnal-infos" class="row">
-          <p>
-            <a href="{{ album.zip }}"
-               title="Download a zip archive with all images">Download ZIP</a>
+          <p><a href="{{ album.zip }}"
+                title="Download a zip archive with all images">Download ZIP</a>
           </p>
         </div>
         {% endif %}

sigal/themes/photoswipe/templates/album.html

@@ -3,7 +3,8 @@
 {% block content %}
   {% if album.zip %}
   <div class="additionnal-infos">
-    <p><a href="{{ album.zip }}" title="Download a zip archive with all images">Download ZIP</a></p>
+    <p><a href="{{ album.zip }}"
+          title="Download a zip archive with all images">Download ZIP</a></p>
   </div>
   {% endif %}