aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2019-10-01 15:40:04 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2020-04-20 11:39:35 +0200
commit5434577883041ea1640b9b9e5221d6edb52779ea (patch)
treed1513166d5e95ecb3077477a284658e064f4bce2 /src/Wallabag
parent361aa02e2ac74ad01e9403d55d32a6a200b0666f (diff)
downloadwallabag-5434577883041ea1640b9b9e5221d6edb52779ea.tar.gz
wallabag-5434577883041ea1640b9b9e5221d6edb52779ea.tar.zst
wallabag-5434577883041ea1640b9b9e5221d6edb52779ea.zip
Improved tags list for material view
Diffstat (limited to 'src/Wallabag')
-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.ja.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/views/themes/material/Tag/tags.html.twig19
11 files changed, 18 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index fc43e9fd..4d525979 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -430,6 +430,7 @@ tag:
430 # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' 430 # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
431 # see_untagged_entries: 'See untagged entries' 431 # see_untagged_entries: 'See untagged entries'
432 # no_untagged_entries: 'There are no untagged entries.' 432 # no_untagged_entries: 'There are no untagged entries.'
433 # untagged: 'Untagged entries'
433 new: 434 new:
434 # add: 'Add' 435 # add: 'Add'
435 # placeholder: 'You can add several tags, separated by a comma.' 436 # placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 53c960b6..cd70c99f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.' 430 number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.'
431 see_untagged_entries: 'Zeige nicht getaggte Einträge' 431 see_untagged_entries: 'Zeige nicht getaggte Einträge'
432 # no_untagged_entries: 'There are no untagged entries.' 432 # no_untagged_entries: 'There are no untagged entries.'
433 untagged: 'Nicht getaggte Einträge'
433 new: 434 new:
434 add: 'Hinzufügen' 435 add: 'Hinzufügen'
435 placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' 436 placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index c6e3cd42..1bc32423 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.' 430 number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
431 see_untagged_entries: 'See untagged entries' 431 see_untagged_entries: 'See untagged entries'
432 no_untagged_entries: 'There are no untagged entries.' 432 no_untagged_entries: 'There are no untagged entries.'
433 untagged: 'Untagged entries'
433 new: 434 new:
434 add: 'Add' 435 add: 'Add'
435 placeholder: 'You can add several tags, separated by a comma.' 436 placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 72e36449..bced72e9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.' 430 number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.'
431 see_untagged_entries: 'Ver artículos sin etiquetas' 431 see_untagged_entries: 'Ver artículos sin etiquetas'
432 no_untagged_entries: 'No hay artículos sin etiquetas.' 432 no_untagged_entries: 'No hay artículos sin etiquetas.'
433 untagged: 'Artículos sin etiquetas'
433 new: 434 new:
434 add: 'Añadir' 435 add: 'Añadir'
435 placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' 436 placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 8da90018..0704204a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.' 430 number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
431 # see_untagged_entries: 'See untagged entries' 431 # see_untagged_entries: 'See untagged entries'
432 # no_untagged_entries: 'There are no untagged entries.' 432 # no_untagged_entries: 'There are no untagged entries.'
433 # untagged: 'Untagged entries'
433 new: 434 new:
434 # add: 'Add' 435 # add: 'Add'
435 # placeholder: 'You can add several tags, separated by a comma.' 436 # placeholder: 'You can add several tags, separated by a comma.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index d5454781..5d5878eb 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." 430 number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
431 see_untagged_entries: "Voir les articles sans tag" 431 see_untagged_entries: "Voir les articles sans tag"
432 no_untagged_entries: 'Aucun article sans tag.' 432 no_untagged_entries: 'Aucun article sans tag.'
433 untagged: "Article sans tag"
433 new: 434 new:
434 add: "Ajouter" 435 add: "Ajouter"
435 placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." 436 placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 99a8dc2d..23e72f20 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: "{0} Non ci sono etichette.|{1} C'è un'etichetta.|]1,Inf[ ci sono %count% etichette." 430 number_on_the_page: "{0} Non ci sono etichette.|{1} C'è un'etichetta.|]1,Inf[ ci sono %count% etichette."
431 see_untagged_entries: 'Vedi articoli non etichettati' 431 see_untagged_entries: 'Vedi articoli non etichettati'
432 # no_untagged_entries: 'There are no untagged entries.' 432 # no_untagged_entries: 'There are no untagged entries.'
433 untagged: 'Articoli non etichettati'
433 new: 434 new:
434 add: 'Aggiungi' 435 add: 'Aggiungi'
435 placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' 436 placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
index a1eaa5dd..f6530a83 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: '{0} タグはありません|{1} 1 件のタグ|]1,Inf[ %count% 件のタグ' 430 number_on_the_page: '{0} タグはありません|{1} 1 件のタグ|]1,Inf[ %count% 件のタグ'
431 see_untagged_entries: 'タグの無い記事を見る' 431 see_untagged_entries: 'タグの無い記事を見る'
432 no_untagged_entries: 'タグの付いていない記事は存在しません。' 432 no_untagged_entries: 'タグの付いていない記事は存在しません。'
433 untagged: 'タグの無い記事'
433 new: 434 new:
434 add: '追加' 435 add: '追加'
435 placeholder: 'コンマ「,」で区切ることで、複数のタグを追加できます。' 436 placeholder: 'コンマ「,」で区切ることで、複数のタグを追加できます。'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 598243db..6ddff6ea 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas." 430 number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas."
431 see_untagged_entries: "Afichar las entradas sens etiquetas" 431 see_untagged_entries: "Afichar las entradas sens etiquetas"
432 no_untagged_entries: 'I a pas cap d’article pas etiquetat.' 432 no_untagged_entries: 'I a pas cap d’article pas etiquetat.'
433 untagged: 'Articles sens etiqueta'
433 new: 434 new:
434 add: 'Ajustar' 435 add: 'Ajustar'
435 placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." 436 placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index af8447fe..770477c9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -430,6 +430,7 @@ tag:
430 number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.' 430 number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.'
431 see_untagged_entries: 'Zobacz nieotagowane wpisy' 431 see_untagged_entries: 'Zobacz nieotagowane wpisy'
432 # no_untagged_entries: 'There are no untagged entries.' 432 # no_untagged_entries: 'There are no untagged entries.'
433 untagged: 'Odtaguj wpisy'
433 new: 434 new:
434 add: 'Dodaj' 435 add: 'Dodaj'
435 placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' 436 placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index 0a3475ef..50afa6d5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -4,15 +4,16 @@
4 4
5{% block content %} 5{% block content %}
6 <div class="results clearfix"> 6 <div class="results clearfix">
7 <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}</div> 7 {{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}
8 </div> 8 </div>
9 9
10 <br />
11
12 <div class="row"> 10 <div class="row">
13 <ul class="card-tag-labels"> 11 <ul class="card-tag-labels">
12 <li class="chip">
13 <a href="{{ path('untagged') }}">{{ 'tag.list.untagged'|trans }} ({{nbEntriesUntagged}})</a>
14 </li>
14 {% for tag in tags %} 15 {% for tag in tags %}
15 <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}"> 16 <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="chip">
16 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" class="card-tag-link" data-handle="tag-link"> 17 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" class="card-tag-link" data-handle="tag-link">
17 {{ tag.label }}&nbsp;({{ tag.nbEntries }}) 18 {{ tag.label }}&nbsp;({{ tag.nbEntries }})
18 </a> 19 </a>
@@ -21,12 +22,12 @@
21 {{ form_widget(renameForms[tag.id].label, {'attr': {'value': tag.label}}) }} 22 {{ form_widget(renameForms[tag.id].label, {'attr': {'value': tag.label}}) }}
22 {{ form_rest(renameForms[tag.id]) }} 23 {{ form_rest(renameForms[tag.id]) }}
23 </form> 24 </form>
24 <a class="card-tag-rename" data-handler="tag-rename" href="javascript:void(0);"> 25 <a class="card-tag-icon card-tag-rename" data-handler="tag-rename" href="javascript:void(0);">
25 <i class="material-icons">mode_edit</i> 26 <i class="material-icons">mode_edit</i>
26 </a> 27 </a>
27 {% endif %} 28 {% endif %}
28 {% if app.user.config.feedToken %} 29 {% if app.user.config.feedToken %}
29 <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="card-tag-rss"><i class="material-icons">rss_feed</i></a> 30 <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="card-tag-icon"><i class="material-icons">rss_feed</i></a>
30 {% endif %} 31 {% endif %}
31 </li> 32 </li>
32 {% endfor %} 33 {% endfor %}
@@ -34,10 +35,6 @@
34 </div> 35 </div>
35 36
36 <div> 37 <div>
37 {% if nbEntriesUntagged == 0 %} 38
38 {{ 'tag.list.no_untagged_entries'|trans }}
39 {% else %}
40 <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }} ({{nbEntriesUntagged}})</a>
41 {% endif %}
42 </div> 39 </div>
43{% endblock %} 40{% endblock %}