diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
5 files changed, 27 insertions, 7 deletions
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 0ff21f22..0d8e9f24 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 | |||
@@ -15,7 +15,9 @@ | |||
15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> | 15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> |
16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> | 16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> |
17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> | 17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> |
18 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
18 | <li class="tab col s3"><a href="#set5">{% trans %}Add a user{% endtrans %}</a></li> | 19 | <li class="tab col s3"><a href="#set5">{% trans %}Add a user{% endtrans %}</a></li> |
20 | {% endif %} | ||
19 | </ul> | 21 | </ul> |
20 | </div> | 22 | </div> |
21 | 23 | ||
@@ -175,7 +177,7 @@ | |||
175 | </form> | 177 | </form> |
176 | </div> | 178 | </div> |
177 | 179 | ||
178 | 180 | {% if is_granted('ROLE_SUPER_ADMIN') %} | |
179 | <div id="set5" class="col s12"> | 181 | <div id="set5" class="col s12"> |
180 | <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_user) }}> | 182 | <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_user) }}> |
181 | {{ form_errors(form.new_user) }} | 183 | {{ form_errors(form.new_user) }} |
@@ -190,9 +192,17 @@ | |||
190 | 192 | ||
191 | <div class="row"> | 193 | <div class="row"> |
192 | <div class="input-field col s12"> | 194 | <div class="input-field col s12"> |
193 | {{ form_label(form.new_user.password) }} | 195 | {{ form_label(form.new_user.plainPassword.first) }} |
194 | {{ form_errors(form.new_user.password) }} | 196 | {{ form_errors(form.new_user.plainPassword.first) }} |
195 | {{ form_widget(form.new_user.password) }} | 197 | {{ form_widget(form.new_user.plainPassword.first) }} |
198 | </div> | ||
199 | </div> | ||
200 | |||
201 | <div class="row"> | ||
202 | <div class="input-field col s12"> | ||
203 | {{ form_label(form.new_user.plainPassword.second) }} | ||
204 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
205 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
196 | </div> | 206 | </div> |
197 | </div> | 207 | </div> |
198 | 208 | ||
@@ -211,6 +221,7 @@ | |||
211 | 221 | ||
212 | </form> | 222 | </form> |
213 | </div> | 223 | </div> |
224 | {% endif %} | ||
214 | </div> | 225 | </div> |
215 | 226 | ||
216 | </div> | 227 | </div> |
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 4eb6d2b8..b0da42ce 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 | |||
@@ -49,11 +49,12 @@ | |||
49 | {% trans %}Login{% endtrans %} | 49 | {% trans %}Login{% endtrans %} |
50 | <i class="mdi-content-send right"></i> | 50 | <i class="mdi-content-send right"></i> |
51 | </button> | 51 | </button> |
52 | <a href="{{ path('fos_user_registration_register') }}">{% trans %}Register{% endtrans %}</a> | ||
52 | </div> | 53 | </div> |
53 | </form> | 54 | </form> |
54 | </div> | 55 | </div> |
55 | <div class="center"> | 56 | <div class="center"> |
56 | <a href="{{ path('forgot_password') }}">{% trans %}Forgot your password?{% endtrans %}</a> | 57 | <a href="{{ path('fos_user_resetting_request') }}">{% trans %}Forgot your password?{% endtrans %}</a> |
57 | </div> | 58 | </div> |
58 | </div> | 59 | </div> |
59 | </main> | 60 | </main> |
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 10dede8a..36e276f9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -46,8 +46,7 @@ | |||
46 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> | 46 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> |
47 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> | 47 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> |
48 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> | 48 | <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> |
49 | <li class="bold border-bottom {% if currentRoute == 'about' %}active{% endif %}"><a class="waves-effect" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a></li> | 49 | <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> |
50 | <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | ||
51 | </ul> | 50 | </ul> |
52 | <div class="nav-wrapper nav-panels"> | 51 | <div class="nav-wrapper nav-panels"> |
53 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> | 52 | <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> |
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 a5742905..1fe4a533 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 | |||
@@ -24,6 +24,10 @@ body { | |||
24 | background: #f0f0f0; | 24 | background: #f0f0f0; |
25 | } | 25 | } |
26 | 26 | ||
27 | body.login main { | ||
28 | padding: 0; | ||
29 | } | ||
30 | |||
27 | #warning_message { | 31 | #warning_message { |
28 | position: fixed; | 32 | position: fixed; |
29 | background-color: #ff6347; | 33 | background-color: #ff6347; |
@@ -250,9 +254,14 @@ main ul.row { | |||
250 | } | 254 | } |
251 | 255 | ||
252 | .card .card-action a { | 256 | .card .card-action a { |
257 | color: #ffffff; | ||
253 | margin: 0; | 258 | margin: 0; |
254 | } | 259 | } |
255 | 260 | ||
261 | .card .card-action a:hover { | ||
262 | color: #ffffff; | ||
263 | } | ||
264 | |||
256 | .settings .div_tabs { | 265 | .settings .div_tabs { |
257 | padding-bottom: 15px; | 266 | padding-bottom: 15px; |
258 | } | 267 | } |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png index 32543a44..c90aa46f 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png | |||
Binary files differ | |||