From b738bea9ca03c7c05e8c159b9c2f48fb40e58ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 22 Jul 2014 16:37:13 +0200
Subject: Fix #776

---
 themes/baggy/config.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/baggy/config.twig')

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 46735f07..e45c3218 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -111,7 +111,7 @@
                 <fieldset class="w500p">
                     <div class="row">
                         <label class="col w150p" for="file">{% trans "File:" %}</label>
-                        <input class="col" type="file" id="file" name="file" tabindex="4">
+                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
                     </div>
                     <div class="row mts txtcenter">
                         <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
-- 
cgit v1.2.3


From 046b9316244c7a3a19446b2425d2370a26246af0 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Fri, 25 Jul 2014 08:42:03 +0200
Subject: added email field

---
 themes/baggy/config.twig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'themes/baggy/config.twig')

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 46735f07..ccdd2273 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -138,11 +138,15 @@
                 <fieldset class="w500p">
                 <div class="row">
                     <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
-                    <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}">
+                    <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
                 </div>
                 <div class="row">
                     <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
-                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
+                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}" required>
+                </div>
+                <div class="row">
+                    <label class="col w150p" for="newuseremail">{% trans 'Email for new user' %}</label>
+                    <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
                 </div>
                 <div class="row mts txtcenter">
                     <button type="submit">{% trans "Send" %}</button>	
-- 
cgit v1.2.3


From 9f3477a279d8a72a56000a956c940046d3645ff5 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Fri, 25 Jul 2014 08:42:30 +0200
Subject: precision

---
 themes/baggy/config.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/baggy/config.twig')

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index ccdd2273..0ae67bc3 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -145,7 +145,7 @@
                     <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}" required>
                 </div>
                 <div class="row">
-                    <label class="col w150p" for="newuseremail">{% trans 'Email for new user' %}</label>
+                    <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
                     <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
                 </div>
                 <div class="row mts txtcenter">
-- 
cgit v1.2.3


From 200c758ff411c013391d4c84bce24e0df9cfbac1 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Sat, 26 Jul 2014 12:42:48 +0200
Subject: Translations

---
 themes/baggy/config.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/baggy/config.twig')

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 0ae67bc3..12934c8b 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -142,7 +142,7 @@
                 </div>
                 <div class="row">
                     <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
-                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}" required>
+                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
                 </div>
                 <div class="row">
                     <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
@@ -167,5 +167,5 @@
             </div>
             </form>
             {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
-            {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %}
+            {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
 {% endblock %}
-- 
cgit v1.2.3


From 8763e4efde17f133d0bda504640acada108e7870 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 26 Aug 2014 12:43:56 +0200
Subject: Fix downloading SQLite database from all users

---
 themes/baggy/config.twig | 2 --
 1 file changed, 2 deletions(-)

(limited to 'themes/baggy/config.twig')

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index e45c3218..7bd229cb 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -121,8 +121,6 @@
             <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
             
             <h2>{% trans "Export your wallabag data" %}</h2>
-            {% if constant('STORAGE') == 'sqlite' %}
-            <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
             <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
             
             <h2>{% trans "Fancy an E-Book ?" %}</h2>
-- 
cgit v1.2.3