merge changes

9 files changed, 463 insertions, 0 deletions

diff --git a/gn2/wqflask/templates/new_security/forgot_password.html b/gn2/wqflask/templates/new_security/forgot_password.html
new file mode 100644
index 00000000..60a221da
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/forgot_password.html
@@ -0,0 +1,52 @@
+{% extends "base.html" %}
+{% block title %}Forgot Password{% endblock %}
+{% block content %}
+
+    <div class="container">
+        <div class="page-header">
+            <h1>Password Reset</h1>
+        </div>
+
+        <div class="security_box">
+
+            <h4>Enter your email address and we'll send you a link to reset your password</h4>
+
+            <form class="form-horizontal" action="/n/forgot_password_submit"
+                  method="POST" name="login_user_form">
+                <fieldset>
+                    <div class="control-group">
+                        <div class="controls">
+                            <input id="email_address" class="focused" name="email_address" type="text" value="">
+                        </div>
+                    </div>
+
+
+                    <div class="control-group">
+                        <div class="controls" style="margin-top: 10px;">
+                            <input id="next" name="next" type="hidden" value="">
+
+                            <input class="btn btn-primary" id="submit" name="submit" type="submit" value="Send link">
+                        </div>
+                    </div>
+
+                </fieldset>
+
+                <br />
+
+                <div class="well">
+                    <h5>Has your email address changed?</h5>
+
+                    If you no longer use the email address connected to your account, you can contact us for assistance.
+
+                </div>
+
+            </form>
+        </div>
+        </div>
+    </div>
+
+  {% endblock %}
+
+{% block js %}
+
+{% endblock %}
diff --git a/gn2/wqflask/templates/new_security/forgot_password_step2.html b/gn2/wqflask/templates/new_security/forgot_password_step2.html
new file mode 100644
index 00000000..1835fd4c
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/forgot_password_step2.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% block title %}Register{% endblock %}
+{% block content %}
+
+    {{ header("Password Reset", "Check your email.") }}
+
+
+    <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 language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn/zxcvbn.js') }}"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}
diff --git a/gn2/wqflask/templates/new_security/login_user.html b/gn2/wqflask/templates/new_security/login_user.html
new file mode 100644
index 00000000..b8cdf6ef
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/login_user.html
@@ -0,0 +1,119 @@
+{% extends "base.html" %}
+{% block title %}Register{% endblock %}
+{% block content %}
+
+    <div class="container" style="min-width: 1250px;">
+
+        {{ flash_me() }}
+
+        <h3>Sign in here.</h3>
+
+	    {% if redis_is_available: %}
+            <form class="form-horizontal" action="/n/login" method="POST" name="login_user_form" id="loginUserForm">
+                 <input name="anon_id" type="hidden" value="{{ g.user_session.user_id }}">
+                 <fieldset>
+                    <div class="form-group">
+                        <label style="text-align:left;" class="col-xs-1 control-label" for="email_address">Email&nbsp;Address</label>
+                        <div style="margin-left:20px;" class="col-xs-4">
+                            <input id="email_address" class="focused" name="email_address" type="text" value="" size="50">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label style="text-align:left;" class="col-xs-1 control-label" for="password">Password</label>
+                        <div style="margin-left:20px;" class="col-xs-4 controls">
+                            <input id="password" class="focused" name="password" type="password" value="" size="50">
+                            <br />
+                            <br />
+                            <a href="/n/forgot_password">Forgot your password?</a><br/>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="col-xs-1 control-label" for="remember"></label>
+                        <div style="margin-left:20px;" class="col-xs-4 controls">
+                            <input id="remember" name="remember" type="checkbox" value="y"> <b>Remember me</b><br>
+                            <input id="import_collections" name="import_collections" type="checkbox" value="y"> <b>Import existing collections</b>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="col-xs-1 control-label" for="submit"></label>
+                        <div style="margin-left:20px;" class="col-xs-4 controls">
+                            <input id="next" name="next" type="hidden" value="">
+                            <input class="btn btn-primary" id="submit" name="submit" type="submit" value="Sign in">
+                        </div>
+                    </div>
+              </fieldset>
+
+              <div class="security_box">
+
+                    <h4>Don't have an account?</h4>
+
+                {% if redis_is_available: %}
+                <a href="/n/register" class="btn btn-primary modalize">Create a new account</a>
+                {% else %}
+                <div class="alert alert-warning">
+                  <p>You cannot create an account at this moment.<br />
+                Please try again later.</p>
+                </div>
+                {% endif %}
+
+                <hr />
+                <h4>Login with external services</h4>
+
+                {% if external_login: %}
+                <div>
+                  {% if external_login["github"]: %}
+                  <a href="{{external_login['github']}}" title="Login with GitHub" class="btn btn-info btn-group">Login with Github</a>
+                      {% else %}
+                      <p>Github login is not available right now</p>
+                  {% endif %}
+
+                  {% if external_login["orcid"]: %}
+                  <a href="{{external_login['orcid']}}" title="Login with ORCID" class="btn btn-info btn-group">Login with ORCID</a>
+                      {% else %}
+                      <p>ORCID login is not available right now</p>
+                  {% endif %}
+                </div>
+                {% else: %}
+                <div class="alert alert-warning">
+                  <p>Sorry, you cannot login with Github or ORCID at this time.</p>
+                </div>
+                {% endif %}
+
+            </form>
+        {% else: %}
+	    <div class="alert alert-warning">
+	      <p>You cannot login at this moment using your GeneNetwork account (the authentication service is down).<br />
+		Please try again later.</p>
+        </div>
+	    {% endif %}
+            {% if not external_login: %}
+            <hr>
+	        <div class="alert alert-warning">
+               Note: it is safe to use GeneNetwork without a login. Login is only required for keeping track of
+            collections and getting access to some types of restricted data.
+            </div>
+            {% endif %}
+        </div>
+    </div>
+
+  {% endblock %}
+
+{% block css %}
+<style type="text/css">
+input.error{
+    border:1px solid #FF0000 !important;
+}
+
+label.error,div.error{
+    font-weight:normal;
+    color:#FF0000 !important;
+}
+</style>
+{% endblock %}
+
+{% block js %}
+
+{% endblock %}
diff --git a/gn2/wqflask/templates/new_security/not_authenticated.html b/gn2/wqflask/templates/new_security/not_authenticated.html
new file mode 100644
index 00000000..ea688346
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/not_authenticated.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% block title %}Authentication Needed{% endblock %}
+{% block content %}
+    <div class="container">
+        <div class="page-header">
+            <h3>You lack the permissions to view these data.</h3>
+        </div>
+        <p>Please contact the data's owner or GN administrators if you believe you should have access to these data.</p>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/gn2/wqflask/templates/new_security/password_reset.html b/gn2/wqflask/templates/new_security/password_reset.html
new file mode 100644
index 00000000..e21f075c
--- /dev/null
+++ b/gn2/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>
+
+                    <input class="hidden" name="user_encode" value="{{ user_encode }}">
+
+
+                    <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 language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn/zxcvbn.js') }}"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}
diff --git a/gn2/wqflask/templates/new_security/register_user.html b/gn2/wqflask/templates/new_security/register_user.html
new file mode 100644
index 00000000..c2895517
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/register_user.html
@@ -0,0 +1,105 @@
+{% extends "base.html" %}
+{% block title %}Register{% endblock %}
+{% block content %}
+
+    {{ 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">
+                    <strong>Please note:</strong>
+                    <ul>
+                        {% for error in errors %}
+                            <li>{{error}}</li>
+                        {% endfor %}
+                    </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">
+                            <input id="email_address" name="email_address" class="focused" type="text" size="50" value="{{values.email_address}}"
+                                   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">
+                            <input id="full_name" name="full_name" type="text" size="50" value="{{values.full_name}}"
+                                   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" size="50" 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" size="50" 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" size="50" value=""
+                                   data-trigger="change" data-required="true" data-equalto="#password">
+                        </div>
+                    </div>
+
+                    <div class="control-group">
+                        <div class="controls" style="margin-top: 10px;">
+                            <input class="btn btn-primary" id="submit" name="submit" type="submit" value="Create account">
+                        </div>
+                    </div>
+
+                </fieldset>
+
+            </form>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block js %}
+
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn/zxcvbn.js') }}"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}
diff --git a/gn2/wqflask/templates/new_security/registered.html b/gn2/wqflask/templates/new_security/registered.html
new file mode 100644
index 00000000..29889a97
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/registered.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{% block title %}Register{% endblock %}
+{% block content %}
+     {{ header("Almost Done", "Thanks for registering") }}
+
+    <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 complete registration.</p>
+
+        <p>If you don't see the email, check your spam folder.</p>
+    </div>
+
+{% endblock %}
+
+{% block js %}
+
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn/zxcvbn.js') }}"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}
diff --git a/gn2/wqflask/templates/new_security/thank_you.html b/gn2/wqflask/templates/new_security/thank_you.html
new file mode 100644
index 00000000..d4f5e574
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/thank_you.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+{% block title %}Register{% endblock %}
+{% block content %}
+    {{ header("Thank you", "Thanks for verifying") }}
+
+    <div class="container">
+        <div class="page-header">
+            <h3>You are done registering</h3>
+        </div>
+
+        <p>Enjoy using the site.</p>
+
+        <br />
+
+        <a class="btn btn-primary" href="{{ url_for("index_page") }}">Go to the homepage</a>
+    </div>
+
+{% endblock %}
+
+{% block js %}
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn/zxcvbn.js') }}"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}
diff --git a/gn2/wqflask/templates/new_security/verification_still_needed.html b/gn2/wqflask/templates/new_security/verification_still_needed.html
new file mode 100644
index 00000000..1f91fd8d
--- /dev/null
+++ b/gn2/wqflask/templates/new_security/verification_still_needed.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+{% block title %}Verification{% endblock %}
+{% block content %}
+     {{ header("Verification", "You still need to verify") }}
+
+    <div class="container">
+        <div class="page-header">
+            <h3>Verification of e-mail address</h3>
+        </div>
+        <h4>You still need to verify your e-mail address before you can sign in.</h4>
+
+        <p>We've resent the verificaiton email.
+
+        <p>Please check for 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 %}
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn/zxcvbn.js') }}"></script>
+    <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
+{% endblock %}