aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2018-12-02 08:54:54 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-01-23 13:28:01 +0100
commitacd4412080dfb73ecaa7f9983728d1d55bc27ea4 (patch)
tree3a28a0b7419a3201d2b0da1ff3a097db443e90cd /src
parentc6024246b744e411175318065f7c396bbb5a213e (diff)
downloadwallabag-acd4412080dfb73ecaa7f9983728d1d55bc27ea4.tar.gz
wallabag-acd4412080dfb73ecaa7f9983728d1d55bc27ea4.tar.zst
wallabag-acd4412080dfb73ecaa7f9983728d1d55bc27ea4.zip
Create a dedicated tab to reset data
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig63
15 files changed, 46 insertions, 31 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5a770dff..96679a9c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Adgangskode' 59 password: 'Adgangskode'
60 # rules: 'Tagging rules' 60 # rules: 'Tagging rules'
61 new_user: 'Tilføj bruger' 61 new_user: 'Tilføj bruger'
62 # reset: 'Reset area'
62 form: 63 form:
63 save: 'Gem' 64 save: 'Gem'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 2ae8f08e..c56e87b5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Kennwort' 59 password: 'Kennwort'
60 rules: 'Tagging-Regeln' 60 rules: 'Tagging-Regeln'
61 new_user: 'Benutzer hinzufügen' 61 new_user: 'Benutzer hinzufügen'
62 reset: 'Zurücksetzen'
62 form: 63 form:
63 save: 'Speichern' 64 save: 'Speichern'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index d1d74159..d57cea0f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Password' 59 password: 'Password'
60 rules: 'Tagging rules' 60 rules: 'Tagging rules'
61 new_user: 'Add a user' 61 new_user: 'Add a user'
62 reset: 'Reset area'
62 form: 63 form:
63 save: 'Save' 64 save: 'Save'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 741d3e9f..e1c4e221 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Contraseña' 59 password: 'Contraseña'
60 rules: 'Reglas de etiquetado automáticas' 60 rules: 'Reglas de etiquetado automáticas'
61 new_user: 'Añadir un usuario' 61 new_user: 'Añadir un usuario'
62 reset: 'Reiniciar mi cuenta'
62 form: 63 form:
63 save: 'Guardar' 64 save: 'Guardar'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 2ef5dd52..2ede433e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -59,6 +59,7 @@ config:
59 password: 'رمز' 59 password: 'رمز'
60 rules: 'برچسب‌گذاری خودکار' 60 rules: 'برچسب‌گذاری خودکار'
61 new_user: 'افزودن کاربر' 61 new_user: 'افزودن کاربر'
62 # reset: 'Reset area'
62 form: 63 form:
63 save: 'ذخیره' 64 save: 'ذخیره'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 7a2029b4..d69ae280 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -59,6 +59,7 @@ config:
59 password: "Mot de passe" 59 password: "Mot de passe"
60 rules: "Règles de tag automatiques" 60 rules: "Règles de tag automatiques"
61 new_user: "Créer un compte" 61 new_user: "Créer un compte"
62 reset: "Réinitialisation"
62 form: 63 form:
63 save: "Enregistrer" 64 save: "Enregistrer"
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 3a459445..f16ffb6b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Password' 59 password: 'Password'
60 rules: 'Regole di etichettatura' 60 rules: 'Regole di etichettatura'
61 new_user: 'Aggiungi utente' 61 new_user: 'Aggiungi utente'
62 reset: 'Area di reset'
62 form: 63 form:
63 save: 'Salva' 64 save: 'Salva'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 9df9e645..b568fbc5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Senhal' 59 password: 'Senhal'
60 rules: "Règlas d'etiquetas automaticas" 60 rules: "Règlas d'etiquetas automaticas"
61 new_user: 'Crear un compte' 61 new_user: 'Crear un compte'
62 reset: 'Zòna de reïnicializacion'
62 form: 63 form:
63 save: 'Enregistrar' 64 save: 'Enregistrar'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 684c40e2..b58e14f4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Hasło' 59 password: 'Hasło'
60 rules: 'Zasady tagowania' 60 rules: 'Zasady tagowania'
61 new_user: 'Dodaj użytkownika' 61 new_user: 'Dodaj użytkownika'
62 reset: 'Reset'
62 form: 63 form:
63 save: 'Zapisz' 64 save: 'Zapisz'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 7932d7ab..add28bf7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Senha' 59 password: 'Senha'
60 rules: 'Regras de tags' 60 rules: 'Regras de tags'
61 new_user: 'Adicionar um usuário' 61 new_user: 'Adicionar um usuário'
62 # reset: 'Reset area'
62 form: 63 form:
63 save: 'Salvar' 64 save: 'Salvar'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 4d091f03..6a38c4a1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Parolă' 59 password: 'Parolă'
60 # rules: 'Tagging rules' 60 # rules: 'Tagging rules'
61 new_user: 'Crează un utilizator' 61 new_user: 'Crează un utilizator'
62 # reset: 'Reset area'
62 form: 63 form:
63 save: 'Salvează' 64 save: 'Salvează'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index cc327ae4..1b7ac38a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -58,6 +58,7 @@ config:
58 password: 'Пароль' 58 password: 'Пароль'
59 rules: 'Правила настройки простановки тегов' 59 rules: 'Правила настройки простановки тегов'
60 new_user: 'Добавить пользователя' 60 new_user: 'Добавить пользователя'
61 reset: 'Сброс данных'
61 form: 62 form:
62 save: 'Сохранить' 63 save: 'Сохранить'
63 form_settings: 64 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index 148aa541..fe1b35be 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -59,6 +59,7 @@ config:
59 password: 'รหัสผ่าน' 59 password: 'รหัสผ่าน'
60 rules: 'การแท็กข้อบังคับ' 60 rules: 'การแท็กข้อบังคับ'
61 new_user: 'เพิ่มผู้ใช้' 61 new_user: 'เพิ่มผู้ใช้'
62 reset: 'รีเซ็ตพื้นที่ '
62 form: 63 form:
63 save: 'บันทึก' 64 save: 'บันทึก'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 6fb9852a..638714e4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -59,6 +59,7 @@ config:
59 password: 'Şifre' 59 password: 'Şifre'
60 rules: 'Etiketleme kuralları' 60 rules: 'Etiketleme kuralları'
61 new_user: 'Bir kullanıcı ekle' 61 new_user: 'Bir kullanıcı ekle'
62 # reset: 'Reset area'
62 form: 63 form:
63 save: 'Kaydet' 64 save: 'Kaydet'
64 form_settings: 65 form_settings:
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index f896fe2d..35800989 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -16,6 +16,7 @@
16 <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> 16 <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li>
17 <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> 17 <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li>
18 <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> 18 <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li>
19 <li class="tab col s12 m6 l3"><a href="#set6">{{ 'config.tab_menu.reset'|trans }}</a></li>
19 </ul> 20 </ul>
20 </div> 21 </div>
21 22
@@ -218,37 +219,6 @@
218 {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 219 {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
219 {{ form_widget(form.user._token) }} 220 {{ form_widget(form.user._token) }}
220 </form> 221 </form>
221
222 <br /><hr /><br />
223
224 <div class="row">
225 <h5>{{ 'config.reset.title'|trans }}</h5>
226 <p>{{ 'config.reset.description'|trans }}</p>
227 <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
228 {{ 'config.reset.annotations'|trans }}
229 </a>
230 <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
231 {{ 'config.reset.tags'|trans }}
232 </a>
233 <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
234 {{ 'config.reset.archived'|trans }}
235 </a>
236 <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
237 {{ 'config.reset.entries'|trans }}
238 </a>
239 </div>
240
241 {% if enabled_users > 1 %}
242 <br /><hr /><br />
243
244 <div class="row">
245 <h5>{{ 'config.form_user.delete.title'|trans }}</h5>
246 <p>{{ 'config.form_user.delete.description'|trans }}</p>
247 <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
248 {{ 'config.form_user.delete.button'|trans }}
249 </a>
250 </div>
251 {% endif %}
252 </div> 222 </div>
253 223
254 <div id="set4" class="col s12"> 224 <div id="set4" class="col s12">
@@ -422,6 +392,37 @@
422 </div> 392 </div>
423 </div> 393 </div>
424 </div> 394 </div>
395
396 <div id="set6" class="col s12">
397 <div class="row">
398 <h5>{{ 'config.reset.title'|trans }}</h5>
399 <p>{{ 'config.reset.description'|trans }}</p>
400 <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
401 {{ 'config.reset.annotations'|trans }}
402 </a>
403 <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
404 {{ 'config.reset.tags'|trans }}
405 </a>
406 <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
407 {{ 'config.reset.archived'|trans }}
408 </a>
409 <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
410 {{ 'config.reset.entries'|trans }}
411 </a>
412 </div>
413
414 {% if enabled_users > 1 %}
415 <br /><hr /><br />
416
417 <div class="row">
418 <h5>{{ 'config.form_user.delete.title'|trans }}</h5>
419 <p>{{ 'config.form_user.delete.description'|trans }}</p>
420 <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
421 {{ 'config.form_user.delete.button'|trans }}
422 </a>
423 </div>
424 {% endif %}
425 </div>
425 </div> 426 </div>
426 427
427 </div> 428 </div>