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 ++++++--
 themes/baggy/css/main.css | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'themes')

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>	
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 6d320cd2..ad68c7b5 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -89,7 +89,7 @@ form fieldset {
   margin: 0;
 }
 
-form input[type="text"], select, form input[type="password"], form input[type="url"] {
+form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
   border: 1px solid #999;
   padding: 0.5em 1em;
   min-width: 12em;
-- 
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')

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 ++--
 themes/courgette/config.twig | 2 +-
 themes/default/config.twig   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'themes')

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 %}
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index 9ab58461..e921b499 100755
--- a/themes/courgette/config.twig
+++ b/themes/courgette/config.twig
@@ -116,6 +116,6 @@
             </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 %}
         </div>
 {% endblock %}
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 160f6046..72c5d6f4 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -162,5 +162,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 280972a66cd1a64003b4c4e5cc9b17347c1638bc Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Sat, 26 Jul 2014 12:44:55 +0200
Subject: changes in all themes

---
 themes/courgette/config.twig | 4 ++++
 themes/default/config.twig   | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'themes')

diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index e921b499..c4933794 100755
--- a/themes/courgette/config.twig
+++ b/themes/courgette/config.twig
@@ -97,6 +97,10 @@
                     <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
                     <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
                 </div>
+                <div class="row">
+                    <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">
                     <button type="submit">{% trans "Send" %}</button>	
                 </div>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 72c5d6f4..9dfbc5da 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -143,6 +143,10 @@
                     <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
                     <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
                 </div>
+                <div class="row">
+                    <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">
                     <button type="submit">{% trans "Send" %}</button>	
                 </div>
-- 
cgit v1.2.3