diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-05-09 11:43:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 11:43:48 +0200 |
commit | b28c5430efefa63d04d87404c99798e82d0427e4 (patch) | |
tree | 0bf158fb56120be6624fa26639a28beb84a6598e /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |
parent | 43f81a62e93fb20c7af619a5132276706e989c62 (diff) | |
parent | efac66cb56d650b863b64c9c4582589da6a2442a (diff) | |
download | wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.tar.gz wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.tar.zst wallabag-b28c5430efefa63d04d87404c99798e82d0427e4.zip |
Merge pull request #3022 from wallabag/webpack
Adds Webpack support and remove Grunt
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 92 |
1 files changed, 45 insertions, 47 deletions
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 3c4ad024..47e6e8c3 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,47 +125,43 @@ | |||
125 | {% endif %} | 125 | {% endif %} |
126 | {% if craue_setting('share_shaarli') %} | 126 | {% if craue_setting('share_shaarli') %} |
127 | <li> | 127 | <li> |
128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank"> | 128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" title="shaarli" class="tool icon-image shaarli"> |
129 | <i class="tool icon-image icon-image--shaarli" title="shaarli"></i> | ||
130 | <span>shaarli</span> | 129 | <span>shaarli</span> |
131 | </a> | 130 | </a> |
132 | </li> | 131 | </li> |
133 | {% endif %} | 132 | {% endif %} |
134 | {% if craue_setting('share_scuttle') %} | 133 | {% if craue_setting('share_scuttle') %} |
135 | <li> | 134 | <li> |
136 | <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank"> | 135 | <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" title="scuttle" class="tool icon-image scuttle"> |
137 | <i class="tool icon-image icon-image--scuttle" title="scuttle"></i> | ||
138 | <span>scuttle</span> | 136 | <span>scuttle</span> |
139 | </a> | 137 | </a> |
140 | </li> | 138 | </li> |
141 | {% endif %} | 139 | {% endif %} |
142 | {% if craue_setting('share_diaspora') %} | 140 | {% if craue_setting('share_diaspora') %} |
143 | <li> | 141 | <li> |
144 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank"> | 142 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool icon-image diaspora" title="diaspora"> |
145 | <i class="tool icon-image icon-image--diaspora" title="diaspora"></i> | ||
146 | <span>diaspora*</span> | 143 | <span>diaspora*</span> |
147 | </a> | 144 | </a> |
148 | </li> | 145 | </li> |
149 | {% endif %} | 146 | {% endif %} |
150 | {% if craue_setting('share_unmark') %} | 147 | {% if craue_setting('share_unmark') %} |
151 | <li> | 148 | <li> |
152 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|striptags|url_encode}}&v=6" target="_blank"> | 149 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|striptags|url_encode}}&v=6" target="_blank" class="tool icon-image unmark" title="unmark"> |
153 | <i class="tool icon-image icon-image--unmark" title="unmark"></i> | ||
154 | <span>unmark.it</span> | 150 | <span>unmark.it</span> |
155 | </a> | 151 | </a> |
156 | </li> | 152 | </li> |
157 | {% endif %} | 153 | {% endif %} |
158 | {% if craue_setting('carrot') %} | 154 | {% if craue_setting('carrot') %} |
159 | <li> | 155 | <li> |
160 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot"> | 156 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot" class="tool icon-image carrot"> |
161 | <i class="tool icon-image icon-image--carrot"></i> | ||
162 | <span>Carrot</span> | 157 | <span>Carrot</span> |
163 | </a> | 158 | </a> |
164 | </li> | 159 | </li> |
165 | {% endif %} | 160 | {% endif %} |
166 | {% if craue_setting('share_mail') %} | 161 | {% if craue_setting('share_mail') %} |
167 | <li> | 162 | <li> |
168 | <a href="mailto:?subject={{ entry.title|striptags|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"> | 163 | <a href="mailto:?subject={{ entry.title|striptags|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool icon"> |
164 | <i class="material-icons vertical-align-middle">mail</i> | ||
169 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> | 165 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> |
170 | </a> | 166 | </a> |
171 | </li> | 167 | </li> |
@@ -220,46 +216,48 @@ | |||
220 | <h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 216 | <h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
221 | </header> | 217 | </header> |
222 | <aside> | 218 | <aside> |
223 | <ul class="tools"> | 219 | <div class="tools"> |
224 | <li> | 220 | <ul class="stats"> |
225 | {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} | ||
226 | </li> | ||
227 | <li> | ||
228 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> | ||
229 | {{ entry.createdAt|date('Y-m-d H:i') }} | ||
230 | </li> | ||
231 | {% if entry.publishedAt is not null %} | ||
232 | <li> | ||
233 | <i class="material-icons" title="{{ 'entry.view.published_at'|trans }}">create</i> | ||
234 | {{ entry.publishedAt|date('Y-m-d H:i') }} | ||
235 | </li> | ||
236 | {% endif %} | ||
237 | {% if entry.publishedBy is not empty %} | ||
238 | <li> | 221 | <li> |
239 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> | 222 | {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} |
240 | {% for author in entry.publishedBy %} | ||
241 | {{ author }}{% if not loop.last %}, {% endif %} | ||
242 | {% endfor %} | ||
243 | </li> | 223 | </li> |
244 | {% endif %} | 224 | <li> |
245 | <li> | 225 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> |
246 | <i class="material-icons link">link</i> | 226 | {{ entry.createdAt|date('Y-m-d H:i') }} |
247 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> | 227 | </li> |
248 | {{ entry.domainName|removeWww }} | 228 | {% if entry.publishedAt is not null %} |
249 | </a> | 229 | <li> |
250 | </li> | 230 | <i class="material-icons" title="{{ 'entry.view.published_at'|trans }}">create</i> |
251 | <li> | 231 | {{ entry.publishedAt|date('Y-m-d H:i') }} |
252 | <i class="material-icons link">comment</i> | 232 | </li> |
253 | {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} | 233 | {% endif %} |
254 | </li> | 234 | {% if entry.publishedBy is not empty %} |
255 | <li id="list"> | 235 | <li> |
236 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> | ||
237 | {% for author in entry.publishedBy %} | ||
238 | {{ author }}{% if not loop.last %}, {% endif %} | ||
239 | {% endfor %} | ||
240 | </li> | ||
241 | {% endif %} | ||
242 | <li> | ||
243 | <i class="material-icons link">link</i> | ||
244 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> | ||
245 | {{ entry.domainName|removeWww }} | ||
246 | </a> | ||
247 | </li> | ||
248 | <li> | ||
249 | <i class="material-icons link">comment</i> | ||
250 | {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} | ||
251 | </li> | ||
252 | </ul> | ||
253 | <ul class="tags"> | ||
256 | {% for tag in entry.tags %} | 254 | {% for tag in entry.tags %} |
257 | <div class="chip"> | 255 | <li class="chip"> |
258 | <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> | 256 | <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 vertical-align-middle">delete</i></a> |
259 | </div> | 257 | </li> |
260 | {% endfor %} | 258 | {% endfor %} |
261 | </li> | 259 | </ul> |
262 | </ul> | 260 | </div> |
263 | 261 | ||
264 | <div class="input-field nav-panel-add-tag" style="display: none"> | 262 | <div class="input-field nav-panel-add-tag" style="display: none"> |
265 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 263 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |