aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-06-24 14:23:38 +0200
committerGitHub <noreply@github.com>2016-06-24 14:23:38 +0200
commit33e2aec18b25d2c47774fede22ecd91e936b4400 (patch)
treeadc266a43baf13509c119bbbab8be7cc06dadd2b
parentb1c9b78203710ad4cfd601b06bf1ec384595b3f3 (diff)
parenteef833d644f90518c712eccac7805d99562fd263 (diff)
downloadwallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.tar.gz
wallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.tar.zst
wallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.zip
Merge pull request #2170 from wallabag/addTagsOnEntriesView
Add tags on entries view and minor ui fixes
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css47
-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.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig18
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig4
14 files changed, 75 insertions, 5 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 473b0308..053dfd91 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -342,6 +342,44 @@ main ul.row {
342 line-height: 32px; 342 line-height: 32px;
343} 343}
344 344
345.card .card-entry-labels {
346 position: absolute;
347 top:10px;
348 z-index: 90;
349 max-width: 50%;
350}
351
352.card .card-entry-labels li {
353 margin: 10px 10px 10px auto;
354 padding: 5px 12px 5px 16px;
355 background-color: rgba(0,151,167,0.85);
356 border-radius: 0 3px 3px 0;
357 color: #fff;
358 cursor: default;
359 max-height: 2em;
360 overflow: hidden;
361 text-overflow: ellipsis;
362 white-space: nowrap;
363}
364
365.card .card-entry-labels-hidden {
366 margin-top: 5px;
367}
368
369.card .card-entry-labels-hidden li {
370 display: inline-block;
371 background-color: rgba(0,151,167,0.85);
372 margin: 0 5px;
373 padding: 5px 12px;
374 border-radius: 3px;
375 color: #fff;
376 max-height: 2em;
377 max-width: calc(100% - 15px);
378 overflow: hidden;
379 text-overflow: ellipsis;
380 white-space: nowrap;
381}
382
345.card .card-content .estimatedTime { 383.card .card-content .estimatedTime {
346 margin-bottom: 10px; 384 margin-bottom: 10px;
347} 385}
@@ -401,6 +439,10 @@ main ul.row {
401 height: auto; 439 height: auto;
402} 440}
403 441
442#article > header > h1 {
443 font-size: 2em;
444}
445
404.reader-mode { 446.reader-mode {
405 width: 95px !important; 447 width: 95px !important;
406 transition: width 0.2s ease; 448 transition: width 0.2s ease;
@@ -445,12 +487,13 @@ main ul.row {
445 487
446#article aside #list { 488#article aside #list {
447 float: right; 489 float: right;
448 margin-right: 15px; 490 margin: 0 15px 10px;
449} 491}
450 492
451#article aside .chip { 493#article aside .chip {
452 background-color: #039be5; 494 background-color: rgba(0,151,167,0.85);
453 color: #fff; 495 color: #fff;
496 padding: 0 15px 0 10px;
454} 497}
455 498
456#article aside .chip i { 499#article aside .chip i {
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 213d5790..798d8cba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'estimeret læsetid' 144 reading_time: 'estimeret læsetid'
145 reading_time_minutes: 'estimeret læsetid: %readingTime% min' 145 reading_time_minutes: 'estimeret læsetid: %readingTime% min'
146 reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Marker som læst' 149 toogle_as_read: 'Marker som læst'
149 toogle_as_star: 'Skift favoritstatus' 150 toogle_as_star: 'Skift favoritstatus'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 89cbbbf8..0b8516ee 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'geschätzte Lesezeit' 144 reading_time: 'geschätzte Lesezeit'
145 reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min' 145 reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min'
146 reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Gelesen-Status ändern' 149 toogle_as_read: 'Gelesen-Status ändern'
149 toogle_as_star: 'Favoriten-Status ändern' 150 toogle_as_star: 'Favoriten-Status ändern'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index b65e4522..826bd470 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'estimated reading time' 144 reading_time: 'estimated reading time'
145 reading_time_minutes: 'estimated reading time: %readingTime% min' 145 reading_time_minutes: 'estimated reading time: %readingTime% min'
146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
147 number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Toggle mark as read' 149 toogle_as_read: 'Toggle mark as read'
149 toogle_as_star: 'Toggle favorite' 150 toogle_as_star: 'Toggle favorite'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 8351bcf4..f3fa44f1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'tiempo estimado de lectura' 144 reading_time: 'tiempo estimado de lectura'
145 reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min' 145 reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min'
146 reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Marcar como leído/ no leído' 149 toogle_as_read: 'Marcar como leído/ no leído'
149 toogle_as_star: 'Marcar como favorito/ no favorito' 150 toogle_as_star: 'Marcar como favorito/ no favorito'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index db6e5960..5a8bc5c4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'زمان تخمینی برای خواندن' 144 reading_time: 'زمان تخمینی برای خواندن'
145 reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min' 145 reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min'
146 reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'خوانده‌شده/خوانده‌نشده' 149 toogle_as_read: 'خوانده‌شده/خوانده‌نشده'
149 toogle_as_star: 'برگزیده/نابرگزیده' 150 toogle_as_star: 'برگزیده/نابرگزیده'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 94300596..7c1464e1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'durée de lecture' 144 reading_time: 'durée de lecture'
145 reading_time_minutes: 'durée de lecture: %readingTime% min' 145 reading_time_minutes: 'durée de lecture: %readingTime% min'
146 reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min'
147 number_of_tags: '{1}et un autre tag|]1,Inf[et %count% autres tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Marquer comme lu/non lu' 149 toogle_as_read: 'Marquer comme lu/non lu'
149 toogle_as_star: 'Marquer comme favori' 150 toogle_as_star: 'Marquer comme favori'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 00ed9c98..0bcc94a5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'tempo di lettura stimato' 144 reading_time: 'tempo di lettura stimato'
145 reading_time_minutes: 'tempo di lettura stimato: %readingTime% min' 145 reading_time_minutes: 'tempo di lettura stimato: %readingTime% min'
146 reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'originale' 148 original_article: 'originale'
148 toogle_as_read: 'Segna come da leggere' 149 toogle_as_read: 'Segna come da leggere'
149 toogle_as_star: 'Segna come non preferito' 150 toogle_as_star: 'Segna come non preferito'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index c81c852b..bf6b4100 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'durada de lectura' 144 reading_time: 'durada de lectura'
145 reading_time_minutes: 'durada de lectura : %readingTime% min' 145 reading_time_minutes: 'durada de lectura : %readingTime% min'
146 reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Marcar coma legit/pas legit' 149 toogle_as_read: 'Marcar coma legit/pas legit'
149 toogle_as_star: 'Marcar coma favorit' 150 toogle_as_star: 'Marcar coma favorit'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 3707a857..09428c89 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'szacunkowy czas czytania' 144 reading_time: 'szacunkowy czas czytania'
145 reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min' 145 reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min'
146 reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'oryginał' 148 original_article: 'oryginał'
148 toogle_as_read: 'Oznacz jako przeczytane' 149 toogle_as_read: 'Oznacz jako przeczytane'
149 toogle_as_star: 'Oznacz jako ulubione' 150 toogle_as_star: 'Oznacz jako ulubione'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 27be1edc..bc16eddc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'timp estimat de citire' 144 reading_time: 'timp estimat de citire'
145 reading_time_minutes: 'timp estimat de citire: %readingTime% min' 145 reading_time_minutes: 'timp estimat de citire: %readingTime% min'
146 reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'original' 148 original_article: 'original'
148 toogle_as_read: 'Comută marcat ca citit' 149 toogle_as_read: 'Comută marcat ca citit'
149 toogle_as_star: 'Comută marcat ca favorit' 150 toogle_as_star: 'Comută marcat ca favorit'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 85ee7316..240bc53a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -144,6 +144,7 @@ entry:
144 reading_time: 'tahmini okuma süresi' 144 reading_time: 'tahmini okuma süresi'
145 reading_time_minutes: 'tahmini okuma süresi: %readingTime% min' 145 reading_time_minutes: 'tahmini okuma süresi: %readingTime% min'
146 reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min'
147 # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
147 original_article: 'orijinal' 148 original_article: 'orijinal'
148 toogle_as_read: 'Okundu/okunmadı olarak işaretle' 149 toogle_as_read: 'Okundu/okunmadı olarak işaretle'
149 toogle_as_star: 'Favorilere ekle/çıkar' 150 toogle_as_star: 'Favorilere ekle/çıkar'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 98616635..d1cadea9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -26,6 +26,11 @@
26 <div class="card-body"> 26 <div class="card-body">
27 {% if not entry.previewPicture is null %} 27 {% if not entry.previewPicture is null %}
28 <div class="card-image waves-effect waves-block waves-light"> 28 <div class="card-image waves-effect waves-block waves-light">
29 <ul class="card-entry-labels">
30 {% for tag in entry.tags | slice(0, 3) %}
31 <li>{{ tag.label }}</li>
32 {% endfor %}
33 </ul>
29 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> 34 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
30 </div> 35 </div>
31 {% endif %} 36 {% endif %}
@@ -35,7 +40,7 @@
35 <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> 40 <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
36 {% endif %} 41 {% endif %}
37 42
38 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span> 43 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|striptags }}">{{ entry.title|striptags|raw }}</a></span>
39 44
40 <div class="estimatedTime grey-text"> 45 <div class="estimatedTime grey-text">
41 <span class="tool reading-time"> 46 <span class="tool reading-time">
@@ -50,6 +55,11 @@
50 55
51 {% if entry.previewPicture is null %} 56 {% if entry.previewPicture is null %}
52 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p> 57 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
58 <ul class="card-entry-labels-hidden">
59 {% for tag in entry.tags | slice(0, 2) %}
60 <li>{{ tag.label }}</li>
61 {% endfor %}
62 </ul>
53 {% endif %} 63 {% endif %}
54 </div> 64 </div>
55 </div> 65 </div>
@@ -66,6 +76,12 @@
66 </div> 76 </div>
67 77
68 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p> 78 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
79
80 <ul class="card-entry-labels-hidden">
81 {% for tag in entry.tags %}
82 <li>{{ tag.label }}</li>
83 {% endfor %}
84 </ul>
69 </div> 85 </div>
70 {% endif %} 86 {% endif %}
71 87
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 7fc7a552..2a5cdfac 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
@@ -20,7 +20,7 @@
20 <ul class="right"> 20 <ul class="right">
21 <li> 21 <li>
22 <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> 22 <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
23 <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}"</i> 23 <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i>
24 </a> 24 </a>
25 </li> 25 </li>
26 <li> 26 <li>
@@ -30,7 +30,7 @@
30 </li> 30 </li>
31 <li> 31 <li>
32 <a href="#" data-activates="slide-out" class="button-collapse right"> 32 <a href="#" data-activates="slide-out" class="button-collapse right">
33 <i class="material-icons">navigation_menu</i> 33 <i class="material-icons">menu</i>
34 </a> 34 </a>
35 </li> 35 </li>
36 </ul> 36 </ul>