diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
commit | 16dabc326311f084d671be188c7941bbb3c341c9 (patch) | |
tree | 3210a7688ea2bfa1bff5fd0422b52adf570edcdc /src/Wallabag/CoreBundle/Resources/views | |
parent | fdef5f460524215d806e244e5546865f4b8e01df (diff) | |
parent | 8263e71192989dc0fd28a41ac22f9c5b32eb11c4 (diff) | |
download | wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.gz wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.zst wallabag-16dabc326311f084d671be188c7941bbb3c341c9.zip |
Merge pull request #1436 from wallabag/v2-register
Public registration & oAuth2 \o/
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
12 files changed, 43 insertions, 135 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 152c5c28..c94c0044 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -45,7 +45,7 @@ | |||
45 | <script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script> | 45 | <script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script> |
46 | {% endblock %} | 46 | {% endblock %} |
47 | 47 | ||
48 | <title>{% block title %}{% endblock %} - wallabag</title> | 48 | <title>{% block title %}{% endblock %}</title> |
49 | {% endblock %} | 49 | {% endblock %} |
50 | </head> | 50 | </head> |
51 | 51 | ||
@@ -60,7 +60,7 @@ | |||
60 | 60 | ||
61 | {% block messages %}{% endblock %} | 61 | {% block messages %}{% endblock %} |
62 | 62 | ||
63 | <div id="content" class="w600p"> | 63 | <div id="content"> |
64 | {% block content %}{% endblock %} | 64 | {% block content %}{% endblock %} |
65 | </div> | 65 | </div> |
66 | </main> | 66 | </main> |
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 c90bb2e3..64305b16 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 | |||
@@ -135,6 +135,7 @@ | |||
135 | {{ form_rest(form.pwd) }} | 135 | {{ form_rest(form.pwd) }} |
136 | </form> | 136 | </form> |
137 | 137 | ||
138 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
138 | <h2>{% trans %}Add a user{% endtrans %}</h2> | 139 | <h2>{% trans %}Add a user{% endtrans %}</h2> |
139 | 140 | ||
140 | <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}> | 141 | <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}> |
@@ -150,9 +151,17 @@ | |||
150 | 151 | ||
151 | <fieldset class="w500p inline"> | 152 | <fieldset class="w500p inline"> |
152 | <div class="row"> | 153 | <div class="row"> |
153 | {{ form_label(form.new_user.password) }} | 154 | {{ form_label(form.new_user.plainPassword.first) }} |
154 | {{ form_errors(form.new_user.password) }} | 155 | {{ form_errors(form.new_user.plainPassword.first) }} |
155 | {{ form_widget(form.new_user.password) }} | 156 | {{ form_widget(form.new_user.plainPassword.first) }} |
157 | </div> | ||
158 | </fieldset> | ||
159 | |||
160 | <fieldset class="w500p inline"> | ||
161 | <div class="row"> | ||
162 | {{ form_label(form.new_user.plainPassword.second) }} | ||
163 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
164 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
156 | </div> | 165 | </div> |
157 | </fieldset> | 166 | </fieldset> |
158 | 167 | ||
@@ -165,5 +174,6 @@ | |||
165 | </fieldset> | 174 | </fieldset> |
166 | 175 | ||
167 | {{ form_rest(form.new_user) }} | 176 | {{ form_rest(form.new_user) }} |
177 | {% endif %} | ||
168 | </form> | 178 | </form> |
169 | {% endblock %} | 179 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig deleted file mode 100644 index 056d65b5..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | |||
9 | {% block content %} | ||
10 | <form> | ||
11 | <fieldset class="w500p center"> | ||
12 | <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2> | ||
13 | |||
14 | <p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}</p> | ||
15 | </fieldset> | ||
16 | </form> | ||
17 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig deleted file mode 100644 index 4476ea7b..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | |||
9 | {% block content %} | ||
10 | <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform"> | ||
11 | <fieldset class="w500p center"> | ||
12 | <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2> | ||
13 | |||
14 | {{ form_errors(form) }} | ||
15 | |||
16 | <p>Enter your email address below and we'll send you password reset instructions.</p> | ||
17 | |||
18 | <div class="row"> | ||
19 | {{ form_label(form.email) }} | ||
20 | {{ form_errors(form.email) }} | ||
21 | {{ form_widget(form.email) }} | ||
22 | </div> | ||
23 | |||
24 | <div class="row mts txtcenter"> | ||
25 | <button type="submit">Send me reset instructions</button> | ||
26 | </div> | ||
27 | </fieldset> | ||
28 | |||
29 | {{ form_rest(form) }} | ||
30 | </form> | ||
31 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig deleted file mode 100644 index 5437d20c..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | {% block messages %}{% endblock %} | ||
9 | |||
10 | {% block content %} | ||
11 | <form action="{{ path('login_check') }}" method="post" name="loginform"> | ||
12 | <fieldset class="w500p center"> | ||
13 | <h2 class="mbs txtcenter">{% trans %}Login to wallabag{% endtrans %}</h2> | ||
14 | {% if error %} | ||
15 | <div>{{ error.message }}</div> | ||
16 | {% endif %} | ||
17 | |||
18 | {% for flashMessage in app.session.flashbag.get('notice') %} | ||
19 | <p>{{ flashMessage }}</p> | ||
20 | {% endfor %} | ||
21 | |||
22 | <div class="row"> | ||
23 | <label class="col w150p" for="username">{% trans %}Username{% endtrans %}</label> | ||
24 | <input type="text" id="username" name="_username" value="{{ last_username }}" /> | ||
25 | </div> | ||
26 | |||
27 | <div class="row"> | ||
28 | <label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label> | ||
29 | <input type="password" id="password" name="_password" /> | ||
30 | </div> | ||
31 | |||
32 | <div class="row mts txtcenter"> | ||
33 | <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" /> | ||
34 | <button type="submit">Login</button> | ||
35 | <a href="{{ path('forgot_password') }}" class="small">Forgot your password?</a> | ||
36 | </div> | ||
37 | </fieldset> | ||
38 | </form> | ||
39 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig deleted file mode 100644 index fda88af2..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{% trans %}Change password{% endtrans %}{% endblock %} | ||
4 | |||
5 | {% block body_class %}login{% endblock %} | ||
6 | |||
7 | {% block menu %}{% endblock %} | ||
8 | |||
9 | {% block content %} | ||
10 | <form action="{{ path('forgot_password_reset', {'token': token}) }}" method="post" name="loginform"> | ||
11 | <fieldset class="w500p center"> | ||
12 | <h2 class="mbs txtcenter">{% trans %}Change password{% endtrans %}</h2> | ||
13 | |||
14 | {{ form_errors(form) }} | ||
15 | |||
16 | <div class="row"> | ||
17 | {{ form_label(form.new_password.first) }} | ||
18 | {{ form_errors(form.new_password.first) }} | ||
19 | {{ form_widget(form.new_password.first) }} | ||
20 | </div> | ||
21 | |||
22 | <div class="row"> | ||
23 | {{ form_label(form.new_password.second) }} | ||
24 | {{ form_errors(form.new_password.second) }} | ||
25 | {{ form_widget(form.new_password.second) }} | ||
26 | </div> | ||
27 | |||
28 | <div class="row mts txtcenter"> | ||
29 | <button type="submit">Change password</button> | ||
30 | </div> | ||
31 | </fieldset> | ||
32 | |||
33 | {{ form_rest(form) }} | ||
34 | </form> | ||
35 | {% 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 3d573eaa..de4ed2e7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -52,7 +52,7 @@ | |||
52 | </li> | 52 | </li> |
53 | <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> | 53 | <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> |
54 | <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li> | 54 | <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li> |
55 | <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> | 55 | <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> |
56 | </ul> | 56 | </ul> |
57 | {% endblock %} | 57 | {% endblock %} |
58 | 58 | ||
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 | |||