Merge remote-tracking branch 'origin/master' into 2.5.0

src/Wallabag/CoreBundle/Resources/views/base.html.twig

@@ -67,7 +67,7 @@
 
                 {% block messages %}{% endblock %}
 
-                <div id="content">
+                <div id="content" dir="auto">
                     {% block content %}{% endblock %}
                 </div>
             </main>

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig

@@ -37,7 +37,7 @@
                 {{ form_widget(form.config.reading_speed) }}
                 <p>
                     {{ 'config.form_settings.reading_speed.help_message'|trans }}
-                    <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
+                    <a href="https://wallabag.github.io/myreadspeed/">myreadspeed</a>
                 </p>
             </div>
             <a href="#" title="{{ 'config.form_settings.help_reading_speed'|trans }}">

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig

@@ -8,7 +8,7 @@
             <h1><span{% if entry.language is defined and entry.language is not null %} lang="{{ entry.getHTMLLanguage() }}"{% endif %}>{{ entry.title|e|default('entry.default_title'|trans)|raw }}</span> <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
         </header>
 
-        <div id="article_toolbar">
+        <div id="article_toolbar" dir="auto">
             <ul class="links">
                 <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li>
                 <li><a href="{{ entry.url|e }}" target="_blank" rel="noopener" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link original"><span>{{ entry.domainName|removeWww }}</span></a></li>

src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig

@@ -31,9 +31,11 @@
     {% for entry in entries %}
     <entry>
         <title><![CDATA[{{ entry.title|e }}]]></title>
+        <link href="{{ entry.url }}"/>
         <link rel="alternate" type="text/html"
               href="{{ url('view', {'id': entry.id}) }}"/>
-        <link rel="via">{{ entry.url }}</link>
+        <link rel="via"
+              href="{{ entry.url }}"/>
         <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:entry:{{ entry.id }}</id>
         <updated>{{ entry.updatedAt|date('c') }}</updated>
         <published>{{ entry.createdAt|date('c') }}</published>

src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig

@@ -58,7 +58,7 @@
                                     {{ form_label(form.config.reading_speed) }}
                                     <p>
                                         {{ 'config.form_settings.reading_speed.help_message'|trans }}
-                                        <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
+                                        <a href="https://wallabag.github.io/myreadspeed/">myreadspeed</a>
                                     </p>
                                 </div>
                                 <div class="input-field col s1">

src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig

@@ -1,4 +1,4 @@
-<div class="card{% if currentRoute == 'tag_entries' and entry.isArchived %} archived{% endif %}">
+<div class="card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
     <div class="card-body">
         <div class="card-fullimage">
             <ul class="card-entry-labels">

src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig

@@ -1,4 +1,4 @@
-<div class="card-stacked{% if currentRoute == 'tag_entries' and entry.isArchived %} archived{% endif %}">
+<div class="card-stacked{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
     {% include "@WallabagCore/themes/material/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
     <div class="card-preview">
         <a href="{{ path('view', { 'id': entry.id }) }}">

src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig

@@ -1,4 +1,4 @@
-<div class="card{% if currentRoute == 'tag_entries' and entry.isArchived %} archived{% endif %}">
+<div class="card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
     <div class="card-body">
         <div class="card-image waves-effect waves-block waves-light">
             <ul class="card-entry-labels">

src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig

@@ -20,6 +20,7 @@
 
 {% block content %}
     {% set listMode = app.user.config.listMode %}
+    {% set entriesWithArchivedClassRoutes = ['tag_entries', 'search', 'all'] %}
     {% set currentRoute = app.request.attributes.get('_route') %}
     {% if currentRoute == 'homepage' %}
         {% set currentRoute = 'unread' %}
@@ -57,11 +58,11 @@
         {% for entry in entries %}
             <li id="entry-{{ entry.id|e }}" class="entry col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12">
                 {% if listMode == 1 %}
-                    {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': currentRoute} only %}
+                    {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': currentRoute, 'routes': entriesWithArchivedClassRoutes} only %}
                 {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
-                    {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': currentRoute} only %}
+                    {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': currentRoute, 'routes': entriesWithArchivedClassRoutes} only %}
                 {% else %}
-                    {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': currentRoute} only %}
+                    {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': currentRoute, 'routes': entriesWithArchivedClassRoutes} only %}
                 {% endif %}
             </li>
         {% endfor %}

src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig

@@ -216,6 +216,13 @@
         </li>
         {% endif %}
 
+        <li class="bold border-top border-bottom">
+            <a class="waves-effect collapsible-header" title="{{ 'menu.top.random_entry'|trans }}" href="{{ path('random_entry', { 'type': 'all' }) }}">
+                <i class="material-icons small">casino</i>
+                <span>{{ 'menu.top.random_entry'|trans }}</span>
+            </a>
+        </li>
+
         <li class="bold">
             <a class="waves-effect collapsible-header">
                 <i class="material-icons small">file_download</i>
@@ -252,7 +259,7 @@
             <h1><span{% if entry.language is defined and entry.language is not null %} lang="{{ entry.getHTMLLanguage() }}"{% endif %}>{{ entry.title|striptags|default('entry.default_title'|trans)|raw }}</span> <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}"><i class="material-icons grey-text">create</i></a></h1>
         </header>
         <aside>
-            <div class="tools grey-text">
+            <div class="tools grey-text" dir="auto">
                 <ul class="stats">
                     <li>
                         {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}