aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2018-10-16 07:45:22 +0000
committerGitHub <noreply@github.com>2018-10-16 07:45:22 +0000
commit0658ce4f111c888f64464cfaa2a8ed392bae0a6e (patch)
tree5070d298f9c975e91713652e9a1590cfe34fa6eb /src/Wallabag
parentfbdc665487bc5ea9fd46502be06a13ebc3e2fb4f (diff)
parentcefbe6a87fee244840e088955aa787a7ad3abb3e (diff)
downloadwallabag-0658ce4f111c888f64464cfaa2a8ed392bae0a6e.tar.gz
wallabag-0658ce4f111c888f64464cfaa2a8ed392bae0a6e.tar.zst
wallabag-0658ce4f111c888f64464cfaa2a8ed392bae0a6e.zip
Merge pull request #3745 from burkemw3/patch-3
Add placeholder image to card-based gallery entries page
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig14
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig4
3 files changed, 5 insertions, 17 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
deleted file mode 100644
index 4fd4debd..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
1<div class="card">
2 <div class="card-body">
3 <div class="card-image waves-effect waves-block waves-light">
4 <ul class="card-entry-labels">
5 {% for tag in entry.tags | slice(0, 3) %}
6 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
7 {% endfor %}
8 </ul>
9 </div>
10 {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry} only %}
11 </div>
12
13 {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
14</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
index e93646dc..dee1f55b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
@@ -7,7 +7,11 @@
7 {% endfor %} 7 {% endfor %}
8 </ul> 8 </ul>
9 <a href="{{ path('view', { 'id': entry.id }) }}"> 9 <a href="{{ path('view', { 'id': entry.id }) }}">
10 {% if entry.previewPicture is null %}
11 <span class="preview placeholder" style="background-image: url({{ asset('wallassets/themes/_global/img/logo-square.svg') }});"></span>
12 {% else %}
10 <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span> 13 <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span>
14 {% endif %}
11 </a> 15 </a>
12 </div> 16 </div>
13 {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %} 17 {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %}
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 e883503e..a137f3c3 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
@@ -39,11 +39,9 @@
39 <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12"> 39 <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12">
40 {% if listMode == 1 %} 40 {% if listMode == 1 %}
41 {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %} 41 {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %}
42 {% elseif entry.previewPicture is null %}
43 {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %}
44 {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %} 42 {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
45 {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %} 43 {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %}
46 {% elseif not entry.previewPicture is null %} 44 {% else %}
47 {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry} only %} 45 {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry} only %}
48 {% endif %} 46 {% endif %}
49 </li> 47 </li>