Merge remote branch 'upstream/dev' into dev

Conflicts:
	themes/default/_head.twig

5 files changed, 12 insertions, 7 deletions

diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig
index 2b895854..06148a57 100644
--- a/themes/default/_footer.twig
+++ b/themes/default/_footer.twig
@@ -1,4 +1,4 @@
         <footer class="w600p center mt3 mb3 smaller txtright">
             <p>{% trans "powered by" %} <a href="http://inthepoche.com">poche</a></p>
-            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE_VERSION')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
+            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
         </footer>
\ No newline at end of file
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 9745459c..247b929e 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -8,4 +8,4 @@
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
         <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
-        <script src="href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 0f1aea80..13bdaafd 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -23,7 +23,7 @@
 
             <h2>{% trans "Updating poche" %}</h2>
             <ul>
-                <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
+                <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
                 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
             </ul>
@@ -77,4 +77,4 @@
 
             <h2>{% trans "Export your poche datas" %}</h2>
             <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index eb04f0c4..3ef9c823 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -188,7 +188,7 @@ a:visited {
     bottom: 0;
     left: 0;
     width: 100%;
-    height: 50px;
+    min-height: 50px;
     padding-top: 17px;
     text-align: center;
     color: #fff;
diff --git a/themes/default/error.twig b/themes/default/error.twig
index c829d12b..99eb1ed6 100644
--- a/themes/default/error.twig
+++ b/themes/default/error.twig
@@ -1,6 +1,11 @@
 {% extends "layout.twig" %}
 {% block title %}{% trans "plop" %}{% endblock %}
 {% block content %}
-        {{ msg|raw }}
-        <p>Don't forget <a href="http://inthepoche.com/doc">the documentation</a>.</p>
+    <h1>Errors</h1>
+    <ol>
+        {% for message in msg %}
+            <li>{{message}}</li>
+        {% endfor %}
+    </ol>
+    <p>Don't forget <a href="http://inthepoche.com/doc">the documentation</a>.</p>
 {% endblock %}
\ No newline at end of file