aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-09-13 11:41:23 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-09-13 11:41:23 +0200
commit4d5fd9be812825c480589cdcfcec281ffb5aa66a (patch)
treef961c5b2c8068af9dc15c95df878edb126b7483c /src
parent40f59b219bfd438bdaf4f36227a43f2b674ece00 (diff)
parentb026d3b11566e705284c0ce95c61ff44a6e714bf (diff)
downloadwallabag-4d5fd9be812825c480589cdcfcec281ffb5aa66a.tar.gz
wallabag-4d5fd9be812825c480589cdcfcec281ffb5aa66a.tar.zst
wallabag-4d5fd9be812825c480589cdcfcec281ffb5aa66a.zip
Merge pull request #1417 from wallabag/v2-display-picture
fix #972: add preview pictures
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig3
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css4
-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
6 files changed, 25 insertions, 2 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) }}&hellip;</p> 40 {% if entry.previewPicture is null %}
41 <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</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
451img.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;
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 @@
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}