diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
commit | 7d1d961267c129e2110ce9cc14c5a9d0a7d255cb (patch) | |
tree | d260d7b4ffc8466d7d410ec61bd896bdadd8456e /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |
parent | e1cc8fd79921fdff9999087ba896c88b14ffc0cd (diff) | |
parent | 6ae579e43f6a4ffe607a6361191366410d19f806 (diff) | |
download | wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.gz wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.zst wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.zip |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 20 |
1 files changed, 10 insertions, 10 deletions
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 15428b92..c3508083 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|e|raw }} ({{ entry.domainName|removeWww }}){% endblock %} | 3 | {% block title %}{{ entry.title|striptags|raw }} ({{ entry.domainName|removeWww }}){% endblock %} |
4 | 4 | ||
5 | {% block body_class %}entry{% endblock %} | 5 | {% block body_class %}entry{% endblock %} |
6 | 6 | ||
@@ -118,14 +118,14 @@ | |||
118 | {% endif %} | 118 | {% endif %} |
119 | {% if craue_setting('share_twitter') %} | 119 | {% if craue_setting('share_twitter') %} |
120 | <li> | 120 | <li> |
121 | <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool icon-twitter" title="twitter"> | 121 | <a href="https://twitter.com/home?status={{entry.title|striptags|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool icon-twitter" title="twitter"> |
122 | <span>twitter</span> | 122 | <span>twitter</span> |
123 | </a> | 123 | </a> |
124 | </li> | 124 | </li> |
125 | {% endif %} | 125 | {% endif %} |
126 | {% if craue_setting('share_shaarli') %} | 126 | {% if craue_setting('share_shaarli') %} |
127 | <li> | 127 | <li> |
128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank"> | 128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank"> |
129 | <i class="tool icon-image icon-image--shaarli" title="shaarli"></i> | 129 | <i class="tool icon-image icon-image--shaarli" title="shaarli"></i> |
130 | <span>shaarli</span> | 130 | <span>shaarli</span> |
131 | </a> | 131 | </a> |
@@ -133,7 +133,7 @@ | |||
133 | {% endif %} | 133 | {% endif %} |
134 | {% if craue_setting('share_diaspora') %} | 134 | {% if craue_setting('share_diaspora') %} |
135 | <li> | 135 | <li> |
136 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank"> | 136 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank"> |
137 | <i class="tool icon-image icon-image--diaspora" title="diaspora"></i> | 137 | <i class="tool icon-image icon-image--diaspora" title="diaspora"></i> |
138 | <span>diaspora*</span> | 138 | <span>diaspora*</span> |
139 | </a> | 139 | </a> |
@@ -141,7 +141,7 @@ | |||
141 | {% endif %} | 141 | {% endif %} |
142 | {% if craue_setting('share_unmark') %} | 142 | {% if craue_setting('share_unmark') %} |
143 | <li> | 143 | <li> |
144 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank"> | 144 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|striptags|url_encode}}&v=6" target="_blank"> |
145 | <i class="tool icon-image icon-image--unmark" title="unmark"></i> | 145 | <i class="tool icon-image icon-image--unmark" title="unmark"></i> |
146 | <span>unmark.it</span> | 146 | <span>unmark.it</span> |
147 | </a> | 147 | </a> |
@@ -149,7 +149,7 @@ | |||
149 | {% endif %} | 149 | {% endif %} |
150 | {% if craue_setting('carrot') %} | 150 | {% if craue_setting('carrot') %} |
151 | <li> | 151 | <li> |
152 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot"> | 152 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot"> |
153 | <i class="tool icon-image icon-image--carrot"></i> | 153 | <i class="tool icon-image icon-image--carrot"></i> |
154 | <span>Carrot</span> | 154 | <span>Carrot</span> |
155 | </a> | 155 | </a> |
@@ -157,7 +157,7 @@ | |||
157 | {% endif %} | 157 | {% endif %} |
158 | {% if craue_setting('share_mail') %} | 158 | {% if craue_setting('share_mail') %} |
159 | <li> | 159 | <li> |
160 | <a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool email icon icon-mail"> | 160 | <a href="mailto:?subject={{ entry.title|striptags|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool email icon icon-mail"> |
161 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> | 161 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> |
162 | </a> | 162 | </a> |
163 | </li> | 163 | </li> |
@@ -209,7 +209,7 @@ | |||
209 | {% block content %} | 209 | {% block content %} |
210 | <div id="article"> | 210 | <div id="article"> |
211 | <header class="mbm"> | 211 | <header class="mbm"> |
212 | <h1>{{ entry.title|e|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 212 | <h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
213 | </header> | 213 | </header> |
214 | <aside> | 214 | <aside> |
215 | <ul class="tools"> | 215 | <ul class="tools"> |
@@ -222,7 +222,7 @@ | |||
222 | </li> | 222 | </li> |
223 | <li> | 223 | <li> |
224 | <i class="material-icons link">link</i> | 224 | <i class="material-icons link">link</i> |
225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> | 225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> |
226 | {{ entry.domainName|removeWww }} | 226 | {{ entry.domainName|removeWww }} |
227 | </a> | 227 | </a> |
228 | </li> | 228 | </li> |
@@ -244,7 +244,7 @@ | |||
244 | </div> | 244 | </div> |
245 | 245 | ||
246 | {% if entry.previewPicture is not null %} | 246 | {% if entry.previewPicture is not null %} |
247 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> | 247 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div> |
248 | {% endif %} | 248 | {% endif %} |
249 | 249 | ||
250 | </aside> | 250 | </aside> |