Before getting rid of query_string in DecodeUser

4 files changed, 141 insertions, 37 deletions

diff --git a/wqflask/wqflask/templates/new_security/forgot_password_step2.html b/wqflask/wqflask/templates/new_security/forgot_password_step2.html
new file mode 100644
index 00000000..1295e589
--- /dev/null
+++ b/wqflask/wqflask/templates/new_security/forgot_password_step2.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+{% block title %}Register{% endblock %}
+{% block content %}
+    <header class="jumbotron subhead" id="overview">
+        <div class="container">
+            <h1>Password Reset</h1>
+            <p class="lead">
+                Check your email.
+            </p>
+        </div>
+    </header>
+
+    <div class="container">
+        <div class="page-header">
+            <h3>One last step</h3>
+        </div>
+
+        <p>You will receive an email with the subject <strong>"{{ subject }}"</strong>.</p>
+
+        <p>You must click the link in the email to reset the password.</p>
+
+        <p>If you don't see the email, check your spam folder.</p>
+    </div>
+
+{% endblock %}
+
+{% block js %}
+    <!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>-->
+
+    {% include "new_security/_scripts.html" %}
+    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}
diff --git a/wqflask/wqflask/templates/new_security/password_reset.html b/wqflask/wqflask/templates/new_security/password_reset.html
new file mode 100644
index 00000000..c66ddd07
--- /dev/null
+++ b/wqflask/wqflask/templates/new_security/password_reset.html
@@ -0,0 +1,78 @@
+{% extends "base.html" %}
+{% block title %}Register{% endblock %}
+{% block content %}
+
+    {{ header("Password Reset", "Create a new password.") }}
+
+
+    <div class="container">
+        <div class="page-header">
+            <h1>Password reset</h1>
+        </div>
+
+        <div class="security_box">
+
+
+            <h4>Enter your new password</h4>
+
+
+            {% if errors %}
+                <div class="alert alert-error">
+                    <strong>Please note:</strong>
+                    <ul>
+                        {% for error in errors %}
+                            <li>{{error}}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
+
+            <form class="form-horizontal" action="/n/password_reset_step2" data-validate="parsley"
+                  method="POST" name="login_user_form">
+                <fieldset>
+
+
+
+                    <div class="control-group">
+                        <label class="control-label" for="password">Password</label>
+                        <div class="controls">
+                            <input id="password" name="password" type="password" value=""
+                                   data-trigger="change" data-required="true" data-minlength="6">
+                        </div>
+                    </div>
+
+                    <div class="control-group" style="display: none" id="password_alert">
+                        <div class="controls"">
+                            <span id="password_strength" class="alert"></span>
+                        </div>
+                    </div>
+
+                    <div class="control-group">
+                        <label class="control-label" for="password_confirm">Confirm Password</label>
+                        <div class="controls">
+                            <input id="password" name="password_confirm" type="password" value=""
+                                   data-trigger="change" data-required="true" data-equalto="#password">
+                        </div>
+                    </div>
+
+                    <div class="control-group">
+                        <div class="controls"">
+                            <input class="btn btn-primary" id="submit" name="submit" type="submit" value="Reset password">
+                        </div>
+                    </div>
+
+                </fieldset>
+
+            </form>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block js %}
+    <!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>-->
+
+    {% include "new_security/_scripts.html" %}
+    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}
diff --git a/wqflask/wqflask/templates/new_security/register_user.html b/wqflask/wqflask/templates/new_security/register_user.html
index 2a02e7ca..998d2a7b 100644
--- a/wqflask/wqflask/templates/new_security/register_user.html
+++ b/wqflask/wqflask/templates/new_security/register_user.html
@@ -1,36 +1,31 @@
 {% extends "base.html" %}
 {% block title %}Register{% endblock %}
 {% block content %}
-    <header class="jumbotron subhead" id="overview">
-        <div class="container">
-            <h1>Register</h1>
-            <p class="lead">
-                It's easy and fast to make an account.
-            </p>
-        </div>
-    </header>
+
+    {{ header("Register", "It's fast and easy to make an account.") }}
+
 
     <div class="container">
         <div class="page-header">
             <h1>Registration</h1>
         </div>
-    
+
         <div class="security_box">
             <h4>Already have an account?</h4>
-        
-            
+
+
             <a href="/n/login"
                 class="btn btn-info modalize">Sign in using existing account</a>
-            
-        
+
+
             <hr />
-        
+
             <h4>Don't have an account?</h4>
-        
+
             <h5>Register here</h5>
-            
+
             {% if errors %}
-                <div class="alert alert-error">  
+                <div class="alert alert-error">
                     <strong>Please note:</strong>
                     <ul>
                         {% for error in errors %}
@@ -39,11 +34,11 @@
                     </ul>
                 </div>
             {% endif %}
-           
+
             <form class="form-horizontal" action="/n/register" data-validate="parsley"
                   method="POST" name="login_user_form">
                 <fieldset>
-        
+
                     <div class="control-group">
                         <label class="control-label" for="email_address">Email Address</label>
                         <div class="controls">
@@ -51,7 +46,7 @@
                                    data-trigger="change" data-required="true" data-type="email" data-maxlength="50">
                         </div>
                     </div>
-                    
+
                     <div class="control-group">
                         <label class="control-label" for="full_name">Full Name</label>
                         <div class="controls">
@@ -59,28 +54,28 @@
                                    data-trigger="change" data-required="true" data-minlength="5" data-maxlength="50">
                         </div>
                     </div>
-        
+
                     <div class="control-group">
                         <label class="control-label" for="organization">Organization</label>
                         <div class="controls">
                             <input id="organization" name="organization" type="text" value="{{values.organization}}" data-minlength="3" data-maxlength="50">
                         </div>
                     </div>
-                    
+
                     <div class="control-group">
                         <label class="control-label" for="password">Password</label>
                         <div class="controls">
                             <input id="password" name="password" type="password" value=""
                                    data-trigger="change" data-required="true" data-minlength="6">
                         </div>
-                    </div>           
-      
+                    </div>
+
                     <div class="control-group" style="display: none" id="password_alert">
                         <div class="controls"">
                             <span id="password_strength" class="alert"></span>
                         </div>
                     </div>
-             
+
                     <div class="control-group">
                         <label class="control-label" for="password_confirm">Confirm Password</label>
                         <div class="controls">
@@ -88,26 +83,25 @@
                                    data-trigger="change" data-required="true" data-equalto="#password">
                         </div>
                     </div>
-        
+
                     <div class="control-group">
                         <div class="controls"">
                             <input class="btn btn-primary" id="submit" name="submit" type="submit" value="Create account">
                         </div>
                     </div>
-        
+
                 </fieldset>
-        
+
             </form>
         </div>
     </div>
 
 {% endblock %}
 
-{% block js %}  
+{% block js %}
     <!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>-->
-    
+
     {% include "new_security/_scripts.html" %}
     <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
-
diff --git a/wqflask/wqflask/templates/new_security/registered.html b/wqflask/wqflask/templates/new_security/registered.html
index 391a6044..49dc961f 100644
--- a/wqflask/wqflask/templates/new_security/registered.html
+++ b/wqflask/wqflask/templates/new_security/registered.html
@@ -15,20 +15,19 @@
             <h3>One last step</h3>
         </div>
     
-        <p>You will receive an email with the subject <strong>"GeneNetwork email verification"</strong>.</p>
-        
+        <p>You will receive an email with the subject <strong>"{{ subject }}"</strong>.</p>
+
         <p>You must click the link in the email to complete registration.</p>
-        
+
         <p>If you don't see the email, check your spam folder.</p>
     </div>
 
 {% endblock %}
 
-{% block js %}  
+{% block js %}
     <!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>-->
-    
+
     {% include "new_security/_scripts.html" %}
     <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
-