diff options
author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
---|---|---|
committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry | |
parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')
3 files changed, 89 insertions, 104 deletions
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 f6941ca5..919f94ec 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 | |||
@@ -1,18 +1,7 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %} | 3 | {% block title %} |
4 | {% set currentRoute = app.request.attributes.get('_route') %} | 4 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} |
5 | |||
6 | {% if currentRoute == 'starred' %} | ||
7 | {{ 'entry.page_titles.starred'|trans }} | ||
8 | {% elseif currentRoute == 'archive' %} | ||
9 | {{ 'entry.page_titles.archived'|trans }} | ||
10 | {% elseif currentRoute == 'all' %} | ||
11 | {{ 'entry.page_titles.filtered'|trans }} | ||
12 | {% else %} | ||
13 | {{ 'entry.page_titles.unread'|trans }} | ||
14 | {% endif %} | ||
15 | |||
16 | {% endblock %} | 5 | {% endblock %} |
17 | 6 | ||
18 | {% block content %} | 7 | {% block content %} |
@@ -26,13 +15,18 @@ | |||
26 | <div class="card-body"> | 15 | <div class="card-body"> |
27 | {% if not entry.previewPicture is null %} | 16 | {% if not entry.previewPicture is null %} |
28 | <div class="card-image waves-effect waves-block waves-light"> | 17 | <div class="card-image waves-effect waves-block waves-light"> |
18 | <ul class="card-entry-labels"> | ||
19 | {% for tag in entry.tags | slice(0, 3) %} | ||
20 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
21 | {% endfor %} | ||
22 | </ul> | ||
29 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> | 23 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> |
30 | </div> | 24 | </div> |
31 | {% endif %} | 25 | {% endif %} |
32 | 26 | ||
33 | <div class="card-content"> | 27 | <div class="card-content"> |
34 | {% if not entry.previewPicture is null %} | 28 | {% if not entry.previewPicture is null %} |
35 | <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i> | 29 | <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> |
36 | {% endif %} | 30 | {% endif %} |
37 | 31 | ||
38 | <span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span> | 32 | <span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span> |
@@ -50,13 +44,18 @@ | |||
50 | 44 | ||
51 | {% if entry.previewPicture is null %} | 45 | {% if entry.previewPicture is null %} |
52 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 46 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
47 | <ul class="card-entry-labels-hidden"> | ||
48 | {% for tag in entry.tags | slice(0, 2) %} | ||
49 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
50 | {% endfor %} | ||
51 | </ul> | ||
53 | {% endif %} | 52 | {% endif %} |
54 | </div> | 53 | </div> |
55 | </div> | 54 | </div> |
56 | 55 | ||
57 | {% if not entry.previewPicture is null %} | 56 | {% if not entry.previewPicture is null %} |
58 | <div class="card-reveal"> | 57 | <div class="card-reveal"> |
59 | <i class="card-title grey-text text-darken-4 mdi-card-close right"></i> | 58 | <i class="card-title grey-text text-darken-4 material-icons right">clear</i> |
60 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> | 59 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> |
61 | 60 | ||
62 | <div class="estimatedTime grey-text"> | 61 | <div class="estimatedTime grey-text"> |
@@ -66,19 +65,25 @@ | |||
66 | </div> | 65 | </div> |
67 | 66 | ||
68 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 67 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
68 | |||
69 | <ul class="card-entry-labels-hidden"> | ||
70 | {% for tag in entry.tags %} | ||
71 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
72 | {% endfor %} | ||
73 | </ul> | ||
69 | </div> | 74 | </div> |
70 | {% endif %} | 75 | {% endif %} |
71 | 76 | ||
72 | <div class="card-action"> | 77 | <div class="card-action"> |
73 | <span class="bold"> | 78 | <span class="bold"> |
74 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a> | 79 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a> |
75 | </bold> | 80 | </span> |
76 | 81 | ||
77 | <ul class="tools links right"> | 82 | <ul class="tools right"> |
78 | <li> | 83 | <li> |
79 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> | 84 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> |
80 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> | 85 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> |
81 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> | 86 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> |
82 | </li> | 87 | </li> |
83 | </ul> | 88 | </ul> |
84 | </div> | 89 | </div> |
@@ -106,6 +111,7 @@ | |||
106 | </div> | 111 | </div> |
107 | 112 | ||
108 | <!-- Filters --> | 113 | <!-- Filters --> |
114 | {% if form is not null %} | ||
109 | <div id="filters" class="side-nav fixed right-aligned"> | 115 | <div id="filters" class="side-nav fixed right-aligned"> |
110 | <form action="{{ path('all') }}"> | 116 | <form action="{{ path('all') }}"> |
111 | 117 | ||
@@ -189,5 +195,6 @@ | |||
189 | 195 | ||
190 | </form> | 196 | </form> |
191 | </div> | 197 | </div> |
192 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 198 | {% endif %} |
199 | |||
193 | {% endblock %} | 200 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig deleted file mode 100644 index 6cabcf44..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/"> | ||
3 | <channel> | ||
4 | <title>wallabag — {{type}} feed</title> | ||
5 | <link>{{ url('unread') }}</link> | ||
6 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> | ||
7 | <generator>wallabag</generator> | ||
8 | <description>wallabag {{type}} elements</description> | ||
9 | |||
10 | {% for entry in entries %} | ||
11 | |||
12 | <item> | ||
13 | <title><![CDATA[{{ entry.title }}]]></title> | ||
14 | <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source> | ||
15 | <link>{{ entry.url }}</link> | ||
16 | <guid>{{ entry.url }}</guid> | ||
17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> | ||
18 | <description> | ||
19 | <![CDATA[ | ||
20 | {%- if entry.readingTime > 0 -%} | ||
21 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} | ||
22 | {%- else -%} | ||
23 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
24 | {%- endif %} | ||
25 | |||
26 | {{ entry.content|raw -}} | ||
27 | ]]> | ||
28 | </description> | ||
29 | </item> | ||
30 | |||
31 | {% endfor %} | ||
32 | |||
33 | </channel> | ||
34 | </rss> | ||
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 2ee615aa..5188eb01 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 | |||
@@ -13,24 +13,24 @@ | |||
13 | <ul> | 13 | <ul> |
14 | <li> | 14 | <li> |
15 | <a class="waves-effect" href="{{ path('homepage') }}"> | 15 | <a class="waves-effect" href="{{ path('homepage') }}"> |
16 | <i class="mdi-action-exit-to-app"></i> | 16 | <i class="material-icons">exit_to_app</i> |
17 | </a> | 17 | </a> |
18 | </li> | 18 | </li> |
19 | </ul> | 19 | </ul> |
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="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></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> |
27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
28 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> | 28 | <i class="material-icons small">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> |
29 | </a> | 29 | </a> |
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="mdi-navigation-menu"></i> | 33 | <i class="material-icons">menu</i> |
34 | </a> | 34 | </a> |
35 | </li> | 35 | </li> |
36 | </ul> | 36 | </ul> |
@@ -39,7 +39,7 @@ | |||
39 | <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion"> | 39 | <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion"> |
40 | <li class="bold border-bottom hide-on-med-and-down"> | 40 | <li class="bold border-bottom hide-on-med-and-down"> |
41 | <a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> | 41 | <a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> |
42 | <i class="mdi-action-exit-to-app small"></i> | 42 | <i class="material-icons small">exit_to_app</i> |
43 | <span>{{ 'entry.view.left_menu.back_to_homepage'|trans }}</span> | 43 | <span>{{ 'entry.view.left_menu.back_to_homepage'|trans }}</span> |
44 | </a> | 44 | </a> |
45 | <div class="collapsible-body"></div> | 45 | <div class="collapsible-body"></div> |
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | <li class="bold border-bottom hide-on-med-and-down"> | 48 | <li class="bold border-bottom hide-on-med-and-down"> |
49 | <a class="waves-effect collapsible-header" href="{{ entry.url|e }}"> | 49 | <a class="waves-effect collapsible-header" href="{{ entry.url|e }}"> |
50 | <i class="mdi-content-link small"></i> | 50 | <i class="material-icons small">link</i> |
51 | <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span> | 51 | <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span> |
52 | </a> | 52 | </a> |
53 | <div class="collapsible-body"></div> | 53 | <div class="collapsible-body"></div> |
@@ -55,30 +55,35 @@ | |||
55 | 55 | ||
56 | <li class="bold hide-on-med-and-down"> | 56 | <li class="bold hide-on-med-and-down"> |
57 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> | 57 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> |
58 | <i class="mdi-action-autorenew small"></i> | 58 | <i class="material-icons small">autorenew</i> |
59 | <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span> | 59 | <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span> |
60 | </a> | 60 | </a> |
61 | <div class="collapsible-body"></div> | 61 | <div class="collapsible-body"></div> |
62 | </li> | 62 | </li> |
63 | 63 | ||
64 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %} | ||
65 | {% if entry.isArchived == 0 %} | ||
66 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %} | ||
67 | {% endif %} | ||
68 | |||
64 | <li class="bold hide-on-med-and-down"> | 69 | <li class="bold hide-on-med-and-down"> |
65 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 70 | <a class="waves-effect collapsible-header" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
66 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> | 71 | <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i> |
67 | <span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span> | 72 | <span>{{ markAsReadLabel|trans }}</span> |
68 | </a> | 73 | </a> |
69 | <div class="collapsible-body"></div> | 74 | <div class="collapsible-body"></div> |
70 | </li> | 75 | </li> |
71 | 76 | ||
72 | <li class="bold hide-on-med-and-down"> | 77 | <li class="bold hide-on-med-and-down"> |
73 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 78 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
74 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> | 79 | <i class="material-icons spall">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> |
75 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> | 80 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> |
76 | </a> | 81 | </a> |
77 | <div class="collapsible-body"></div> | 82 | <div class="collapsible-body"></div> |
78 | </li> | 83 | </li> |
79 | <li class="bold border-bottom hide-on-med-and-down"> | 84 | <li class="bold border-bottom hide-on-med-and-down"> |
80 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 85 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
81 | <i class="mdi-action-delete small"></i> | 86 | <i class="material-icons small">delete</i> |
82 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
83 | </a> | 88 | </a> |
84 | <div class="collapsible-body"></div> | 89 | <div class="collapsible-body"></div> |
@@ -86,7 +91,7 @@ | |||
86 | 91 | ||
87 | <li class="bold border-bottom hide-on-med-and-down"> | 92 | <li class="bold border-bottom hide-on-med-and-down"> |
88 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> | 93 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> |
89 | <i class="mdi-action-label-outline small"></i> | 94 | <i class="material-icons small">label_outline</i> |
90 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> | 95 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> |
91 | </a> | 96 | </a> |
92 | <div class="collapsible-body"></div> | 97 | <div class="collapsible-body"></div> |
@@ -94,42 +99,57 @@ | |||
94 | 99 | ||
95 | <li class="bold"> | 100 | <li class="bold"> |
96 | <a class="waves-effect collapsible-header"> | 101 | <a class="waves-effect collapsible-header"> |
97 | <i class="mdi-social-share small"></i> | 102 | <i class="material-icons small">share</i> |
98 | <span>{{ 'entry.view.left_menu.share_content'|trans }}</span> | 103 | <span>{{ 'entry.view.left_menu.share_content'|trans }}</span> |
99 | </a> | 104 | </a> |
100 | <div class="collapsible-body"> | 105 | <div class="collapsible-body"> |
101 | <ul> | 106 | <ul> |
107 | {% if craue_setting('share_public') %} | ||
108 | <li> | ||
109 | <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}" class="tool icon-eye"> | ||
110 | <span>{{ 'entry.view.left_menu.public_link'|trans }}</span> | ||
111 | </a> | ||
112 | </li> | ||
113 | <li> | ||
114 | <a href="{{ path('delete_share', {'id': entry.id }) }}" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}" class="tool icon-no-eye"> | ||
115 | <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span> | ||
116 | </a> | ||
117 | </li> | ||
118 | {% endif %} | ||
102 | {% if craue_setting('share_twitter') %} | 119 | {% if craue_setting('share_twitter') %} |
103 | <li> | 120 | <li> |
104 | <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="twitter"> | 121 | <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool icon-twitter" title="twitter"> |
105 | <span>twitter</span> | 122 | <span>twitter</span> |
106 | </a> | 123 | </a> |
107 | </li> | 124 | </li> |
108 | {% endif %} | 125 | {% endif %} |
109 | {% if craue_setting('share_shaarli') %} | 126 | {% if craue_setting('share_shaarli') %} |
110 | <li> | 127 | <li> |
111 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"> | 128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank"> |
129 | <i class="tool icon-image icon-image--shaarli" title="shaarli"></i> | ||
112 | <span>shaarli</span> | 130 | <span>shaarli</span> |
113 | </a> | 131 | </a> |
114 | </li> | 132 | </li> |
115 | {% endif %} | 133 | {% endif %} |
116 | {% if craue_setting('share_diaspora') %} | 134 | {% if craue_setting('share_diaspora') %} |
117 | <li> | 135 | <li> |
118 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora}"> | 136 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank"> |
137 | <i class="tool icon-image icon-image--diaspora" title="diaspora"></i> | ||
119 | <span>diaspora*</span> | 138 | <span>diaspora*</span> |
120 | </a> | 139 | </a> |
121 | </li> | 140 | </li> |
122 | {% endif %} | 141 | {% endif %} |
123 | {% if craue_setting('carrot') %} | 142 | {% if craue_setting('carrot') %} |
124 | <li> | 143 | <li> |
125 | <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"> | 144 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot"> |
145 | <i class="tool icon-image icon-image--carrot"></i> | ||
126 | <span>Carrot</span> | 146 | <span>Carrot</span> |
127 | </a> | 147 | </a> |
128 | </li> | 148 | </li> |
129 | {% endif %} | 149 | {% endif %} |
130 | {% if craue_setting('share_mail') %} | 150 | {% if craue_setting('share_mail') %} |
131 | <li> | 151 | <li> |
132 | <a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{{ 'entry.view.left_menu.share_email_label'|trans }}"> | 152 | <a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool email icon icon-mail"> |
133 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> | 153 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> |
134 | </a> | 154 | </a> |
135 | </li> | 155 | </li> |
@@ -141,17 +161,16 @@ | |||
141 | {% if craue_setting('show_printlink') %} | 161 | {% if craue_setting('show_printlink') %} |
142 | <li class="bold border-bottom hide-on-med-and-down"> | 162 | <li class="bold border-bottom hide-on-med-and-down"> |
143 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();"> | 163 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();"> |
144 | <i class="mdi-action-print small"></i> | 164 | <i class="material-icons small">print</i> |
145 | <span>{{ 'entry.view.left_menu.print'|trans }}</span> | 165 | <span>{{ 'entry.view.left_menu.print'|trans }}</span> |
146 | </a> | 166 | </a> |
147 | <div class="collapsible-body"></div> | 167 | <div class="collapsible-body"></div> |
148 | </li> | 168 | </li> |
149 | {% endif %} | 169 | {% endif %} |
150 | 170 | ||
151 | |||
152 | <li class="bold"> | 171 | <li class="bold"> |
153 | <a class="waves-effect collapsible-header"> | 172 | <a class="waves-effect collapsible-header"> |
154 | <i class="mdi-file-file-download small"></i> | 173 | <i class="material-icons small">file_download</i> |
155 | <span>{{ 'entry.view.left_menu.download'|trans }}</span> | 174 | <span>{{ 'entry.view.left_menu.download'|trans }}</span> |
156 | </a> | 175 | </a> |
157 | <div class="collapsible-body"> | 176 | <div class="collapsible-body"> |
@@ -169,7 +188,7 @@ | |||
169 | 188 | ||
170 | <li class="bold hide-on-large-only"> | 189 | <li class="bold hide-on-large-only"> |
171 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 190 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
172 | <i class="mdi-action-delete small"></i> | 191 | <i class="material-icons small">delete</i> |
173 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 192 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
174 | </a> | 193 | </a> |
175 | <div class="collapsible-body"></div> | 194 | <div class="collapsible-body"></div> |
@@ -177,7 +196,7 @@ | |||
177 | 196 | ||
178 | <li class="bold"> | 197 | <li class="bold"> |
179 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> | 198 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> |
180 | <i class="mdi-alert-error small"></i> | 199 | <i class="material-icons small">error</i> |
181 | <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> | 200 | <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> |
182 | </a> | 201 | </a> |
183 | <div class="collapsible-body"></div> | 202 | <div class="collapsible-body"></div> |
@@ -193,21 +212,24 @@ | |||
193 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 212 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
194 | </header> | 213 | </header> |
195 | <aside> | 214 | <aside> |
196 | <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span> | ||
197 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 215 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
198 | <span class="link mdi-action-query-builder"> | 216 | <i class="material-icons">timer</i> |
217 | <span class="link"> | ||
199 | {% if readingTime > 0 %} | 218 | {% if readingTime > 0 %} |
200 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 219 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
201 | {% else %} | 220 | {% else %} |
202 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 221 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} |
203 | {% endif %} | 222 | {% endif %} |
204 | </span> | 223 | </span> |
205 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> | 224 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> |
206 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> | ||
227 | </a> | ||
228 | <span class="tool"><i class="material-icons link">comment</i></span> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | ||
207 | <div id="list"> | 229 | <div id="list"> |
208 | {% for tag in entry.tags %} | 230 | {% for tag in entry.tags %} |
209 | <div class="chip"> | 231 | <div class="chip"> |
210 | {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="mdi-action-delete"></i></a> | 232 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> |
211 | </div> | 233 | </div> |
212 | {% endfor %} | 234 | {% endfor %} |
213 | </div> | 235 | </div> |
@@ -226,27 +248,17 @@ | |||
226 | </article> | 248 | </article> |
227 | </div> | 249 | </div> |
228 | 250 | ||
229 | <script type="text/javascript"> | 251 | <script id="annotationroutes" type="application/json"> |
230 | 252 | { | |
231 | var app = new annotator.App(); | 253 | "prefix": "", |
232 | app.include(annotator.ui.main, { | 254 | "urls": { |
233 | element: document.querySelector('article') | 255 | "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}", |
234 | }); | 256 | "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}", |
235 | app.include(annotator.storage.http, { | 257 | "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}", |
236 | prefix: '', | 258 | "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}" |
237 | urls: { | 259 | }, |
238 | create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}', | 260 | "entryId": "{{ entry.id }}" |
239 | update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}', | 261 | }</script> |
240 | destroy: '{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}', | ||
241 | search: '{{ path('annotations_get_annotations', { 'entry': entry.id }) }}' | ||
242 | } | ||
243 | }); | ||
244 | app | ||
245 | .start() | ||
246 | .then(function () { | ||
247 | app.annotations.load({entry: {{ entry.id }}}); | ||
248 | }); | ||
249 | </script> | ||
250 | 262 | ||
251 | {% endblock %} | 263 | {% endblock %} |
252 | 264 | ||