aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-09-12 13:39:01 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-09-12 13:39:01 +0200
commite610143f51d991a63bb70645f2de63fdbc1173fe (patch)
treeda261d1c10e3347089592e9d1fee70c5e0080b1a /src
parent9c08a891f9bb90bc3f23a575a734283c1ee00ba1 (diff)
downloadwallabag-e610143f51d991a63bb70645f2de63fdbc1173fe.tar.gz
wallabag-e610143f51d991a63bb70645f2de63fdbc1173fe.tar.zst
wallabag-e610143f51d991a63bb70645f2de63fdbc1173fe.zip
add preview pictures
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig4
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css4
3 files changed, 13 insertions, 1 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 3711f6e5..f7f53b9d 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 @@
40 {% else %} 40 {% else %}
41 <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur">&lt;</small> 1 min</span></div> 41 <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time: {% endtrans %} <small class="inferieur">&lt;</small> 1 min</span></div>
42 {% endif %} 42 {% endif %}
43 <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p> 43 {% if entry.previewPicture is null %}
44 <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
45 {% else %}
46 <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
47 {% endif %}
44 </div> 48 </div>
45 <div class="card-action"> 49 <div class="card-action">
46 <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> 50 <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 {
149 {% for tag in entry.tags %}<span><a href="#">{{ tag.label }}</a></span>{% endfor %} 149 {% for tag in entry.tags %}<span><a href="#">{{ tag.label }}</a></span>{% endfor %}
150 </div> 150 </div>
151 151
152 {% if entry.previewPicture is not null %}
153 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
154 {% endif %}
155
152 <div class="input-field nav-panel-add-tag" style="display: none"> 156 <div class="input-field nav-panel-add-tag" style="display: none">
153 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} 157 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
154 </div> 158 </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 {
226 overflow: hidden; 226 overflow: hidden;
227} 227}
228 228
229img.preview {
230 max-width: 100%;
231}
232
229.card .card-content .card-title { 233.card .card-content .card-title {
230 line-height: 32px; 234 line-height: 32px;
231} 235}