diff options
author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
---|---|---|
committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /src/Wallabag/CoreBundle/Resources/views | |
parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
37 files changed, 583 insertions, 981 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig deleted file mode 100644 index 966a84db..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | <a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">bag it!</a> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index f024b633..a1a9a136 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -41,13 +41,9 @@ | |||
41 | {% block css %} | 41 | {% block css %} |
42 | {% endblock %} | 42 | {% endblock %} |
43 | {% block scripts %} | 43 | {% block scripts %} |
44 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/jquery-2.0.3.min.js') }}"></script> | ||
45 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/jquery.cookie.js') }}"></script> | ||
46 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/bookmarklet.js') }}"></script> | ||
47 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/annotator.min.js') }}"></script> | ||
48 | {% endblock %} | 44 | {% endblock %} |
49 | 45 | ||
50 | <title>wallabag - {% block title %}{% endblock %}</title> | 46 | <title>{% block title %}{% endblock %} – wallabag</title> |
51 | {% endblock %} | 47 | {% endblock %} |
52 | </head> | 48 | </head> |
53 | 49 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index a8abe8d3..ff7ef73a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -44,6 +44,18 @@ | |||
44 | </div> | 44 | </div> |
45 | </fieldset> | 45 | </fieldset> |
46 | 46 | ||
47 | <fieldset class="w500p inline"> | ||
48 | <div class="row"> | ||
49 | {{ form_label(form.config.pocket_consumer_key) }} | ||
50 | {{ form_errors(form.config.pocket_consumer_key) }} | ||
51 | {{ form_widget(form.config.pocket_consumer_key) }} | ||
52 | <p> | ||
53 | » | ||
54 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | ||
55 | </p> | ||
56 | </div> | ||
57 | </fieldset> | ||
58 | |||
47 | {{ form_rest(form.config) }} | 59 | {{ form_rest(form.config) }} |
48 | </form> | 60 | </form> |
49 | 61 | ||
@@ -179,6 +191,7 @@ | |||
179 | « {{ tagging_rule.rule }} » | 191 | « {{ tagging_rule.rule }} » |
180 | {{ 'config.form_rules.then_tag_as_label'|trans }} | 192 | {{ 'config.form_rules.then_tag_as_label'|trans }} |
181 | « {{ tagging_rule.tags|join(', ') }} » | 193 | « {{ tagging_rule.tags|join(', ') }} » |
194 | <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="tool mode_edit">✎</a> | ||
182 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a> | 195 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a> |
183 | </li> | 196 | </li> |
184 | {% endfor %} | 197 | {% endfor %} |
@@ -205,7 +218,6 @@ | |||
205 | 218 | ||
206 | {{ form_rest(form.new_tagging_rule) }} | 219 | {{ form_rest(form.new_tagging_rule) }} |
207 | </form> | 220 | </form> |
208 | |||
209 | <div class="row"> | 221 | <div class="row"> |
210 | <div class="input-field col s12"> | 222 | <div class="input-field col s12"> |
211 | <h3>{{ 'config.form_rules.faq.title'|trans }}</h3> | 223 | <h3>{{ 'config.form_rules.faq.title'|trans }}</h3> |
@@ -290,46 +302,4 @@ | |||
290 | </table> | 302 | </table> |
291 | </div> | 303 | </div> |
292 | </div> | 304 | </div> |
293 | |||
294 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
295 | <h2>{{ 'config.tab_menu.new_user'|trans }}</h2> | ||
296 | |||
297 | {{ form_start(form.new_user) }} | ||
298 | {{ form_errors(form.new_user) }} | ||
299 | |||
300 | <fieldset class="w500p inline"> | ||
301 | <div class="row"> | ||
302 | {{ form_label(form.new_user.username) }} | ||
303 | {{ form_errors(form.new_user.username) }} | ||
304 | {{ form_widget(form.new_user.username) }} | ||
305 | </div> | ||
306 | </fieldset> | ||
307 | |||
308 | <fieldset class="w500p inline"> | ||
309 | <div class="row"> | ||
310 | {{ form_label(form.new_user.plainPassword.first) }} | ||
311 | {{ form_errors(form.new_user.plainPassword.first) }} | ||
312 | {{ form_widget(form.new_user.plainPassword.first) }} | ||
313 | </div> | ||
314 | </fieldset> | ||
315 | |||
316 | <fieldset class="w500p inline"> | ||
317 | <div class="row"> | ||
318 | {{ form_label(form.new_user.plainPassword.second) }} | ||
319 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
320 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
321 | </div> | ||
322 | </fieldset> | ||
323 | |||
324 | <fieldset class="w500p inline"> | ||
325 | <div class="row"> | ||
326 | {{ form_label(form.new_user.email) }} | ||
327 | {{ form_errors(form.new_user.email) }} | ||
328 | {{ form_widget(form.new_user.email) }} | ||
329 | </div> | ||
330 | </fieldset> | ||
331 | |||
332 | {{ form_rest(form.new_user) }} | ||
333 | {% endif %} | ||
334 | </form> | ||
335 | {% endblock %} | 305 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig deleted file mode 100644 index 78a9dc04..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <div class="row"> | ||
7 | <div class="col s12"> | ||
8 | <div class="card-panel settings"> | ||
9 | |||
10 | <div class="row"> | ||
11 | <p>{{ 'developer.client.page_description'|trans }}</p> | ||
12 | {{ form_start(form) }} | ||
13 | {{ form_errors(form) }} | ||
14 | |||
15 | <div class="input-field col s12"> | ||
16 | {{ form_label(form.redirect_uris) }} | ||
17 | {{ form_errors(form.redirect_uris) }} | ||
18 | {{ form_widget(form.redirect_uris) }} | ||
19 | </div> | ||
20 | |||
21 | <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a> | ||
22 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
23 | |||
24 | {{ form_rest(form) }} | ||
25 | </div> | ||
26 | |||
27 | </div> | ||
28 | </div> | ||
29 | </div> | ||
30 | |||
31 | {% endblock %} | ||
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 778625ae..3af88b23 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 | |||
@@ -1,6 +1,8 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %} | 3 | {% block title %} |
4 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} | ||
5 | {% endblock %} | ||
4 | 6 | ||
5 | {% block content %} | 7 | {% block content %} |
6 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 8 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} |
@@ -27,14 +29,45 @@ | |||
27 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li> | 29 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li> |
28 | </ul> | 30 | </ul> |
29 | {% if entry.previewPicture is null %} | 31 | {% if entry.previewPicture is null %} |
32 | <ul class="card-entry-tags"> | ||
33 | {% for tag in entry.tags %} | ||
34 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
35 | {% endfor %} | ||
36 | </ul> | ||
30 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> | 37 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> |
31 | {% else %} | 38 | {% else %} |
39 | <ul class="card-entry-labels"> | ||
40 | {% for tag in entry.tags | slice(0, 3) %} | ||
41 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
42 | {% endfor %} | ||
43 | </ul> | ||
32 | <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /> | 44 | <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /> |
33 | {% endif %} | 45 | {% endif %} |
34 | </div> | 46 | </div> |
35 | {% endfor %} | 47 | {% endfor %} |
36 | 48 | ||
37 | <aside id="filter-form" class=""> | 49 | <!-- Export --> |
50 | <aside id="download-form"> | ||
51 | {% set currentRoute = app.request.attributes.get('_route') %} | ||
52 | {% if currentRoute == 'homepage' %} | ||
53 | {% set currentRoute = 'unread' %} | ||
54 | {% endif %} | ||
55 | <h2>{{ 'entry.list.export_title'|trans }}</h2> | ||
56 | <a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">×</a> | ||
57 | <ul> | ||
58 | {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">EPUB</a></li>{% endif %} | ||
59 | {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">MOBI</a></li>{% endif %} | ||
60 | {% if craue_setting('export_pdf') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">PDF</a></li>{% endif %} | ||
61 | {% if craue_setting('export_csv') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">JSON</a></li>{% endif %} | ||
62 | {% if craue_setting('export_json') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">CSV</a></li>{% endif %} | ||
63 | {% if craue_setting('export_txt') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">TXT</a></li>{% endif %} | ||
64 | {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">XML</a></li>{% endif %} | ||
65 | </ul> | ||
66 | </aside> | ||
67 | |||
68 | <!-- Filter --> | ||
69 | {% if form is not null %} | ||
70 | <div id="filters" class=""> | ||
38 | <form method="get" action="{{ path('all') }}"> | 71 | <form method="get" action="{{ path('all') }}"> |
39 | <h2>{{ 'entry.filters.title'|trans }}</h2> | 72 | <h2>{{ 'entry.filters.title'|trans }}</h2> |
40 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> | 73 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> |
@@ -114,7 +147,6 @@ | |||
114 | <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button> | 147 | <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button> |
115 | </div> | 148 | </div> |
116 | </form> | 149 | </form> |
117 | </aside> | 150 | </div> |
118 | 151 | {% endif %} | |
119 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | ||
120 | {% endblock %} | 152 | {% endblock %} |
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 d7374dc7..3689159b 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 | |||
@@ -5,53 +5,67 @@ | |||
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|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 8 | <h1>{{ entry.title|raw }} <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"> |
12 | <ul class="links"> | 12 | <ul class="links"> |
13 | <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li> | 13 | <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li> |
14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> | 14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> |
15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> | 15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> |
16 | <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li> | 16 | |
17 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> | 17 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %} |
18 | <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> | 18 | {% if entry.isArchived == 0 %} |
19 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> | 19 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %} |
20 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} | 20 | {% endif %} |
21 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} | ||
22 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} | ||
23 | {% if craue_setting('share_diaspora') %}<li><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" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} | ||
24 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} | ||
25 | {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %} | ||
26 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %} | ||
27 | {% if craue_setting('export_mobi') %}<li><a href="?mobi&method=id&value={{ entry.id }}" title="Generate Mobi file">MOBI</a></li>{% endif %} | ||
28 | {% if craue_setting('export_pdf') %}<li><a href="?pdf&method=id&value={{ entry.id }}" title="Generate PDF file">PDF</a></li>{% endif %} | ||
29 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li> | ||
30 | </ul> | ||
31 | </div> | ||
32 | <div class="link mdi-action-today"> | ||
33 | {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} | ||
34 | </div> | ||
35 | 21 | ||
36 | <div class="link mdi-action-query-builder"> | 22 | <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li> |
37 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 23 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> |
38 | {% if readingTime > 0 %} | 24 | <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> |
39 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} | 25 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> |
40 | {% else %} | 26 | {% if craue_setting('share_public') %} |
41 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | 27 | <li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> |
42 | {% endif %} | 28 | <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li> |
29 | {% endif %} | ||
30 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} | ||
31 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} | ||
32 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} | ||
33 | {% if craue_setting('share_diaspora') %}<li><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" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} | ||
34 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} | ||
35 | {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %} | ||
36 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %} | ||
37 | {% if craue_setting('export_mobi') %}<li><a href="?mobi&method=id&value={{ entry.id }}" title="Generate Mobi file">MOBI</a></li>{% endif %} | ||
38 | {% if craue_setting('export_pdf') %}<li><a href="?pdf&method=id&value={{ entry.id }}" title="Generate PDF file">PDF</a></li>{% endif %} | ||
39 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li> | ||
40 | </ul> | ||
43 | </div> | 41 | </div> |
44 | 42 | ||
45 | {% set nbAnnotations = entry.annotations | length %} | 43 | <div id="article-informations"> |
46 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 44 | <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}"> |
47 | <aside class="tags"> | 45 | {{ entry.createdAt|date('Y-m-d') }} |
48 | {% for tag in entry.tags %} | 46 | </i> |
49 | <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a> | 47 | |
50 | {% endfor %} | 48 | <i class="tool icon icon-time"> |
51 | <div class="input-field nav-panel-add-tag" style="display: none"> | 49 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
52 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 50 | {% if readingTime > 0 %} |
53 | </div> | 51 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
54 | </aside> | 52 | {% else %} |
53 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | ||
54 | {% endif %} | ||
55 | </i> | ||
56 | |||
57 | <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | ||
58 | <aside class="tags"> | ||
59 | <div class="card-entry-tags"> | ||
60 | {% for tag in entry.tags %} | ||
61 | <span class="label-outline"><i class="material-icons">label_outline</i> <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" class="nostyle"><i>✘</i></a></span> | ||
62 | {% endfor %} | ||
63 | </div> | ||
64 | <div class="input-field nav-panel-add-tag" style="display: none"> | ||
65 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | ||
66 | </div> | ||
67 | </aside> | ||
68 | </div> | ||
55 | {% if entry.previewPicture is not null %} | 69 | {% if entry.previewPicture is not null %} |
56 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> | 70 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> |
57 | {% endif %} | 71 | {% endif %} |
@@ -59,87 +73,17 @@ | |||
59 | {{ entry.content | raw }} | 73 | {{ entry.content | raw }} |
60 | </article> | 74 | </article> |
61 | </div> | 75 | </div> |
62 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script> | ||
63 | <script type="text/javascript"> | ||
64 | $(document).ready(function() { | ||
65 | 76 | ||
66 | // toggle read property of current article | 77 | <script id="annotationroutes" type="application/json"> |
67 | /* $('#markAsRead').click(function(){ | 78 | { |
68 | $("body").css("cursor", "wait"); | 79 | "prefix": "", |
69 | $.ajax( { url: '{{ path('archive_entry', { 'id': entry.id }) }}' }).done( | 80 | "urls": { |
70 | function( data ) { | 81 | "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}", |
71 | if ( data == '1' ) { | 82 | "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}", |
72 | if ( $('#markAsRead').hasClass("archive-off") ) { | 83 | "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}", |
73 | $('#markAsRead').removeClass("archive-off"); | 84 | "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}" |
74 | $('#markAsRead').addClass("archive"); | 85 | }, |
75 | } | 86 | "entryId": "{{ entry.id }}" |
76 | else { | 87 | } |
77 | $('#markAsRead').removeClass("archive"); | ||
78 | $('#markAsRead').addClass("archive-off"); | ||
79 | } | ||
80 | } | ||
81 | else { | ||
82 | alert('Error! Pls check if you are logged in.'); | ||
83 | } | ||
84 | }); | ||
85 | $("body").css("cursor", "auto"); | ||
86 | });*/ | ||
87 | |||
88 | // toggle starred property of current article | ||
89 | /* $('#setFav').click(function(){ | ||
90 | $("body").css("cursor", "wait"); | ||
91 | $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done( | ||
92 | function( data ) { | ||
93 | if ( data == '1' ) { | ||
94 | if ( $('#setFav').hasClass("fav-off") ) { | ||
95 | $('#setFav').removeClass("fav-off"); | ||
96 | $('#setFav').addClass("fav"); | ||
97 | } | ||
98 | else { | ||
99 | $('#setFav').removeClass("fav"); | ||
100 | $('#setFav').addClass("fav-off"); | ||
101 | } | ||
102 | } | ||
103 | else { | ||
104 | alert('Error! Pls check if you are logged in.'); | ||
105 | } | ||
106 | }); | ||
107 | $("body").css("cursor", "auto"); | ||
108 | });*/ | ||
109 | |||
110 | $(window).scroll(function(e){ | ||
111 | var scrollTop = $(window).scrollTop(); | ||
112 | var docHeight = $(document).height(); | ||
113 | var scrollPercent = (scrollTop) / (docHeight); | ||
114 | var scrollPercentRounded = Math.round(scrollPercent*100)/100; | ||
115 | savePercent({{ entry.id }}, scrollPercentRounded); | ||
116 | }); | ||
117 | |||
118 | retrievePercent({{ entry.id }}); | ||
119 | |||
120 | $(window).resize(function(){ | ||
121 | retrievePercent({{ entry.id }}); | ||
122 | }); | ||
123 | }); | ||
124 | |||
125 | var app = new annotator.App(); | ||
126 | app.include(annotator.ui.main, { | ||
127 | element: document.querySelector('article') | ||
128 | }); | ||
129 | app.include(annotator.storage.http, { | ||
130 | prefix: '', | ||
131 | urls: { | ||
132 | create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}', | ||
133 | update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}', | ||
134 | destroy: '{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}', | ||
135 | search: '{{ path('annotations_get_annotations', { 'entry': entry.id }) }}' | ||
136 | } | ||
137 | }); | ||
138 | app | ||
139 | .start() | ||
140 | .then(function () { | ||
141 | app.annotations.load({entry: {{ entry.id }}}); | ||
142 | }); | ||
143 | </script> | 88 | </script> |
144 | |||
145 | {% endblock %} | 89 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig index ac74676a..faaa21a8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig | |||
@@ -2,7 +2,8 @@ | |||
2 | <div class="results"> | 2 | <div class="results"> |
3 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | 3 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> |
4 | <div class="pagination"> | 4 | <div class="pagination"> |
5 | <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a> | 5 | <i class="btn-clickable download-btn material-icons md-36">file_download</i> |
6 | <i class="btn-clickable filter-btn material-icons md-36">filter_list</i> | ||
6 | {% if entries.getNbPages > 1 %} | 7 | {% if entries.getNbPages > 1 %} |
7 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | 8 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} |
8 | {% endif %} | 9 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig new file mode 100644 index 00000000..b52634fd --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig | |||
@@ -0,0 +1,24 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'error.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | {% block messages %}{% endblock %} | ||
9 | {% block header %}{% endblock %} | ||
10 | |||
11 | {% block content %} | ||
12 | <main class="valign-wrapper"> | ||
13 | <div class="valign row"> | ||
14 | <div class="card sw"> | ||
15 | <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /></div> | ||
16 | <h2>{{ status_code }}: {{ status_text }}</h2> | ||
17 | <p>{{ exception.message }}</p> | ||
18 | </div> | ||
19 | </div> | ||
20 | </main> | ||
21 | {% endblock %} | ||
22 | |||
23 | {% block footer %} | ||
24 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig deleted file mode 100644 index 404d2857..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ /dev/null | |||
@@ -1,170 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'about.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <h2>{{ 'about.top_menu.who_behind_wallabag'|trans }}</h2> | ||
7 | |||
8 | <dl> | ||
9 | <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt> | ||
10 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | ||
11 | <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | ||
12 | <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | ||
13 | |||
14 | <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt> | ||
15 | |||
16 | <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt> | ||
17 | <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd> | ||
18 | |||
19 | <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt> | ||
20 | |||
21 | <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt> | ||
22 | </dl> | ||
23 | |||
24 | <h2>{{ 'about.top_menu.getting_help'|trans }}</h2> | ||
25 | |||
26 | <dl> | ||
27 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> | ||
28 | <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd> | ||
29 | <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd> | ||
30 | |||
31 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> | ||
32 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> | ||
33 | </dl> | ||
34 | |||
35 | <h2>{{ 'about.top_menu.helping'|trans }}</h2> | ||
36 | |||
37 | <p>{{ 'about.helping.description'|trans }}</p> | ||
38 | |||
39 | <dl> | ||
40 | <dt>{{ 'about.helping.description'|trans }}</dt> | ||
41 | <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd> | ||
42 | <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd> | ||
43 | </dl> | ||
44 | |||
45 | <h2>{{ 'about.top_menu.contributors'|trans }}</h2> | ||
46 | <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p> | ||
47 | |||
48 | <h2>{{ 'about.top_menu.third_party'|trans }}</h2> | ||
49 | <p>{{ 'about.third_party.description'|trans }}</p> | ||
50 | <table class="striped"> | ||
51 | <tr> | ||
52 | <th>{{ 'about.third_party.package'|trans }}</th> | ||
53 | <th>{{ 'about.third_party.license'|trans }}</th> | ||
54 | </tr> | ||
55 | <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr> | ||
56 | <tr><td>CraueConfigBundle</td><td>MIT</td></tr> | ||
57 | <tr><td>doctrine/annotations</td><td>MIT</td></tr> | ||
58 | <tr><td>doctrine/cache</td><td>MIT</td></tr> | ||
59 | <tr><td>doctrine/collections</td><td>MIT</td></tr> | ||
60 | <tr><td>doctrine/common</td><td>MIT</td></tr> | ||
61 | <tr><td>doctrine/dbal</td><td>MIT</td></tr> | ||
62 | <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr> | ||
63 | <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr> | ||
64 | <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr> | ||
65 | <tr><td>doctrine/inflector</td><td>MIT</td></tr> | ||
66 | <tr><td>doctrine/instantiator</td><td>MIT</td></tr> | ||
67 | <tr><td>doctrine/lexer</td><td>MIT</td></tr> | ||
68 | <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr> | ||
69 | <tr><td>doctrine/orm</td><td>MIT</td></tr> | ||
70 | <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr> | ||
71 | <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr> | ||
72 | <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr> | ||
73 | <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr> | ||
74 | <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr> | ||
75 | <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr> | ||
76 | <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr> | ||
77 | <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr> | ||
78 | <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr> | ||
79 | <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr> | ||
80 | <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr> | ||
81 | <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr> | ||
82 | <tr><td>guzzlehttp/streams</td><td>MIT</td></tr> | ||
83 | <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr> | ||
84 | <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr> | ||
85 | <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr> | ||
86 | <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr> | ||
87 | <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr> | ||
88 | <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr> | ||
89 | <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr> | ||
90 | <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr> | ||
91 | <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr> | ||
92 | <tr><td>hoa/ruler</td><td>BSD-3-Clausev | ||
93 | <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr> | ||
94 | <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr> | ||
95 | <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr> | ||
96 | <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr> | ||
97 | <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr> | ||
98 | <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr> | ||
99 | <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr> | ||
100 | <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr> | ||
101 | <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr> | ||
102 | <tr><td>j0k3r/safecurl</td><td>MIT</td></tr> | ||
103 | <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr> | ||
104 | <tr><td>jms/metadata</td><td>Apache</td></tr> | ||
105 | <tr><td>jms/parser-lib</td><td>Apache2</td></tr> | ||
106 | <tr><td>jms/serializer</td><td>Apache2</td></tr> | ||
107 | <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr> | ||
108 | <tr><td>kphoen/rulerz</td><td>MIT</td></tr> | ||
109 | <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr> | ||
110 | <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr> | ||
111 | <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr> | ||
112 | <tr><td>liip/theme-bundle</td><td>MIT</td></tr> | ||
113 | <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr> | ||
114 | <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr> | ||
115 | <tr><td>monolog/monolog</td><td>MIT</td></tr> | ||
116 | <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr> | ||
117 | <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr> | ||
118 | <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr> | ||
119 | <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr> | ||
120 | <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr> | ||
121 | <tr><td>paragonie/random_compat</td><td>MIT</td></tr> | ||
122 | <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr> | ||
123 | <tr><td>phpoption/phpoption</td><td>Apache2</td></tr> | ||
124 | <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr> | ||
125 | <tr><td>psr/log</td><td>MIT</td></tr> | ||
126 | <tr><td>react/promise</td><td>MIT</td></tr> | ||
127 | <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr> | ||
128 | <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr> | ||
129 | <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr> | ||
130 | <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr> | ||
131 | <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr> | ||
132 | <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr> | ||
133 | <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr> | ||
134 | <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr> | ||
135 | <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr> | ||
136 | <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr> | ||
137 | <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr> | ||
138 | <tr><td>All of Symfony</td><td>MIT-licenced</td></tr> | ||
139 | <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr> | ||
140 | <tr><td>twig/extensions</td><td>MIT</td></tr> | ||
141 | <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr> | ||
142 | <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr> | ||
143 | <tr><td>willdurand/hateoas</td><td>MIT</td></tr> | ||
144 | <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr> | ||
145 | <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr> | ||
146 | <tr><td>willdurand/negotiation</td><td>MIT</td></tr> | ||
147 | <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr> | ||
148 | <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr> | ||
149 | <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr> | ||
150 | <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr> | ||
151 | <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr> | ||
152 | <tr><td>phpspec/prophecy</td><td>MIT</td></tr> | ||
153 | <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr> | ||
154 | <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr> | ||
155 | <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr> | ||
156 | <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr> | ||
157 | <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr> | ||
158 | <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr> | ||
159 | <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr> | ||
160 | <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr> | ||
161 | <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr> | ||
162 | <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr> | ||
163 | <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr> | ||
164 | <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr> | ||
165 | <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr> | ||
166 | <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr> | ||
167 | <tr><td>sensio/generator-bundle</td><td>MIT</td></tr> | ||
168 | <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr> | ||
169 | </table> | ||
170 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig deleted file mode 100644 index b529a0ac..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'howto.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <h2>{{ 'howto.page_title'|trans }}</h2> | ||
7 | |||
8 | <p>{{ 'howto.page_description'|trans }}</p> | ||
9 | <ul> | ||
10 | <li><a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a></li> | ||
11 | </ul> | ||
12 | <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3> | ||
13 | <ul> | ||
14 | <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> | ||
15 | <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> | ||
16 | </ul> | ||
17 | <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3> | ||
18 | <ul> | ||
19 | <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li> | ||
20 | <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li> | ||
21 | <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li> | ||
22 | </ul> | ||
23 | <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3> | ||
24 | <p> | ||
25 | {{ 'howto.bookmarklet.description'|trans }} | ||
26 | {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} | ||
27 | |||
28 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig deleted file mode 100644 index b3d3d5a0..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <h3>{{ 'quickstart.intro.title'|trans }}</h3> | ||
8 | <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p> | ||
9 | <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p> | ||
10 | |||
11 | <h4>{{ 'quickstart.configure.title'|trans }}</h4> | ||
12 | <ul> | ||
13 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | ||
14 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | ||
15 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li> | ||
16 | </ul> | ||
17 | |||
18 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
19 | <h4>{{ 'quickstart.admin.title'|trans }}</h4> | ||
20 | <p>{{ 'quickstart.admin.description'|trans }}</p> | ||
21 | <ul> | ||
22 | <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li> | ||
23 | <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li> | ||
24 | <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li> | ||
25 | <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li> | ||
26 | <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li> | ||
27 | </ul> | ||
28 | {% endif %} | ||
29 | |||
30 | <h4>{{ 'quickstart.first_steps.title'|trans }}</h4> | ||
31 | <ul> | ||
32 | <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li> | ||
33 | <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li> | ||
34 | </ul> | ||
35 | |||
36 | <h4>{{ 'quickstart.migrate.title'|trans }}</h4> | ||
37 | <p>{{ 'quickstart.migrate.description'|trans }}</p> | ||
38 | <ul> | ||
39 | <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li> | ||
40 | <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li> | ||
41 | <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li> | ||
42 | </ul> | ||
43 | |||
44 | <h4>{{ 'quickstart.developer.title'|trans }}</h4> | ||
45 | <ul> | ||
46 | <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> | ||
47 | </ul> | ||
48 | |||
49 | <h4>{{ 'quickstart.docs.title'|trans }}</h4> | ||
50 | <ul> | ||
51 | <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> | ||
52 | <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li> | ||
53 | <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li> | ||
54 | <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li> | ||
55 | <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> | ||
56 | </ul> | ||
57 | |||
58 | <h4>{{ 'quickstart.support.title'|trans }}</h4> | ||
59 | <p>{{ 'quickstart.support.description'|trans }}</p> | ||
60 | <ul> | ||
61 | <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li> | ||
62 | <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li> | ||
63 | <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li> | ||
64 | </ul> | ||
65 | |||
66 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig index 524a1d23..1e2c6b42 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig | |||
@@ -9,7 +9,11 @@ | |||
9 | 9 | ||
10 | <ul> | 10 | <ul> |
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li> | 12 | <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries | length }})</a></li> |
13 | {% endfor %} | 13 | {% endfor %} |
14 | </ul> | 14 | </ul> |
15 | |||
16 | <div> | ||
17 | <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a> | ||
18 | </div> | ||
15 | {% endblock %} | 19 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 2c15ad95..a046f7cf 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -2,29 +2,19 @@ | |||
2 | 2 | ||
3 | {% block css %} | 3 | {% block css %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | 5 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/style.min.css') }}" media="screen,projection,print"/> | |
6 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/ratatouille.css') }}" media="all"> | ||
7 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/font.css') }}" media="all"> | ||
8 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/main.css') }}" media="all"> | ||
9 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/messages.css') }}" media="all"> | ||
10 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/print.css') }}" media="print"> | ||
11 | {% endblock %} | 6 | {% endblock %} |
12 | 7 | ||
13 | {% block scripts %} | 8 | {% block scripts %} |
14 | {{ parent() }} | 9 | {{ parent() }} |
15 | 10 | <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/baggy.min.js') }}"></script> | |
16 | <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/init.js') }}"></script> | ||
17 | <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/closeMessage.js') }}"></script> | ||
18 | <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/autoClose.js') }}"></script> | ||
19 | <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/saveLink.js') }}"></script> | ||
20 | <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/popupForm.js') }}"></script> | ||
21 | {% endblock %} | 11 | {% endblock %} |
22 | 12 | ||
23 | {% block header %} | 13 | {% block header %} |
24 | <header class="w600p center mbm"> | 14 | <header class="w600p center mbm"> |
25 | <h1 class="logo"> | 15 | <h1 class="logo"> |
26 | {% block logo %} | 16 | {% block logo %} |
27 | <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/baggy/img/logo-w.png') }}" alt="wallabag logo" /> | 17 | <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /> |
28 | {% endblock %} | 18 | {% endblock %} |
29 | </h1> | 19 | </h1> |
30 | </header> | 20 | </header> |
@@ -33,12 +23,12 @@ | |||
33 | {% block menu %} | 23 | {% block menu %} |
34 | <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button> | 24 | <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button> |
35 | <ul id="links" class="links"> | 25 | <ul id="links" class="links"> |
36 | <li><a href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a></li> | 26 | <li class="menu unread"><a href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a></li> |
37 | <li><a href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a></li> | 27 | <li class="menu starred"><a href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a></li> |
38 | <li><a href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a></li> | 28 | <li class="menu archive"><a href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a></li> |
39 | <li><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li> | 29 | <li class="menu all"><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li> |
40 | <li><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li> | 30 | <li class="menu tag"><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li> |
41 | <li><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li> | 31 | <li class="menu new"><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li> |
42 | <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a> | 32 | <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a> |
43 | <div id="search-form" class="messages info popup-form"> | 33 | <div id="search-form" class="messages info popup-form"> |
44 | <form method="get" action="index.php"> | 34 | <form method="get" action="index.php"> |
@@ -50,15 +40,16 @@ | |||
50 | </form> | 40 | </form> |
51 | </div> | 41 | </div> |
52 | </li>--> | 42 | </li>--> |
53 | <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> | 43 | <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> |
54 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 44 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
55 | <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> | 45 | <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> |
46 | <li class="menu internal"><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> | ||
56 | {% endif %} | 47 | {% endif %} |
57 | <li><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li> | 48 | <li class="menu import"><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li> |
58 | <li><a href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a></li> | 49 | <li class="menu howto"><a href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a></li> |
59 | <li><a href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a></li> | 50 | <li class="menu developer"><a href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a></li> |
60 | <li><a href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a></li> | 51 | <li class="menu about"><a href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a></li> |
61 | <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a></li> | 52 | <li class="menu logout"><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a></li> |
62 | </ul> | 53 | </ul> |
63 | {% endblock %} | 54 | {% endblock %} |
64 | 55 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig index 78a9dc04..8a5da71a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig | |||
@@ -13,6 +13,12 @@ | |||
13 | {{ form_errors(form) }} | 13 | {{ form_errors(form) }} |
14 | 14 | ||
15 | <div class="input-field col s12"> | 15 | <div class="input-field col s12"> |
16 | {{ form_label(form.name) }} | ||
17 | {{ form_errors(form.name) }} | ||
18 | {{ form_widget(form.name) }} | ||
19 | </div> | ||
20 | |||
21 | <div class="input-field col s12"> | ||
16 | {{ form_label(form.redirect_uris) }} | 22 | {{ form_label(form.redirect_uris) }} |
17 | {{ form_errors(form.redirect_uris) }} | 23 | {{ form_errors(form.redirect_uris) }} |
18 | {{ form_widget(form.redirect_uris) }} | 24 | {{ form_widget(form.redirect_uris) }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig index b615fa3b..b498cceb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig | |||
@@ -9,6 +9,7 @@ | |||
9 | <div class="row"> | 9 | <div class="row"> |
10 | <p>{{ 'developer.client_parameter.page_description'|trans }}</p> | 10 | <p>{{ 'developer.client_parameter.page_description'|trans }}</p> |
11 | <ul> | 11 | <ul> |
12 | <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li> | ||
12 | <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> | 13 | <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> |
13 | <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> | 14 | <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> |
14 | </ul> | 15 | </ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig index acbc2c88..acbc2c88 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig index 001c5cbb..3430c0d4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig | |||
@@ -28,7 +28,7 @@ | |||
28 | <ul class="collapsible" data-collapsible="expandable"> | 28 | <ul class="collapsible" data-collapsible="expandable"> |
29 | {% for client in clients %} | 29 | {% for client in clients %} |
30 | <li> | 30 | <li> |
31 | <div class="collapsible-header">#{{ client.id }}</div> | 31 | <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div> |
32 | <div class="collapsible-body"> | 32 | <div class="collapsible-body"> |
33 | <table class="striped"> | 33 | <table class="striped"> |
34 | <tr> | 34 | <tr> |
@@ -49,9 +49,9 @@ | |||
49 | </tr> | 49 | </tr> |
50 | </table> | 50 | </table> |
51 | <p> | 51 | <p> |
52 | {{ 'developer.remove.warn_message_1'|trans }}<br/> | 52 | {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/> |
53 | {{ 'developer.remove.warn_message_2'|trans }}<br/> | 53 | {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/> |
54 | <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans }}</a> | 54 | <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a> |
55 | </p> | 55 | </p> |
56 | </div> | 56 | </div> |
57 | </li> | 57 | </li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig new file mode 100644 index 00000000..d1c2f203 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig | |||
@@ -0,0 +1,15 @@ | |||
1 | {% set currentRoute = app.request.attributes.get('_route') %} | ||
2 | |||
3 | {% if currentRoute == 'starred' %} | ||
4 | {{ 'entry.page_titles.starred'|trans }} | ||
5 | {% elseif currentRoute == 'archive' %} | ||
6 | {{ 'entry.page_titles.archived'|trans }} | ||
7 | {% elseif currentRoute == 'all' %} | ||
8 | {{ 'entry.page_titles.filtered'|trans }} | ||
9 | {% elseif currentRoute == 'tag_entries' %} | ||
10 | {{ 'entry.page_titles.filtered_tags'|trans }} | ||
11 | {% elseif currentRoute == 'untagged' %} | ||
12 | {{ 'entry.page_titles.untagged'|trans }} | ||
13 | {% else %} | ||
14 | {{ 'entry.page_titles.unread'|trans }} | ||
15 | {% endif %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig index 6cabcf44..288bb54f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig | |||
@@ -16,15 +16,7 @@ | |||
16 | <guid>{{ entry.url }}</guid> | 16 | <guid>{{ entry.url }}</guid> |
17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> | 17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> |
18 | <description> | 18 | <description> |
19 | <![CDATA[ | 19 | <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> |
20 | {%- if entry.readingTime > 0 -%} | ||
21 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} | ||
22 | {%- else -%} | ||
23 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
24 | {%- endif %} | ||
25 | |||
26 | {{ entry.content|raw -}} | ||
27 | ]]> | ||
28 | </description> | 20 | </description> |
29 | </item> | 21 | </item> |
30 | 22 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig new file mode 100644 index 00000000..804adb36 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig | |||
@@ -0,0 +1,54 @@ | |||
1 | <html> | ||
2 | <head> | ||
3 | <title>{{ entry.title | raw }}</title> | ||
4 | <style> | ||
5 | body { | ||
6 | margin: 10px; | ||
7 | font-family: 'Roboto',Verdana,Geneva,sans-serif; | ||
8 | font-size: 16px; | ||
9 | color: #000; | ||
10 | } | ||
11 | header { | ||
12 | text-align: center; | ||
13 | } | ||
14 | |||
15 | header h1 { | ||
16 | font-size: 1.3em; | ||
17 | } | ||
18 | |||
19 | a, | ||
20 | a:hover, | ||
21 | a:visited { | ||
22 | color: #000; | ||
23 | } | ||
24 | |||
25 | article { | ||
26 | margin: 0 auto; | ||
27 | width: 600px; | ||
28 | } | ||
29 | </style> | ||
30 | <meta property="og:title" content="{{ entry.title | raw }}" /> | ||
31 | <meta property="og:type" content="article" /> | ||
32 | <meta property="og:url" content="{{ app.request.uri }}" /> | ||
33 | {% set picturePath = app.request.schemeAndHttpHost ~ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') %} | ||
34 | {% if entry.previewPicture is not null %} | ||
35 | {% set picturePath = entry.previewPicture %} | ||
36 | {% endif %} | ||
37 | <meta property="og:image" content="{{ picturePath }}" /> | ||
38 | <meta name="twitter:card" content="summary" /> | ||
39 | <meta name="twitter:image" content="{{ picturePath }}" /> | ||
40 | <meta name="twitter:site" content="@wallabagapp" /> | ||
41 | <meta name="twitter:title" content="{{ entry.title | raw }}" /> | ||
42 | <meta name="twitter:description" content="{{ entry.title | raw }}" /> | ||
43 | </head> | ||
44 | <body> | ||
45 | <header> | ||
46 | <h1>{{ entry.title | raw }}</h1> | ||
47 | <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></div> | ||
48 | <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div> | ||
49 | </header> | ||
50 | <article> | ||
51 | {{ entry.content | raw }} | ||
52 | </article> | ||
53 | </body> | ||
54 | </html> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig new file mode 100644 index 00000000..631bcb88 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig | |||
@@ -0,0 +1,6 @@ | |||
1 | Hello {{username}}! | ||
2 | |||
3 | To reset your password - please visit {{confirmationUrl}} | ||
4 | |||
5 | Regards, | ||
6 | Wallabag bot | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig new file mode 100644 index 00000000..3385cd53 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig | |||
@@ -0,0 +1 @@ | |||
<a id="bookmarklet" ondragend="this.click();" href="javascript:(function(){var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');})();">bag it!</a> | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig index d0b94279..db193e81 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | |||
@@ -11,11 +11,11 @@ | |||
11 | <div class="row"> | 11 | <div class="row"> |
12 | <div class="div_tabs col s12"> | 12 | <div class="div_tabs col s12"> |
13 | <ul class="tabs"> | 13 | <ul class="tabs"> |
14 | <li class="tab col s3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li> | 14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li> |
15 | <li class="tab col s3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li> | 15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li> |
16 | <li class="tab col s3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li> | 16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li> |
17 | <li class="tab col s3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li> | 17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li> |
18 | <li class="tab col s3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li> | 18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li> |
19 | </ul> | 19 | </ul> |
20 | </div> | 20 | </div> |
21 | 21 | ||
@@ -36,6 +36,7 @@ | |||
36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> | 36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> |
37 | <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd> | 37 | <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd> |
38 | <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd> | 38 | <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd> |
39 | <dd><a href="http://doc.wallabag.org/de/master/">deutsch</a></dd> | ||
39 | 40 | ||
40 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> | 41 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> |
41 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> | 42 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig index 6a177d6b..67a10190 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig | |||
@@ -35,7 +35,7 @@ | |||
35 | <div class="col s12"> | 35 | <div class="col s12"> |
36 | <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5> | 36 | <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5> |
37 | {{ 'howto.bookmarklet.description'|trans }} | 37 | {{ 'howto.bookmarklet.description'|trans }} |
38 | {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} | 38 | {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %} |
39 | </div> | 39 | </div> |
40 | 40 | ||
41 | </div> | 41 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig new file mode 100644 index 00000000..c8a303a6 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig | |||
@@ -0,0 +1,119 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row quickstart"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel settings"> | ||
10 | |||
11 | <div class="row"> | ||
12 | <h3>{{ 'quickstart.intro.title'|trans }}</h3> | ||
13 | |||
14 | <ul class="row data"> | ||
15 | <li class="col l4 m6 s12"> | ||
16 | <div class="card teal darken-1"> | ||
17 | <div class="card-content white-text"> | ||
18 | <span class="card-title">{{ 'quickstart.configure.title'|trans }}</span> | ||
19 | <p>{{ 'quickstart.configure.description'|trans }}</p> | ||
20 | </div> | ||
21 | <div class="card-action"> | ||
22 | <ul> | ||
23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | ||
24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | ||
25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> | ||
26 | </ul> | ||
27 | </div> | ||
28 | </div> | ||
29 | </li> | ||
30 | |||
31 | <li class="col l4 m6 s12"> | ||
32 | <div class="card green darken-1"> | ||
33 | <div class="card-content white-text"> | ||
34 | <span class="card-title">{{ 'quickstart.first_steps.title'|trans }}</span> | ||
35 | <p>{{ 'quickstart.first_steps.description'|trans }}</p> | ||
36 | </div> | ||
37 | <div class="card-action"> | ||
38 | <ul> | ||
39 | <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li> | ||
40 | <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li> | ||
41 | </ul> | ||
42 | </div> | ||
43 | </div> | ||
44 | </li> | ||
45 | |||
46 | <li class="col l4 m6 s12"> | ||
47 | <div class="card light-green darken-1"> | ||
48 | <div class="card-content white-text"> | ||
49 | <span class="card-title">{{ 'quickstart.migrate.title'|trans }}</span> | ||
50 | <p>{{ 'quickstart.migrate.description'|trans }}</p> | ||
51 | </div> | ||
52 | <div class="card-action"> | ||
53 | <ul> | ||
54 | <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li> | ||
55 | <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li> | ||
56 | <li><a href="{{ path('import_instapaper') }}">{{ 'quickstart.migrate.instapaper'|trans }}</a></li> | ||
57 | <li><a href="{{ path('import') }}">{{ 'quickstart.more'|trans }}</a></li> | ||
58 | </ul> | ||
59 | </div> | ||
60 | </div> | ||
61 | </li> | ||
62 | |||
63 | <li class="col l4 m6 s12"> | ||
64 | <div class="card blue darken-1"> | ||
65 | <div class="card-content white-text"> | ||
66 | <span class="card-title">{{ 'quickstart.developer.title'|trans }}</span> | ||
67 | <p>{{ 'quickstart.developer.description'|trans }}</p> | ||
68 | </div> | ||
69 | <div class="card-action"> | ||
70 | <ul> | ||
71 | <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> | ||
72 | <li><a href="http://doc.wallabag.org/en/master/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li> | ||
73 | <li><a href="http://doc.wallabag.org/en/master/index.html#dev-docs">{{ 'quickstart.more'|trans }}</a></li> | ||
74 | </ul> | ||
75 | </div> | ||
76 | </div> | ||
77 | </li> | ||
78 | |||
79 | <li class="col l4 m6 s12"> | ||
80 | <div class="card light-blue darken-1"> | ||
81 | <div class="card-content white-text"> | ||
82 | <span class="card-title">{{ 'quickstart.docs.title'|trans }}</span> | ||
83 | <p>{{ 'quickstart.docs.description'|trans }}</p> | ||
84 | </div> | ||
85 | <div class="card-action"> | ||
86 | <ul> | ||
87 | <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> | ||
88 | <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li> | ||
89 | <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> | ||
90 | </ul> | ||
91 | </div> | ||
92 | </div> | ||
93 | </li> | ||
94 | |||
95 | <li class="col l4 m6 s12"> | ||
96 | <div class="card cyan darken-1"> | ||
97 | <div class="card-content white-text"> | ||
98 | <span class="card-title">{{ 'quickstart.support.title'|trans }}</span> | ||
99 | <p>{{ 'quickstart.support.description'|trans }}</p> | ||
100 | </div> | ||
101 | <div class="card-action"> | ||
102 | <ul> | ||
103 | <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li> | ||
104 | <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li> | ||
105 | <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li> | ||
106 | </ul> | ||
107 | </div> | ||
108 | </div> | ||
109 | </li> | ||
110 | |||
111 | </ul> | ||
112 | |||
113 | </div> | ||
114 | |||
115 | </div> | ||
116 | </div> | ||
117 | </div> | ||
118 | |||
119 | {% endblock %} | ||
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 afd5b499..19faddc0 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 | |||
@@ -11,14 +11,11 @@ | |||
11 | <div class="row"> | 11 | <div class="row"> |
12 | <div class="div_tabs col s12"> | 12 | <div class="div_tabs col s12"> |
13 | <ul class="tabs"> | 13 | <ul class="tabs"> |
14 | <li class="tab col s3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> | 14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> |
15 | <li class="tab col s3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li> | 15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li> |
16 | <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> | 16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> |
17 | <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> | 17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> |
18 | <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> | 18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> |
19 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
20 | <li class="tab col s3"><a href="#set6">{{ 'config.tab_menu.new_user'|trans }}</a></li> | ||
21 | {% endif %} | ||
22 | </ul> | 19 | </ul> |
23 | </div> | 20 | </div> |
24 | 21 | ||
@@ -62,6 +59,18 @@ | |||
62 | </div> | 59 | </div> |
63 | </div> | 60 | </div> |
64 | 61 | ||
62 | <div class="row"> | ||
63 | <div class="input-field col s12"> | ||
64 | {{ form_label(form.config.pocket_consumer_key) }} | ||
65 | {{ form_errors(form.config.pocket_consumer_key) }} | ||
66 | {{ form_widget(form.config.pocket_consumer_key) }} | ||
67 | <p> | ||
68 | » | ||
69 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | ||
70 | </p> | ||
71 | </div> | ||
72 | </div> | ||
73 | |||
65 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 74 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
66 | {{ form_rest(form.config) }} | 75 | {{ form_rest(form.config) }} |
67 | </form> | 76 | </form> |
@@ -145,11 +154,9 @@ | |||
145 | <div class="row"> | 154 | <div class="row"> |
146 | <div class="input-field col s12"> | 155 | <div class="input-field col s12"> |
147 | {{ 'config.form_user.two_factor_description'|trans }} | 156 | {{ 'config.form_user.two_factor_description'|trans }} |
148 | </div> | ||
149 | </div> | ||
150 | 157 | ||
151 | <div class="row"> | 158 | <br /> |
152 | <div class="input-field col s12"> | 159 | |
153 | {{ form_widget(form.user.twoFactorAuthentication) }} | 160 | {{ form_widget(form.user.twoFactorAuthentication) }} |
154 | {{ form_label(form.user.twoFactorAuthentication) }} | 161 | {{ form_label(form.user.twoFactorAuthentication) }} |
155 | {{ form_errors(form.user.twoFactorAuthentication) }} | 162 | {{ form_errors(form.user.twoFactorAuthentication) }} |
@@ -196,6 +203,7 @@ | |||
196 | </div> | 203 | </div> |
197 | 204 | ||
198 | <div id="set5" class="col s12"> | 205 | <div id="set5" class="col s12"> |
206 | {% if app.user.config.taggingRules is not empty %} | ||
199 | <div class="row"> | 207 | <div class="row"> |
200 | <div class="input-field col s12"> | 208 | <div class="input-field col s12"> |
201 | <ul> | 209 | <ul> |
@@ -205,14 +213,18 @@ | |||
205 | « {{ tagging_rule.rule }} » | 213 | « {{ tagging_rule.rule }} » |
206 | {{ 'config.form_rules.then_tag_as_label'|trans }} | 214 | {{ 'config.form_rules.then_tag_as_label'|trans }} |
207 | « {{ tagging_rule.tags|join(', ') }} » | 215 | « {{ tagging_rule.tags|join(', ') }} » |
216 | <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}"> | ||
217 | <i class="tool grey-text mode_edit material-icons">mode_edit</i> | ||
218 | </a> | ||
208 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}"> | 219 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}"> |
209 | <i class="tool grey-text delete mdi-action-delete"></i> | 220 | <i class="tool grey-text delete material-icons">delete</i> |
210 | </a> | 221 | </a> |
211 | </li> | 222 | </li> |
212 | {% endfor %} | 223 | {% endfor %} |
213 | </ul> | 224 | </ul> |
214 | </div> | 225 | </div> |
215 | </div> | 226 | </div> |
227 | {% endif %} | ||
216 | 228 | ||
217 | {{ form_start(form.new_tagging_rule) }} | 229 | {{ form_start(form.new_tagging_rule) }} |
218 | {{ form_errors(form.new_tagging_rule) }} | 230 | {{ form_errors(form.new_tagging_rule) }} |
@@ -322,49 +334,6 @@ | |||
322 | </div> | 334 | </div> |
323 | </div> | 335 | </div> |
324 | </div> | 336 | </div> |
325 | |||
326 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
327 | <div id="set6" class="col s12"> | ||
328 | {{ form_start(form.new_user) }} | ||
329 | {{ form_errors(form.new_user) }} | ||
330 | |||
331 | <div class="row"> | ||
332 | <div class="input-field col s12"> | ||
333 | {{ form_label(form.new_user.username) }} | ||
334 | {{ form_errors(form.new_user.username) }} | ||
335 | {{ form_widget(form.new_user.username) }} | ||
336 | </div> | ||
337 | </div> | ||
338 | |||
339 | <div class="row"> | ||
340 | <div class="input-field col s12"> | ||
341 | {{ form_label(form.new_user.plainPassword.first) }} | ||
342 | {{ form_errors(form.new_user.plainPassword.first) }} | ||
343 | {{ form_widget(form.new_user.plainPassword.first) }} | ||
344 | </div> | ||
345 | </div> | ||
346 | |||
347 | <div class="row"> | ||
348 | <div class="input-field col s12"> | ||
349 | {{ form_label(form.new_user.plainPassword.second) }} | ||
350 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
351 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
352 | </div> | ||
353 | </div> | ||
354 | |||
355 | <div class="row"> | ||
356 | <div class="input-field col s12"> | ||
357 | {{ form_label(form.new_user.email) }} | ||
358 | {{ form_errors(form.new_user.email) }} | ||
359 | {{ form_widget(form.new_user.email) }} | ||
360 | </div> | ||
361 | </div> | ||
362 | |||
363 | {{ form_widget(form.new_user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
364 | {{ form_rest(form.new_user) }} | ||
365 | </form> | ||
366 | </div> | ||
367 | {% endif %} | ||
368 | </div> | 337 | </div> |
369 | 338 | ||
370 | </div> | 339 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig deleted file mode 100644 index b615fa3b..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <div class="row"> | ||
7 | <div class="col s12"> | ||
8 | <div class="card-panel settings"> | ||
9 | <div class="row"> | ||
10 | <p>{{ 'developer.client_parameter.page_description'|trans }}</p> | ||
11 | <ul> | ||
12 | <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li> | ||
13 | <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li> | ||
14 | </ul> | ||
15 | |||
16 | <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a> | ||
17 | <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a> | ||
18 | </div> | ||
19 | </div> | ||
20 | </div> | ||
21 | </div> | ||
22 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig deleted file mode 100644 index acbc2c88..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block css %} | ||
6 | {{ parent() }} | ||
7 | <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}"> | ||
8 | {% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | <div class="row"> | ||
12 | <div class="col s12"> | ||
13 | <div class="card-panel settings"> | ||
14 | |||
15 | <div class="row"> | ||
16 | <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p> | ||
17 | <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p> | ||
18 | <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p> | ||
19 | <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p> | ||
20 | <p> | ||
21 | <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \ | ||
22 | grant_type=password \ | ||
23 | client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \ | ||
24 | client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \ | ||
25 | username=yourUsername \ | ||
26 | password=yourPassw0rd</code></pre> | ||
27 | </p> | ||
28 | <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p> | ||
29 | <p> | ||
30 | <pre><code class="language-bash">HTTP/1.1 200 OK | ||
31 | Cache-Control: no-store, private | ||
32 | Connection: close | ||
33 | Content-Type: application/json | ||
34 | Date: Tue, 06 Oct 2015 18:24:03 GMT | ||
35 | Host: localhost:8000 | ||
36 | Pragma: no-cache | ||
37 | X-Debug-Token: be00a1 | ||
38 | X-Debug-Token-Link: /profiler/be00a1 | ||
39 | X-Powered-By: PHP/5.5.9-1ubuntu4.13 | ||
40 | { | ||
41 | "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw", | ||
42 | "expires_in": 3600, | ||
43 | "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg", | ||
44 | "scope": null, | ||
45 | "token_type": "bearer" | ||
46 | }</code></pre> | ||
47 | </p> | ||
48 | <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p> | ||
49 | <p> | ||
50 | <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \ | ||
51 | "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre> | ||
52 | </p> | ||
53 | <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p> | ||
54 | <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p> | ||
55 | <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p> | ||
56 | </div> | ||
57 | |||
58 | </div> | ||
59 | </div> | ||
60 | </div> | ||
61 | <script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script> | ||
62 | <script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script> | ||
63 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig deleted file mode 100644 index 001c5cbb..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'developer.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <div class="row"> | ||
7 | <div class="col s12"> | ||
8 | <div class="card-panel settings"> | ||
9 | |||
10 | <div class="row"> | ||
11 | <h3>{{ 'developer.welcome_message'|trans }}</h3> | ||
12 | |||
13 | <h4>{{ 'developer.documentation'|trans }}</h4> | ||
14 | |||
15 | <ul> | ||
16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> | ||
17 | <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> | ||
18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> | ||
19 | </ul> | ||
20 | |||
21 | <h4>{{ 'developer.clients.title'|trans }}</h4> | ||
22 | <ul> | ||
23 | <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li> | ||
24 | </ul> | ||
25 | |||
26 | <h4>{{ 'developer.existing_clients.title'|trans }}</h4> | ||
27 | {% if clients %} | ||
28 | <ul class="collapsible" data-collapsible="expandable"> | ||
29 | {% for client in clients %} | ||
30 | <li> | ||
31 | <div class="collapsible-header">#{{ client.id }}</div> | ||
32 | <div class="collapsible-body"> | ||
33 | <table class="striped"> | ||
34 | <tr> | ||
35 | <td>{{ 'developer.existing_clients.field_id'|trans }}</td> | ||
36 | <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td> | ||
37 | </tr> | ||
38 | <tr> | ||
39 | <td>{{ 'developer.existing_clients.field_secret'|trans }}</td> | ||
40 | <td><strong><code>{{ client.secret }}</code></strong></td> | ||
41 | </tr> | ||
42 | <tr> | ||
43 | <td>{{ 'developer.existing_clients.field_uris'|trans }}</td> | ||
44 | <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td> | ||
45 | </tr> | ||
46 | <tr> | ||
47 | <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td> | ||
48 | <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td> | ||
49 | </tr> | ||
50 | </table> | ||
51 | <p> | ||
52 | {{ 'developer.remove.warn_message_1'|trans }}<br/> | ||
53 | {{ 'developer.remove.warn_message_2'|trans }}<br/> | ||
54 | <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans }}</a> | ||
55 | </p> | ||
56 | </div> | ||
57 | </li> | ||
58 | {% endfor %} | ||
59 | </ul> | ||
60 | {% else %} | ||
61 | {{ 'developer.existing_clients.no_client'|trans }} | ||
62 | {% endif %} | ||
63 | </div> | ||
64 | |||
65 | </div> | ||
66 | </div> | ||
67 | </div> | ||
68 | |||
69 | {% endblock %} | ||
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 f6941ca5..919f94ec 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 | |||
@@ -1,18 +1,7 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %} | 3 | {% block title %} |
4 | {% set currentRoute = app.request.attributes.get('_route') %} | 4 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} |
5 | |||
6 | {% if currentRoute == 'starred' %} | ||
7 | {{ 'entry.page_titles.starred'|trans }} | ||
8 | {% elseif currentRoute == 'archive' %} | ||
9 | {{ 'entry.page_titles.archived'|trans }} | ||
10 | {% elseif currentRoute == 'all' %} | ||
11 | {{ 'entry.page_titles.filtered'|trans }} | ||
12 | {% else %} | ||
13 | {{ 'entry.page_titles.unread'|trans }} | ||
14 | {% endif %} | ||
15 | |||
16 | {% endblock %} | 5 | {% endblock %} |
17 | 6 | ||
18 | {% block content %} | 7 | {% block content %} |
@@ -26,13 +15,18 @@ | |||
26 | <div class="card-body"> | 15 | <div class="card-body"> |
27 | {% if not entry.previewPicture is null %} | 16 | {% if not entry.previewPicture is null %} |
28 | <div class="card-image waves-effect waves-block waves-light"> | 17 | <div class="card-image waves-effect waves-block waves-light"> |
18 | <ul class="card-entry-labels"> | ||
19 | {% for tag in entry.tags | slice(0, 3) %} | ||
20 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
21 | {% endfor %} | ||
22 | </ul> | ||
29 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> | 23 | <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> |
30 | </div> | 24 | </div> |
31 | {% endif %} | 25 | {% endif %} |
32 | 26 | ||
33 | <div class="card-content"> | 27 | <div class="card-content"> |
34 | {% if not entry.previewPicture is null %} | 28 | {% if not entry.previewPicture is null %} |
35 | <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i> | 29 | <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i> |
36 | {% endif %} | 30 | {% endif %} |
37 | 31 | ||
38 | <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> | 32 | <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> |
@@ -50,13 +44,18 @@ | |||
50 | 44 | ||
51 | {% if entry.previewPicture is null %} | 45 | {% if entry.previewPicture is null %} |
52 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 46 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
47 | <ul class="card-entry-labels-hidden"> | ||
48 | {% for tag in entry.tags | slice(0, 2) %} | ||
49 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
50 | {% endfor %} | ||
51 | </ul> | ||
53 | {% endif %} | 52 | {% endif %} |
54 | </div> | 53 | </div> |
55 | </div> | 54 | </div> |
56 | 55 | ||
57 | {% if not entry.previewPicture is null %} | 56 | {% if not entry.previewPicture is null %} |
58 | <div class="card-reveal"> | 57 | <div class="card-reveal"> |
59 | <i class="card-title grey-text text-darken-4 mdi-card-close right"></i> | 58 | <i class="card-title grey-text text-darken-4 material-icons right">clear</i> |
60 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> | 59 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span> |
61 | 60 | ||
62 | <div class="estimatedTime grey-text"> | 61 | <div class="estimatedTime grey-text"> |
@@ -66,19 +65,25 @@ | |||
66 | </div> | 65 | </div> |
67 | 66 | ||
68 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> | 67 | <p>{{ entry.content|striptags|slice(0, 300)|raw }}…</p> |
68 | |||
69 | <ul class="card-entry-labels-hidden"> | ||
70 | {% for tag in entry.tags %} | ||
71 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
72 | {% endfor %} | ||
73 | </ul> | ||
69 | </div> | 74 | </div> |
70 | {% endif %} | 75 | {% endif %} |
71 | 76 | ||
72 | <div class="card-action"> | 77 | <div class="card-action"> |
73 | <span class="bold"> | 78 | <span class="bold"> |
74 | <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> | 79 | <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> |
75 | </bold> | 80 | </span> |
76 | 81 | ||
77 | <ul class="tools links right"> | 82 | <ul class="tools right"> |
78 | <li> | 83 | <li> |
79 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> | 84 | <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> |
80 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> | 85 | <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> |
81 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> | 86 | <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> |
82 | </li> | 87 | </li> |
83 | </ul> | 88 | </ul> |
84 | </div> | 89 | </div> |
@@ -106,6 +111,7 @@ | |||
106 | </div> | 111 | </div> |
107 | 112 | ||
108 | <!-- Filters --> | 113 | <!-- Filters --> |
114 | {% if form is not null %} | ||
109 | <div id="filters" class="side-nav fixed right-aligned"> | 115 | <div id="filters" class="side-nav fixed right-aligned"> |
110 | <form action="{{ path('all') }}"> | 116 | <form action="{{ path('all') }}"> |
111 | 117 | ||
@@ -189,5 +195,6 @@ | |||
189 | 195 | ||
190 | </form> | 196 | </form> |
191 | </div> | 197 | </div> |
192 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 198 | {% endif %} |
199 | |||
193 | {% endblock %} | 200 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig deleted file mode 100644 index 6cabcf44..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/"> | ||
3 | <channel> | ||
4 | <title>wallabag — {{type}} feed</title> | ||
5 | <link>{{ url('unread') }}</link> | ||
6 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> | ||
7 | <generator>wallabag</generator> | ||
8 | <description>wallabag {{type}} elements</description> | ||
9 | |||
10 | {% for entry in entries %} | ||
11 | |||
12 | <item> | ||
13 | <title><![CDATA[{{ entry.title }}]]></title> | ||
14 | <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source> | ||
15 | <link>{{ entry.url }}</link> | ||
16 | <guid>{{ entry.url }}</guid> | ||
17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> | ||
18 | <description> | ||
19 | <![CDATA[ | ||
20 | {%- if entry.readingTime > 0 -%} | ||
21 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} | ||
22 | {%- else -%} | ||
23 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
24 | {%- endif %} | ||
25 | |||
26 | {{ entry.content|raw -}} | ||
27 | ]]> | ||
28 | </description> | ||
29 | </item> | ||
30 | |||
31 | {% endfor %} | ||
32 | |||
33 | </channel> | ||
34 | </rss> | ||
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 2ee615aa..5188eb01 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 | |||
@@ -13,24 +13,24 @@ | |||
13 | <ul> | 13 | <ul> |
14 | <li> | 14 | <li> |
15 | <a class="waves-effect" href="{{ path('homepage') }}"> | 15 | <a class="waves-effect" href="{{ path('homepage') }}"> |
16 | <i class="mdi-action-exit-to-app"></i> | 16 | <i class="material-icons">exit_to_app</i> |
17 | </a> | 17 | </a> |
18 | </li> | 18 | </li> |
19 | </ul> | 19 | </ul> |
20 | <ul class="right"> | 20 | <ul class="right"> |
21 | <li> | 21 | <li> |
22 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 22 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
23 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> | 23 | <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i> |
24 | </a> | 24 | </a> |
25 | </li> | 25 | </li> |
26 | <li> | 26 | <li> |
27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 27 | <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
28 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> | 28 | <i class="material-icons small">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> |
29 | </a> | 29 | </a> |
30 | </li> | 30 | </li> |
31 | <li> | 31 | <li> |
32 | <a href="#" data-activates="slide-out" class="button-collapse right"> | 32 | <a href="#" data-activates="slide-out" class="button-collapse right"> |
33 | <i class="mdi-navigation-menu"></i> | 33 | <i class="material-icons">menu</i> |
34 | </a> | 34 | </a> |
35 | </li> | 35 | </li> |
36 | </ul> | 36 | </ul> |
@@ -39,7 +39,7 @@ | |||
39 | <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion"> | 39 | <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion"> |
40 | <li class="bold border-bottom hide-on-med-and-down"> | 40 | <li class="bold border-bottom hide-on-med-and-down"> |
41 | <a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> | 41 | <a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> |
42 | <i class="mdi-action-exit-to-app small"></i> | 42 | <i class="material-icons small">exit_to_app</i> |
43 | <span>{{ 'entry.view.left_menu.back_to_homepage'|trans }}</span> | 43 | <span>{{ 'entry.view.left_menu.back_to_homepage'|trans }}</span> |
44 | </a> | 44 | </a> |
45 | <div class="collapsible-body"></div> | 45 | <div class="collapsible-body"></div> |
@@ -47,7 +47,7 @@ | |||
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" href="{{ entry.url|e }}"> | 49 | <a class="waves-effect collapsible-header" href="{{ entry.url|e }}"> |
50 | <i class="mdi-content-link small"></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> |
53 | <div class="collapsible-body"></div> | 53 | <div class="collapsible-body"></div> |
@@ -55,30 +55,35 @@ | |||
55 | 55 | ||
56 | <li class="bold hide-on-med-and-down"> | 56 | <li class="bold hide-on-med-and-down"> |
57 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> | 57 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> |
58 | <i class="mdi-action-autorenew small"></i> | 58 | <i class="material-icons small">autorenew</i> |
59 | <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span> | 59 | <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span> |
60 | </a> | 60 | </a> |
61 | <div class="collapsible-body"></div> | 61 | <div class="collapsible-body"></div> |
62 | </li> | 62 | </li> |
63 | 63 | ||
64 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %} | ||
65 | {% if entry.isArchived == 0 %} | ||
66 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %} | ||
67 | {% endif %} | ||
68 | |||
64 | <li class="bold hide-on-med-and-down"> | 69 | <li class="bold hide-on-med-and-down"> |
65 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 70 | <a class="waves-effect collapsible-header" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
66 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> | 71 | <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i> |
67 | <span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span> | 72 | <span>{{ markAsReadLabel|trans }}</span> |
68 | </a> | 73 | </a> |
69 | <div class="collapsible-body"></div> | 74 | <div class="collapsible-body"></div> |
70 | </li> | 75 | </li> |
71 | 76 | ||
72 | <li class="bold hide-on-med-and-down"> | 77 | <li class="bold hide-on-med-and-down"> |
73 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 78 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
74 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> | 79 | <i class="material-icons spall">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> |
75 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> | 80 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> |
76 | </a> | 81 | </a> |
77 | <div class="collapsible-body"></div> | 82 | <div class="collapsible-body"></div> |
78 | </li> | 83 | </li> |
79 | <li class="bold border-bottom hide-on-med-and-down"> | 84 | <li class="bold border-bottom hide-on-med-and-down"> |
80 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 85 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
81 | <i class="mdi-action-delete small"></i> | 86 | <i class="material-icons small">delete</i> |
82 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
83 | </a> | 88 | </a> |
84 | <div class="collapsible-body"></div> | 89 | <div class="collapsible-body"></div> |
@@ -86,7 +91,7 @@ | |||
86 | 91 | ||
87 | <li class="bold border-bottom hide-on-med-and-down"> | 92 | <li class="bold border-bottom hide-on-med-and-down"> |
88 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> | 93 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> |
89 | <i class="mdi-action-label-outline small"></i> | 94 | <i class="material-icons small">label_outline</i> |
90 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> | 95 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> |
91 | </a> | 96 | </a> |
92 | <div class="collapsible-body"></div> | 97 | <div class="collapsible-body"></div> |
@@ -94,42 +99,57 @@ | |||
94 | 99 | ||
95 | <li class="bold"> | 100 | <li class="bold"> |
96 | <a class="waves-effect collapsible-header"> | 101 | <a class="waves-effect collapsible-header"> |
97 | <i class="mdi-social-share small"></i> | 102 | <i class="material-icons small">share</i> |
98 | <span>{{ 'entry.view.left_menu.share_content'|trans }}</span> | 103 | <span>{{ 'entry.view.left_menu.share_content'|trans }}</span> |
99 | </a> | 104 | </a> |
100 | <div class="collapsible-body"> | 105 | <div class="collapsible-body"> |
101 | <ul> | 106 | <ul> |
107 | {% if craue_setting('share_public') %} | ||
108 | <li> | ||
109 | <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}" class="tool icon-eye"> | ||
110 | <span>{{ 'entry.view.left_menu.public_link'|trans }}</span> | ||
111 | </a> | ||
112 | </li> | ||
113 | <li> | ||
114 | <a href="{{ path('delete_share', {'id': entry.id }) }}" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}" class="tool icon-no-eye"> | ||
115 | <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span> | ||
116 | </a> | ||
117 | </li> | ||
118 | {% endif %} | ||
102 | {% if craue_setting('share_twitter') %} | 119 | {% if craue_setting('share_twitter') %} |
103 | <li> | 120 | <li> |
104 | <a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="twitter"> | 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"> |
105 | <span>twitter</span> | 122 | <span>twitter</span> |
106 | </a> | 123 | </a> |
107 | </li> | 124 | </li> |
108 | {% endif %} | 125 | {% endif %} |
109 | {% if craue_setting('share_shaarli') %} | 126 | {% if craue_setting('share_shaarli') %} |
110 | <li> | 127 | <li> |
111 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"> | 128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank"> |
129 | <i class="tool icon-image icon-image--shaarli" title="shaarli"></i> | ||
112 | <span>shaarli</span> | 130 | <span>shaarli</span> |
113 | </a> | 131 | </a> |
114 | </li> | 132 | </li> |
115 | {% endif %} | 133 | {% endif %} |
116 | {% if craue_setting('share_diaspora') %} | 134 | {% if craue_setting('share_diaspora') %} |
117 | <li> | 135 | <li> |
118 | <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" class="tool diaspora icon-image icon-image--diaspora" title="diaspora}"> | 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"> |
137 | <i class="tool icon-image icon-image--diaspora" title="diaspora"></i> | ||
119 | <span>diaspora*</span> | 138 | <span>diaspora*</span> |
120 | </a> | 139 | </a> |
121 | </li> | 140 | </li> |
122 | {% endif %} | 141 | {% endif %} |
123 | {% if craue_setting('carrot') %} | 142 | {% if craue_setting('carrot') %} |
124 | <li> | 143 | <li> |
125 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"> | 144 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot"> |
145 | <i class="tool icon-image icon-image--carrot"></i> | ||
126 | <span>Carrot</span> | 146 | <span>Carrot</span> |
127 | </a> | 147 | </a> |
128 | </li> | 148 | </li> |
129 | {% endif %} | 149 | {% endif %} |
130 | {% if craue_setting('share_mail') %} | 150 | {% if craue_setting('share_mail') %} |
131 | <li> | 151 | <li> |
132 | <a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{{ 'entry.view.left_menu.share_email_label'|trans }}"> | 152 | <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"> |
133 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> | 153 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> |
134 | </a> | 154 | </a> |
135 | </li> | 155 | </li> |
@@ -141,17 +161,16 @@ | |||
141 | {% if craue_setting('show_printlink') %} | 161 | {% if craue_setting('show_printlink') %} |
142 | <li class="bold border-bottom hide-on-med-and-down"> | 162 | <li class="bold border-bottom hide-on-med-and-down"> |
143 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();"> | 163 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.print'|trans }}" href="javascript: window.print();"> |
144 | <i class="mdi-action-print small"></i> | 164 | <i class="material-icons small">print</i> |
145 | <span>{{ 'entry.view.left_menu.print'|trans }}</span> | 165 | <span>{{ 'entry.view.left_menu.print'|trans }}</span> |
146 | </a> | 166 | </a> |
147 | <div class="collapsible-body"></div> | 167 | <div class="collapsible-body"></div> |
148 | </li> | 168 | </li> |
149 | {% endif %} | 169 | {% endif %} |
150 | 170 | ||
151 | |||
152 | <li class="bold"> | 171 | <li class="bold"> |
153 | <a class="waves-effect collapsible-header"> | 172 | <a class="waves-effect collapsible-header"> |
154 | <i class="mdi-file-file-download small"></i> | 173 | <i class="material-icons small">file_download</i> |
155 | <span>{{ 'entry.view.left_menu.download'|trans }}</span> | 174 | <span>{{ 'entry.view.left_menu.download'|trans }}</span> |
156 | </a> | 175 | </a> |
157 | <div class="collapsible-body"> | 176 | <div class="collapsible-body"> |
@@ -169,7 +188,7 @@ | |||
169 | 188 | ||
170 | <li class="bold hide-on-large-only"> | 189 | <li class="bold hide-on-large-only"> |
171 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 190 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
172 | <i class="mdi-action-delete small"></i> | 191 | <i class="material-icons small">delete</i> |
173 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 192 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
174 | </a> | 193 | </a> |
175 | <div class="collapsible-body"></div> | 194 | <div class="collapsible-body"></div> |
@@ -177,7 +196,7 @@ | |||
177 | 196 | ||
178 | <li class="bold"> | 197 | <li class="bold"> |
179 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> | 198 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> |
180 | <i class="mdi-alert-error small"></i> | 199 | <i class="material-icons small">error</i> |
181 | <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> | 200 | <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> |
182 | </a> | 201 | </a> |
183 | <div class="collapsible-body"></div> | 202 | <div class="collapsible-body"></div> |
@@ -193,21 +212,24 @@ | |||
193 | <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> |
194 | </header> | 213 | </header> |
195 | <aside> | 214 | <aside> |
196 | <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span> | ||
197 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 215 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
198 | <span class="link mdi-action-query-builder"> | 216 | <i class="material-icons">timer</i> |
217 | <span class="link"> | ||
199 | {% if readingTime > 0 %} | 218 | {% if readingTime > 0 %} |
200 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 219 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
201 | {% else %} | 220 | {% else %} |
202 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 221 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} |
203 | {% endif %} | 222 | {% endif %} |
204 | </span> | 223 | </span> |
205 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> | 224 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> |
206 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
226 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> | ||
227 | </a> | ||
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> | ||
207 | <div id="list"> | 229 | <div id="list"> |
208 | {% for tag in entry.tags %} | 230 | {% for tag in entry.tags %} |
209 | <div class="chip"> | 231 | <div class="chip"> |
210 | {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="mdi-action-delete"></i></a> | 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> |
211 | </div> | 233 | </div> |
212 | {% endfor %} | 234 | {% endfor %} |
213 | </div> | 235 | </div> |
@@ -226,27 +248,17 @@ | |||
226 | </article> | 248 | </article> |
227 | </div> | 249 | </div> |
228 | 250 | ||
229 | <script type="text/javascript"> | 251 | <script id="annotationroutes" type="application/json"> |
230 | 252 | { | |
231 | var app = new annotator.App(); | 253 | "prefix": "", |
232 | app.include(annotator.ui.main, { | 254 | "urls": { |
233 | element: document.querySelector('article') | 255 | "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}", |
234 | }); | 256 | "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}", |
235 | app.include(annotator.storage.http, { | 257 | "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}", |
236 | prefix: '', | 258 | "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}" |
237 | urls: { | 259 | }, |
238 | create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}', | 260 | "entryId": "{{ entry.id }}" |
239 | update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}', | 261 | }</script> |
240 | destroy: '{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}', | ||
241 | search: '{{ path('annotations_get_annotations', { 'entry': entry.id }) }}' | ||
242 | } | ||
243 | }); | ||
244 | app | ||
245 | .start() | ||
246 | .then(function () { | ||
247 | app.annotations.load({entry: {{ entry.id }}}); | ||
248 | }); | ||
249 | </script> | ||
250 | 262 | ||
251 | {% endblock %} | 263 | {% endblock %} |
252 | 264 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig new file mode 100644 index 00000000..6be78edb --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig | |||
@@ -0,0 +1,30 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'error.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | {% block messages %}{% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | <main class="valign-wrapper"> | ||
12 | <div class="valign row"> | ||
13 | <div class="card sw"> | ||
14 | <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div> | ||
15 | <div class="card-content"> | ||
16 | <div class="row"> | ||
17 | <h5>{{ status_code }}: {{ status_text }}</h5> | ||
18 | <p>{{ exception.message }}</p> | ||
19 | {# {% for trace in exception.trace %} | ||
20 | <p>{{ trace.class }} - {{ trace.type }} - {{ trace.file }} - {{ trace.line }}</p> | ||
21 | {% endfor %} #} | ||
22 | </div> | ||
23 | </div> | ||
24 | </div> | ||
25 | </div> | ||
26 | </main> | ||
27 | {% endblock %} | ||
28 | |||
29 | {% block footer %} | ||
30 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig deleted file mode 100644 index 59dd037b..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel settings"> | ||
10 | |||
11 | <div class="row"> | ||
12 | <h3>{{ 'quickstart.intro.title'|trans }}</h3> | ||
13 | <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p> | ||
14 | <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p> | ||
15 | |||
16 | <h4>{{ 'quickstart.configure.title'|trans }}</h4> | ||
17 | <ul> | ||
18 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | ||
19 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | ||
20 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li> | ||
21 | </ul> | ||
22 | |||
23 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
24 | <h4>{{ 'quickstart.admin.title'|trans }}</h4> | ||
25 | <p>{{ 'quickstart.admin.description'|trans }}</p> | ||
26 | <ul> | ||
27 | <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li> | ||
28 | <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li> | ||
29 | <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li> | ||
30 | <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li> | ||
31 | <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li> | ||
32 | </ul> | ||
33 | {% endif %} | ||
34 | |||
35 | <h4>{{ 'quickstart.first_steps.title'|trans }}</h4> | ||
36 | <ul> | ||
37 | <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li> | ||
38 | <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li> | ||
39 | </ul> | ||
40 | |||
41 | <h4>{{ 'quickstart.migrate.title'|trans }}</h4> | ||
42 | <p>{{ 'quickstart.migrate.description'|trans }}</p> | ||
43 | <ul> | ||
44 | <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li> | ||
45 | <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li> | ||
46 | <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li> | ||
47 | </ul> | ||
48 | |||
49 | <h4>{{ 'quickstart.developer.title'|trans }}</h4> | ||
50 | <ul> | ||
51 | <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> | ||
52 | </ul> | ||
53 | |||
54 | <h4>{{ 'quickstart.docs.title'|trans }}</h4> | ||
55 | <ul> | ||
56 | <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> | ||
57 | <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li> | ||
58 | <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li> | ||
59 | <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li> | ||
60 | <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> | ||
61 | </ul> | ||
62 | |||
63 | <h4>{{ 'quickstart.support.title'|trans }}</h4> | ||
64 | <p>{{ 'quickstart.support.description'|trans }}</p> | ||
65 | <ul> | ||
66 | <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li> | ||
67 | <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li> | ||
68 | <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li> | ||
69 | </ul> | ||
70 | </div> | ||
71 | |||
72 | </div> | ||
73 | </div> | ||
74 | </div> | ||
75 | |||
76 | {% 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 d958c4b8..96f4f990 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 | |||
@@ -6,10 +6,20 @@ | |||
6 | <div class="results clearfix"> | 6 | <div class="results clearfix"> |
7 | <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}</div> | 7 | <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}</div> |
8 | </div> | 8 | </div> |
9 | |||
9 | <br /> | 10 | <br /> |
10 | <ul class="row data"> | 11 | |
11 | {% for tag in tags %} | 12 | <div class="row"> |
12 | <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li> | 13 | <ul class="card-tag-labels"> |
13 | {% endfor %} | 14 | {% for tag in tags %} |
14 | </ul> | 15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s2"> |
16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> | ||
17 | </li> | ||
18 | {% endfor %} | ||
19 | </ul> | ||
20 | </div> | ||
21 | |||
22 | <div> | ||
23 | <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a> | ||
24 | </div> | ||
15 | {% endblock %} | 25 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig deleted file mode 100644 index 7cb19966..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | <footer class="page-footer cyan darken-2"> | ||
2 | <div class="container"> | ||
3 | <div class="row"> | ||
4 | <div class="col l6 s12"> | ||
5 | <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5> | ||
6 | <p class="grey-text text-lighten-4"> | ||
7 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.google_play }}" title="Android"> | ||
8 | <span class="icon-android"></span> | ||
9 | </a> | ||
10 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.ios }}" title="iOS"> | ||
11 | <span class="icon-apple"></span> | ||
12 | </a> | ||
13 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.firefox }}" title="Firefox"> | ||
14 | <span class="icon-firefox"></span> | ||
15 | </a> | ||
16 | <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.chrome }}" title="Chrome"> | ||
17 | <span class="icon-chrome"></span> | ||
18 | </a> | ||
19 | </p> | ||
20 | </div> | ||
21 | <div class="col l4 offset-l2 s12"> | ||
22 | <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5> | ||
23 | <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.twitter }}" title="Twitter"> | ||
24 | <span class="icon-twitter"></span> | ||
25 | </a> | ||
26 | <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.google_plus }}" title="Google+"> | ||
27 | <span class="icon-google-plus2"></span> | ||
28 | </a> | ||
29 | <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.facebook }}" title="Facebook"> | ||
30 | <span class="icon-facebook2"></span> | ||
31 | </a> | ||
32 | </div> | ||
33 | </div> | ||
34 | </div> | ||
35 | <div class="footer-copyright"> | ||
36 | <div class="container"> | ||
37 | <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> | ||
38 | <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a> | ||
39 | </div> | ||
40 | </div> | ||
41 | </footer> | ||
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 0573e8e5..de0049d3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -2,18 +2,12 @@ | |||
2 | 2 | ||
3 | {% block css %} | 3 | {% block css %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | 5 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/style.min.css') }}" media="screen,projection,print"/> | |
6 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/materialize.min.css') }}" media="screen,projection"/> | ||
7 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/main.css') }}" media="all"> | ||
8 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/print.css') }}" media="print"> | ||
9 | {% endblock %} | 6 | {% endblock %} |
10 | 7 | ||
11 | {% block scripts %} | 8 | {% block scripts %} |
12 | {{ parent() }} | 9 | {{ parent() }} |
13 | 10 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script> | |
14 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script> | ||
15 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script> | ||
16 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script> | ||
17 | {% endblock %} | 11 | {% endblock %} |
18 | 12 | ||
19 | {% block header %} | 13 | {% block header %} |
@@ -25,6 +19,8 @@ | |||
25 | Materialize.toast('{{ flashMessage|trans }}', 4000); | 19 | Materialize.toast('{{ flashMessage|trans }}', 4000); |
26 | </script> | 20 | </script> |
27 | {% endfor %} | 21 | {% endfor %} |
22 | |||
23 | {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} | ||
28 | {% endblock %} | 24 | {% endblock %} |
29 | 25 | ||
30 | {% block menu %} | 26 | {% block menu %} |
@@ -33,7 +29,7 @@ | |||
33 | {% block logo %} | 29 | {% block logo %} |
34 | <li class="logo border-bottom"> | 30 | <li class="logo border-bottom"> |
35 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> | 31 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> |
36 | <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" /> | 32 | <img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }}" alt="wallabag logo" /> |
37 | </a> | 33 | </a> |
38 | </li> | 34 | </li> |
39 | {% endblock %} | 35 | {% endblock %} |
@@ -41,24 +37,28 @@ | |||
41 | {% set currentRoute = app.request.attributes.get('_route') %} | 37 | {% set currentRoute = app.request.attributes.get('_route') %} |
42 | 38 | ||
43 | <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"> | 39 | <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"> |
44 | <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a> | 40 | <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }} <span class="numberItems grey-text">{{ count_entries('unread') }}</span></a> |
45 | </li> | 41 | </li> |
46 | <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"> | 42 | <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"> |
47 | <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a> | 43 | <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }} <span class="numberItems grey-text">{{ count_entries('starred') }}</span></a> |
48 | </li> | 44 | </li> |
49 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"> | 45 | <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"> |
50 | <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a> | 46 | <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ count_entries('archive') }}</span></a> |
51 | </li> | 47 | </li> |
52 | <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"> | 48 | <li class="bold {% if currentRoute == 'all' %}active{% endif %}"> |
53 | <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a> | 49 | <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a> |
54 | </li> | 50 | </li> |
55 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> | 51 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> |
56 | <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a> | 52 | <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }} <span class="numberItems grey-text">{{ count_tags() }}</span></a> |
57 | </li> | 53 | </li> |
58 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"> | 54 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"> |
59 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> | 55 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> |
60 | </li> | 56 | </li> |
61 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 57 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
58 | <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}"> | ||
59 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> | ||
60 | </li> | ||
61 | |||
62 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> | 62 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> |
63 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> | 63 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> |
64 | </li> | 64 | </li> |
@@ -73,11 +73,11 @@ | |||
73 | <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a> | 73 | <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a> |
74 | </li> | 74 | </li> |
75 | <li class="bold"> | 75 | <li class="bold"> |
76 | <a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a> | 76 | <a class="waves-effect icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a> |
77 | </li> | 77 | </li> |
78 | </ul> | 78 | </ul> |
79 | <div class="nav-wrapper nav-panels"> | 79 | <div class="nav-wrapper nav-panels"> |
80 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> | 80 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a> |
81 | <div class="left action"> | 81 | <div class="left action"> |
82 | {% block title %} | 82 | {% block title %} |
83 | {% endblock %} | 83 | {% endblock %} |
@@ -86,22 +86,22 @@ | |||
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 title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> |
89 | <i class="mdi-content-add"></i> | 89 | <i class="material-icons">add</i> |
90 | </a> | 90 | </a> |
91 | </li> | 91 | </li> |
92 | <!--<li> | 92 | <!--<li> |
93 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> | 93 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> |
94 | <i class="mdi-action-search"></i> | 94 | <i class="material-icons">search</i> |
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 title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> |
99 | <i class="mdi-content-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" class="nav-panel-menu button-collapse-right"> | 103 | <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export"> |
104 | <i class="mdi-file-file-download"></i> | 104 | <i class="material-icons">file_download</i> |
105 | </a> | 105 | </a> |
106 | </li> | 106 | </li> |
107 | </ul> | 107 | </ul> |
@@ -109,19 +109,37 @@ | |||
109 | <form method="get" action="index.php"> | 109 | <form method="get" action="index.php"> |
110 | <div class="input-field nav-panel-search" style="display: none"> | 110 | <div class="input-field nav-panel-search" style="display: none"> |
111 | <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> | 111 | <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> |
112 | <label for="search"><i class="mdi-action-search"></i></label> | 112 | <label for="search"><i class="material-icons search">search</i></label> |
113 | <i class="mdi-navigation-close"></i> | 113 | <i class="material-icons close">clear</i> |
114 | </div> | 114 | </div> |
115 | </form> | 115 | </form> |
116 | <div class="input-field nav-panel-add" style="display: none"> | 116 | <div class="input-field nav-panel-add" style="display: none"> |
117 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 117 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
118 | <label for="add" class="active"><i class="mdi-content-add"></i></label> | 118 | <label for="add" class="active"><i class="material-icons add">add</i></label> |
119 | <i class="mdi-navigation-close"></i> | 119 | <i class="material-icons close">clear</i> |
120 | </div> | 120 | </div> |
121 | </div> | 121 | </div> |
122 | </nav> | 122 | </nav> |
123 | {% endblock %} | 123 | {% endblock %} |
124 | 124 | ||
125 | {% block footer %} | 125 | {% block footer %} |
126 | {{ render(controller("WallabagCoreBundle:Footer:index")) }} | 126 | <footer class="page-footer cyan darken-2"> |
127 | <div class="footer-copyright"> | ||
128 | <div class="container"> | ||
129 | <div class="row"> | ||
130 | <div class="col s8"> | ||
131 | <p> | ||
132 | {{ display_stats() }} | ||
133 | </p> | ||
134 | </div> | ||
135 | <div class="col s4"> | ||
136 | <p> | ||
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> | ||
139 | </p> | ||
140 | </div> | ||
141 | </div> | ||
142 | </div> | ||
143 | </div> | ||
144 | </footer> | ||
127 | {% endblock %} | 145 | {% endblock %} |