diff options
Diffstat (limited to 'gn_auth/templates')
| -rw-r--r-- | gn_auth/templates/404.html | 13 | ||||
| -rw-r--r-- | gn_auth/templates/base.html | 18 | ||||
| -rw-r--r-- | gn_auth/templates/emails/forgot-password.html | 2 | ||||
| -rw-r--r-- | gn_auth/templates/emails/forgot-password.txt | 2 | ||||
| -rw-r--r-- | gn_auth/templates/emails/verify-email.html | 2 | ||||
| -rw-r--r-- | gn_auth/templates/emails/verify-email.txt | 2 | ||||
| -rw-r--r-- | gn_auth/templates/http-error-4xx.html | 20 | ||||
| -rw-r--r-- | gn_auth/templates/http-error-5xx.html (renamed from gn_auth/templates/50x.html) | 0 | ||||
| -rw-r--r-- | gn_auth/templates/oauth2/authorise-user.html | 87 |
9 files changed, 87 insertions, 59 deletions
diff --git a/gn_auth/templates/404.html b/gn_auth/templates/404.html deleted file mode 100644 index e17bfe8..0000000 --- a/gn_auth/templates/404.html +++ /dev/null @@ -1,13 +0,0 @@ -{%extends "base.html"%} - -{%block title%}404: Page Not Found{%endblock%} - -{%block pagetitle%}404: Could Not Find the Requested Page{%endblock%} - -{%block content%} - -<p> - The page "<strong>{{page}}</strong>" does not exist on this server. -</p> - -{%endblock%} diff --git a/gn_auth/templates/base.html b/gn_auth/templates/base.html index b452ca1..d80096d 100644 --- a/gn_auth/templates/base.html +++ b/gn_auth/templates/base.html @@ -5,24 +5,24 @@ <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>gn-auth: {%block title%}{%endblock%}</title> + <title>Authorization {%block title%}{%endblock%}</title> <link rel="stylesheet" type="text/css" - href="https://genenetwork.org/static/new/css/bootstrap-custom.css" /> + href="{{url_for('static', filename='css/bootstrap-custom.css')}}" /> <link rel="stylesheet" type="text/css" - href="https://genenetwork.org/static/new/css/non-responsive.css" /> + href="{{url_for('static', filename='css/non-responsive.css')}}" /> <link rel="stylesheet" type="text/css" href="{{url_for('static', filename='css/styles.css')}}" /> <link rel="stylesheet" type="text/css" - href="https://genenetwork.org/static/new/css/docs.css" /> + href="{{url_for('static', filename='css/docs.css')}}" /> <link rel="stylesheet" type="text/css" - href="https://genenetwork.org/static/new/css/colorbox.css" /> + href="{{url_for('static', filename='css/colorbox.css')}}" /> <link rel="stylesheet" type="text/css" - href="https://genenetwork.org/static/new/css/parsley.css" /> + href="{{url_for('static', filename='css/parsley.css')}}" /> <link rel="stylesheet" type="text/css" - href="https://genenetwork.org/static/new/css/broken_links.css" /> + href="{{url_for('static', filename='css/broken_links.css')}}" /> <link rel="stylesheet" - href="https://genenetwork.org/static/new/css/autocomplete.css" /> + href="{{url_for('static', filename='css/autocomplete.css')}}" /> {%block css%}{%endblock%} </head> @@ -39,7 +39,7 @@ style="font-weight: bold;">GeneNetwork</a> </li> <li> - <a href="#">gn-auth: {%block pagetitle%}{%endblock%}</a> + <a href="#">{%block pagetitle%}{%endblock%}</a> </li> </ul> </div> diff --git a/gn_auth/templates/emails/forgot-password.html b/gn_auth/templates/emails/forgot-password.html index e40ebb8..5f16a02 100644 --- a/gn_auth/templates/emails/forgot-password.html +++ b/gn_auth/templates/emails/forgot-password.html @@ -24,7 +24,7 @@ </p> <p style="font-weight: bold;color: #ee55ee;"> - The link will expire in <strong>{{expiration_minutes}}</strong> minutes. + The link will expire in <strong>{{expiration_minutes}}</strong>. </p> <hr /> diff --git a/gn_auth/templates/emails/forgot-password.txt b/gn_auth/templates/emails/forgot-password.txt index 55a4b13..68abf16 100644 --- a/gn_auth/templates/emails/forgot-password.txt +++ b/gn_auth/templates/emails/forgot-password.txt @@ -7,6 +7,6 @@ You (or someone pretending to be you) made a request to change your password. Pl If you did not request to change your password, simply ignore this email. -The link will expire {{expiration_minutes}} minutes. +The link will expire in {{expiration_minutes}}. Note that if you requested to change your password multiple times, only the latest/newest token will be valid. diff --git a/gn_auth/templates/emails/verify-email.html b/gn_auth/templates/emails/verify-email.html index 7f85c1c..11ae575 100644 --- a/gn_auth/templates/emails/verify-email.html +++ b/gn_auth/templates/emails/verify-email.html @@ -20,7 +20,7 @@ <p style="font-weight: bold;color: #ee55ee;"> Please note that the verification code will expire in - <strong>{{expiration_minutes}}</strong> minutes after it was generated. + <strong>{{expiration_minutes}}</strong> after it was generated. </p> </body> </html> diff --git a/gn_auth/templates/emails/verify-email.txt b/gn_auth/templates/emails/verify-email.txt index 281d682..ecfbfc0 100644 --- a/gn_auth/templates/emails/verify-email.txt +++ b/gn_auth/templates/emails/verify-email.txt @@ -9,4 +9,4 @@ If that does not work, please log in to GeneNetwork and copy the verification co {{verification_code}} -Please note that the verification code will expire {{expiration_minutes}} minutes after it was generated. +Please note that the verification code will expire {{expiration_minutes}} after it was generated. diff --git a/gn_auth/templates/http-error-4xx.html b/gn_auth/templates/http-error-4xx.html new file mode 100644 index 0000000..16c4581 --- /dev/null +++ b/gn_auth/templates/http-error-4xx.html @@ -0,0 +1,20 @@ +{%extends "base.html"%} + +{%block title%}{{error.code}}: {{error.name}}{%endblock%} + +{%block pagetitle%}{{error.code}}: {{error.name}}{%endblock%} + +{%block content%} + +<dl> + <dt>status code</dt> + <dd>{{error.code}}: {{error.name}}</dd> + + <dt><strong>URI</strong></dt> + <dd>{{page}}</dd> + + <dt>error description</dt> + <dd>{{description}}</dd> +</dl> + +{%endblock%} diff --git a/gn_auth/templates/50x.html b/gn_auth/templates/http-error-5xx.html index 859a232..859a232 100644 --- a/gn_auth/templates/50x.html +++ b/gn_auth/templates/http-error-5xx.html diff --git a/gn_auth/templates/oauth2/authorise-user.html b/gn_auth/templates/oauth2/authorise-user.html index 2ef22af..f186167 100644 --- a/gn_auth/templates/oauth2/authorise-user.html +++ b/gn_auth/templates/oauth2/authorise-user.html @@ -2,44 +2,65 @@ {%block title%}Authorise User{%endblock%} -{%block pagetitle%}Authenticate to the API Server{%endblock%} +{%block pagetitle%}{%endblock%} {%block content%} {{flash_messages()}} +<div class="container" style="min-width: 1250px;"> + <form method="POST" + class="form-horizontal" + action="{{url_for( + 'oauth2.auth.authorise', + response_type=response_type, + client_id=client.client_id, + redirect_uri=redirect_uri)}}" + style="max-width: 700px;"> + <legend style="margin-top: 20px;">Sign In</legend> -<form method="POST" action="{{url_for( - 'oauth2.auth.authorise', - response_type=response_type, - client_id=client.client_id, - redirect_uri=redirect_uri)}}"> - <input type="hidden" name="response_type" value="{{response_type}}" /> - <input type="hidden" name="redirect_uri" value="{{redirect_uri}}" /> - <input type="hidden" name="scope" value="{{scope | join(' ')}}" /> - <input type="hidden" name="client_id" value="{{client.client_id}}" /> + <input type="hidden" name="response_type" value="{{response_type}}" /> + <input type="hidden" name="redirect_uri" value="{{redirect_uri}}" /> + <input type="hidden" name="scope" value="{{scope | join(' ')}}" /> + <input type="hidden" name="client_id" value="{{client.client_id}}" /> - <legend>User Credentials</legend> - <div class="form-group"> - <label for="user:email" class="form-label">Email</label> - <input type="email" name="user:email" id="user:email" required="required" - class="form-control"/> - </div> + <div class="form-group"> + <label for="user:email" class="control-label col-xs-2" + style="text-align: left;">Email</label> + <div class="col-xs-10"> + <input type="email" + name="user:email" + id="user:email" + required="required" + class="form-control" /> + </div> + </div> - <div class="form-group"> - <label for="user:password" class="form-label">Password</label> - <input type="password" name="user:password" id="user:password" - required="required" class="form-control" /> - </div> + <div class="form-group"> + <label for="user:password" class="control-label col-xs-2" + style="text-align: left;">Password</label> + <div class="col-xs-10"> + <input type="password" + name="user:password" + id="user:password" + required="required" + class="form-control" /> + </div> + </div> - <div class="form-group"> - <input type="submit" value="authorise" class="btn btn-primary" /> - {%if display_forgot_password%} - <a href="{{url_for('oauth2.users.forgot_password', - client_id=client.client_id, - redirect_uri=redirect_uri, - response_type=response_type)}}" - title="Click here to change your password." - class="form-text text-danger">Forgot Password</a> - {%endif%} - </div> -</form> + <div class="form-group"> + <div class="controls col-xs-offset-2 col-xs-10"> + <input type="submit" value="Sign in" class="btn btn-primary" /> + {%if display_forgot_password%} + <a href="{{url_for('oauth2.users.forgot_password', + client_id=client.client_id, + redirect_uri=redirect_uri, + response_type=response_type)}}" + title="Click here to change your password." + class="form-text text-danger">Forgot Password</a> + {%endif%} + </div> + </div> + <hr> + <a href="{{ source_uri }}/oauth2/user/register" class="btn btn-primary" role="button">Create a New Account</a> + </form> +</div> {%endblock%} |