diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-05-07 17:13:08 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-05-07 17:13:08 +0200 |
commit | 4c6ee89c9c70f24209f2bb86de2b3137ab2d801c (patch) | |
tree | cca46b17bc9b1293a5c70c8d14b2bcb52eab4ebe /src/Wallabag | |
parent | 34806fab1b26eb626862d45402cb4e265cc0af5b (diff) | |
download | wallabag-4c6ee89c9c70f24209f2bb86de2b3137ab2d801c.tar.gz wallabag-4c6ee89c9c70f24209f2bb86de2b3137ab2d801c.tar.zst wallabag-4c6ee89c9c70f24209f2bb86de2b3137ab2d801c.zip |
Fix review again
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 74 |
1 files changed, 38 insertions, 36 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 987329a5..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 | |||
@@ -216,46 +216,48 @@ | |||
216 | <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> |
217 | </header> | 217 | </header> |
218 | <aside> | 218 | <aside> |
219 | <ul class="tools"> | 219 | <div class="tools"> |
220 | <li> | 220 | <ul class="stats"> |
221 | {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} | ||
222 | </li> | ||
223 | <li> | ||
224 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> | ||
225 | {{ entry.createdAt|date('Y-m-d H:i') }} | ||
226 | </li> | ||
227 | {% if entry.publishedAt is not null %} | ||
228 | <li> | ||
229 | <i class="material-icons" title="{{ 'entry.view.published_at'|trans }}">create</i> | ||
230 | {{ entry.publishedAt|date('Y-m-d H:i') }} | ||
231 | </li> | ||
232 | {% endif %} | ||
233 | {% if entry.publishedBy is not empty %} | ||
234 | <li> | 221 | <li> |
235 | <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 %} |
236 | {% for author in entry.publishedBy %} | ||
237 | {{ author }}{% if not loop.last %}, {% endif %} | ||
238 | {% endfor %} | ||
239 | </li> | 223 | </li> |
240 | {% endif %} | 224 | <li> |
241 | <li> | 225 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> |
242 | <i class="material-icons link">link</i> | 226 | {{ entry.createdAt|date('Y-m-d H:i') }} |
243 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> | 227 | </li> |
244 | {{ entry.domainName|removeWww }} | 228 | {% if entry.publishedAt is not null %} |
245 | </a> | 229 | <li> |
246 | </li> | 230 | <i class="material-icons" title="{{ 'entry.view.published_at'|trans }}">create</i> |
247 | <li> | 231 | {{ entry.publishedAt|date('Y-m-d H:i') }} |
248 | <i class="material-icons link">comment</i> | 232 | </li> |
249 | {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} | 233 | {% endif %} |
250 | </li> | 234 | {% if entry.publishedBy is not empty %} |
251 | <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"> | ||
252 | {% for tag in entry.tags %} | 254 | {% for tag in entry.tags %} |
253 | <div class="chip"> | 255 | <li class="chip"> |
254 | <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> | 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> |
255 | </div> | 257 | </li> |
256 | {% endfor %} | 258 | {% endfor %} |
257 | </li> | 259 | </ul> |
258 | </ul> | 260 | </div> |
259 | 261 | ||
260 | <div class="input-field nav-panel-add-tag" style="display: none"> | 262 | <div class="input-field nav-panel-add-tag" style="display: none"> |
261 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 263 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |