aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy/config.twig
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@smile.fr>2014-10-10 13:33:54 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@smile.fr>2014-10-10 13:33:54 +0200
commit44d35257e805856b4913c63fcbed3c0acb64bae8 (patch)
tree11e9d276c34b1b287706cb61182bdc71729661e2 /themes/baggy/config.twig
parentaf8292c1de1886cd975d79f0f42df40e0bd1c5bd (diff)
parentcf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b (diff)
downloadwallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.tar.gz
wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.tar.zst
wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.zip
Merge branch 'dev'1.8.0
Diffstat (limited to 'themes/baggy/config.twig')
-rwxr-xr-xthemes/baggy/config.twig14
1 files changed, 8 insertions, 6 deletions
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 46735f07..3523cd08 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -111,7 +111,7 @@
111 <fieldset class="w500p"> 111 <fieldset class="w500p">
112 <div class="row"> 112 <div class="row">
113 <label class="col w150p" for="file">{% trans "File:" %}</label> 113 <label class="col w150p" for="file">{% trans "File:" %}</label>
114 <input class="col" type="file" id="file" name="file" tabindex="4"> 114 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
115 </div> 115 </div>
116 <div class="row mts txtcenter"> 116 <div class="row mts txtcenter">
117 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button> 117 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
@@ -121,8 +121,6 @@
121 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p> 121 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
122 122
123 <h2>{% trans "Export your wallabag data" %}</h2> 123 <h2>{% trans "Export your wallabag data" %}</h2>
124 {% if constant('STORAGE') == 'sqlite' %}
125 <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
126 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p> 124 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
127 125
128 <h2>{% trans "Fancy an E-Book ?" %}</h2> 126 <h2>{% trans "Fancy an E-Book ?" %}</h2>
@@ -138,11 +136,15 @@
138 <fieldset class="w500p"> 136 <fieldset class="w500p">
139 <div class="row"> 137 <div class="row">
140 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label> 138 <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
141 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}"> 139 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
142 </div> 140 </div>
143 <div class="row"> 141 <div class="row">
144 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> 142 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
145 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> 143 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
144 </div>
145 <div class="row">
146 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
147 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
146 </div> 148 </div>
147 <div class="row mts txtcenter"> 149 <div class="row mts txtcenter">
148 <button type="submit">{% trans "Send" %}</button> 150 <button type="submit">{% trans "Send" %}</button>
@@ -163,5 +165,5 @@
163 </div> 165 </div>
164 </form> 166 </form>
165 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 167 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
166 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %} 168 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
167{% endblock %} 169{% endblock %}