diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
10 files changed, 220 insertions, 124 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index e774795b..5d411fdd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -24,23 +24,33 @@ | |||
24 | {{ form_errors(form.config) }} | 24 | {{ form_errors(form.config) }} |
25 | 25 | ||
26 | <div class="row"> | 26 | <div class="row"> |
27 | <div class="input-field col s12"> | 27 | <div class="input-field col s11"> |
28 | {{ form_label(form.config.theme) }} | 28 | {{ form_label(form.config.theme) }} |
29 | {{ form_errors(form.config.theme) }} | 29 | {{ form_errors(form.config.theme) }} |
30 | {{ form_widget(form.config.theme) }} | 30 | {{ form_widget(form.config.theme) }} |
31 | </div> | 31 | </div> |
32 | <div class="input-field col s1"> | ||
33 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}"> | ||
34 | <i class="material-icons">live_help</i> | ||
35 | </a> | ||
36 | </div> | ||
32 | </div> | 37 | </div> |
33 | 38 | ||
34 | <div class="row"> | 39 | <div class="row"> |
35 | <div class="input-field col s12"> | 40 | <div class="input-field col s11"> |
36 | {{ form_label(form.config.items_per_page) }} | 41 | {{ form_label(form.config.items_per_page) }} |
37 | {{ form_errors(form.config.items_per_page) }} | 42 | {{ form_errors(form.config.items_per_page) }} |
38 | {{ form_widget(form.config.items_per_page) }} | 43 | {{ form_widget(form.config.items_per_page) }} |
39 | </div> | 44 | </div> |
45 | <div class="input-field col s1"> | ||
46 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}"> | ||
47 | <i class="material-icons">live_help</i> | ||
48 | </a> | ||
49 | </div> | ||
40 | </div> | 50 | </div> |
41 | 51 | ||
42 | <div class="row"> | 52 | <div class="row"> |
43 | <div class="input-field col s12"> | 53 | <div class="input-field col s11"> |
44 | {{ form_label(form.config.reading_speed) }} | 54 | {{ form_label(form.config.reading_speed) }} |
45 | {{ form_errors(form.config.reading_speed) }} | 55 | {{ form_errors(form.config.reading_speed) }} |
46 | {{ form_widget(form.config.reading_speed) }} | 56 | {{ form_widget(form.config.reading_speed) }} |
@@ -49,6 +59,11 @@ | |||
49 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> | 59 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> |
50 | </p> | 60 | </p> |
51 | </div> | 61 | </div> |
62 | <div class="input-field col s1"> | ||
63 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_reading_speed'|trans }}"> | ||
64 | <i class="material-icons">live_help</i> | ||
65 | </a> | ||
66 | </div> | ||
52 | </div> | 67 | </div> |
53 | 68 | ||
54 | <div class="row"> | 69 | <div class="row"> |
@@ -60,15 +75,20 @@ | |||
60 | </div> | 75 | </div> |
61 | 76 | ||
62 | <div class="row"> | 77 | <div class="row"> |
63 | <div class="input-field col s12"> | 78 | <div class="input-field col s11"> |
64 | {{ form_label(form.config.language) }} | 79 | {{ form_label(form.config.language) }} |
65 | {{ form_errors(form.config.language) }} | 80 | {{ form_errors(form.config.language) }} |
66 | {{ form_widget(form.config.language) }} | 81 | {{ form_widget(form.config.language) }} |
67 | </div> | 82 | </div> |
83 | <div class="input-field col s1"> | ||
84 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}"> | ||
85 | <i class="material-icons">live_help</i> | ||
86 | </a> | ||
87 | </div> | ||
68 | </div> | 88 | </div> |
69 | 89 | ||
70 | <div class="row"> | 90 | <div class="row"> |
71 | <div class="input-field col s12"> | 91 | <div class="input-field col s11"> |
72 | {{ form_label(form.config.pocket_consumer_key) }} | 92 | {{ form_label(form.config.pocket_consumer_key) }} |
73 | {{ form_errors(form.config.pocket_consumer_key) }} | 93 | {{ form_errors(form.config.pocket_consumer_key) }} |
74 | {{ form_widget(form.config.pocket_consumer_key) }} | 94 | {{ form_widget(form.config.pocket_consumer_key) }} |
@@ -77,6 +97,11 @@ | |||
77 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | 97 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> |
78 | </p> | 98 | </p> |
79 | </div> | 99 | </div> |
100 | <div class="input-field col s1"> | ||
101 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}"> | ||
102 | <i class="material-icons">live_help</i> | ||
103 | </a> | ||
104 | </div> | ||
80 | </div> | 105 | </div> |
81 | 106 | ||
82 | <div class="row"> | 107 | <div class="row"> |
@@ -172,7 +197,7 @@ | |||
172 | 197 | ||
173 | {% if twofactor_auth %} | 198 | {% if twofactor_auth %} |
174 | <div class="row"> | 199 | <div class="row"> |
175 | <div class="input-field col s12"> | 200 | <div class="input-field col s11"> |
176 | {{ 'config.form_user.two_factor_description'|trans }} | 201 | {{ 'config.form_user.two_factor_description'|trans }} |
177 | 202 | ||
178 | <br /> | 203 | <br /> |
@@ -181,6 +206,11 @@ | |||
181 | {{ form_label(form.user.twoFactorAuthentication) }} | 206 | {{ form_label(form.user.twoFactorAuthentication) }} |
182 | {{ form_errors(form.user.twoFactorAuthentication) }} | 207 | {{ form_errors(form.user.twoFactorAuthentication) }} |
183 | </div> | 208 | </div> |
209 | <div class="input-field col s1"> | ||
210 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}"> | ||
211 | <i class="material-icons">live_help</i> | ||
212 | </a> | ||
213 | </div> | ||
184 | </div> | 214 | </div> |
185 | {% endif %} | 215 | {% endif %} |
186 | 216 | ||
@@ -221,6 +251,12 @@ | |||
221 | {{ form_start(form.pwd) }} | 251 | {{ form_start(form.pwd) }} |
222 | {{ form_errors(form.pwd) }} | 252 | {{ form_errors(form.pwd) }} |
223 | 253 | ||
254 | <div class="row"> | ||
255 | <div class="input-field col s12"> | ||
256 | {{ 'config.form_password.description'|trans }} | ||
257 | </div> | ||
258 | </div> | ||
259 | |||
224 | <div class="row"> | 260 | <div class="row"> |
225 | <div class="input-field col s12"> | 261 | <div class="input-field col s12"> |
226 | {{ form_label(form.pwd.old_password) }} | 262 | {{ form_label(form.pwd.old_password) }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig new file mode 100644 index 00000000..56442116 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig | |||
@@ -0,0 +1,17 @@ | |||
1 | <div class="card-action"> | ||
2 | <span class="reading-time grey-text"> | ||
3 | <i class="material-icons" title="{{ 'entry.list.reading_time'|trans }}">timer</i> | ||
4 | {{ entry.readingTime / app.user.config.readingSpeed|round }} min | ||
5 | |||
6 | <i class="material-icons hide-on-med-and-down" title="{{ 'entry.view.created_at'|trans }}">today</i> | ||
7 | <span class="hide-on-med-and-down"> {{ entry.createdAt|date('Y-m-d') }}</span> | ||
8 | </span> | ||
9 | |||
10 | <ul class="tools right"> | ||
11 | <li> | ||
12 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> | ||
13 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> | ||
14 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> | ||
15 | </li> | ||
16 | </ul> | ||
17 | </div> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig new file mode 100644 index 00000000..0fdd5996 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig | |||
@@ -0,0 +1,28 @@ | |||
1 | <div class="card"> | ||
2 | <div class="card-body"> | ||
3 | <div class="card-fullimage"> | ||
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 class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> | ||
10 | </div> | ||
11 | |||
12 | <div class="card-content"> | ||
13 | <span class="card-title dot-ellipsis dot-resize-update"> | ||
14 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}"> | ||
15 | {{ entry.title | raw | striptags | truncate(80, true, '…') }} | ||
16 | </a> | ||
17 | </span> | ||
18 | |||
19 | <div class="original grey-text"> | ||
20 | <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool original grey-text"> | ||
21 | <span>{{ entry.domainName|removeWww }}</span> | ||
22 | </a> | ||
23 | </div> | ||
24 | </div> | ||
25 | </div> | ||
26 | |||
27 | {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} | ||
28 | </div> | ||
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 new file mode 100644 index 00000000..19a400b4 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig | |||
@@ -0,0 +1,26 @@ | |||
1 | <div class="card"> | ||
2 | <div class="card-body"> | ||
3 | <div class="card-content"> | ||
4 | <span class="card-title dot-ellipsis dot-resize-update"> | ||
5 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}"> | ||
6 | {{ entry.title | raw | striptags | truncate(80, true, '…') }} | ||
7 | </a> | ||
8 | </span> | ||
9 | |||
10 | <div class="original grey-text"> | ||
11 | <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool original grey-text"> | ||
12 | <span>{{ entry.domainName|removeWww }}</span> | ||
13 | </a> | ||
14 | </div> | ||
15 | |||
16 | <p>{{ entry.content|striptags|slice(0, 250)|raw }}…</p> | ||
17 | <ul class="card-entry-labels-hidden"> | ||
18 | {% for tag in entry.tags | slice(0, 2) %} | ||
19 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
20 | {% endfor %} | ||
21 | </ul> | ||
22 | </div> | ||
23 | </div> | ||
24 | |||
25 | {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} | ||
26 | </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 new file mode 100644 index 00000000..b0e3c06d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig | |||
@@ -0,0 +1,47 @@ | |||
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 class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> | ||
10 | </div> | ||
11 | |||
12 | <div class="card-content"> | ||
13 | <i class="grey-text text-darken-4 activator material-icons right">more_vert</i> | ||
14 | |||
15 | <span class="card-title dot-ellipsis dot-resize-update"> | ||
16 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}"> | ||
17 | {{ entry.title| striptags | truncate(80, true, '…') | raw }} | ||
18 | </a> | ||
19 | </span> | ||
20 | |||
21 | <div class="original grey-text"> | ||
22 | <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool original grey-text"> | ||
23 | <span>{{ entry.domainName|removeWww }}</span> | ||
24 | </a> | ||
25 | </div> | ||
26 | </div> | ||
27 | </div> | ||
28 | |||
29 | <div class="card-reveal"> | ||
30 | <i class="card-title activator grey-text text-darken-4 material-icons right">clear</i> | ||
31 | <span class="card-title"> | ||
32 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}"> | ||
33 | {{ entry.title | raw | striptags | truncate(80, true, '…') }} | ||
34 | </a> | ||
35 | </span> | ||
36 | |||
37 | <p>{{ entry.content|striptags|slice(0, 250)|raw }}…</p> | ||
38 | |||
39 | <ul class="card-entry-labels-hidden"> | ||
40 | {% for tag in entry.tags %} | ||
41 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
42 | {% endfor %} | ||
43 | </ul> | ||
44 | </div> | ||
45 | |||
46 | {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} | ||
47 | </div> | ||
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 a0205ffb..160dbf3d 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 | |||
@@ -9,93 +9,34 @@ | |||
9 | {% endblock %} | 9 | {% endblock %} |
10 | 10 | ||
11 | {% block content %} | 11 | {% block content %} |
12 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 12 | <div class="results clearfix"> |
13 | <div class="nb-results left"> | ||
14 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | ||
15 | </div> | ||
16 | {% if entries.getNbPages > 1 %} | ||
17 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
18 | {% endif %} | ||
19 | </div> | ||
20 | |||
13 | <br /> | 21 | <br /> |
14 | <ul class="row data"> | 22 | <ul class="row data"> |
15 | {% for entry in entries %} | 23 | {% for entry in entries %} |
16 | <li id="entry-{{ entry.id|e }}" class="col l4 m6 s12"> | 24 | <li id="entry-{{ entry.id|e }}" class="col l3 m6 s12"> |
17 | <div class="card"> | 25 | {% if entry.previewPicture is null %} |
18 | 26 | {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %} | |
19 | <div class="card-body"> | 27 | {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %} |
20 | {% if not entry.previewPicture is null %} | 28 | {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %} |
21 | <div class="card-image waves-effect waves-block waves-light"> | 29 | {% elseif not entry.previewPicture is null %} |
22 | <ul class="card-entry-labels"> | 30 | {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry} only %} |
23 | {% for tag in entry.tags | slice(0, 3) %} | 31 | {% endif %} |
24 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
25 | {% endfor %} | ||
26 | </ul> | ||
27 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> | ||
28 | </div> | ||
29 | {% endif %} | ||
30 | |||
31 | <div class="card-content"> | ||
32 | {% if not entry.previewPicture is null %} | ||
33 | <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> | ||
34 | {% endif %} | ||
35 | |||
36 | <span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span> | ||
37 | |||
38 | <div class="estimatedTime grey-text"> | ||
39 | <span class="tool reading-time"> | ||
40 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | ||
41 | {% if readingTime > 0 %} | ||
42 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }} | ||
43 | {% else %} | ||
44 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
45 | {% endif %} | ||
46 | </span> | ||
47 | </div> | ||
48 | |||
49 | {% if entry.previewPicture is null %} | ||
50 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | ||
51 | <ul class="card-entry-labels-hidden"> | ||
52 | {% for tag in entry.tags | slice(0, 2) %} | ||
53 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
54 | {% endfor %} | ||
55 | </ul> | ||
56 | {% endif %} | ||
57 | </div> | ||
58 | </div> | ||
59 | |||
60 | {% if not entry.previewPicture is null %} | ||
61 | <div class="card-reveal"> | ||
62 | <i class="card-title grey-text text-darken-4 material-icons right">clear</i> | ||
63 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> | ||
64 | |||
65 | <div class="estimatedTime grey-text"> | ||
66 | <span class="tool reading-time"> | ||
67 | {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}{% else %}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{% endif %} | ||
68 | </span> | ||
69 | </div> | ||
70 | |||
71 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | ||
72 | |||
73 | <ul class="card-entry-labels-hidden"> | ||
74 | {% for tag in entry.tags %} | ||
75 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
76 | {% endfor %} | ||
77 | </ul> | ||
78 | </div> | ||
79 | {% endif %} | ||
80 | |||
81 | <div class="card-action"> | ||
82 | <span class="bold"> | ||
83 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a> | ||
84 | </span> | ||
85 | |||
86 | <ul class="tools right"> | ||
87 | <li> | ||
88 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> | ||
89 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> | ||
90 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> | ||
91 | </li> | ||
92 | </ul> | ||
93 | </div> | ||
94 | </div> | ||
95 | </li> | 32 | </li> |
96 | {% endfor %} | 33 | {% endfor %} |
97 | </ul> | 34 | </ul> |
98 | 35 | ||
36 | {% if entries.getNbPages > 1 %} | ||
37 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
38 | {% endif %} | ||
39 | |||
99 | <!-- Export --> | 40 | <!-- Export --> |
100 | <div id="export" class="side-nav fixed right-aligned"> | 41 | <div id="export" class="side-nav fixed right-aligned"> |
101 | {% set currentRoute = app.request.attributes.get('_route') %} | 42 | {% set currentRoute = app.request.attributes.get('_route') %} |
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 7912caa9..bed0fdec 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 | |||
@@ -212,27 +212,38 @@ | |||
212 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 212 | <h1>{{ entry.title|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 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 215 | <ul class="tools"> |
216 | <i class="material-icons">timer</i> | 216 | <li> |
217 | <span class="link"> | 217 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
218 | {% if readingTime > 0 %} | 218 | <i class="material-icons">timer</i> |
219 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 219 | {% if readingTime > 0 %} |
220 | {% else %} | 220 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
221 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 221 | {% else %} |
222 | {% endif %} | 222 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} |
223 | </span> | 223 | {% endif %} |
224 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> | 224 | </li> |
225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> | 225 | <li> |
226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> | 226 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> |
227 | </a> | 227 | {{ entry.createdAt|date('Y-m-d') }} |
228 | <span class="tool"><i class="material-icons link">comment</i></span> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 228 | </li> |
229 | <div id="list"> | 229 | <li> |
230 | {% for tag in entry.tags %} | 230 | <i class="material-icons link">link</i> |
231 | <div class="chip"> | 231 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
232 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> | 232 | {{ entry.domainName|removeWww }} |
233 | </div> | 233 | </a> |
234 | {% endfor %} | 234 | </li> |
235 | </div> | 235 | <li> |
236 | <i class="material-icons link">comment</i> | ||
237 | {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} | ||
238 | </li> | ||
239 | <li id="list"> | ||
240 | {% for tag in entry.tags %} | ||
241 | <div class="chip"> | ||
242 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> | ||
243 | </div> | ||
244 | {% endfor %} | ||
245 | </li> | ||
246 | </ul> | ||
236 | 247 | ||
237 | <div class="input-field nav-panel-add-tag" style="display: none"> | 248 | <div class="input-field nav-panel-add-tag" style="display: none"> |
238 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 249 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig deleted file mode 100644 index 6f8e60fc..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | {% block pager %} | ||
2 | <div class="results clearfix"> | ||
3 | <div class="nb-results left"> | ||
4 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | ||
5 | </div> | ||
6 | {% if entries.getNbPages > 1 %} | ||
7 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
8 | {% endif %} | ||
9 | </div> | ||
10 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig index 96f4f990..c83543ac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig | |||
@@ -12,7 +12,7 @@ | |||
12 | <div class="row"> | 12 | <div class="row"> |
13 | <ul class="card-tag-labels"> | 13 | <ul class="card-tag-labels"> |
14 | {% for tag in tags %} | 14 | {% for tag in tags %} |
15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s2"> | 15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s5"> |
16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> | 16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> |
17 | </li> | 17 | </li> |
18 | {% endfor %} | 18 | {% endfor %} |
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 de0049d3..f1ef01df 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -85,7 +85,7 @@ | |||
85 | <div class="input-field nav-panel-buttom"> | 85 | <div class="input-field nav-panel-buttom"> |
86 | <ul> | 86 | <ul> |
87 | <li class="bold"> | 87 | <li class="bold"> |
88 | <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> | 88 | <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add"> |
89 | <i class="material-icons">add</i> | 89 | <i class="material-icons">add</i> |
90 | </a> | 90 | </a> |
91 | </li> | 91 | </li> |
@@ -95,12 +95,12 @@ | |||
95 | </a> | 95 | </a> |
96 | </li>--> | 96 | </li>--> |
97 | <li id="button_filters"> | 97 | <li id="button_filters"> |
98 | <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> | 98 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> |
99 | <i class="material-icons">filter_list</i> | 99 | <i class="material-icons">filter_list</i> |
100 | </a> | 100 | </a> |
101 | </li> | 101 | </li> |
102 | <li id="button_export"> | 102 | <li id="button_export"> |
103 | <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export"> | 103 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export"> |
104 | <i class="material-icons">file_download</i> | 104 | <i class="material-icons">file_download</i> |
105 | </a> | 105 | </a> |
106 | </li> | 106 | </li> |
@@ -127,12 +127,12 @@ | |||
127 | <div class="footer-copyright"> | 127 | <div class="footer-copyright"> |
128 | <div class="container"> | 128 | <div class="container"> |
129 | <div class="row"> | 129 | <div class="row"> |
130 | <div class="col s8"> | 130 | <div class="col m12 l8 hide-on-small-only"> |
131 | <p> | 131 | <p title="{{ display_stats() | raw | striptags }}"> |
132 | {{ display_stats() }} | 132 | {{ display_stats() }} |
133 | </p> | 133 | </p> |
134 | </div> | 134 | </div> |
135 | <div class="col s4"> | 135 | <div class="col s12 l4"> |
136 | <p> | 136 | <p> |
137 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – | 137 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – |
138 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> | 138 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> |