diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-23 23:18:36 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-23 23:18:36 +0200 |
commit | 38b418b7d63783fa0c7b920b7de6a1f6930fc7cb (patch) | |
tree | 3d2a95c3c74130c31ee3e21d540ccae0504ee17c /tpl/home.twig | |
parent | d29b3e5f9e195b99d3891acd8537f8f4680e430f (diff) | |
parent | fa5f9764ae370d6eb5efd6b05bf8e257aae9899d (diff) | |
download | wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.tar.gz wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.tar.zst wallabag-38b418b7d63783fa0c7b920b7de6a1f6930fc7cb.zip |
resolve conflicts
Diffstat (limited to 'tpl/home.twig')
-rw-r--r-- | tpl/home.twig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tpl/home.twig b/tpl/home.twig index 21910ae8..a2fa9a93 100644 --- a/tpl/home.twig +++ b/tpl/home.twig | |||
@@ -5,19 +5,19 @@ | |||
5 | {% endblock %} | 5 | {% endblock %} |
6 | {% block precontent %} | 6 | {% block precontent %} |
7 | <ul id="sort"> | 7 | <ul id="sort"> |
8 | <li><a href="./?sort=ia&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> | 8 | <li><a href="./?sort=ia&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> |
9 | <li><a href="./?sort=ta&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> | 9 | <li><a href="./?sort=ta&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> |
10 | </ul> | 10 | </ul> |
11 | {% endblock %} | 11 | {% endblock %} |
12 | {% block content %} | 12 | {% block content %} |
13 | {{ page_links | raw }} | 13 | {{ page_links | raw }} |
14 | {% for entry in entries %} | 14 | {% for entry in entries %} |
15 | <div id="entry-{{ entry.id|e }}" class="entrie"> | 15 | <div id="entry-{{ entry.id|e }}" class="entrie"> |
16 | <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> | 16 | <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> |
17 | <ul class="tools"> | 17 | <ul class="tools"> |
18 | <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> | 18 | <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> |
19 | <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> | 19 | <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> |
20 | <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li> | 20 | <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li> |
21 | <li class="reading-time">{{ entry.content| getReadingTime }} min</li> | 21 | <li class="reading-time">{{ entry.content| getReadingTime }} min</li> |
22 | </ul> | 22 | </ul> |
23 | <p>{{ entry.content|striptags|slice(0, 300) }}...</p> | 23 | <p>{{ entry.content|striptags|slice(0, 300) }}...</p> |