diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-17 15:32:59 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-17 15:32:59 +0200 |
commit | 925d8ab316127be8dc0cea2515cfc1d419b1d5e8 (patch) | |
tree | 41f81822db306039281230f5fba5c659e3c177d0 /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry | |
parent | 0a3a5f6cd702f224c97ce8decadccad5347bde2c (diff) | |
parent | d5b28518e9c1c654e3eaa913603dd08fc7b04677 (diff) | |
download | wallabag-925d8ab316127be8dc0cea2515cfc1d419b1d5e8.tar.gz wallabag-925d8ab316127be8dc0cea2515cfc1d419b1d5e8.tar.zst wallabag-925d8ab316127be8dc0cea2515cfc1d419b1d5e8.zip |
Merge pull request #1337 from modos189/v2_material
fixes material
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry')
3 files changed, 50 insertions, 2 deletions
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 101f5939..d0ebdad6 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 | |||
@@ -18,7 +18,6 @@ | |||
18 | {% if entries is not empty %} | 18 | {% if entries is not empty %} |
19 | <div class="results clearfix"> | 19 | <div class="results clearfix"> |
20 | <div class="nb-results left">{{ entries.count }} {% trans %}entries{% endtrans %}</div> | 20 | <div class="nb-results left">{{ entries.count }} {% trans %}entries{% endtrans %}</div> |
21 | <div class="left"><form>{{ form_rest(form) }}<button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">Filter</button></form></div> | ||
22 | <ul class="pagination right"> | 21 | <ul class="pagination right"> |
23 | {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %} | 22 | {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %} |
24 | <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> | 23 | <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> |
@@ -62,4 +61,50 @@ | |||
62 | {% endfor %} | 61 | {% endfor %} |
63 | </ul> | 62 | </ul> |
64 | {% endif %} | 63 | {% endif %} |
64 | |||
65 | |||
66 | <!-- Filters --> | ||
67 | <div id="filters" class="side-nav fixed right-aligned"> | ||
68 | <form> | ||
69 | |||
70 | <h4 class="center">{% trans %}Filters{% endtrans %}</h1> | ||
71 | |||
72 | <div class="row"> | ||
73 | |||
74 | <div class="col s12"> | ||
75 | <label>{% trans %}Reading time in minutes{% endtrans %}</label> | ||
76 | </div> | ||
77 | <div class="input-field col s6"> | ||
78 | {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} | ||
79 | <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label> | ||
80 | </div> | ||
81 | <div class="input-field col s6"> | ||
82 | {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} | ||
83 | <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label> | ||
84 | </div> | ||
85 | |||
86 | <div class="col s12"> | ||
87 | <label>{% trans %}Create at{% endtrans %}</label> | ||
88 | </div> | ||
89 | <div class="input-field col s6"> | ||
90 | {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }} | ||
91 | <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label> | ||
92 | </div> | ||
93 | <div class="input-field col s6"> | ||
94 | {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }} | ||
95 | <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label> | ||
96 | </div> | ||
97 | |||
98 | <div class="col s6"> | ||
99 | <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a> | ||
100 | </div> | ||
101 | |||
102 | <div class="col s6"> | ||
103 | <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filter{% endtrans %}</button> | ||
104 | </div> | ||
105 | |||
106 | </div> | ||
107 | |||
108 | </form> | ||
109 | </div> | ||
65 | {% endblock %} | 110 | {% 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 561d0183..b92c41b6 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 | |||
@@ -3,6 +3,9 @@ | |||
3 | {% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} | 3 | {% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} |
4 | 4 | ||
5 | {% block menu %} | 5 | {% block menu %} |
6 | <div class="progress"> | ||
7 | <div class="determinate"></div> | ||
8 | </div> | ||
6 | <nav class="hide-on-large-only"> | 9 | <nav class="hide-on-large-only"> |
7 | <div class="nav-wrapper cyan darken-1"> | 10 | <div class="nav-wrapper cyan darken-1"> |
8 | <ul> | 11 | <ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig index 1a3ab86d..fda53e5b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig | |||
@@ -8,7 +8,7 @@ | |||
8 | <span class="black-text">{{ form_errors(form.url) }}</span> | 8 | <span class="black-text">{{ form_errors(form.url) }}</span> |
9 | {% endif %} | 9 | {% endif %} |
10 | 10 | ||
11 | {{ form_widget(form.url) }} | 11 | {{ form_widget(form.url, { 'attr': {'autocomplete': 'off'} }) }} |
12 | 12 | ||
13 | <div class="hidden">{{ form_rest(form) }}</div> | 13 | <div class="hidden">{{ form_rest(form) }}</div> |
14 | </form> | 14 | </form> |