16 files changed, 30 insertions, 30 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 3380edca..34d4021c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -168,10 +168,10 @@ entry:
         # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
         reading_time: 'estimeret læsetid'
         reading_time_minutes: 'estimeret læsetid: %readingTime% min'
-        reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'estimeret læsetid: &lt; 1 min'
         # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'Marker som læst'
         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 cfa11e82..eb3644f6 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
         reading_time: 'geschätzte Lesezeit'
         reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min'
-        reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'geschätzte Lesezeit: &lt; 1 min'
         number_of_tags: '{1}und ein anderer Tag|]1,Inf[und %count% andere Tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'Original'
         toogle_as_read: 'Gelesen-Status ändern'
         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 673a0a16..2626523a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
         reading_time: 'estimated reading time'
         reading_time_minutes: 'estimated reading time: %readingTime% min'
-        reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'estimated reading time: &lt; 1 min'
         number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'Toggle mark as read'
         toogle_as_star: 'Toggle starred'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index d08edd6e..d45f8bf5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
         reading_time: 'tiempo estimado de lectura'
         reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min'
-        reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tiempo estimado de lectura: &lt; 1 min'
         # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'Marcar como leído/ no leído'
         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 ad6144b8..36a7cd80 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
         reading_time: 'زمان تخمینی برای خواندن'
         reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min'
-        reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'زمان تخمینی برای خواندن: &lt; 1 min'
         # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'خوانده‌شده/خوانده‌نشده'
         toogle_as_star: 'برگزیده/نابرگزیده'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 6f4befc9..6dd449ba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
         reading_time: "durée de lecture"
         reading_time_minutes: "durée de lecture: %readingTime% min"
-        reading_time_less_one_minute: "durée de lecture: <small class=\"inferieur\">&lt;</small> 1 min"
+        reading_time_less_one_minute: "durée de lecture: &lt; 1 min"
         number_of_tags: "{1}et un autre tag|]1,Inf[et %count% autres tags"
         reading_time_minutes_short: "%readingTime% min"
-        reading_time_less_one_minute_short: "<small class=\"inferieur\">&lt;</small> 1 min"
+        reading_time_less_one_minute_short: "&lt; 1 min"
         original_article: "original"
         toogle_as_read: "Marquer comme lu/non lu"
         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 bbb526dc..4298d1f7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
         reading_time: 'tempo di lettura stimato'
         reading_time_minutes: 'tempo di lettura stimato: %readingTime% min'
-        reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tempo di lettura stimato: &lt; 1 min'
         # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'originale'
         toogle_as_read: 'Segna come da leggere'
         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 33c1a660..85310cd7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
         reading_time: 'durada de lectura'
         reading_time_minutes: 'durada de lectura : %readingTime% min'
-        reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'durada de lectura : &lt; 1 min'
         number_of_tags: '{1}e una autra etiqueta|]1,Inf[e %count% autras etiquetas'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'Marcar coma legit/pas legit'
         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 1eb83d53..35120edc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
         reading_time: 'szacunkowy czas czytania'
         reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min'
-        reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'szacunkowy czas czytania: &lt; 1 min'
         number_of_tags: '{1} i inny tag|]1,Inf[i %count% innych tagów'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'oryginał'
         toogle_as_read: 'Oznacz jako przeczytane'
         toogle_as_star: 'Oznacz jako ulubione'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index f58b2115..c4ace37c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.'
         reading_time: 'tempo estimado de leitura'
         reading_time_minutes: 'tempo estimado de leitura: %readingTime% min'
-        reading_time_less_one_minute: 'tempo estimado de leitura: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tempo estimado de leitura: &lt; 1 min'
         number_of_tags: '{1}e uma outra tag|]1,Inf[e %count% outras tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'Marcar como lido'
         toogle_as_star: 'Marcar como destacado'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index b9a57e36..928e5c27 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -168,10 +168,10 @@ entry:
         # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
         reading_time: 'timp estimat de citire'
         reading_time_minutes: 'timp estimat de citire: %readingTime% min'
-        reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'timp estimat de citire: &lt; 1 min'
         # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'Comută marcat ca citit'
         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 ec21c014..d6cea974 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -168,10 +168,10 @@ entry:
         number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
         reading_time: 'tahmini okuma süresi'
         reading_time_minutes: 'tahmini okuma süresi: %readingTime% min'
-        reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tahmini okuma süresi: &lt; 1 min'
         # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'orijinal'
         toogle_as_read: 'Okundu/okunmadı olarak işaretle'
         toogle_as_star: 'Favorilere ekle/çıkar'
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 a4a56e46..95c84686 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
@@ -18,8 +18,8 @@
         <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
         <div class="pagination">
             <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a>
-            <i class="btn-clickable download-btn material-icons md-36">file_download</i>
-            <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
+            <i class="btn-clickable download-btn material-icons md-36 js-export-action">file_download</i>
+            <i class="btn-clickable filter-btn material-icons md-36 js-filters-action">filter_list</i>
             {% if entries.getNbPages > 1 %}
                 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
             {% endif %}
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 2e9673d5..8ac2bc0b 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
@@ -29,7 +29,7 @@
                 {% endif %}
                 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
-                {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
+                {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
                 {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
                 {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|url_encode}}&amp;v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %}
                 {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %}
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 46f89e19..a99bc4ea 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
@@ -125,7 +125,7 @@
                     {% endif %}
                     {% if craue_setting('share_shaarli') %}
                         <li>
-                            <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank">
+                        <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank">
                                 <i class="tool icon-image icon-image--shaarli" title="shaarli"></i>
                                 <span>shaarli</span>
                             </a>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index e0d36738..d9fb5d73 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -92,12 +92,12 @@
                     </a>
                 </li>
                 <li id="button_filters">
-                    <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
+                    <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
                         <i class="material-icons">filter_list</i>
                     </a>
                 </li>
                 <li id="button_export">
-                    <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
+                    <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
                         <i class="material-icons">file_download</i>
                     </a>
                 </li>