aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-22 08:51:30 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-22 08:51:30 +0200
commitb6d859fa927be8e60752ea44d682401b10671dfa (patch)
tree3900bacab453cc7f3e5f6c742aea151abc453d3c /themes
parent1a0d776394d7e10b5e017f00d3626e3de6ba3688 (diff)
parent1ba1628ed6d22833096049ca9975c3d72f99804c (diff)
downloadwallabag-b6d859fa927be8e60752ea44d682401b10671dfa.tar.gz
wallabag-b6d859fa927be8e60752ea44d682401b10671dfa.tar.zst
wallabag-b6d859fa927be8e60752ea44d682401b10671dfa.zip
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
Diffstat (limited to 'themes')
-rw-r--r--themes/default/config.twig2
-rw-r--r--themes/default/login.twig4
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 @@
66 <input type="hidden" name="token" value="{{ token }}"> 66 <input type="hidden" name="token" value="{{ token }}">
67 </form> 67 </form>
68 68
69 {% if http_auth == 0 %}
69 <h2>{% trans "Change your password" %}</h2> 70 <h2>{% trans "Change your password" %}</h2>
70 <form method="post" action="?config" name="loginform"> 71 <form method="post" action="?config" name="loginform">
71 <fieldset class="w500p"> 72 <fieldset class="w500p">
@@ -84,6 +85,7 @@
84 <input type="hidden" name="returnurl" value="{{ referer }}"> 85 <input type="hidden" name="returnurl" value="{{ referer }}">
85 <input type="hidden" name="token" value="{{ token }}"> 86 <input type="hidden" name="token" value="{{ token }}">
86 </form> 87 </form>
88 {% endif %}
87 89
88 <h2>{% trans "Import" %}</h2> 90 <h2>{% trans "Import" %}</h2>
89 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 91 <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 @@
2 2
3{% block title %}{% trans "login to your poche" %}{% endblock %} 3{% block title %}{% trans "login to your poche" %}{% endblock %}
4{% block content %} 4{% block content %}
5 {% if http_auth == 0 %}
5 <form method="post" action="?login" name="loginform"> 6 <form method="post" action="?login" name="loginform">
6 <fieldset class="w500p center"> 7 <fieldset class="w500p center">
7 <h2 class="mbs txtcenter">{% trans "login to your poche" %}</h2> 8 <h2 class="mbs txtcenter">{% trans "login to your poche" %}</h2>
@@ -29,4 +30,5 @@
29 <input type="hidden" name="returnurl" value="{{ referer }}"> 30 <input type="hidden" name="returnurl" value="{{ referer }}">
30 <input type="hidden" name="token" value="{{ token }}"> 31 <input type="hidden" name="token" value="{{ token }}">
31 </form> 32 </form>
32{% endblock %} \ No newline at end of file 33 {% endif %}
34{% endblock %}