Skip to content
This repository was archived by the owner on Sep 17, 2021. It is now read-only.

Updating the way we interact with Flask-WTF. Closes Issue #494. #495

Merged
scriptsrc merged 2 commits into from
Jan 10, 2017
Merged

Updating the way we interact with Flask-WTF. Closes Issue #494. #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b33a2e8
Updating the way we interact with Flask-WTF. Closes Issue #494.
Jan 10, 2017
7c6e530
Fixing the jinja templates.
Jan 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions security_monkey/templates/security/forgot_password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<body role="document">

<div class="container">

<!-- Fixed navbar -->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
Expand All @@ -52,15 +52,15 @@
<form action="{{ url_for_security('forgot_password') }}" method="POST" name="forgot_password_form" class="form-signin">
{% include "security/_messages.html" %}
<h1>Send password reset instructions</h1>
<input id="csrf_token" name="csrf_token" type="hidden" value="{{ forgot_password_form.generate_csrf_token() }}">
{{ forgot_password_form.csrf_token }}
<input type="email" class="form-control" placeholder="Email address" id="email" name="email" required autofocus>
{{ render_errors(forgot_password_form.email) }}
<button class="btn btn-lg btn-primary btn-block" id="submit" name="submit" type="submit" value="Recover Password">Recover Password</button>
{% include "security/_menu.html" %}
</form>

</div>

<div class="container-fluid">
</div>
<!-- Bootstrap core JavaScript
Expand Down
10 changes: 5 additions & 5 deletions security_monkey/templates/security/login_user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<body role="document">

<div class="container">

<!-- Fixed navbar -->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
Expand All @@ -47,7 +47,7 @@
<!--/.nav-collapse -->
</div>
</div>

{% from "security/_macros.html" import render_errors, render_field, render_generic_error %}
<form action="{{ url_for_security('login') }}" method="POST" name="login_user_form" class="form-signin">
{% include "security/_messages.html" %}
Expand All @@ -58,7 +58,7 @@ <h1>Login</h1>

<br />
<div class="login-or"><hr class="hr-or"><span class="span-or">OR</span></div>
<input id="csrf_token" name="csrf_token" type="hidden" value="{{ login_user_form.generate_csrf_token() }}">
{{ login_user_form.csrf_token }}
<input type="email" class="form-control" placeholder="Email address" id="email" name="email" required autofocus>
<input type="password" class="form-control" placeholder="Password" id="password" name="password" required>
{{ render_generic_error(login_user_form.email, login_user_form.password) }}
Expand All @@ -70,9 +70,9 @@ <h1>Login</h1>
{% include "security/_menu.html" %}
</div>
</form>

</div>

<div class="container-fluid">
</div>
<!-- Bootstrap core JavaScript
Expand Down
6 changes: 3 additions & 3 deletions security_monkey/templates/security/register_user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<body role="document">

<div class="container">

<!-- Fixed navbar -->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
Expand All @@ -53,7 +53,7 @@
<form action="{{ url_for_security('register') }}" method="POST" name="register_user_form" class="form-signin">
{% include "security/_messages.html" %}
<h1>Register</h1>
<input id="csrf_token" name="csrf_token" type="hidden" value="{{ register_user_form.generate_csrf_token() }}">
{{ register_user_form.csrf_token }}
<input type="email" class="form-control" placeholder="Email address" id="email" name="email" required autofocus>
{{ render_errors(register_user_form.email) }}
<input type="password" class="form-control" placeholder="Password" id="password" name="password" required>
Expand All @@ -67,7 +67,7 @@ <h1>Register</h1>
</form>

</div>

<div class="container-fluid">
</div>
<!-- Bootstrap core JavaScript
Expand Down
6 changes: 3 additions & 3 deletions security_monkey/templates/security/reset_password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<body role="document">

<div class="container">

<!-- Fixed navbar -->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
Expand All @@ -53,7 +53,7 @@
<form action="{{ url_for_security('reset_password', token=reset_password_token) }}" method="POST" name="reset_password_form" class="form-signin">
{% include "security/_messages.html" %}
<h1>Reset password</h1>
<input id="csrf_token" name="csrf_token" type="hidden" value="{{ reset_password_form.generate_csrf_token() }}">
{{ reset_password_form.csrf_token }}
<input type="password" class="form-control" placeholder="Password" id="password" name="password" required>
{{ render_errors(reset_password_form.password) }}
<input type="password" class="form-control" placeholder="Confirm Password" id="password_confirm" name="password_confirm" required>
Expand All @@ -63,7 +63,7 @@ <h1>Reset password</h1>
</form>

</div>

<div class="container-fluid">
</div>
<!-- Bootstrap core JavaScript
Expand Down
6 changes: 3 additions & 3 deletions security_monkey/templates/security/send_confirmation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<body role="document">

<div class="container">

<!-- Fixed navbar -->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
Expand All @@ -52,15 +52,15 @@
<form action="{{ url_for_security('send_confirmation') }}" method="POST" name="send_confirmation_form" class="form-signin">
{% include "security/_messages.html" %}
<h1>Resend confirmation instructions</h1>
<input id="csrf_token" name="csrf_token" type="hidden" value="{{ send_confirmation_form.generate_csrf_token() }}">
{{ send_confirmation_form.csrf_token }}
<input type="email" class="form-control" placeholder="Email address" id="email" name="email" required autofocus>
{{ render_errors(send_confirmation_form.email) }}
<button class="btn btn-lg btn-primary btn-block" id="submit" name="submit" type="submit" value="Resend Confirmation">Resend Confirmation</button>
{% include "security/_menu.html" %}
</form>

</div>

<div class="container-fluid">
</div>
<!-- Bootstrap core JavaScript
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
'Flask-Script==0.6.3',
# 'Flask-Security==1.7.4',
'Flask-Security-Fork==1.8.2',
'Flask-WTF>=0.14.2',
'Jinja2>=2.8.1',
'SQLAlchemy==0.9.2',
'boto>=2.41.0',
Expand Down