diff --git a/myapp/static/global.css b/myapp/static/global.css index 3352794a..241103ef 100644 --- a/myapp/static/global.css +++ b/myapp/static/global.css @@ -18,10 +18,6 @@ a:hover { text-decoration: underline; } -a:visited { - color: #183E51; -} - label { display: block; } diff --git a/myapp/static/login/styles.css b/myapp/static/login/styles.css index d7b5fa50..8c20e9c3 100644 --- a/myapp/static/login/styles.css +++ b/myapp/static/login/styles.css @@ -104,12 +104,11 @@ input[type="password"]:focus::placeholder { width: 100%; color: #888; margin-top: 2px; - margin-bottom: 25px; } input[type="submit"] { cursor: pointer; - width: 30%; + width: 120px; background-color: #183E51; color: white; border-radius: 5px; @@ -117,23 +116,19 @@ input[type="submit"] { font-size: 1rem; border: none; transition: background 0.3s ease; + margin-top: 25px; } input[type="submit"]:hover { background-color: #050A24; } -.register-text { - font-size: 0.9rem; - margin-top: 15px; -} - -.register-text a { +.register-text{ color: #5FBFF9; font-weight: bold; } -.login-text a { +.login-text{ color: #5FBFF9; font-weight: bold; } @@ -144,4 +139,12 @@ input[type="submit"]:hover { right: 10px; width: 200px; height: auto; +} + +.return-login{ + font-size: 0.9rem; + text-align: center; + width: 100%; + color: #888; + margin-top: 10px; } \ No newline at end of file diff --git a/myapp/templates/registration/form_complete.html b/myapp/templates/registration/form_complete.html index 560dbd39..f1b6e789 100644 --- a/myapp/templates/registration/form_complete.html +++ b/myapp/templates/registration/form_complete.html @@ -8,15 +8,28 @@ + + - -
-

Thank you for completing the form!
- Your roles and permissions have been updated.
- Back to home -

-
+
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+

Thank you for completing the form!
+ Your roles and permissions have been updated.
+ Back to home +

+
+ HKN Mascot +
+
{% endblock content %} \ No newline at end of file diff --git a/myapp/templates/registration/inductee_form.html b/myapp/templates/registration/inductee_form.html index 165a5407..a2fcce80 100644 --- a/myapp/templates/registration/inductee_form.html +++ b/myapp/templates/registration/inductee_form.html @@ -8,83 +8,98 @@ + + - -
- {% if user.is_authenticated %} -
- {% csrf_token %} -

Inductee Sign Up Form

-

Congratulations! You've been selected to induct to Eta Kappa Nu - (HKN), the Official Honor Society of IEEE. - We are so happy to see that you are interested in inducting.
-
- Please fill out this form to begin your induction process. There - is no risk in filling out this form (you can opt-out at any time - by unsubscribing or ignoring the emails), but it is mandatory - for you to fill out this form in order to induct! -

- - {% for field in form %} - {% if field.name == 'other_major' %} - - - - - {% elif field.name == 'other_degree' %} - - - - - {% else %} - - - - - {% endif %} - {% endfor %} +
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
- {% for field in form %} - {% if field.errors %} -
- - - {% endif %} - {% endfor %} -
{{ field.label_tag }}{{ field }}
{{ field.label_tag }}{{ field }}
{{ field.label_tag }}{{ field }}
- - - + -
- {% else %} -

You are not logged in, please login or register an account.

- {% endif %} + + $('#id_major').change(function() { + if ($(this).val() === 'Other') { + $('#major_other_option_container').show(); + } else { + $('#major_other_option_container').hide(); + } + }); + $('#id_degree').change(function() { + if ($(this).val() === 'Other') { + $('#degree_other_option_container').show(); + } else { + $('#degree_other_option_container').hide(); + } + }); + }); + + + {% else %} +

You are not logged in, please + or + register an account.

+ {% endif %} +
+ HKN Mascot + diff --git a/myapp/templates/registration/inductee_form_invalid.html b/myapp/templates/registration/inductee_form_invalid.html index f8b4d205..fe3276ae 100644 --- a/myapp/templates/registration/inductee_form_invalid.html +++ b/myapp/templates/registration/inductee_form_invalid.html @@ -8,20 +8,33 @@ + + - -
- {% if error == "invalid" %} -

Invalid link, please check you have entered the url correctly.

-

If the issue persists, please contact an officer on our discord server.

- {% elif error == "form_closed" %} -

The form for this induction cycle has closed.

- {% else %} -

An unspecified error has occured.

- {% endif %} -

Back to home

+
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+ {% if error == "invalid" %} +

Invalid link, please check you have entered the url correctly.

+

If the issue persists, please contact an officer on our discord server.

+ {% elif error == "form_closed" %} +

The form for this induction cycle has closed.

+ {% else %} +

An unspecified error has occured.

+ {% endif %} +

Back to home

+
+ HKN Mascot +
{% endblock content %} \ No newline at end of file diff --git a/myapp/templates/registration/login.html b/myapp/templates/registration/login.html index 0357c8dc..e78c7ed4 100644 --- a/myapp/templates/registration/login.html +++ b/myapp/templates/registration/login.html @@ -45,8 +45,8 @@

Welcome back!

-

- Don't have an account? Sign up +

+ Don't have an account? Sign up

diff --git a/myapp/templates/registration/outreach_form.html b/myapp/templates/registration/outreach_form.html index e9c237c7..20e168e3 100644 --- a/myapp/templates/registration/outreach_form.html +++ b/myapp/templates/registration/outreach_form.html @@ -8,42 +8,57 @@ + + - -
- {% if user.is_authenticated %} -
- {% csrf_token %} -

Outreach Student Form

-

- Please provide the following information to complete your outreach profile. -

- - {% for field in form %} - - - - - {% endfor %} - {% for field in form %} - {% if field.errors %} - - - - {% endif %} - {% endfor %} -
{{ field.label_tag }}{{ field }}
- -
- {% else %} -

You are not logged in, please login or register an account.

- {% endif %} +
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+ {% if user.is_authenticated %} +
+ {% csrf_token %} +

Outreach Student Form

+

+ Please provide the following information to complete your outreach profile. +

+ + {% for field in form %} + + + + + {% endfor %} + {% for field in form %} + {% if field.errors %} + +
    + {% for error in field.errors %} +
  • {{ error }}
    • + {% endfor %} +
+ + {% endif %} + {% endfor %} +
{{ field.label_tag }}{{ field }}
+ +
+ {% else %} +

You are not logged in, please + or + register an account.

+ {% endif %} +
+ HKN Mascot +
diff --git a/myapp/templates/registration/outreach_form_invalid.html b/myapp/templates/registration/outreach_form_invalid.html index cd91088e..86dbe16a 100644 --- a/myapp/templates/registration/outreach_form_invalid.html +++ b/myapp/templates/registration/outreach_form_invalid.html @@ -8,18 +8,31 @@ + + - -
- {% if error == "invalid" %} -

Invalid link, please check you have entered the url correctly.

-

If the issue persists, please contact an officer on our discord server.

- {% else %} -

An unspecified error has occured.

- {% endif %} -

Back to home

+
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+ {% if error == "invalid" %} +

Invalid link, please check you have entered the url correctly.

+

If the issue persists, please contact an officer on our discord server.

+ {% else %} +

An unspecified error has occured.

+ {% endif %} +

Back to home

+
+ HKN Mascot +
{% endblock content %} \ No newline at end of file diff --git a/myapp/templates/registration/password_reset.html b/myapp/templates/registration/password_reset.html index e59eb481..5466a346 100644 --- a/myapp/templates/registration/password_reset.html +++ b/myapp/templates/registration/password_reset.html @@ -8,43 +8,51 @@ + + - -
-
- {% csrf_token %} -

Reset Password

-

To reset your password, please enter your email below.

- - {% for field in form %} - - - - - {% endfor %} - {% for field in form %} - {% if field.errors %} +
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+ + {% csrf_token %} +

Reset Password

+

To reset your password, please enter your email below.

+
{{ field.label_tag }}{{ field }}
+ {% for field in form %} -
    - {% for error in field.errors %} -
  • {{ error }}
    • - {% endfor %} -
+ + - {% endif %} - {% endfor %} -
{{ field.label_tag }}{{ field }}
- - - -
+ {% endfor %} + {% for field in form %} + {% if field.errors %} + +
    + {% for error in field.errors %} +
  • {{ error }}
    • + {% endfor %} +
+ + {% endif %} + {% endfor %} + + + + + + HKN Mascot +
{% endblock content %} \ No newline at end of file diff --git a/myapp/templates/registration/password_reset_complete.html b/myapp/templates/registration/password_reset_complete.html index ec8e69d8..6202bffd 100644 --- a/myapp/templates/registration/password_reset_complete.html +++ b/myapp/templates/registration/password_reset_complete.html @@ -8,12 +8,25 @@ + + - -
-

Your password has been changed successfully. Please Login

+
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+

Your password has been changed successfully. Please Login

+
+ HKN Mascot +
{% endblock content %} \ No newline at end of file diff --git a/myapp/templates/registration/password_reset_confirm.html b/myapp/templates/registration/password_reset_confirm.html index ec94e939..71388214 100644 --- a/myapp/templates/registration/password_reset_confirm.html +++ b/myapp/templates/registration/password_reset_confirm.html @@ -8,34 +8,47 @@ + + - -
-
- {% csrf_token %} - - {% for field in form %} - - - - - {% endfor %} - {% for field in form %} - {% if field.errors %} - -
    - {% for error in field.errors %} -
  • {{ error }}
    • - {% endfor %} -
- - {% endif %} - {% endfor %} -
{{ field.label_tag }}{{ field }}
- -
+
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+
+ {% csrf_token %} + + {% for field in form %} + + + + + {% endfor %} + {% for field in form %} + {% if field.errors %} + +
    + {% for error in field.errors %} +
  • {{ error }}
    • + {% endfor %} +
+ + {% endif %} + {% endfor %} +
{{ field.label_tag }}{{ field }}
+ +
+
+ HKN Mascot +
{% endblock content %} \ No newline at end of file diff --git a/myapp/templates/registration/password_reset_done.html b/myapp/templates/registration/password_reset_done.html index 61f97387..7d0662f5 100644 --- a/myapp/templates/registration/password_reset_done.html +++ b/myapp/templates/registration/password_reset_done.html @@ -8,12 +8,25 @@ + + - -
-

Please check your inbox and follow the instructions to reset your password

+
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+

Please check your inbox and follow the instructions to reset your password

+
+ HKN Mascot +
diff --git a/myapp/templates/registration/password_reset_invalid.html b/myapp/templates/registration/password_reset_invalid.html index 1f77bbaa..51890262 100644 --- a/myapp/templates/registration/password_reset_invalid.html +++ b/myapp/templates/registration/password_reset_invalid.html @@ -8,13 +8,26 @@ + + - -
-

Invalid token, please check you have entered the url correctly.

-

If the issue persists, please try reset password again.

+
+ +
+ +

The Premier Engineering
Honor Society of UCSD

+
+ + +
+
+

Invalid token, please check you have entered the url correctly.

+

If the issue persists, please try reset password again.

+
+ HKN Mascot +
{% endblock content %} \ No newline at end of file diff --git a/myapp/templates/registration/register.html b/myapp/templates/registration/register.html index 0d294869..8bc7ddef 100644 --- a/myapp/templates/registration/register.html +++ b/myapp/templates/registration/register.html @@ -8,6 +8,8 @@ + + @@ -44,14 +46,15 @@

Account Registration

{% endfor %} -

+ Already have an account?

-
+ HKN Mascot +