diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
commit | b878be4cc99fd4927c70b59386cf7a57b33bb381 (patch) | |
tree | 9a5186ead93b9f6114b5341a7713f614eb58f6ec /src/Wallabag/CoreBundle/Resources/views/themes/material | |
parent | e673b54f702f274a087e4feff409663d9636e57b (diff) | |
parent | bffe65478de71113a16f6e7a7ef75845c9d61180 (diff) | |
download | wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip |
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
5 files changed, 13 insertions, 21 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 8e6bbae0..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | <div class="card"> | ||
2 | <div class="card-body"> | ||
3 | {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry} only %} | ||
4 | </div> | ||
5 | |||
6 | {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} | ||
7 | </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..581a1813 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,8 @@ | |||
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 | <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span> | 10 | {% set previewClassModifier = entry.previewPicture ? '' : ' preview--default' %} |
11 | <span class="preview{{ previewClassModifier }}" style="background-image: url({{ entry.previewPicture | default(asset('wallassets/themes/_global/img/logo-square.svg')) }})"></span> | ||
11 | </a> | 12 | </a> |
12 | </div> | 13 | </div> |
13 | {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %} | 14 | {% 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> |
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 7484d53b..9ae6e73e 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 | |||
@@ -46,7 +46,7 @@ | |||
46 | </li> | 46 | </li> |
47 | 47 | ||
48 | <li class="bold border-bottom hide-on-med-and-down"> | 48 | <li class="bold border-bottom hide-on-med-and-down"> |
49 | <a class="waves-effect collapsible-header original" href="{{ entry.url|e }}" target="_blank"> | 49 | <a class="waves-effect collapsible-header original" href="{{ entry.url|e }}" target="_blank" rel="noopener"> |
50 | <i class="material-icons small">link</i> | 50 | <i class="material-icons small">link</i> |
51 | <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span> | 51 | <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span> |
52 | </a> | 52 | </a> |
@@ -127,42 +127,42 @@ | |||
127 | {% endif %} | 127 | {% endif %} |
128 | {% if craue_setting('share_twitter') %} | 128 | {% if craue_setting('share_twitter') %} |
129 | <li> | 129 | <li> |
130 | <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"> | 130 | <a href="https://twitter.com/home?status={{entry.title|striptags|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" rel="noopener" class="tool icon-twitter" title="twitter"> |
131 | <span>twitter</span> | 131 | <span>twitter</span> |
132 | </a> | 132 | </a> |
133 | </li> | 133 | </li> |
134 | {% endif %} | 134 | {% endif %} |
135 | {% if craue_setting('share_shaarli') %} | 135 | {% if craue_setting('share_shaarli') %} |
136 | <li> | 136 | <li> |
137 | <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 }}{% if craue_setting('shaarli_share_origin_url') %}&original_url={{ entry.originUrl|url_encode }}{% endif %}" target="_blank" title="shaarli" class="tool icon-image shaarli"> | 137 | <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 }}{% if craue_setting('shaarli_share_origin_url') %}&original_url={{ entry.originUrl|url_encode }}{% endif %}" target="_blank" rel="noopener" title="shaarli" class="tool icon-image shaarli"> |
138 | <span>shaarli</span> | 138 | <span>shaarli</span> |
139 | </a> | 139 | </a> |
140 | </li> | 140 | </li> |
141 | {% endif %} | 141 | {% endif %} |
142 | {% if craue_setting('share_scuttle') %} | 142 | {% if craue_setting('share_scuttle') %} |
143 | <li> | 143 | <li> |
144 | <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" title="scuttle" class="tool icon-image scuttle"> | 144 | <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" rel="noopener" title="scuttle" class="tool icon-image scuttle"> |
145 | <span>scuttle</span> | 145 | <span>scuttle</span> |
146 | </a> | 146 | </a> |
147 | </li> | 147 | </li> |
148 | {% endif %} | 148 | {% endif %} |
149 | {% if craue_setting('share_diaspora') %} | 149 | {% if craue_setting('share_diaspora') %} |
150 | <li> | 150 | <li> |
151 | <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" class="tool icon-image diaspora" title="diaspora"> | 151 | <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" rel="noopener" class="tool icon-image diaspora" title="diaspora"> |
152 | <span>diaspora*</span> | 152 | <span>diaspora*</span> |
153 | </a> | 153 | </a> |
154 | </li> | 154 | </li> |
155 | {% endif %} | 155 | {% endif %} |
156 | {% if craue_setting('share_unmark') %} | 156 | {% if craue_setting('share_unmark') %} |
157 | <li> | 157 | <li> |
158 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|striptags|url_encode}}&v=6" target="_blank" class="tool icon-image unmark" title="unmark"> | 158 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|striptags|url_encode}}&v=6" target="_blank" rel="noopener" class="tool icon-image unmark" title="unmark"> |
159 | <span>unmark.it</span> | 159 | <span>unmark.it</span> |
160 | </a> | 160 | </a> |
161 | </li> | 161 | </li> |
162 | {% endif %} | 162 | {% endif %} |
163 | {% if craue_setting('carrot') %} | 163 | {% if craue_setting('carrot') %} |
164 | <li> | 164 | <li> |
165 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot" class="tool icon-image carrot"> | 165 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}" target="_blank" rel="noopener" title="carrot" class="tool icon-image carrot"> |
166 | <span>Carrot</span> | 166 | <span>Carrot</span> |
167 | </a> | 167 | </a> |
168 | </li> | 168 | </li> |
@@ -251,7 +251,7 @@ | |||
251 | {% endif %} | 251 | {% endif %} |
252 | <li> | 252 | <li> |
253 | <i class="material-icons link">link</i> | 253 | <i class="material-icons link">link</i> |
254 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> | 254 | <a href="{{ entry.url|e }}" target="_blank" rel="noopener" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> |
255 | {{ entry.domainName|removeWww }} | 255 | {{ entry.domainName|removeWww }} |
256 | </a> | 256 | </a> |
257 | </li> | 257 | </li> |
@@ -262,7 +262,7 @@ | |||
262 | {% if entry.originUrl is not empty %} | 262 | {% if entry.originUrl is not empty %} |
263 | <li> | 263 | <li> |
264 | <i class="material-icons" title="{{ 'entry.view.provided_by'|trans }}">launch</i> | 264 | <i class="material-icons" title="{{ 'entry.view.provided_by'|trans }}">launch</i> |
265 | <a href="{{ entry.originUrl|e }}" target="_blank" class="tool"> | 265 | <a href="{{ entry.originUrl|e }}" target="_blank" rel="noopener" class="tool"> |
266 | {{ entry.originUrl|striptags|removeSchemeAndWww|truncate(32) }} | 266 | {{ entry.originUrl|striptags|removeSchemeAndWww|truncate(32) }} |
267 | </a> | 267 | </a> |
268 | </li> | 268 | </li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index f0012ad9..052a8c01 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -143,7 +143,7 @@ | |||
143 | </div> | 143 | </div> |
144 | <div class="col s12 l4"> | 144 | <div class="col s12 l4"> |
145 | <p class="footer-text"> | 145 | <p class="footer-text"> |
146 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – | 146 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" rel="noopener" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – |
147 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> | 147 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> |
148 | </p> | 148 | </p> |
149 | </div> | 149 | </div> |