Merge branch 'dev' of https://github.com/inthepoche/poche into dev

2 files changed, 5 insertions, 1 deletions

diff --git a/themes/default/config.twig b/themes/default/config.twig
index 23860ebd..72671702 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -66,6 +66,7 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
 
+            {% if http_auth == 0 %}
             <h2>{% trans "Change your password" %}</h2>
             <form method="post" action="?config" name="loginform">
                 <fieldset class="w500p">
@@ -84,6 +85,7 @@
                 <input type="hidden" name="returnurl" value="{{ referer }}">
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
+            {% endif %}
 
             <h2>{% trans "Import" %}</h2>
             <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
diff --git a/themes/default/login.twig b/themes/default/login.twig
index 0ae130bc..2e48052b 100644
--- a/themes/default/login.twig
+++ b/themes/default/login.twig
@@ -2,6 +2,7 @@
 
 {% block title %}{% trans "login to your poche" %}{% endblock %}
 {% block content %}
+    {% if http_auth == 0 %}
             <form method="post" action="?login" name="loginform">
                 <fieldset class="w500p center">
                     <h2 class="mbs txtcenter">{% trans "login to your poche" %}</h2>
@@ -29,4 +30,5 @@
                 <input type="hidden" name="returnurl" value="{{ referer }}">
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
-{% endblock %}
\ No newline at end of file
+    {% endif %}
+{% endblock %}