diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy')
4 files changed, 49 insertions, 15 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 4c01b128..3548f590 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 | |||
@@ -14,6 +14,9 @@ | |||
14 | {{ form_errors(form.config.theme) }} | 14 | {{ form_errors(form.config.theme) }} |
15 | {{ form_widget(form.config.theme) }} | 15 | {{ form_widget(form.config.theme) }} |
16 | </div> | 16 | </div> |
17 | <a href="#" title="{{ 'config.form_settings.help_theme'|trans }}"> | ||
18 | <i class="material-icons">live_help</i> | ||
19 | </a> | ||
17 | </fieldset> | 20 | </fieldset> |
18 | 21 | ||
19 | <fieldset class="w500p inline"> | 22 | <fieldset class="w500p inline"> |
@@ -22,6 +25,9 @@ | |||
22 | {{ form_errors(form.config.items_per_page) }} | 25 | {{ form_errors(form.config.items_per_page) }} |
23 | {{ form_widget(form.config.items_per_page) }} | 26 | {{ form_widget(form.config.items_per_page) }} |
24 | </div> | 27 | </div> |
28 | <a href="#" title="{{ 'config.form_settings.help_items_per_page'|trans }}"> | ||
29 | <i class="material-icons">live_help</i> | ||
30 | </a> | ||
25 | </fieldset> | 31 | </fieldset> |
26 | 32 | ||
27 | <fieldset class="w500p inline"> | 33 | <fieldset class="w500p inline"> |
@@ -34,6 +40,9 @@ | |||
34 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> | 40 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> |
35 | </p> | 41 | </p> |
36 | </div> | 42 | </div> |
43 | <a href="#" title="{{ 'config.form_settings.help_reading_speed'|trans }}"> | ||
44 | <i class="material-icons">live_help</i> | ||
45 | </a> | ||
37 | </fieldset> | 46 | </fieldset> |
38 | 47 | ||
39 | <fieldset class="w500p inline"> | 48 | <fieldset class="w500p inline"> |
@@ -50,6 +59,9 @@ | |||
50 | {{ form_errors(form.config.language) }} | 59 | {{ form_errors(form.config.language) }} |
51 | {{ form_widget(form.config.language) }} | 60 | {{ form_widget(form.config.language) }} |
52 | </div> | 61 | </div> |
62 | <a href="#" title="{{ 'config.form_settings.help_language'|trans }}"> | ||
63 | <i class="material-icons">live_help</i> | ||
64 | </a> | ||
53 | </fieldset> | 65 | </fieldset> |
54 | 66 | ||
55 | <fieldset class="w500p inline"> | 67 | <fieldset class="w500p inline"> |
@@ -62,10 +74,16 @@ | |||
62 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | 74 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> |
63 | </p> | 75 | </p> |
64 | </div> | 76 | </div> |
77 | <a href="#" title="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}"> | ||
78 | <i class="material-icons">live_help</i> | ||
79 | </a> | ||
80 | </fieldset> | ||
65 | 81 | ||
82 | <fieldset class="w500p inline"> | ||
66 | <div class="row"> | 83 | <div class="row"> |
67 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> | 84 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> |
68 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a> | 85 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a> |
86 | <br/> | ||
69 | <img id="androidQrcode" /> | 87 | <img id="androidQrcode" /> |
70 | <script> | 88 | <script> |
71 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); | 89 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); |
@@ -161,6 +179,9 @@ | |||
161 | {{ form_errors(form.user.twoFactorAuthentication) }} | 179 | {{ form_errors(form.user.twoFactorAuthentication) }} |
162 | {{ form_widget(form.user.twoFactorAuthentication) }} | 180 | {{ form_widget(form.user.twoFactorAuthentication) }} |
163 | </div> | 181 | </div> |
182 | <a href="#" title="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}"> | ||
183 | <i class="material-icons">live_help</i> | ||
184 | </a> | ||
164 | </fieldset> | 185 | </fieldset> |
165 | {% endif %} | 186 | {% endif %} |
166 | 187 | ||
@@ -204,6 +225,10 @@ | |||
204 | {{ form_start(form.pwd) }} | 225 | {{ form_start(form.pwd) }} |
205 | {{ form_errors(form.pwd) }} | 226 | {{ form_errors(form.pwd) }} |
206 | 227 | ||
228 | <div class="row"> | ||
229 | {{ 'config.form_password.description'|trans }} | ||
230 | </div> | ||
231 | |||
207 | <fieldset class="w500p inline"> | 232 | <fieldset class="w500p inline"> |
208 | <div class="row"> | 233 | <div class="row"> |
209 | {{ form_label(form.pwd.old_password) }} | 234 | {{ form_label(form.pwd.old_password) }} |
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 86c1c5ec..d1baa283 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 | |||
@@ -9,7 +9,17 @@ | |||
9 | {% endblock %} | 9 | {% endblock %} |
10 | 10 | ||
11 | {% block content %} | 11 | {% block content %} |
12 | {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} | 12 | |
13 | <div class="results"> | ||
14 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | ||
15 | <div class="pagination"> | ||
16 | <i class="btn-clickable download-btn material-icons md-36">file_download</i> | ||
17 | <i class="btn-clickable filter-btn material-icons md-36">filter_list</i> | ||
18 | {% if entries.getNbPages > 1 %} | ||
19 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
20 | {% endif %} | ||
21 | </div> | ||
22 | </div> | ||
13 | 23 | ||
14 | {% for entry in entries %} | 24 | {% for entry in entries %} |
15 | <div id="entry-{{ entry.id|e }}" class="entry"> | 25 | <div id="entry-{{ entry.id|e }}" class="entry"> |
@@ -24,6 +34,11 @@ | |||
24 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | 34 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} |
25 | {% endif %} | 35 | {% endif %} |
26 | </span> | 36 | </span> |
37 | <span class="tool created-at"> | ||
38 | <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}"> | ||
39 | {{ entry.createdAt|date('Y-m-d') }} | ||
40 | </i> | ||
41 | </span> | ||
27 | </div> | 42 | </div> |
28 | 43 | ||
29 | <ul class="tools links"> | 44 | <ul class="tools links"> |
@@ -50,6 +65,10 @@ | |||
50 | </div> | 65 | </div> |
51 | {% endfor %} | 66 | {% endfor %} |
52 | 67 | ||
68 | {% if entries.getNbPages > 1 %} | ||
69 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
70 | {% endif %} | ||
71 | |||
53 | <!-- Export --> | 72 | <!-- Export --> |
54 | <aside id="download-form"> | 73 | <aside id="download-form"> |
55 | {% set currentRoute = app.request.attributes.get('_route') %} | 74 | {% set currentRoute = app.request.attributes.get('_route') %} |
@@ -75,7 +94,7 @@ | |||
75 | 94 | ||
76 | <!-- Filter --> | 95 | <!-- Filter --> |
77 | {% if form is not null %} | 96 | {% if form is not null %} |
78 | <div id="filters" class=""> | 97 | <div id="filters"> |
79 | <form method="get" action="{{ path('all') }}"> | 98 | <form method="get" action="{{ path('all') }}"> |
80 | <h2>{{ 'entry.filters.title'|trans }}</h2> | 99 | <h2>{{ 'entry.filters.title'|trans }}</h2> |
81 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> | 100 | <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">×</a> |
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 deleted file mode 100644 index faaa21a8..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | {% block pager %} | ||
2 | <div class="results"> | ||
3 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | ||
4 | <div class="pagination"> | ||
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> | ||
7 | {% if entries.getNbPages > 1 %} | ||
8 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | ||
9 | {% endif %} | ||
10 | </div> | ||
11 | </div> | ||
12 | {% 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 a046f7cf..cd4ed3fa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -14,7 +14,9 @@ | |||
14 | <header class="w600p center mbm"> | 14 | <header class="w600p center mbm"> |
15 | <h1 class="logo"> | 15 | <h1 class="logo"> |
16 | {% block logo %} | 16 | {% block logo %} |
17 | <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /> | 17 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> |
18 | <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /> | ||
19 | </a> | ||
18 | {% endblock %} | 20 | {% endblock %} |
19 | </h1> | 21 | </h1> |
20 | </header> | 22 | </header> |