aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig37
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig26
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig10
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css45
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js14
5 files changed, 112 insertions, 20 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 7777dc7f..4fbc4473 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,40 @@
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
78 <div class="input-field col s6">
79 {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
80 <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label>
81 </div>
82
83 <div class="input-field col s6">
84 {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
85 <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
86 </div>
87
88 <div class="col s6">
89 <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a>
90 </div>
91
92 <div class="col s6">
93 <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filter{% endtrans %}</button>
94 </div>
95
96 </div>
97
98 </form>
99 </div>
65{% endblock %} 100{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 73abc3f8..2c513ffe 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -23,19 +23,23 @@
23 <span class="black-text"><p>{{ flashMessage }}</p></span> 23 <span class="black-text"><p>{{ flashMessage }}</p></span>
24 {% endfor %} 24 {% endfor %}
25 25
26 <div class="input-field s12"> 26 <div class="row">
27 <label for="username">{% trans %}Username{% endtrans %}</label>
28 <input type="text" id="username" name="_username" value="{{ last_username }}" />
29 </div>
30 27
31 <div class="input-field s12"> 28 <div class="input-field col s12">
32 <label for="password">{% trans %}Password{% endtrans %}</label> 29 <label for="username">{% trans %}Username{% endtrans %}</label>
33 <input type="password" id="password" name="_password" /> 30 <input type="text" id="username" name="_username" value="{{ last_username }}" />
34 </div> 31 </div>
32
33 <div class="input-field col s12">
34 <label for="password">{% trans %}Password{% endtrans %}</label>
35 <input type="password" id="password" name="_password" />
36 </div>
37
38 <div class="input-field col s12">
39 <input type="checkbox" id="remember_me" name="_remember_me" checked />
40 <label for="remember_me">{% trans %}Keep me logged in{% endtrans %}</label>
41 </div>
35 42
36 <div class="input-field s12">
37 <input type="checkbox" id="remember_me" name="_remember_me" checked />
38 <label for="remember_me">{% trans %}Keep me logged in{% endtrans %}</label>
39 </div> 43 </div>
40 44
41 </div> 45 </div>
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 17136566..554865d7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -57,6 +57,7 @@
57 <ul> 57 <ul>
58 <li class="bold"><a class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li> 58 <li class="bold"><a class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
59 <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a> 59 <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a>
60 <li id="button_filters"><a href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"><i class="mdi-content-filter-list"></i></a></li>
60 </ul> 61 </ul>
61 </div> 62 </div>
62 <form method="get" action="index.php"> 63 <form method="get" action="index.php">
@@ -68,16 +69,9 @@
68 </form> 69 </form>
69 <div class="input-field nav-panel-add" style="display: none"> 70 <div class="input-field nav-panel-add" style="display: none">
70 {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} 71 {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }}
71 <label for="add"><i class="mdi-content-add"></i></label> 72 <label for="add" class="active"><i class="mdi-content-add"></i></label>
72 <i class="mdi-navigation-close"></i> 73 <i class="mdi-navigation-close"></i>
73 </div> 74 </div>
74 <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
75 <div class="input-field nav-panel-add" style="display: none">
76 <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}">
77 <label for="add"><i class="mdi-content-add"></i></label>
78 <i class="mdi-navigation-close"></i>
79 </div>
80 </form>-->
81 </div> 75 </div>
82 </nav> 76 </nav>
83{% endblock %} 77{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index bf7e667e..2497e3e9 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -60,6 +60,10 @@ nav, main, footer {
60 1 = Nav 60 1 = Nav
61 ========================================================================== */ 61 ========================================================================== */
62 62
63nav input {
64 color: #aaa;
65}
66
63.nav-wrapper .button-collapse { 67.nav-wrapper .button-collapse {
64 padding: 0px 15px; 68 padding: 0px 15px;
65} 69}
@@ -96,6 +100,38 @@ nav, main, footer {
96 white-space: nowrap; 100 white-space: nowrap;
97} 101}
98 102
103.nav-panels .input-field input {
104 display: block;
105 line-height: inherit;
106 padding-left: 4rem !important;
107 width: calc(100% - 8rem);
108}
109
110.nav-panels .input-field input:focus {
111 background-color: #fff;
112 border: 0;
113 box-shadow: none;
114 color: #444;
115}
116
117.input-field.nav-panel-add label {
118 left: 1rem;
119}
120
121.input-field.nav-panel-add .mdi-navigation-close {
122 position: absolute;
123 top: 0;
124 right: 1rem;
125 color: transparent;
126 cursor: pointer;
127 font-size: 2rem;
128 transition: .3s color;
129}
130
131#button_filters {
132 display: none;
133}
134
99/* ========================================================================== 135/* ==========================================================================
100 2 = Side-nav 136 2 = Side-nav
101 ========================================================================== */ 137 ========================================================================== */
@@ -133,6 +169,15 @@ nav, main, footer {
133} 169}
134 170
135/* ========================================================================== 171/* ==========================================================================
172 * 3 = Filters slider
173 * ========================================================================== */
174
175#filters button {
176 padding: 0px;
177 width: 100%;
178}
179
180/* ==========================================================================
136 3 = Cards 181 3 = Cards
137 ========================================================================== */ 182 ========================================================================== */
138 183
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 9341cb5a..4adc1a8d 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -1,3 +1,16 @@
1function init_filters() {
2 // no display if filters not aviable
3 if ($("div").is("#filters")) {
4 $('#button_filters').show();
5 $('.button-collapse-right').sideNav({ edge: 'right' });
6 $('#filters').css({ "left": "auto" });
7 $('#clean_form_filters').click(function(){
8 $('#filters input').val('');
9 return false;
10 });
11 }
12}
13
1$(document).ready(function(){ 14$(document).ready(function(){
2 // sideNav 15 // sideNav
3 $('.button-collapse').sideNav(); 16 $('.button-collapse').sideNav();
@@ -5,6 +18,7 @@ $(document).ready(function(){
5 $('.collapsible').collapsible({ 18 $('.collapsible').collapsible({
6 accordion : false 19 accordion : false
7 }); 20 });
21 init_filters();
8 22
9 $('#nav-btn-add').click(function(){ 23 $('#nav-btn-add').click(function(){
10 $(".nav-panel-buttom").hide(100); 24 $(".nav-panel-buttom").hide(100);