diff --git a/app/templates/flask_user/_authorized_base.html b/app/templates/flask_user/_authorized_base.html new file mode 100644 index 0000000..98ff239 --- /dev/null +++ b/app/templates/flask_user/_authorized_base.html @@ -0,0 +1 @@ +{% extends 'flask_user/_common_base.html' %} diff --git a/app/templates/flask_user/_common_base.html b/app/templates/flask_user/_common_base.html new file mode 100644 index 0000000..bead9e2 --- /dev/null +++ b/app/templates/flask_user/_common_base.html @@ -0,0 +1,53 @@ +{% extends 'base.jinja2' %} +{% block header %}{% endblock %} + +{% block css %} + {{ super() }} + {# override the body and html css to force center #} + +{% endblock %} + + + +{% block content_before %} +
+
+
+
+
+ +
Electronic Thesis and Dissertation System
+
+ +
+ + {% with messages = get_flashed_messages() %} + +

+ {% block form_title %}{% endblock %} +

+ + {# Show any errors #} + {% for message in messages %} + + {% endfor %} + + {% endwith %} + + {% block form %} + {% endblock %} +
+
+
+
+
+{% endblock %} diff --git a/app/templates/flask_user/_public_base.html b/app/templates/flask_user/_public_base.html index 7d12259..98ff239 100644 --- a/app/templates/flask_user/_public_base.html +++ b/app/templates/flask_user/_public_base.html @@ -1 +1 @@ -{% extends 'base.jinja2' %} +{% extends 'flask_user/_common_base.html' %} diff --git a/app/templates/flask_user/change_password.html b/app/templates/flask_user/change_password.html index 6c588cd..b36c6ec 100644 --- a/app/templates/flask_user/change_password.html +++ b/app/templates/flask_user/change_password.html @@ -1,17 +1,20 @@ {% extends 'flask_user/_authorized_base.html' %} - -{% block content %} {% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Change password{%endtrans%}

-
- {{ form.hidden_tag() }} - {{ render_field(form.old_password, tabindex=10) }} - {{ render_field(form.new_password, tabindex=20) }} - {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %} - {{ render_field(form.retype_password, tabindex=30) }} - {% endif %} - {{ render_submit_field(form.submit, tabindex=90) }} -
+{% block title %}Change password{% endblock %} +{% block form_title %}Change password{% endblock %} -{% endblock %} \ No newline at end of file +{% block form %} + +
+ {{ form.hidden_tag() }} + + {{ render_field(form.old_password, tabindex=10) }} + {{ render_field(form.new_password, tabindex=20) }} + {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %} + {{ render_field(form.retype_password, tabindex=30) }} + {% endif %} + {{ render_submit_field(form.submit, tabindex=90) }} +
+ +{% endblock %} diff --git a/app/templates/flask_user/change_username.html b/app/templates/flask_user/change_username.html index 39c7aed..522265b 100644 --- a/app/templates/flask_user/change_username.html +++ b/app/templates/flask_user/change_username.html @@ -1,14 +1,9 @@ {% extends 'flask_user/_authorized_base.html' %} -{% block content %} -{% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Change username{%endtrans%}

+{% block title %}Invalid Request{% endblock %} +{% block form_title %}Invalid Request{% endblock %} -
- {{ form.hidden_tag() }} - {{ render_field(form.new_username, tabindex=10) }} - {{ render_field(form.old_password, tabindex=20) }} - {{ render_submit_field(form.submit, tabindex=90) }} -
- -{% endblock %} \ No newline at end of file +{% block form %} + {# This form should not be used. #} + Invalid Request +{% endblock %} diff --git a/app/templates/flask_user/edit_user_profile.html b/app/templates/flask_user/edit_user_profile.html index 1fa2575..3533246 100644 --- a/app/templates/flask_user/edit_user_profile.html +++ b/app/templates/flask_user/edit_user_profile.html @@ -1,30 +1,27 @@ {% extends 'flask_user/_authorized_base.html' %} - -{% block content %} {% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %} -

{%trans%}User profile{%endtrans%}

-
- {{ form.hidden_tag() }} - {% for field in form %} - {% if not field.flags.hidden %} - {% if field.type=='SubmitField' %} - {{ render_submit_field(field, tabindex=loop.index*10) }} - {% else %} - {{ render_field(field, tabindex=loop.index*10) }} +{% block title %}User Profile{% endblock %} +{% block form_title %}User Profile{% endblock %} + +{% block form %} + + {{ form.hidden_tag() }} + {% for field in form %} + {% if not field.flags.hidden %} + {% if field.type=='SubmitField' %} + {{ render_submit_field(field, tabindex=loop.index*10) }} + {% else %} + {{ render_field(field, tabindex=loop.index*10) }} + {% endif %} {% endif %} + {% endfor %} +
+
+ + {% if not user_manager.USER_ENABLE_AUTH0 %} + {% if user_manager.USER_ENABLE_CHANGE_PASSWORD %} +

{% trans %}Change password{% endtrans %}

{% endif %} - {% endfor %} - -
- -{% if not user_manager.USER_ENABLE_AUTH0 %} - {% if user_manager.USER_ENABLE_CHANGE_USERNAME %} -

{%trans%}Change username{%endtrans%}

{% endif %} - {% if user_manager.USER_ENABLE_CHANGE_PASSWORD %} -

{%trans%}Change password{%endtrans%}

- {% endif %} -{% endif %} - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/flask_user/forgot_password.html b/app/templates/flask_user/forgot_password.html index cf78b45..76399ee 100644 --- a/app/templates/flask_user/forgot_password.html +++ b/app/templates/flask_user/forgot_password.html @@ -1,13 +1,14 @@ {% extends 'flask_user/_public_base.html' %} - -{% block content %} {% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Forgot Password{%endtrans%}

-
- {{ form.hidden_tag() }} - {{ render_field(form.email, tabindex=10) }} - {{ render_submit_field(form.submit, tabindex=90) }} -
+{% block title %}Forgot Password{% endblock %} +{% block form_title %}Forgot Password{% endblock %} -{% endblock %} \ No newline at end of file +{% block form %} +
+ {{ form.hidden_tag() }} + {{ render_field(form.email, tabindex=10) }} + {{ render_submit_field(form.submit, tabindex=90) }} +
+ +{% endblock %} diff --git a/app/templates/flask_user/invite_user.html b/app/templates/flask_user/invite_user.html index 5abe526..a8b4904 100644 --- a/app/templates/flask_user/invite_user.html +++ b/app/templates/flask_user/invite_user.html @@ -1,13 +1,13 @@ {% extends 'flask_user/_authorized_base.html' %} - -{% block content %} {% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Invite User{%endtrans%}

-
- {{ form.hidden_tag() }} - {{ render_field(form.email, tabindex=10) }} - {{ render_submit_field(form.submit, tabindex=90) }} -
+{% block title %}Invite User{% endblock %} +{% block form_title %}Invite User{% endblock %} +{% block form %} +
+ {{ form.hidden_tag() }} + {{ render_field(form.email, tabindex=10) }} + {{ render_submit_field(form.submit, tabindex=90) }} +
{% endblock %} diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html index 1cb30cc..bcfcda0 100644 --- a/app/templates/flask_user/login.html +++ b/app/templates/flask_user/login.html @@ -1,116 +1,67 @@ {% extends 'flask_user/_public_base.html' %} - -{% set navbar_shadow = True %} -{% block title %}Login{% endblock %} -{% block header %}{% endblock %} - -{% block css %} - {{ super() }} - {# override the body and html css to force center #} - -{% endblock %} - {% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %} -{% block content_before %} -
-
-
+{% block title %}Login{% endblock %} +{% block form_title %}Login{% endblock %} - {# Splash card #} -
-
- -
Electronic Thesis and Dissertation System
-
+{% block form %} -
+
+ {{ form.hidden_tag() }} - - {{ form.hidden_tag() }} - -

- Login -

- -
- - {# Show any errors #} - {% with messages = get_flashed_messages() %} - {% for message in messages %} - - {% endfor %} - {% endwith %} - - - {# NetID field #} - {% set field = form.netid %} -
- {# Label on left, "New here? Register." on right #} -
-
- -
-
- {% if user_manager.USER_ENABLE_REGISTER and not user_manager.USER_REQUIRE_INVITATION %} - - {%trans%}New here? Register.{%endtrans%} - {% endif %} -
-
- {{ field(class_='form-control', tabindex=110) }} - {% if field.errors %} - {% for e in field.errors %} -

{{ e }}

- {% endfor %} - {% endif %} -
- - {# Password field #} - {% set field = form.password %} -
- {# Label on left, "Forgot your Password?" on right #} -
-
- -
-
- {% if user_manager.USER_ENABLE_FORGOT_PASSWORD %} - - {%trans%}Forgot your Password?{%endtrans%} - {% endif %} -
-
- {{ field(class_='form-control', tabindex=120) }} - {% if field.errors %} - {% for e in field.errors %} -

{{ e }}

- {% endfor %} - {% endif %} -
- - {# Remember me #} - {% if user_manager.USER_ENABLE_REMEMBER_ME %} - {{ render_checkbox_field(login_form.remember_me, tabindex=130) }} - {% endif %} - - {# Submit button #} - {{ render_submit_field(form.submit, tabindex=180) }} - -
- -
+ {# NetID field #} + {% set field = form.netid %} +
+ {# Label on left, "New here? Register." on right #} +
+
+ +
+
+ {% if user_manager.USER_ENABLE_REGISTER and not user_manager.USER_REQUIRE_INVITATION %} + + {% trans %}New here? Register.{% endtrans %} + {% endif %}
-
+ {{ field(class_='form-control', tabindex=110) }} + {% if field.errors %} + {% for e in field.errors %} +

{{ e }}

+ {% endfor %} + {% endif %}
-
+ + {# Password field #} + {% set field = form.password %} +
+ {# Label on left, "Forgot your Password?" on right #} +
+
+ +
+
+ {% if user_manager.USER_ENABLE_FORGOT_PASSWORD %} + + {% trans %}Forgot your Password?{% endtrans %} + {% endif %} +
+
+ {{ field(class_='form-control', tabindex=120) }} + {% if field.errors %} + {% for e in field.errors %} +

{{ e }}

+ {% endfor %} + {% endif %} +
+ + {# Remember me #} + {% if user_manager.USER_ENABLE_REMEMBER_ME %} + {{ render_checkbox_field(login_form.remember_me, tabindex=130) }} + {% endif %} + + {# Submit button #} + {{ render_submit_field(form.submit, tabindex=180) }} + + {% endblock %} diff --git a/app/templates/flask_user/manage_emails.html b/app/templates/flask_user/manage_emails.html index 1677db7..6c1871f 100644 --- a/app/templates/flask_user/manage_emails.html +++ b/app/templates/flask_user/manage_emails.html @@ -1,39 +1,46 @@ {% extends 'flask_user/_authorized_base.html' %} -{% block content %} -{% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Manage Emails{%endtrans%}

+{% block title %}Manage Emails{% endblock %} +{% block form_title %}Manage Emails{% endblock %} - - -{% for user_email in user_emails %} - - - - - -{% endfor %} -
EmailStatusActions
{{ user_email.email }} - {% if user_email.email_confirmed_at %} - Confirmed - {% else %} - Confirm Email - {% endif %} - - {% if user_email.is_primary %} - Primary email - {% else %} - {% if user_email.email_confirmed_at %} - Make primary | - {% endif %} - Delete - {% endif %} -
+{% block form %} -
- {{ form.hidden_tag() }} - {{ render_field(form.email) }} - {{ render_submit_field(form.submit) }} -
+ + + + + + + {% for user_email in user_emails %} + + + + + + {% endfor %} +
EmailStatusActions
{{ user_email.email }} + {% if user_email.email_confirmed_at %} + Confirmed + {% else %} + Confirm + Email + {% endif %} + + {% if user_email.is_primary %} + Primary email + {% else %} + {% if user_email.email_confirmed_at %} + Make + primary | + {% endif %} + Delete + {% endif %} +
-{% endblock %} \ No newline at end of file +
+ {{ form.hidden_tag() }} + {{ render_field(form.email) }} + {{ render_submit_field(form.submit) }} +
+ +{% endblock %} diff --git a/app/templates/flask_user/register.html b/app/templates/flask_user/register.html index df54c4a..a107e69 100644 --- a/app/templates/flask_user/register.html +++ b/app/templates/flask_user/register.html @@ -1,46 +1,48 @@ {% extends 'flask_user/_public_base.html' %} - -{% block content %} {% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Register{%endtrans%}

-
- {{ form.hidden_tag() }} +{% block title %}Register{% endblock %} +{% block form_title %}Register{% endblock %} - {# Username or Email #} - {% set field = form.username if user_manager.USER_ENABLE_USERNAME else form.email %} -
- {# Label on left, "Already registered? Sign in." on right #} -
-
- -
-
- {% if user_manager.USER_ENABLE_REGISTER %} - - {%trans%}Already registered? Sign in.{%endtrans%} - {% endif %} +{% block form %} + + + {{ form.hidden_tag() }} + + {# Username or Email #} + {% set field = form.username if user_manager.USER_ENABLE_USERNAME else form.email %} +
+ {# Label on left, "Already registered? Sign in." on right #} +
+
+ +
+
+ {% if user_manager.USER_ENABLE_REGISTER %} + + {% trans %}Already registered? Sign in.{% endtrans %} + {% endif %} +
+ {{ field(class_='form-control', tabindex=210) }} + {% if field.errors %} + {% for e in field.errors %} +

{{ e }}

+ {% endfor %} + {% endif %}
- {{ field(class_='form-control', tabindex=210) }} - {% if field.errors %} - {% for e in field.errors %} -

{{ e }}

- {% endfor %} + + {% if user_manager.USER_ENABLE_EMAIL and user_manager.USER_ENABLE_USERNAME %} + {{ render_field(form.email, tabindex=220) }} {% endif %} -
- {% if user_manager.USER_ENABLE_EMAIL and user_manager.USER_ENABLE_USERNAME %} - {{ render_field(form.email, tabindex=220) }} - {% endif %} + {{ render_field(form.password, tabindex=230) }} - {{ render_field(form.password, tabindex=230) }} + {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %} + {{ render_field(form.retype_password, tabindex=240) }} + {% endif %} - {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %} - {{ render_field(form.retype_password, tabindex=240) }} - {% endif %} + {{ render_submit_field(form.submit, tabindex=280) }} + - {{ render_submit_field(form.submit, tabindex=280) }} - - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/flask_user/resend_confirm_email.html b/app/templates/flask_user/resend_confirm_email.html index 5de6033..2155f37 100644 --- a/app/templates/flask_user/resend_confirm_email.html +++ b/app/templates/flask_user/resend_confirm_email.html @@ -1,13 +1,15 @@ {% extends 'flask_user/_public_base.html' %} - -{% block content %} {% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Resend Confirmation Email{%endtrans%}

-
- {{ form.hidden_tag() }} - {{ render_field(form.email, tabindex=10) }} - {{ render_submit_field(form.submit, tabindex=90) }} -
+{% block title %}Resend confirmation email{% endblock %} +{% block form_title %}Resend confirmation email{% endblock %} -{% endblock %} \ No newline at end of file +{% block form %} + +
+ {{ form.hidden_tag() }} + {{ render_field(form.email, tabindex=10) }} + {{ render_submit_field(form.submit, tabindex=90) }} +
+ +{% endblock %} diff --git a/app/templates/flask_user/reset_password.html b/app/templates/flask_user/reset_password.html index 033aa5d..ec26ca0 100644 --- a/app/templates/flask_user/reset_password.html +++ b/app/templates/flask_user/reset_password.html @@ -1,16 +1,18 @@ {% extends 'flask_user/_public_base.html' %} - -{% block content %} {% from "flask_user/_macros.html" import render_field, render_submit_field %} -

{%trans%}Reset Password{%endtrans%}

-
- {{ form.hidden_tag() }} - {{ render_field(form.new_password, tabindex=10) }} - {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %} - {{ render_field(form.retype_password, tabindex=20) }} - {% endif %} - {{ render_submit_field(form.submit, tabindex=90) }} -
+{% block title %}Reset password{% endblock %} +{% block form_title %}Reset password{% endblock %} -{% endblock %} \ No newline at end of file +{% block form %} + +
+ {{ form.hidden_tag() }} + {{ render_field(form.new_password, tabindex=10) }} + {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %} + {{ render_field(form.retype_password, tabindex=20) }} + {% endif %} + {{ render_submit_field(form.submit, tabindex=90) }} +
+ +{% endblock %}