diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2018-02-24 22:24:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-24 22:24:24 +0100 |
commit | 2ff26deaf8a71ee428eebc08c387ad4bab764686 (patch) | |
tree | 02a79ca310a1f08e7e575e9630bb3dcf7e641453 /src/Wallabag/CoreBundle/Resources/views/themes/material | |
parent | 228d317204810db32c858fe3a1bd0b82e0960707 (diff) | |
parent | 4d9128ded96bb70b7bda964870ba3e279832dd9b (diff) | |
download | wallabag-2ff26deaf8a71ee428eebc08c387ad4bab764686.tar.gz wallabag-2ff26deaf8a71ee428eebc08c387ad4bab764686.tar.zst wallabag-2ff26deaf8a71ee428eebc08c387ad4bab764686.zip |
Merge pull request #3592 from Simounet/fix/html-entities-on-default-title
Fix title card HTML parsing
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig index 1c898f0f..1f3cd1a7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig | |||
@@ -3,7 +3,7 @@ | |||
3 | <i class="grey-text text-darken-4 activator material-icons right">more_vert</i> | 3 | <i class="grey-text text-darken-4 activator material-icons right">more_vert</i> |
4 | {% endif %} | 4 | {% endif %} |
5 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| striptags | e('html_attr') }}" class="card-title dot-ellipsis dot-resize-update"> | 5 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| striptags | e('html_attr') }}" class="card-title dot-ellipsis dot-resize-update"> |
6 | {{ entry.title | striptags | truncate(80, true, '…') | raw | default('entry.default_title'|trans) }} | 6 | {{ entry.title | striptags | truncate(80, true, '…') | default('entry.default_title'|trans) | raw }} |
7 | </a> | 7 | </a> |
8 | 8 | ||
9 | <div class="{{ subClass|default('original grey-text') }}"> | 9 | <div class="{{ subClass|default('original grey-text') }}"> |
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 8abf90c1..0d05f4d5 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{{ entry.title|striptags|raw|default('entry.default_title'|trans) }} ({{ entry.domainName|removeWww }}){% endblock %} | 3 | {% block title %}{{ entry.title|striptags|default('entry.default_title'|trans)|raw }} ({{ entry.domainName|removeWww }}){% endblock %} |
4 | 4 | ||
5 | {% block body_class %}entry{% endblock %} | 5 | {% block body_class %}entry{% endblock %} |
6 | 6 | ||
@@ -223,7 +223,7 @@ | |||
223 | {% block content %} | 223 | {% block content %} |
224 | <div id="article"> | 224 | <div id="article"> |
225 | <header class="mbm"> | 225 | <header class="mbm"> |
226 | <h1>{{ entry.title|striptags|raw|default('entry.default_title'|trans) }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 226 | <h1>{{ entry.title|striptags|default('entry.default_title'|trans)|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
227 | </header> | 227 | </header> |
228 | <aside> | 228 | <aside> |
229 | <div class="tools"> | 229 | <div class="tools"> |