From bb95308cda581589de07a6f4bb761672d1242c94 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Fri, 12 Oct 2018 23:11:40 +0200
Subject: [PATCH] Move links to a dedicated template

---
 sigal/themes/colorbox/templates/base.html         | 10 +---------
 sigal/themes/default/templates/links.html         |  9 +++++++++
 sigal/themes/galleria/templates/album_list.html   |  1 -
 sigal/themes/galleria/templates/base.html         | 10 +---------
 sigal/themes/photoswipe/static/styles.css         |  6 +++---
 sigal/themes/photoswipe/templates/album_list.html | 10 +---------
 6 files changed, 15 insertions(+), 31 deletions(-)
 create mode 100644 sigal/themes/default/templates/links.html

diff --git a/sigal/themes/colorbox/templates/base.html b/sigal/themes/colorbox/templates/base.html
index 9225115..ba0483c 100644
--- a/sigal/themes/colorbox/templates/base.html
+++ b/sigal/themes/colorbox/templates/base.html
@@ -27,15 +27,7 @@
           {{ index_title }}
           {% endif %}
           </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 %}
+          {% include 'links.html' %}
           {% include 'footer.html' %}
         </div>
       </div>
diff --git a/sigal/themes/default/templates/links.html b/sigal/themes/default/templates/links.html
new file mode 100644
index 0000000..9da5285
--- /dev/null
+++ b/sigal/themes/default/templates/links.html
@@ -0,0 +1,9 @@
+{% if settings.links %}
+<nav id="menu">
+  <ul>
+    {% for title, link in settings.links %}
+    <li><a href="{{ link }}">{{ title }}</a></li>
+    {% endfor %}
+  </ul>
+</nav>
+{% endif %}
diff --git a/sigal/themes/galleria/templates/album_list.html b/sigal/themes/galleria/templates/album_list.html
index 22cdbd5..8cc7d8c 100644
--- a/sigal/themes/galleria/templates/album_list.html
+++ b/sigal/themes/galleria/templates/album_list.html
@@ -15,7 +15,6 @@
 
 {% block content %}
         <div id="albums">
-          <!-- <h1>Albums</h1> -->
           <ul>
             {% for alb in album.albums %}
             <li><a href="{{ alb.url }}">
diff --git a/sigal/themes/galleria/templates/base.html b/sigal/themes/galleria/templates/base.html
index e7119dc..391400d 100644
--- a/sigal/themes/galleria/templates/base.html
+++ b/sigal/themes/galleria/templates/base.html
@@ -21,15 +21,7 @@
       <header>
         <h1><a href="{{ 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 %}
+        {% include 'links.html' %}
         {% if album.breadcrumb %}
         <h2>
           {%- for url, title in album.breadcrumb -%}
diff --git a/sigal/themes/photoswipe/static/styles.css b/sigal/themes/photoswipe/static/styles.css
index edd709a..9cacc1a 100644
--- a/sigal/themes/photoswipe/static/styles.css
+++ b/sigal/themes/photoswipe/static/styles.css
@@ -84,18 +84,18 @@ figcaption {
   padding:2em 0;
 }
 
-.menu {
+#menu {
   width: 100%;
   background: #F7F7F7 none repeat scroll 0 0;
   padding: 30px 0;
 }
 
-.menu ul {
+#menu ul {
   max-width: 1024px;
   margin: 0 auto;
 }
 
-.menu li {
+#menu li {
     display: inline;
     list-style: none; /* pour enlever les puces sur IE7 */
 }
diff --git a/sigal/themes/photoswipe/templates/album_list.html b/sigal/themes/photoswipe/templates/album_list.html
index f0f79b2..57290b4 100644
--- a/sigal/themes/photoswipe/templates/album_list.html
+++ b/sigal/themes/photoswipe/templates/album_list.html
@@ -23,15 +23,7 @@
   <div class="container">
 	<h1><a href="{{ album.index_url }}">{{ index_title }}</a></h1>
 
-	{% if settings.links %}
-    <div class="menu">
-      <ul>
-        {% for title, link in settings.links %}
-        	<li><a href="{{ link }}">{{ title }}</a></li>
-        {% endfor %}
-      </ul>
-    </div>
-    {% endif %}
+  {% include 'links.html' %}
 
 	{% block content %}