diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-05-30 09:42:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-30 09:42:56 +0200 |
commit | 7a90ca6171995e16b74f14712fafb42b636bdb3e (patch) | |
tree | 542ff82bfbb9f86cb7b81ba5047a0ffd3b31c575 /src/Wallabag | |
parent | b788add08787863ac2a0e68ddaf4620da4b2b33c (diff) | |
parent | 7e8b90d1ed14255af0fbc3a38851325a58a10554 (diff) | |
download | wallabag-7a90ca6171995e16b74f14712fafb42b636bdb3e.tar.gz wallabag-7a90ca6171995e16b74f14712fafb42b636bdb3e.tar.zst wallabag-7a90ca6171995e16b74f14712fafb42b636bdb3e.zip |
Merge pull request #3147 from wallabag/delete-confirm
Add some deletion confirmation to avoid mistake
Diffstat (limited to 'src/Wallabag')
17 files changed, 65 insertions, 20 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 1bd0b8fd..3e64af8f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -240,6 +240,9 @@ entry: | |||
240 | save_label: 'Gem' | 240 | save_label: 'Gem' |
241 | public: | 241 | public: |
242 | # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" | 242 | # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" |
243 | confirm: | ||
244 | # delete: "Are you sure you want to remove that article?" | ||
245 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
243 | 246 | ||
244 | about: | 247 | about: |
245 | page_title: 'Om' | 248 | page_title: 'Om' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 94bb3295..00468575 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -110,7 +110,7 @@ config: | |||
110 | annotations: Entferne ALLE Annotationen | 110 | annotations: Entferne ALLE Annotationen |
111 | tags: Entferne ALLE Tags | 111 | tags: Entferne ALLE Tags |
112 | entries: Entferne ALLE Einträge | 112 | entries: Entferne ALLE Einträge |
113 | # archived: Remove ALL archived entries | 113 | archived: Entferne ALLE archivierten Einträge |
114 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) | 114 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) |
115 | form_password: | 115 | form_password: |
116 | description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten." | 116 | description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten." |
@@ -155,7 +155,7 @@ config: | |||
155 | or: 'Eine Regel ODER die andere' | 155 | or: 'Eine Regel ODER die andere' |
156 | and: 'Eine Regel UND eine andere' | 156 | and: 'Eine Regel UND eine andere' |
157 | matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>' | 157 | matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>' |
158 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 158 | notmatches: 'Testet, ob ein <i>Titel</i> nicht auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title notmatches "Fußball"</code>' |
159 | 159 | ||
160 | entry: | 160 | entry: |
161 | page_titles: | 161 | page_titles: |
@@ -225,8 +225,8 @@ entry: | |||
225 | original_article: 'original' | 225 | original_article: 'original' |
226 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen' | 226 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen' |
227 | created_at: 'Erstellungsdatum' | 227 | created_at: 'Erstellungsdatum' |
228 | # published_at: 'Publication date' | 228 | published_at: 'Erscheinungsdatum' |
229 | # published_by: 'Published by' | 229 | published_by: 'Veröffentlicht von' |
230 | new: | 230 | new: |
231 | page_title: 'Neuen Artikel speichern' | 231 | page_title: 'Neuen Artikel speichern' |
232 | placeholder: 'https://website.de' | 232 | placeholder: 'https://website.de' |
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Speichern' | 241 | save_label: 'Speichern' |
242 | public: | 242 | public: |
243 | shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" | 243 | shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" |
244 | confirm: | ||
245 | delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?" | ||
246 | delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'Über' | 249 | page_title: 'Über' |
@@ -514,7 +517,7 @@ user: | |||
514 | delete_confirm: Bist du sicher? | 517 | delete_confirm: Bist du sicher? |
515 | back_to_list: Zurück zur Liste | 518 | back_to_list: Zurück zur Liste |
516 | search: | 519 | search: |
517 | # placeholder: Filter by username or email | 520 | placeholder: Filtere nach Benutzer oder E-Mail-Adresse |
518 | 521 | ||
519 | error: | 522 | error: |
520 | page_title: Ein Fehler ist aufgetreten | 523 | page_title: Ein Fehler ist aufgetreten |
@@ -533,7 +536,7 @@ flashes: | |||
533 | annotations_reset: Anmerkungen zurücksetzen | 536 | annotations_reset: Anmerkungen zurücksetzen |
534 | tags_reset: Tags zurücksetzen | 537 | tags_reset: Tags zurücksetzen |
535 | entries_reset: Einträge zurücksetzen | 538 | entries_reset: Einträge zurücksetzen |
536 | # archived_reset: Archived entries deleted | 539 | archived_reset: Archiverte Einträge zurücksetzen |
537 | entry: | 540 | entry: |
538 | notice: | 541 | notice: |
539 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 542 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 3a006a0e..8703a0e5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Save' | 241 | save_label: 'Save' |
242 | public: | 242 | public: |
243 | shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 243 | shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | delete: "Are you sure you want to remove that article?" | ||
246 | delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'About' | 249 | page_title: 'About' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index ca5d9b2c..0f2a4a7b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Guardar' | 241 | save_label: 'Guardar' |
242 | public: | 242 | public: |
243 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" | 243 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | # delete: "Are you sure you want to remove that article?" | ||
246 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'Acerca de' | 249 | page_title: 'Acerca de' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index ecd8f64d..ec7a4362 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'ذخیره' | 241 | save_label: 'ذخیره' |
242 | public: | 242 | public: |
243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | # delete: "Are you sure you want to remove that article?" | ||
246 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'درباره' | 249 | page_title: 'درباره' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 84706459..6969b67b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: "Enregistrer" | 241 | save_label: "Enregistrer" |
242 | public: | 242 | public: |
243 | shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" | 243 | shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" |
244 | confirm: | ||
245 | delete: "Voulez-vous vraiment supprimer cet article ?" | ||
246 | delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: "À propos" | 249 | page_title: "À propos" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index a8baa96f..70e9575a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Salva' | 241 | save_label: 'Salva' |
242 | public: | 242 | public: |
243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | # delete: "Are you sure you want to remove that article?" | ||
246 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'About' | 249 | page_title: 'About' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 8f39ce05..3ac472d0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Enregistrar' | 241 | save_label: 'Enregistrar' |
242 | public: | 242 | public: |
243 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" | 243 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | # delete: "Are you sure you want to remove that article?" | ||
246 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'A prepaus' | 249 | page_title: 'A prepaus' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index a6e0c10f..fa672387 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -110,7 +110,7 @@ config: | |||
110 | annotations: Usuń WSZYSTKIE adnotacje | 110 | annotations: Usuń WSZYSTKIE adnotacje |
111 | tags: Usuń WSZYSTKIE tagi | 111 | tags: Usuń WSZYSTKIE tagi |
112 | entries: usuń WSZYTSTKIE wpisy | 112 | entries: usuń WSZYTSTKIE wpisy |
113 | # archived: Remove ALL archived entries | 113 | archived: usuń WSZYSTKIE zarchiwizowane wpisy |
114 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) | 114 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) |
115 | form_password: | 115 | form_password: |
116 | description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." | 116 | description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." |
@@ -155,7 +155,7 @@ config: | |||
155 | or: 'Jedna reguła LUB inna' | 155 | or: 'Jedna reguła LUB inna' |
156 | and: 'Jedna reguła I inna' | 156 | and: 'Jedna reguła I inna' |
157 | matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>' | 157 | matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>' |
158 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 158 | notmatches: 'Sprawdź czy <i>temat</i> nie zawiera <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł nie zawiera "piłka nożna"</code>' |
159 | 159 | ||
160 | entry: | 160 | entry: |
161 | page_titles: | 161 | page_titles: |
@@ -225,8 +225,8 @@ entry: | |||
225 | original_article: 'oryginalny' | 225 | original_article: 'oryginalny' |
226 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji' | 226 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji' |
227 | created_at: 'Czas stworzenia' | 227 | created_at: 'Czas stworzenia' |
228 | # published_at: 'Publication date' | 228 | published_at: 'Data publikacji' |
229 | # published_by: 'Published by' | 229 | published_by: 'Opublikowane przez' |
230 | new: | 230 | new: |
231 | page_title: 'Zapisz nowy wpis' | 231 | page_title: 'Zapisz nowy wpis' |
232 | placeholder: 'http://website.com' | 232 | placeholder: 'http://website.com' |
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Zapisz' | 241 | save_label: 'Zapisz' |
242 | public: | 242 | public: |
243 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" | 243 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | delete: "Czy jesteś pewien, że chcesz usunąć ten artykuł?" | ||
246 | delete_tag: "Czy jesteś pewien, że chcesz usunąć ten tag, z tego artykułu?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'O nas' | 249 | page_title: 'O nas' |
@@ -514,7 +517,7 @@ user: | |||
514 | delete_confirm: Jesteś pewien? | 517 | delete_confirm: Jesteś pewien? |
515 | back_to_list: Powrót do listy | 518 | back_to_list: Powrót do listy |
516 | search: | 519 | search: |
517 | # placeholder: Filter by username or email | 520 | placeholder: Filtruj po nazwie użytkownika lub adresie e-mail |
518 | 521 | ||
519 | error: | 522 | error: |
520 | page_title: Wystąpił błąd | 523 | page_title: Wystąpił błąd |
@@ -533,7 +536,7 @@ flashes: | |||
533 | annotations_reset: Zresetuj adnotacje | 536 | annotations_reset: Zresetuj adnotacje |
534 | tags_reset: Zresetuj tagi | 537 | tags_reset: Zresetuj tagi |
535 | entries_reset: Zresetuj wpisy | 538 | entries_reset: Zresetuj wpisy |
536 | # archived_reset: Archived entries deleted | 539 | archived_reset: Zarchiwizowane wpisy usunięte |
537 | entry: | 540 | entry: |
538 | notice: | 541 | notice: |
539 | entry_already_saved: 'Wpis już został dodany %date%' | 542 | entry_already_saved: 'Wpis już został dodany %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index a9473591..bf038ee8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Salvar' | 241 | save_label: 'Salvar' |
242 | public: | 242 | public: |
243 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" | 243 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | # delete: "Are you sure you want to remove that article?" | ||
246 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'Sobre' | 249 | page_title: 'Sobre' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 80d78a01..bd66d83a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Salvează' | 241 | save_label: 'Salvează' |
242 | public: | 242 | public: |
243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | # delete: "Are you sure you want to remove that article?" | ||
246 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'Despre' | 249 | page_title: 'Despre' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 2896c823..b86c4003 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -241,6 +241,9 @@ entry: | |||
241 | save_label: 'Kaydet' | 241 | save_label: 'Kaydet' |
242 | public: | 242 | public: |
243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 243 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" |
244 | confirm: | ||
245 | # delete: "Are you sure you want to remove that article?" | ||
246 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
244 | 247 | ||
245 | about: | 248 | about: |
246 | page_title: 'Hakkımızda' | 249 | page_title: 'Hakkımızda' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index bdd44b54..0ba6f4f4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -50,7 +50,7 @@ | |||
50 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}"><span>{{ entry.domainName|removeWww }}</span></a></li> | 50 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}"><span>{{ entry.domainName|removeWww }}</span></a></li> |
51 | <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">check</i><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li> | 51 | <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">check</i><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li> |
52 | <li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">star_rate</i><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li> | 52 | <li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">star_rate</i><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li> |
53 | <li><a title="{{ 'entry.list.delete'|trans }}" class="tool icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">delete</i><span>{{ 'entry.list.delete'|trans }}</span></a></li> | 53 | <li><a title="{{ 'entry.list.delete'|trans }}" class="tool icon" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">delete</i><span>{{ 'entry.list.delete'|trans }}</span></a></li> |
54 | </ul> | 54 | </ul> |
55 | {% if (entry.previewPicture is null or listMode == 1) %} | 55 | {% if (entry.previewPicture is null or listMode == 1) %} |
56 | <ul class="card-entry-tags"> | 56 | <ul class="card-entry-tags"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 660211f2..3d20a6bc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -22,7 +22,7 @@ | |||
22 | <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li> | 22 | <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li> |
23 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> | 23 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> |
24 | <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> | 24 | <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> |
25 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> | 25 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> |
26 | {% if craue_setting('share_public') %} | 26 | {% if craue_setting('share_public') %} |
27 | <li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> | 27 | <li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> |
28 | <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li> | 28 | <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li> |
@@ -74,7 +74,13 @@ | |||
74 | <aside class="tags"> | 74 | <aside class="tags"> |
75 | <div class="card-entry-tags"> | 75 | <div class="card-entry-tags"> |
76 | {% for tag in entry.tags %} | 76 | {% for tag in entry.tags %} |
77 | <span class="label-outline"><i class="material-icons">label_outline</i> <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" class="nostyle"><i>✘</i></a></span> | 77 | <span class="label-outline"> |
78 | <i class="material-icons">label_outline</i> | ||
79 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> | ||
80 | <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')" class="nostyle"> | ||
81 | <i>✘</i> | ||
82 | </a> | ||
83 | </span> | ||
78 | {% endfor %} | 84 | {% endfor %} |
79 | </div> | 85 | </div> |
80 | <div class="input-field baggy-add-tag" style="display: none"> | 86 | <div class="input-field baggy-add-tag" style="display: none"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig index d278da1b..468338ac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig | |||
@@ -9,7 +9,7 @@ | |||
9 | <li> | 9 | <li> |
10 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> | 10 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> |
11 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> | 11 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> |
12 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> | 12 | <a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> |
13 | </li> | 13 | </li> |
14 | </ul> | 14 | </ul> |
15 | </div> | 15 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig index 3ba6253a..174b7b54 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig | |||
@@ -10,7 +10,7 @@ | |||
10 | <li> | 10 | <li> |
11 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> | 11 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> |
12 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> | 12 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> |
13 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> | 13 | <a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> |
14 | </li> | 14 | </li> |
15 | </ul> | 15 | </ul> |
16 | </div> | 16 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 58e08cbc..4cff7bf2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -82,7 +82,7 @@ | |||
82 | <div class="collapsible-body"></div> | 82 | <div class="collapsible-body"></div> |
83 | </li> | 83 | </li> |
84 | <li class="bold border-bottom"> | 84 | <li class="bold border-bottom"> |
85 | <a class="waves-effect collapsible-header delete" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 85 | <a class="waves-effect collapsible-header delete" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
86 | <i class="material-icons small">delete</i> | 86 | <i class="material-icons small">delete</i> |
87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
88 | </a> | 88 | </a> |
@@ -253,7 +253,10 @@ | |||
253 | <ul class="tags"> | 253 | <ul class="tags"> |
254 | {% for tag in entry.tags %} | 254 | {% for tag in entry.tags %} |
255 | <li class="chip"> | 255 | <li class="chip"> |
256 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons vertical-align-middle">delete</i></a> | 256 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> |
257 | <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')"> | ||
258 | <i class="material-icons vertical-align-middle">delete</i> | ||
259 | </a> | ||
257 | </li> | 260 | </li> |
258 | {% endfor %} | 261 | {% endfor %} |
259 | </ul> | 262 | </ul> |
@@ -279,7 +282,7 @@ | |||
279 | <ul> | 282 | <ul> |
280 | <li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li> | 283 | <li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li> |
281 | <li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li> | 284 | <li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li> |
282 | <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a></li> | 285 | <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')"><i class="material-icons">delete</i></a></li> |
283 | </ul> | 286 | </ul> |
284 | </div> | 287 | </div> |
285 | </div> | 288 | </div> |