-
-
- {% endif %}
-
{% for section in gallery.sections %}
{% include "sections/" + section.type + ".html" %}
{% endfor %}
-
{% if settings.share %}
{% include 'share.html' -%}
{% endif %}
@@ -66,23 +56,6 @@
{% endif %}
{% endblock %}
diff --git a/prosopopee/themes/material/templates/menu.html b/prosopopee/themes/material/templates/menu.html
index cbbf154..e37da1a 100644
--- a/prosopopee/themes/material/templates/menu.html
+++ b/prosopopee/themes/material/templates/menu.html
@@ -1,15 +1,30 @@
--
- {%- for line in settings.menu -%}
- {% set file_name, menu_name = line.items()[0] %}
+
- {{ menu_name }} {% else %} -
- {{ menu_name }} - {%- endif -%} - {%- endfor -%} + {% set file_name = "../"+file_name %} + {% endif %} +
- {{ menu_name }} + {% endfor %} + {% endfor %} +
- {{ menu_name }} + {% endfor %} + {% endfor %} +
-
+ {% for line in settings.menu %}
+ {% set rowloop = loop %}
+ {% for file_name, menu_name in line.items() %}
{% if file_name.startswith('http') %}
{% set file_name = file_name %}
- {% elif gallery %}
- {% set file_name = "../"+file_name %}
- {%- endif -%}
- {%- if loop.first -%}
-
-
+ {% for line in settings.menu %}
+ {% set rowloop = loop %}
+ {% for file_name, menu_name in line.items() %}
+ {% if file_name.startswith('http') %}
+ {% set file_name = file_name %}
+ {% else %}
+ {% set file_name = "../"+file_name %}
+ {% endif %}
+
-
+
+
-{{ gallery.title }}
-
-
-
-
-
+ {% for section in gallery.sections %}
+ {% include "sections/" + section.type + ".html" %}
+ {% endfor %}
-
-
-
-
-{% endblock %}
+ {% include 'footer.html' %}
+
+
diff --git a/setup.py b/setup.py
index 07db29b..cad81fc 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ except ImportError:
setup(name='prosopopee',
- version='0.8',
+ version='0.8.1',
description='A static website generator that allows you to tell a story with your pictures',
author='Laurent Peuch',
long_description=read_md('README.md') + "\n\n\n" + open('docs/changelog.rst').read(),