aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default/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/default/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/default/config.twig')
-rwxr-xr-xthemes/default/config.twig10
1 files changed, 6 insertions, 4 deletions
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 160f6046..36b66e88 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -110,7 +110,7 @@
110 <fieldset class="w500p"> 110 <fieldset class="w500p">
111 <div class="row"> 111 <div class="row">
112 <label class="col w150p" for="file">{% trans "File:" %}</label> 112 <label class="col w150p" for="file">{% trans "File:" %}</label>
113 <input class="col" type="file" id="file" name="file" tabindex="4"> 113 <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
114 </div> 114 </div>
115 <div class="row mts txtcenter"> 115 <div class="row mts txtcenter">
116 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button> 116 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
@@ -120,8 +120,6 @@
120 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p> 120 <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
121 121
122 <h2>{% trans "Export your wallabag data" %}</h2> 122 <h2>{% trans "Export your wallabag data" %}</h2>
123 {% if constant('STORAGE') == 'sqlite' %}
124 <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
125 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p> 123 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
126 124
127 <h2>{% trans "Cache" %}</h2> 125 <h2>{% trans "Cache" %}</h2>
@@ -143,6 +141,10 @@
143 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label> 141 <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
144 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}"> 142 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans "Password" %}">
145 </div> 143 </div>
144 <div class="row">
145 <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
146 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
147 </div>
146 <div class="row mts txtcenter"> 148 <div class="row mts txtcenter">
147 <button type="submit">{% trans "Send" %}</button> 149 <button type="submit">{% trans "Send" %}</button>
148 </div> 150 </div>
@@ -162,5 +164,5 @@
162 </div> 164 </div>
163 </form> 165 </form>
164 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br /> 166 {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}<br />
165 {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}</p>{% endif %} 167 {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
166{% endblock %} 168{% endblock %}