Merge branch 'dev' of github.com:inthepoche/poche into dev

diff --cc tpl/home.twig
index 58586d7a1151021ade5e34c3691453658727a71c,6f6c17e1e5105e59dea4dc94ffe3af136ba67f09..21910ae8c297335ed0eb4bdf6c691cad9a677726
--- 1/tpl/home.twig
--- 2/tpl/home.twig
+++ b/tpl/home.twig
@@@ -13,14 -13,12 +13,12 @@@
              {{ page_links | raw }}
              {% for entry in entries %}
              <div id="entry-{{ entry.id|e }}" class="entrie">
 -                <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|e }}</a></h2>
 +                <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                  <ul class="tools">
-                     <li>
-                         <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li>
-                         <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span></span></a></li>
-                         <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
-                         <li class="reading-time">{{ entry.content| getReadingTime }} min</li>
-                     </li>
+                     <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
+                     <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
+                     <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
+                     <li class="reading-time">{{ entry.content| getReadingTime }} min</li>
                  </ul>
                  <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
                  <p class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></p>

diff --cc tpl/view.twig
Simple merge