diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-09-13 10:03:53 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-09-13 10:03:53 +0200 |
commit | b026d3b11566e705284c0ce95c61ff44a6e714bf (patch) | |
tree | 1c6f2104dcc944714eff86ba92a67ff83aed85b8 /src/Wallabag | |
parent | e610143f51d991a63bb70645f2de63fdbc1173fe (diff) | |
download | wallabag-b026d3b11566e705284c0ce95c61ff44a6e714bf.tar.gz wallabag-b026d3b11566e705284c0ce95c61ff44a6e714bf.tar.zst wallabag-b026d3b11566e705284c0ce95c61ff44a6e714bf.zip |
add previewPicture on baggy theme
Diffstat (limited to 'src/Wallabag')
3 files changed, 12 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig index 3f5cf460..0d295431 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig | |||
@@ -37,7 +37,11 @@ | |||
37 | <li><a title="{% trans %}delete{% endtrans %}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}delete{% endtrans %}</span></a></li> | 37 | <li><a title="{% trans %}delete{% endtrans %}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}delete{% endtrans %}</span></a></li> |
38 | <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName }}</span></a></li> | 38 | <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName }}</span></a></li> |
39 | </ul> | 39 | </ul> |
40 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> | 40 | {% if entry.previewPicture is null %} |
41 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> | ||
42 | {% else %} | ||
43 | <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /> | ||
44 | {% endif %} | ||
41 | </div> | 45 | </div> |
42 | {% endfor %} | 46 | {% endfor %} |
43 | {% endif %} | 47 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig index 18cfd59d..f58d0399 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig | |||
@@ -31,6 +31,9 @@ | |||
31 | {% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %} | 31 | {% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %} |
32 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 32 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |
33 | </aside> | 33 | </aside> |
34 | {% if entry.previewPicture is not null %} | ||
35 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> | ||
36 | {% endif %} | ||
34 | <article> | 37 | <article> |
35 | {{ entry.content | raw }} | 38 | {{ entry.content | raw }} |
36 | </article> | 39 | </article> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css index 6090face..72a7b205 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css | |||
@@ -448,6 +448,10 @@ footer a { | |||
448 | } | 448 | } |
449 | */ | 449 | */ |
450 | 450 | ||
451 | img.preview { | ||
452 | max-width: 100%; | ||
453 | } | ||
454 | |||
451 | .entry p { | 455 | .entry p { |
452 | color: #666; | 456 | color: #666; |
453 | font-size: 0.9em; | 457 | font-size: 0.9em; |