aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/views/themes
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig84
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig27
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig99
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig16
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig17
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig74
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig33
10 files changed, 188 insertions, 168 deletions
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 c51f90d2..f1ed63c0 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
@@ -204,6 +204,90 @@
204 204
205 {{ form_rest(form.new_tagging_rule) }} 205 {{ form_rest(form.new_tagging_rule) }}
206 </form> 206 </form>
207 <div class="row">
208 <div class="input-field col s12">
209 <h4>{{ 'config.form_rules.faq.title'|trans }}</h4>
210
211 <h5>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h5>
212 <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
213
214 <h5>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h5>
215 <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
216
217 <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5>
218 <p class="help">
219 {{ 'config.form_rules.faq.variables_available_description'|trans }}
220
221 <table class="bordered">
222 <thead>
223 <tr>
224 <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
225 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
226 <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
227 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
228 </tr>
229 </thead>
230
231 <tbody>
232 <tr>
233 <td>title</td>
234 <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
235 <td>&lt;=</td>
236 <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
237 </tr>
238 <tr>
239 <td>url</td>
240 <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
241 <td>&lt;</td>
242 <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
243 </tr>
244 <tr>
245 <td>isArchived</td>
246 <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
247 <td>=&gt;</td>
248 <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
249 </tr>
250 <tr>
251 <td>isStarred</td>
252 <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
253 <td>&gt;</td>
254 <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
255 </tr>
256 <tr>
257 <td>content</td>
258 <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
259 <td>=</td>
260 <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
261 </tr>
262 <tr>
263 <td>language</td>
264 <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
265 <td>!=</td>
266 <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
267 </tr>
268 <tr>
269 <td>mimetype</td>
270 <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
271 <td>OR</td>
272 <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
273 </tr>
274 <tr>
275 <td>readingTime</td>
276 <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
277 <td>AND</td>
278 <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
279 </tr>
280 <tr>
281 <td>domainName</td>
282 <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
283 <td>matches</td>
284 <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
285 </tr>
286 </tbody>
287 </table>
288 </p>
289 </div>
290 </div>
207 291
208 <div class="row"> 292 <div class="row">
209 <div class="input-field col s12"> 293 <div class="input-field col s12">
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 a2caaebf..8636e3be 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
@@ -34,7 +34,27 @@
34 </div> 34 </div>
35 {% endfor %} 35 {% endfor %}
36 36
37 <aside id="filter-form" class=""> 37
38 <!-- Export -->
39 <aside id="download-form">
40 {% set currentRoute = app.request.attributes.get('_route') %}
41 {% if currentRoute == 'homepage' %}
42 {% set currentRoute = 'unread' %}
43 {% endif %}
44 <h2>{{ 'entry.list.export_title'|trans }}</h2>
45 <a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">&times;</a>
46 <ul>
47 {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">EPUB</a></li>{% endif %}
48 {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">MOBI</a></li>{% endif %}
49 {% if craue_setting('export_pdf') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">PDF</a></li>{% endif %}
50 {% if craue_setting('export_csv') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">JSON</a></li>{% endif %}
51 {% if craue_setting('export_json') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">CSV</a></li>{% endif %}
52 {% if craue_setting('export_txt') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">TXT</a></li>{% endif %}
53 {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">XML</a></li>{% endif %}
54 </ul>
55 </aside>
56 <!-- Filter -->
57 <aside id="filter-form">
38 <form method="get" action="{{ path('all') }}"> 58 <form method="get" action="{{ path('all') }}">
39 <h2>{{ 'entry.filters.title'|trans }}</h2> 59 <h2>{{ 'entry.filters.title'|trans }}</h2>
40 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a> 60 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
@@ -54,6 +74,11 @@
54 </div> 74 </div>
55 75
56 <div class="input-field"> 76 <div class="input-field">
77 {{ form_widget(form.isUnread) }}
78 {{ form_label(form.isUnread) }}
79 </div>
80
81 <div class="input-field">
57 {{ form_widget(form.previewPicture) }} 82 {{ form_widget(form.previewPicture) }}
58 {{ form_label(form.previewPicture) }} 83 {{ form_label(form.previewPicture) }}
59 </div> 84 </div>
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 5a800332..8c06cf11 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,7 +5,7 @@
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">
@@ -30,10 +30,10 @@
30 </ul> 30 </ul>
31 </div> 31 </div>
32 {% set nbAnnotations = entry.annotations | length %} 32 {% set nbAnnotations = entry.annotations | length %}
33 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 33 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
34 <aside class="tags"> 34 <aside class="tags">
35 {% for tag in entry.tags %} 35 {% for tag in entry.tags %}
36 <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a> 36 <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>
37 {% endfor %} 37 {% endfor %}
38 <div class="input-field nav-panel-add-tag" style="display: none"> 38 <div class="input-field nav-panel-add-tag" style="display: none">
39 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} 39 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
@@ -46,87 +46,16 @@
46 {{ entry.content | raw }} 46 {{ entry.content | raw }}
47 </article> 47 </article>
48 </div> 48 </div>
49 <script src="{{ asset('bundles/wallabagcore/themes/_global/js/restoreScroll.js')}}"></script> 49 <script id="annotationroutes" type="application/json">
50 <script type="text/javascript"> 50 {
51 $(document).ready(function() { 51 "prefix": "",
52 52 "urls": {
53 // toggle read property of current article 53 "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}",
54 /* $('#markAsRead').click(function(){ 54 "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}",
55 $("body").css("cursor", "wait"); 55 "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}",
56 $.ajax( { url: '{{ path('archive_entry', { 'id': entry.id }) }}' }).done( 56 "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}"
57 function( data ) { 57 },
58 if ( data == '1' ) { 58 "entryId": "{{ entry.id }}"
59 if ( $('#markAsRead').hasClass("archive-off") ) { 59 }
60 $('#markAsRead').removeClass("archive-off");
61 $('#markAsRead').addClass("archive");
62 }
63 else {
64 $('#markAsRead').removeClass("archive");
65 $('#markAsRead').addClass("archive-off");
66 }
67 }
68 else {
69 alert('Error! Pls check if you are logged in.');
70 }
71 });
72 $("body").css("cursor", "auto");
73 });*/
74
75 // toggle favorite property of current article
76 /* $('#setFav').click(function(){
77 $("body").css("cursor", "wait");
78 $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done(
79 function( data ) {
80 if ( data == '1' ) {
81 if ( $('#setFav').hasClass("fav-off") ) {
82 $('#setFav').removeClass("fav-off");
83 $('#setFav').addClass("fav");
84 }
85 else {
86 $('#setFav').removeClass("fav");
87 $('#setFav').addClass("fav-off");
88 }
89 }
90 else {
91 alert('Error! Pls check if you are logged in.');
92 }
93 });
94 $("body").css("cursor", "auto");
95 });*/
96
97 $(window).scroll(function(e){
98 var scrollTop = $(window).scrollTop();
99 var docHeight = $(document).height();
100 var scrollPercent = (scrollTop) / (docHeight);
101 var scrollPercentRounded = Math.round(scrollPercent*100)/100;
102 savePercent({{ entry.id }}, scrollPercentRounded);
103 });
104
105 retrievePercent({{ entry.id }});
106
107 $(window).resize(function(){
108 retrievePercent({{ entry.id }});
109 });
110 });
111
112 var app = new annotator.App();
113 app.include(annotator.ui.main, {
114 element: document.querySelector('article')
115 });
116 app.include(annotator.storage.http, {
117 prefix: '',
118 urls: {
119 create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}',
120 update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}',
121 destroy: '{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}',
122 search: '{{ path('annotations_get_annotations', { 'entry': entry.id }) }}'
123 }
124 });
125 app
126 .start()
127 .then(function () {
128 app.annotations.load({entry: {{ entry.id }}});
129 });
130 </script> 60 </script>
131
132{% endblock %} 61{% 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/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 5a90f227..9fb92d3d 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/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 1d569226..98616635 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
@@ -32,7 +32,7 @@
32 32
33 <div class="card-content"> 33 <div class="card-content">
34 {% if not entry.previewPicture is null %} 34 {% if not entry.previewPicture is null %}
35 <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i> 35 <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
36 {% endif %} 36 {% endif %}
37 37
38 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span> 38 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
@@ -56,7 +56,7 @@
56 56
57 {% if not entry.previewPicture is null %} 57 {% if not entry.previewPicture is null %}
58 <div class="card-reveal"> 58 <div class="card-reveal">
59 <i class="card-title grey-text text-darken-4 mdi-card-close right"></i> 59 <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> 60 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span>
61 61
62 <div class="estimatedTime grey-text"> 62 <div class="estimatedTime grey-text">
@@ -74,11 +74,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> 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>
75 </bold> 75 </bold>
76 76
77 <ul class="tools links right"> 77 <ul class="tools right">
78 <li> 78 <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> 79 <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-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> 80 <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 %}favorite_border{% else %}favorite{% 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> 81 <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> 82 </li>
83 </ul> 83 </ul>
84 </div> 84 </div>
@@ -126,6 +126,11 @@
126 {{ form_label(form.isStarred) }} 126 {{ form_label(form.isStarred) }}
127 </div> 127 </div>
128 128
129 <div class="input-field col s6 with-checkbox">
130 {{ form_widget(form.isUnread) }}
131 {{ form_label(form.isUnread) }}
132 </div>
133
129 <div class="col s12"> 134 <div class="col s12">
130 <label>{{ 'entry.filters.preview_picture_help'|trans }}</label> 135 <label>{{ 'entry.filters.preview_picture_help'|trans }}</label>
131 </div> 136 </div>
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 e89aea3a..7fc7a552 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_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> 27 <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
28 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> 28 <i class="material-icons small">{% if entry.isStarred == 0 %}favorite_outline{% else %}favorite{% 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">navigation_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_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> 73 <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
74 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> 74 <i class="material-icons spall">{% if entry.isStarred == 0 %}favorite_outline{% else %}favorite{% endif %}</i>
75 <span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span> 75 <span>{{ 'entry.view.left_menu.set_as_favorite'|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,7 +94,7 @@
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">
@@ -129,7 +129,8 @@
129 {% endif %} 129 {% endif %}
130 {% if craue_setting('share_mail') %} 130 {% if craue_setting('share_mail') %}
131 <li> 131 <li>
132 <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{{ 'entry.view.left_menu.share_email_label'|trans }}"> 132 <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}">
133 <i class="material-icons">email</i>
133 <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> 134 <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span>
134 </a> 135 </a>
135 </li> 136 </li>
@@ -141,7 +142,7 @@
141 {% if craue_setting('show_printlink') %} 142 {% if craue_setting('show_printlink') %}
142 <li class="bold border-bottom hide-on-med-and-down"> 143 <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();"> 144 <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> 145 <i class="material-icons small">print</i>
145 <span>{{ 'entry.view.left_menu.print'|trans }}</span> 146 <span>{{ 'entry.view.left_menu.print'|trans }}</span>
146 </a> 147 </a>
147 <div class="collapsible-body"></div> 148 <div class="collapsible-body"></div>
@@ -151,7 +152,7 @@
151 152
152 <li class="bold"> 153 <li class="bold">
153 <a class="waves-effect collapsible-header"> 154 <a class="waves-effect collapsible-header">
154 <i class="mdi-file-file-download small"></i> 155 <i class="material-icons small">file_download</i>
155 <span>{{ 'entry.view.left_menu.download'|trans }}</span> 156 <span>{{ 'entry.view.left_menu.download'|trans }}</span>
156 </a> 157 </a>
157 <div class="collapsible-body"> 158 <div class="collapsible-body">
@@ -169,7 +170,7 @@
169 170
170 <li class="bold hide-on-large-only"> 171 <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 }) }}"> 172 <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> 173 <i class="material-icons small">delete</i>
173 <span>{{ 'entry.view.left_menu.delete'|trans }}</span> 174 <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
174 </a> 175 </a>
175 <div class="collapsible-body"></div> 176 <div class="collapsible-body"></div>
@@ -177,7 +178,7 @@
177 178
178 <li class="bold"> 179 <li class="bold">
179 <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> 180 <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}">
180 <i class="mdi-alert-error small"></i> 181 <i class="material-icons small">error</i>
181 <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span> 182 <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span>
182 </a> 183 </a>
183 <div class="collapsible-body"></div> 184 <div class="collapsible-body"></div>
@@ -193,12 +194,13 @@
193 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> 194 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
194 </header> 195 </header>
195 <aside> 196 <aside>
196 <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> 197 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
197 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 198 <span class="link"><i class="material-icons link">link</i> {{ entry.domainName|removeWww }}</span></a>
199 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
198 <div id="list"> 200 <div id="list">
199 {% for tag in entry.tags %} 201 {% for tag in entry.tags %}
200 <div class="chip"> 202 <div class="chip">
201 {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="mdi-action-delete"></i></a> 203 {{ tag.label }} <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a>
202 </div> 204 </div>
203 {% endfor %} 205 {% endfor %}
204 </div> 206 </div>
@@ -217,27 +219,17 @@
217 </article> 219 </article>
218 </div> 220 </div>
219 221
220<script type="text/javascript"> 222<script id="annotationroutes" type="application/json">
221 223{
222var app = new annotator.App(); 224 "prefix": "",
223app.include(annotator.ui.main, { 225 "urls": {
224 element: document.querySelector('article') 226 "create": "{{ path('annotations_post_annotation', { 'entry': entry.id }) }}",
225}); 227 "update": "{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}",
226app.include(annotator.storage.http, { 228 "destroy": "{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}",
227 prefix: '', 229 "search": "{{ path('annotations_get_annotations', { 'entry': entry.id }) }}"
228 urls: { 230 },
229 create: '{{ path('annotations_post_annotation', { 'entry': entry.id }) }}', 231 "entryId": "{{ entry.id }}"
230 update: '{{ path('annotations_put_annotation', { 'annotation': 'idAnnotation' }) }}', 232}</script>
231 destroy: '{{ path('annotations_delete_annotation', { 'annotation': 'idAnnotation' }) }}',
232 search: '{{ path('annotations_get_annotations', { 'entry': entry.id }) }}'
233 }
234});
235app
236.start()
237.then(function () {
238 app.annotations.load({entry: {{ entry.id }}});
239});
240</script>
241 233
242{% endblock %} 234{% endblock %}
243 235
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 25ad23dd..ed0ad2f6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -2,17 +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/materialize.min.js') }}"></script>
15 <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
16{% endblock %} 11{% endblock %}
17 12
18{% block header %} 13{% block header %}
@@ -31,8 +26,8 @@
31 <ul id="slide-out" class="side-nav fixed"> 26 <ul id="slide-out" class="side-nav fixed">
32 {% block logo %} 27 {% block logo %}
33 <li class="logo border-bottom"> 28 <li class="logo border-bottom">
34 <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> 29 <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
35 <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" /> 30 <img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }}" alt="wallabag logo" />
36 </a> 31 </a>
37 </li> 32 </li>
38 {% endblock %} 33 {% endblock %}
@@ -76,7 +71,7 @@
76 </li> 71 </li>
77 </ul> 72 </ul>
78 <div class="nav-wrapper nav-panels"> 73 <div class="nav-wrapper nav-panels">
79 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> 74 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a>
80 <div class="left action"> 75 <div class="left action">
81 {% block title %} 76 {% block title %}
82 {% endblock %} 77 {% endblock %}
@@ -85,22 +80,22 @@
85 <ul> 80 <ul>
86 <li class="bold"> 81 <li class="bold">
87 <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> 82 <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add">
88 <i class="mdi-content-add"></i> 83 <i class="material-icons">add</i>
89 </a> 84 </a>
90 </li> 85 </li>
91 <!--<li> 86 <!--<li>
92 <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> 87 <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search">
93 <i class="mdi-action-search"></i> 88 <i class="material-icons">search</i>
94 </a> 89 </a>
95 </li>--> 90 </li>-->
96 <li id="button_filters"> 91 <li id="button_filters">
97 <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> 92 <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right">
98 <i class="mdi-content-filter-list"></i> 93 <i class="material-icons">filter_list</i>
99 </a> 94 </a>
100 </li> 95 </li>
101 <li id="button_export"> 96 <li id="button_export">
102 <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export" class="nav-panel-menu button-collapse-right"> 97 <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export">
103 <i class="mdi-file-file-download"></i> 98 <i class="material-icons">file_download</i>
104 </a> 99 </a>
105 </li> 100 </li>
106 </ul> 101 </ul>
@@ -108,14 +103,14 @@
108 <form method="get" action="index.php"> 103 <form method="get" action="index.php">
109 <div class="input-field nav-panel-search" style="display: none"> 104 <div class="input-field nav-panel-search" style="display: none">
110 <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> 105 <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}">
111 <label for="search"><i class="mdi-action-search"></i></label> 106 <label for="search"><i class="material-icons search">search</i></label>
112 <i class="mdi-navigation-close"></i> 107 <i class="material-icons close">clear</i>
113 </div> 108 </div>
114 </form> 109 </form>
115 <div class="input-field nav-panel-add" style="display: none"> 110 <div class="input-field nav-panel-add" style="display: none">
116 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} 111 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
117 <label for="add" class="active"><i class="mdi-content-add"></i></label> 112 <label for="add" class="active"><i class="material-icons add">add</i></label>
118 <i class="mdi-navigation-close"></i> 113 <i class="material-icons close">clear</i>
119 </div> 114 </div>
120 </div> 115 </div>
121 </nav> 116 </nav>