From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Sun, 13 Sep 2015 09:41:23 +0000 (+0200)
Subject: Merge pull request #1417 from wallabag/v2-display-picture
X-Git-Tag: 2.0.0-alpha.0~2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4d5fd9be812825c480589cdcfcec281ffb5aa66a;hp=40f59b219bfd438bdaf4f36227a43f2b674ece00;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1417 from wallabag/v2-display-picture

fix #972: add preview pictures
---

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 @@
                     <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>
                     <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>
                 </ul>
-                <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                {% if entry.previewPicture is null %}
+                    <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                {% else %}
+                    <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
+                {% endif %}
             </div>
         {% endfor %}
     {% 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 @@
             {% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %}
             {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
         </aside>
+        {% if entry.previewPicture is not null %}
+            <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
+        {% endif %}
         <article>
             {{ entry.content | raw }}
         </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 {
 }
 */
 
+img.preview {
+    max-width: 100%;
+}
+
 .entry p {
   color: #666;
   font-size: 0.9em;
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 89182d98..b46d8f11 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
@@ -40,7 +40,11 @@
                         {% else %}
                             <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur">&lt;</small> 1 min</span></div>
                         {% endif %}
-                        <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                        {% if entry.previewPicture is null %}
+                            <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                        {% else %}
+                            <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
+                        {% endif %}
                     </div>
                     <div class="card-action">
                         <span class="bold"><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %}: {{ entry.title|e }} - {{ entry.domainName }}" class="tool original grey-text"><span>{{ entry.domainName | truncate(18) }}</span></a></bold>
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 75ac2a6b..3b4c7053 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
@@ -149,6 +149,10 @@ main {
                 {% for tag in entry.tags %}<span><a href="#">{{ tag.label }}</a></span>{% endfor %}
             </div>
 
+            {% if entry.previewPicture is not null %}
+                <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
+            {% endif %}
+
             <div class="input-field nav-panel-add-tag" style="display: none">
                 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
             </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 6c139b72..5e1ae8bd 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -226,6 +226,10 @@ main ul.row {
     overflow: hidden;
 }
 
+img.preview {
+    max-width: 100%;
+}
+
 .card .card-content .card-title {
     line-height: 32px;
 }