aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-10-08 13:44:04 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-10-08 13:44:04 +0200
commitcf0ea8f113548191cdeb8d3727dd6d2ad25d19ed (patch)
tree2a90828aead04950e3cb141f4949da30d244d5fb /src
parent9dbcf9d418917201ec6b2598c84d5ecb1a94bfbc (diff)
parentfa853bb603d4c1d25ead3f26722a10906dd748d4 (diff)
downloadwallabag-cf0ea8f113548191cdeb8d3727dd6d2ad25d19ed.tar.gz
wallabag-cf0ea8f113548191cdeb8d3727dd6d2ad25d19ed.tar.zst
wallabag-cf0ea8f113548191cdeb8d3727dd6d2ad25d19ed.zip
Merge pull request #1472 from wallabag/v2-clean-views
fix #1470: clean material theme
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig27
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig58
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig69
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig57
4 files changed, 0 insertions, 211 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig
deleted file mode 100644
index 8f698e17..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig
+++ /dev/null
@@ -1,27 +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 <main class="valign-wrapper">
11 <div class="valign row">
12 <h1>{% trans %}Forgot password{% endtrans %}</h1>
13 <div class="card sw">
14 <div class="card-content">
15 <span class="card-title black-text">
16 <p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}</p>
17 </span>
18 </div>
19 </div>
20 </div>
21 </main>
22 <style>
23 main {
24 padding: 0;
25 }
26 </style>
27{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
deleted file mode 100644
index 7d916237..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
+++ /dev/null
@@ -1,58 +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 <main class="valign-wrapper">
11 <div class="valign row">
12 <div class="card sw">
13 <div class="center"><img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
14 <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform">
15 <div class="card-content">
16 <span class="black-text"><p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p></span>
17
18 {% if form_errors(form) %}
19 <span class="black-text">{{ form_errors(form) }}</span>
20 {% endif %}
21
22 {% for flashMessage in app.session.flashbag.get('notice') %}
23 <span class="black-text"><p>{{ flashMessage }}</p></span>
24 {% endfor %}
25
26 {% if form_errors(form.email) %}
27 <span class="black-text">{{ form_errors(form.email) }}</span>
28 {% endif %}
29
30 <div class="input-field s12">
31 {{ form_label(form.email) }}
32 {{ form_widget(form.email) }}
33 </div>
34
35 </div>
36 <div class="card-action">
37 <button class="btn waves-effect waves-light" type="submit" name="send">
38 {% trans %}Send{% endtrans %}
39 <i class="mdi-content-send right"></i>
40 </button>
41 </div>
42 {{ form_rest(form) }}
43 </form>
44 </div>
45 <div class="center">
46 <a href="{{ path('login') }}">{% trans %}Back to login{% endtrans %}</a>
47 </div>
48 </div>
49 </main>
50 <style>
51 main {
52 padding: 0;
53 }
54 </style>
55{% endblock %}
56
57{% block footer %}
58{% 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
deleted file mode 100644
index b0da42ce..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ /dev/null
@@ -1,69 +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 <main class="valign-wrapper">
12 <div class="valign row">
13 <div class="card sw">
14 <div class="center"><img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
15 <form action="{{ path('login_check') }}" method="post" name="loginform">
16 <div class="card-content">
17
18 {% if error %}
19 <span class="black-text">{{ error.message }}</span>
20 {% endif %}
21
22 {% for flashMessage in app.session.flashbag.get('notice') %}
23 <span class="black-text"><p>{{ flashMessage }}</p></span>
24 {% endfor %}
25
26 <div class="row">
27
28 <div class="input-field col s12">
29 <label for="username">{% trans %}Username{% endtrans %}</label>
30 <input type="text" id="username" name="_username" value="{{ last_username }}" />
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>
42
43 </div>
44
45 </div>
46 <div class="card-action">
47 <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
48 <button class="btn waves-effect waves-light" type="submit" name="send">
49 {% trans %}Login{% endtrans %}
50 <i class="mdi-content-send right"></i>
51 </button>
52 <a href="{{ path('fos_user_registration_register') }}">{% trans %}Register{% endtrans %}</a>
53 </div>
54 </form>
55 </div>
56 <div class="center">
57 <a href="{{ path('fos_user_resetting_request') }}">{% trans %}Forgot your password?{% endtrans %}</a>
58 </div>
59 </div>
60 </main>
61 <style>
62 main {
63 padding: 0;
64 }
65 </style>
66{% endblock %}
67
68{% block footer %}
69{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig
deleted file mode 100644
index 09d0b634..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig
+++ /dev/null
@@ -1,57 +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 <main class="valign-wrapper">
11 <div class="valign row">
12 <div class="card sw">
13 <form action="{{ path('forgot_password_reset', {'token': token}) }}" method="post" name="loginform">
14 <div class="card-content">
15
16 <span class="card-title black-text"><p>{% trans %}Change password{% endtrans %}</p></span>
17
18 {% if form_errors(form) %}
19 <span class="black-text">{{ form_errors(form) }}</span>
20 {% endif %}
21
22 {% if form_errors(form.new_password.first) %}
23 <span class="black-text">{{ form_errors(form.new_password.first) }}</span>
24 {% endif %}
25
26 {% if form_errors(form.new_password.second) %}
27 <span class="black-text">{{ form_errors(form.new_password.second) }}</span>
28 {% endif %}
29
30 <div class="input-field s12">
31 {{ form_label(form.new_password.first) }}
32 {{ form_widget(form.new_password.first) }}
33 </div>
34
35 <div class="input-field s12">
36 {{ form_label(form.new_password.second) }}
37 {{ form_widget(form.new_password.second) }}
38 </div>
39
40 </div>
41 <div class="card-action">
42 <button class="btn waves-effect waves-light" type="submit" name="send">
43 {% trans %}Change password{% endtrans %}
44 <i class="mdi-content-send right"></i>
45 </button>
46 </div>
47 {{ form_rest(form) }}
48 </form>
49 </div>
50 </div>
51 </main>
52 <style>
53 main {
54 padding: 0;
55 }
56 </style>
57{% endblock %}