diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
21 files changed, 248 insertions, 200 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index f024b633..0f88901a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -41,10 +41,6 @@ | |||
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>wallabag - {% block title %}{% endblock %}</title> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig new file mode 100644 index 00000000..d1c2f203 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/_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/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index a8abe8d3..f89265d4 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 | |||
@@ -205,7 +205,6 @@ | |||
205 | 205 | ||
206 | {{ form_rest(form.new_tagging_rule) }} | 206 | {{ form_rest(form.new_tagging_rule) }} |
207 | </form> | 207 | </form> |
208 | |||
209 | <div class="row"> | 208 | <div class="row"> |
210 | <div class="input-field col s12"> | 209 | <div class="input-field col s12"> |
211 | <h3>{{ 'config.form_rules.faq.title'|trans }}</h3> | 210 | <h3>{{ 'config.form_rules.faq.title'|trans }}</h3> |
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 index 78a9dc04..8a5da71a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/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/baggy/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/baggy/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/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/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/baggy/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/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 778625ae..1554cce4 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/_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} %} |
@@ -28,12 +30,43 @@ | |||
28 | </ul> | 30 | </ul> |
29 | {% if entry.previewPicture is null %} | 31 | {% if entry.previewPicture is null %} |
30 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> | 32 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> |
33 | <ul class="card-entry-tags"> | ||
34 | {% for tag in entry.tags %} | ||
35 | <li>{{ tag.label }}</li> | ||
36 | {% endfor %} | ||
37 | </ul> | ||
31 | {% else %} | 38 | {% else %} |
39 | <ul class="card-entry-labels"> | ||
40 | {% for tag in entry.tags | slice(0, 3) %} | ||
41 | <li>{{ tag.label }}</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 | ||
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 %} | ||
37 | <aside id="filter-form" class=""> | 70 | <aside id="filter-form" 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> |
@@ -115,6 +148,5 @@ | |||
115 | </div> | 148 | </div> |
116 | </form> | 149 | </form> |
117 | </aside> | 150 | </aside> |
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..6c46f91f 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,30 +5,31 @@ | |||
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 | <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> |
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 | <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> |
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 | <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> |
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 | <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> |
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 | {% if craue_setting('share_public') %}<li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li>{% 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 %} | 21 | {% 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 %} |
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 %} | 22 | {% 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 %} |
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 %} | 23 | {% 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 %} |
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 %} | 24 | {% 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 %} |
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 %} | 25 | {% 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 %} |
26 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %} | 26 | {% 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 %} |
27 | {% if craue_setting('export_mobi') %}<li><a href="?mobi&method=id&value={{ entry.id }}" title="Generate Mobi file">MOBI</a></li>{% endif %} | 27 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</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 %} | 28 | {% if craue_setting('export_mobi') %}<li><a href="?mobi&method=id&value={{ entry.id }}" title="Generate Mobi file">MOBI</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> | 29 | {% if craue_setting('export_pdf') %}<li><a href="?pdf&method=id&value={{ entry.id }}" title="Generate PDF file">PDF</a></li>{% endif %} |
30 | </ul> | 30 | <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> |
31 | </div> | 31 | </ul> |
32 | </div> | ||
32 | <div class="link mdi-action-today"> | 33 | <div class="link mdi-action-today"> |
33 | {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} | 34 | {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} |
34 | </div> | 35 | </div> |
@@ -43,10 +44,10 @@ | |||
43 | </div> | 44 | </div> |
44 | 45 | ||
45 | {% set nbAnnotations = entry.annotations | length %} | 46 | {% set nbAnnotations = entry.annotations | length %} |
46 | <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 47 | <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
47 | <aside class="tags"> | 48 | <aside class="tags"> |
48 | {% for tag in entry.tags %} | 49 | {% for tag in entry.tags %} |
49 | <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a> | 50 | <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a> |
50 | {% endfor %} | 51 | {% endfor %} |
51 | <div class="input-field nav-panel-add-tag" style="display: none"> | 52 | <div class="input-field nav-panel-add-tag" style="display: none"> |
52 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 53 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |
@@ -59,54 +60,22 @@ | |||
59 | {{ entry.content | raw }} | 60 | {{ entry.content | raw }} |
60 | </article> | 61 | </article> |
61 | </div> | 62 | </div> |
63 | |||
64 | <script id="annotationroutes" type="application/json"> | ||
65 | { | ||
66 | "prefix": "", | ||
67 | "urls": { | ||
68 | "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}", | ||
69 | "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}", | ||
70 | "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}", | ||
71 | "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}" | ||
72 | }, | ||
73 | "entryId": "{{ entry.id }}" | ||
74 | } | ||
75 | </script> | ||
62 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script> | 76 | <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script> |
63 | <script type="text/javascript"> | 77 | <script type="text/javascript"> |
64 | $(document).ready(function() { | 78 | $(document).ready(function() { |
65 | |||
66 | // toggle read property of current article | ||
67 | /* $('#markAsRead').click(function(){ | ||
68 | $("body").css("cursor", "wait"); | ||
69 | $.ajax( { url: '{{ path('archive_entry', { 'id': entry.id }) }}' }).done( | ||
70 | function( data ) { | ||
71 | if ( data == '1' ) { | ||
72 | if ( $('#markAsRead').hasClass("archive-off") ) { | ||
73 | $('#markAsRead').removeClass("archive-off"); | ||
74 | $('#markAsRead').addClass("archive"); | ||
75 | } | ||
76 | else { | ||
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){ | 79 | $(window).scroll(function(e){ |
111 | var scrollTop = $(window).scrollTop(); | 80 | var scrollTop = $(window).scrollTop(); |
112 | var docHeight = $(document).height(); | 81 | var docHeight = $(document).height(); |
@@ -121,25 +90,5 @@ | |||
121 | retrievePercent({{ entry.id }}); | 90 | retrievePercent({{ entry.id }}); |
122 | }); | 91 | }); |
123 | }); | 92 | }); |
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> | 93 | </script> |
144 | |||
145 | {% endblock %} | 94 | {% 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/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig index 404d2857..918249dc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | |||
@@ -37,7 +37,6 @@ | |||
37 | <p>{{ 'about.helping.description'|trans }}</p> | 37 | <p>{{ 'about.helping.description'|trans }}</p> |
38 | 38 | ||
39 | <dl> | 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> | 40 | <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> | 41 | <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd> |
43 | </dl> | 42 | </dl> |
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..50043907 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.entries.getValues | 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..4fd4d317 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> |
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..11b02294 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 | |||
@@ -206,7 +206,7 @@ | |||
206 | {{ 'config.form_rules.then_tag_as_label'|trans }} | 206 | {{ 'config.form_rules.then_tag_as_label'|trans }} |
207 | « {{ tagging_rule.tags|join(', ') }} » | 207 | « {{ tagging_rule.tags|join(', ') }} » |
208 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}"> | 208 | <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> | 209 | <i class="tool grey-text delete material-icons">delete</i> |
210 | </a> | 210 | </a> |
211 | </li> | 211 | </li> |
212 | {% endfor %} | 212 | {% endfor %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/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/material/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/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig index b615fa3b..b498cceb 100644 --- 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 | |||
@@ -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/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig index 001c5cbb..3430c0d4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/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/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index f6941ca5..806a4eef 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/_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>{{ tag.label }}</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>{{ tag.label }}</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,6 +65,12 @@ | |||
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-tags"> | ||
70 | {% for tag in entry.tags %} | ||
71 | <li>{{ tag.label }}</li> | ||
72 | {% endfor %} | ||
73 | </ul> | ||
69 | </div> | 74 | </div> |
70 | {% endif %} | 75 | {% endif %} |
71 | 76 | ||
@@ -74,11 +79,11 @@ | |||
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 | </bold> |
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/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 2ee615aa..eb5d88e3 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,7 +55,7 @@ | |||
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> |
@@ -63,7 +63,7 @@ | |||
63 | 63 | ||
64 | <li class="bold hide-on-med-and-down"> | 64 | <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"> | 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"> |
66 | <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> | 66 | <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> | 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> |
68 | </a> | 68 | </a> |
69 | <div class="collapsible-body"></div> | 69 | <div class="collapsible-body"></div> |
@@ -71,14 +71,14 @@ | |||
71 | 71 | ||
72 | <li class="bold hide-on-med-and-down"> | 72 | <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"> | 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"> |
74 | <i class="{% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %} small"></i> | 74 | <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> | 75 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> |
76 | </a> | 76 | </a> |
77 | <div class="collapsible-body"></div> | 77 | <div class="collapsible-body"></div> |
78 | </li> | 78 | </li> |
79 | <li class="bold border-bottom hide-on-med-and-down"> | 79 | <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 }) }}"> | 80 | <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> | 81 | <i class="material-icons small">delete</i> |
82 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 82 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
83 | </a> | 83 | </a> |
84 | <div class="collapsible-body"></div> | 84 | <div class="collapsible-body"></div> |
@@ -86,7 +86,7 @@ | |||
86 | 86 | ||
87 | <li class="bold border-bottom hide-on-med-and-down"> | 87 | <li class="bold border-bottom hide-on-med-and-down"> |
88 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> | 88 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> |
89 | <i class="mdi-action-label-outline small"></i> | 89 | <i class="material-icons small">label_outline</i> |
90 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> | 90 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> |
91 | </a> | 91 | </a> |
92 | <div class="collapsible-body"></div> | 92 | <div class="collapsible-body"></div> |
@@ -94,11 +94,23 @@ | |||
94 | 94 | ||
95 | <li class="bold"> | 95 | <li class="bold"> |
96 | <a class="waves-effect collapsible-header"> | 96 | <a class="waves-effect collapsible-header"> |
97 | <i class="mdi-social-share small"></i> | 97 | <i class="material-icons small">share</i> |
98 | <span>{{ 'entry.view.left_menu.share_content'|trans }}</span> | 98 | <span>{{ 'entry.view.left_menu.share_content'|trans }}</span> |
99 | </a> | 99 | </a> |
100 | <div class="collapsible-body"> | 100 | <div class="collapsible-body"> |
101 | <ul> | 101 | <ul> |
102 | {% if craue_setting('share_public') %} | ||
103 | <li> | ||
104 | <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="public icon-link" title="{{ 'entry.view.left_menu.public_link'|trans }}"> | ||
105 | <span>{{ 'entry.view.left_menu.public_link'|trans }}</span> | ||
106 | </a> | ||
107 | </li> | ||
108 | <li> | ||
109 | <a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"> | ||
110 | <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span> | ||
111 | </a> | ||
112 | </li> | ||
113 | {% endif %} | ||
102 | {% if craue_setting('share_twitter') %} | 114 | {% if craue_setting('share_twitter') %} |
103 | <li> | 115 | <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"> | 116 | <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"> |
@@ -129,7 +141,8 @@ | |||
129 | {% endif %} | 141 | {% endif %} |
130 | {% if craue_setting('share_mail') %} | 142 | {% if craue_setting('share_mail') %} |
131 | <li> | 143 | <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 }}"> | 144 | <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 }}"> |
145 | <i class="material-icons">email</i> | ||
133 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> | 146 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> |
134 | </a> | 147 | </a> |
135 | </li> | 148 | </li> |
@@ -141,17 +154,16 @@ | |||
141 | {% if craue_setting('show_printlink') %} | 154 | {% if craue_setting('show_printlink') %} |
142 | <li class="bold border-bottom hide-on-med-and-down"> | 155 | <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();"> | 156 | <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> | 157 | <i class="material-icons small">print</i> |
145 | <span>{{ 'entry.view.left_menu.print'|trans }}</span> | 158 | <span>{{ 'entry.view.left_menu.print'|trans }}</span> |
146 | </a> | 159 | </a> |
147 | <div class="collapsible-body"></div> | 160 | <div class="collapsible-body"></div> |
148 | </li> | 161 | </li> |
149 | {% endif %} | 162 | {% endif %} |
150 | 163 | ||
151 | |||
152 | <li class="bold"> | 164 | <li class="bold"> |
153 | <a class="waves-effect collapsible-header"> | 165 | <a class="waves-effect collapsible-header"> |
154 | <i class="mdi-file-file-download small"></i> | 166 | <i class="material-icons small">file_download</i> |
155 | <span>{{ 'entry.view.left_menu.download'|trans }}</span> | 167 | <span>{{ 'entry.view.left_menu.download'|trans }}</span> |
156 | </a> | 168 | </a> |
157 | <div class="collapsible-body"> | 169 | <div class="collapsible-body"> |
@@ -169,7 +181,7 @@ | |||
169 | 181 | ||
170 | <li class="bold hide-on-large-only"> | 182 | <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 }) }}"> | 183 | <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> | 184 | <i class="material-icons small">delete</i> |
173 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 185 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
174 | </a> | 186 | </a> |
175 | <div class="collapsible-body"></div> | 187 | <div class="collapsible-body"></div> |
@@ -177,7 +189,7 @@ | |||
177 | 189 | ||
178 | <li class="bold"> | 190 | <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 }}"> | 191 | <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> | 192 | <i class="material-icons small">error</i> |
181 | <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> | 193 | <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> |
182 | </a> | 194 | </a> |
183 | <div class="collapsible-body"></div> | 195 | <div class="collapsible-body"></div> |
@@ -193,7 +205,6 @@ | |||
193 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 205 | <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
194 | </header> | 206 | </header> |
195 | <aside> | 207 | <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 %} | 208 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
198 | <span class="link mdi-action-query-builder"> | 209 | <span class="link mdi-action-query-builder"> |
199 | {% if readingTime > 0 %} | 210 | {% if readingTime > 0 %} |
@@ -202,12 +213,14 @@ | |||
202 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 213 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} |
203 | {% endif %} | 214 | {% endif %} |
204 | </span> | 215 | </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> | 216 | <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ 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> | 217 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
218 | <span class="link"><i class="material-icons link">link</i> {{ entry.domainName|removeWww }}</span></a> | ||
219 | <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | ||
207 | <div id="list"> | 220 | <div id="list"> |
208 | {% for tag in entry.tags %} | 221 | {% for tag in entry.tags %} |
209 | <div class="chip"> | 222 | <div class="chip"> |
210 | {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="mdi-action-delete"></i></a> | 223 | {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> |
211 | </div> | 224 | </div> |
212 | {% endfor %} | 225 | {% endfor %} |
213 | </div> | 226 | </div> |
@@ -226,27 +239,17 @@ | |||
226 | </article> | 239 | </article> |
227 | </div> | 240 | </div> |
228 | 241 | ||
229 | <script type="text/javascript"> | 242 | <script id="annotationroutes" type="application/json"> |
230 | 243 | { | |
231 | var app = new annotator.App(); | 244 | "prefix": "", |
232 | app.include(annotator.ui.main, { | 245 | "urls": { |
233 | element: document.querySelector('article') | 246 | "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}", |
234 | }); | 247 | "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}", |
235 | app.include(annotator.storage.http, { | 248 | "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}", |
236 | prefix: '', | 249 | "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}" |
237 | urls: { | 250 | }, |
238 | create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}', | 251 | "entryId": "{{ entry.id }}" |
239 | update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}', | 252 | }</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 | 253 | ||
251 | {% endblock %} | 254 | {% endblock %} |
252 | 255 | ||
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..1690633a 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 | |||
@@ -9,7 +9,10 @@ | |||
9 | <br /> | 9 | <br /> |
10 | <ul class="row data"> | 10 | <ul class="row data"> |
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li> | 12 | <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.entries.getValues | length }})</a></li> |
13 | {% endfor %} | 13 | {% endfor %} |
14 | </ul> | 14 | </ul> |
15 | <div> | ||
16 | <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }}</a> | ||
17 | </div> | ||
15 | {% endblock %} | 18 | {% endblock %} |
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..6e95345c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -2,15 +2,11 @@ | |||
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 | |||
14 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script> | 10 | <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> | 11 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script> |
16 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script> | 12 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script> |
@@ -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 %} |
@@ -77,7 +73,7 @@ | |||
77 | </li> | 73 | </li> |
78 | </ul> | 74 | </ul> |
79 | <div class="nav-wrapper nav-panels"> | 75 | <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> | 76 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a> |
81 | <div class="left action"> | 77 | <div class="left action"> |
82 | {% block title %} | 78 | {% block title %} |
83 | {% endblock %} | 79 | {% endblock %} |
@@ -86,22 +82,22 @@ | |||
86 | <ul> | 82 | <ul> |
87 | <li class="bold"> | 83 | <li class="bold"> |
88 | <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> | 84 | <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> | 85 | <i class="material-icons">add</i> |
90 | </a> | 86 | </a> |
91 | </li> | 87 | </li> |
92 | <!--<li> | 88 | <!--<li> |
93 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> | 89 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> |
94 | <i class="mdi-action-search"></i> | 90 | <i class="material-icons">search</i> |
95 | </a> | 91 | </a> |
96 | </li>--> | 92 | </li>--> |
97 | <li id="button_filters"> | 93 | <li id="button_filters"> |
98 | <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> | 94 | <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> | 95 | <i class="material-icons">filter_list</i> |
100 | </a> | 96 | </a> |
101 | </li> | 97 | </li> |
102 | <li id="button_export"> | 98 | <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"> | 99 | <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> | 100 | <i class="material-icons">file_download</i> |
105 | </a> | 101 | </a> |
106 | </li> | 102 | </li> |
107 | </ul> | 103 | </ul> |
@@ -109,14 +105,14 @@ | |||
109 | <form method="get" action="index.php"> | 105 | <form method="get" action="index.php"> |
110 | <div class="input-field nav-panel-search" style="display: none"> | 106 | <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 }}"> | 107 | <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> | 108 | <label for="search"><i class="material-icons search">search</i></label> |
113 | <i class="mdi-navigation-close"></i> | 109 | <i class="material-icons close">clear</i> |
114 | </div> | 110 | </div> |
115 | </form> | 111 | </form> |
116 | <div class="input-field nav-panel-add" style="display: none"> | 112 | <div class="input-field nav-panel-add" style="display: none"> |
117 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 113 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
118 | <label for="add" class="active"><i class="mdi-content-add"></i></label> | 114 | <label for="add" class="active"><i class="material-icons add">add</i></label> |
119 | <i class="mdi-navigation-close"></i> | 115 | <i class="material-icons close">clear</i> |
120 | </div> | 116 | </div> |
121 | </div> | 117 | </div> |
122 | </nav> | 118 | </nav> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig new file mode 100644 index 00000000..b82b3d3d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig | |||
@@ -0,0 +1,40 @@ | |||
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 | </head> | ||
31 | <body> | ||
32 | <header> | ||
33 | <h1>{{ entry.title | raw }}</h1> | ||
34 | <span><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></span> | ||
35 | </header> | ||
36 | <article> | ||
37 | {{ entry.content | raw }} | ||
38 | </article> | ||
39 | </body> | ||
40 | </html> | ||