diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2017-12-26 16:00:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-26 16:00:58 +0100 |
commit | 3473e600b1d0ae0695b8c15342a6a1f76e2bc973 (patch) | |
tree | cb75c9e3ac7bccdffcad97c2aa637a6717bf25e4 /src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry | |
parent | 11ed735c09391f244dfa45b93cdbfded11196866 (diff) | |
parent | c04bde29a36e4a60c596808d0ac45dc23476db44 (diff) | |
download | wallabag-3473e600b1d0ae0695b8c15342a6a1f76e2bc973.tar.gz wallabag-3473e600b1d0ae0695b8c15342a6a1f76e2bc973.tar.zst wallabag-3473e600b1d0ae0695b8c15342a6a1f76e2bc973.zip |
Merge pull request #3525 from Simounet/fix/empty-card-title-link
Fix empty card title link
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 12cead48..27c8e8a2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | {% for entry in entries %} | 39 | {% for entry in entries %} |
40 | <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}"> | 40 | <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}"> |
41 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title|e|raw }}</a></h2> | 41 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title | striptags | truncate(80, true, '…') | raw | default('entry.default_title'|trans) }}</a></h2> |
42 | 42 | ||
43 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 43 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
44 | <div class="estimatedTime"> | 44 | <div class="estimatedTime"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 7ff24dfd..f18e32ca 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -1,11 +1,11 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{{ entry.title|e|raw }} ({{ entry.domainName|removeWww }}){% endblock %} | 3 | {% block title %}{{ entry.title|e|raw|default('entry.default_title'|trans) }} ({{ entry.domainName|removeWww }}){% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | <div id="article"> | 6 | <div id="article"> |
7 | <header class="mbm"> | 7 | <header class="mbm"> |
8 | <h1>{{ entry.title|e|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 8 | <h1>{{ entry.title|e|raw |default('entry.default_title'|trans) }} <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
9 | </header> | 9 | </header> |
10 | 10 | ||
11 | <div id="article_toolbar"> | 11 | <div id="article_toolbar"> |