From 163d977bc2c1f434f6a584b53585ea1f4d8730be Mon Sep 17 00:00:00 2001 From: William Colmenares Date: Mon, 15 Apr 2019 20:16:30 -0400 Subject: [PATCH] added styles to pages --- dal/templates/base_short.html | 6 +- dal/templates/changeddata.html | 41 +++++++++----- dal/templates/changedpassword.html | 33 +++++++++-- dal/templates/changepassword.html | 62 +++++++++++++------- dal/templates/changeuserdata.html | 60 ++++++++++++++------ dal/templates/deleteaccount.html | 55 ++++++++++++------ dal/templates/deleteduser.html | 33 +++++++++-- dal/templates/error.html | 47 +++++++++++----- dal/templates/includes/_footer.html | 4 +- dal/templates/landing.html | 4 ++ dal/templates/loginfailed.html | 38 +++++++++---- dal/templates/mustbeloggedin.html | 34 +++++++++-- dal/templates/registeruser.html | 84 +++++++++++++++++++--------- dal/templates/resetpassword.html | 45 +++++++++++---- dal/templates/resetpasswordnew.html | 78 +++++++++++++++++++++----- dal/templates/send_resetrequest.html | 37 +++++++++--- dal/templates/usercreated.html | 34 +++++++++-- dal/templates/useroptions.html | 50 +++++++++-------- 18 files changed, 541 insertions(+), 204 deletions(-) diff --git a/dal/templates/base_short.html b/dal/templates/base_short.html index d2d03e1..8d2c061 100644 --- a/dal/templates/base_short.html +++ b/dal/templates/base_short.html @@ -10,8 +10,8 @@ - - ungleich + {% block title %} + {% endblock %} @@ -54,7 +54,7 @@ {% include "includes/_navbar_transparent.html" %} {% endblock navbar %} -
+
{% block content %} {% endblock %}
diff --git a/dal/templates/changeddata.html b/dal/templates/changeddata.html index 4fbbff4..3764ac3 100644 --- a/dal/templates/changeddata.html +++ b/dal/templates/changeddata.html @@ -1,14 +1,29 @@ - Userdata changed. +{% extends "base_short.html" %} +{% load i18n staticfiles bootstrap3 %} -

The data for {{user}} has been changed.

-

- -

-
- -
+{% block title %} + Success! +{% endblock %} + + + +{% block content %} +
+
+
+
+
+

{% trans " Data successfully updated." %}

+
+
+
+ +
+
+
+
+
+
+{% endblock %} diff --git a/dal/templates/changedpassword.html b/dal/templates/changedpassword.html index 8ae9707..d9ba591 100644 --- a/dal/templates/changedpassword.html +++ b/dal/templates/changedpassword.html @@ -1,7 +1,28 @@ - Password for {{user}} changed. +{% extends "base_short.html" %} +{% load i18n staticfiles bootstrap3 %} -

The password for {{user}} has been changed.

-

-
- -
+{% block title %} + Password Updated. +{% endblock %} + + + +{% block content %} +
+
+
+
+
+

{% trans " Password successfully updated " %}

+
+
+ +
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/dal/templates/changepassword.html b/dal/templates/changepassword.html index 691d3b0..e9a5abf 100644 --- a/dal/templates/changepassword.html +++ b/dal/templates/changepassword.html @@ -1,20 +1,44 @@ - Changing the password for {{user}} +{% extends "base_short.html" %} +{% load i18n staticfiles bootstrap3 %} -

Changing the password for {{user}}

-

-
- -
-

-To change the password for {{user}}, please supply -
- {% csrf_token %} -
The old password:
- -

The new password (at least 8 characters):
- -
Please repeat the new Password:
- -

- -
+{% block title %} + Changing the password for {{user}} +{% endblock %} + + + +{% block content %} +
+
+
+
+
+

{% trans " Password change " %}

+
+ {% csrf_token %} +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ +
+
+
+
+
+
+{% endblock %} diff --git a/dal/templates/changeuserdata.html b/dal/templates/changeuserdata.html index c5201d1..f8a76d7 100644 --- a/dal/templates/changeuserdata.html +++ b/dal/templates/changeuserdata.html @@ -1,19 +1,43 @@ - Changing user data for {{user}} +{% extends "base_short.html" %} +{% load i18n staticfiles bootstrap3 %} + +{% block title %} + Changing user data for {{user}} +{% endblock %} + + + +{% block content %} +
+
+
+
+
+

{% trans " Update your info " %}

+
+ {% csrf_token %} +
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+
+
+
+
+{% endblock %} -

Changing user data for {{user}}

-

-
- -
-

-
- {% csrf_token %} -
Firstname:
- -

Lastname:
- -

Email:
- -

- -
diff --git a/dal/templates/deleteaccount.html b/dal/templates/deleteaccount.html index b960f38..de6c15b 100644 --- a/dal/templates/deleteaccount.html +++ b/dal/templates/deleteaccount.html @@ -1,18 +1,39 @@ - Deleting an Account +{% extends "base_short.html" %} +{% load i18n staticfiles bootstrap3 %} -

Deleting an Account

-

-
- -
-

-To delete an account, please type the username and password below: -
- {% csrf_token %} -

Username:
- -

Password:
- -

- -
+{% block title %} + Deleting Account +{% endblock %} + + + +{% block content %} +
+
+
+
+
+

{% trans " Enter your credentials to confirm " %}

+
+ {% csrf_token %} +

+
+ + +
+
+ + +
+
+
+ +
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/dal/templates/deleteduser.html b/dal/templates/deleteduser.html index 3076386..d0c4330 100644 --- a/dal/templates/deleteduser.html +++ b/dal/templates/deleteduser.html @@ -1,7 +1,28 @@ - Deleted user {{user}} +{% extends "base_short.html" %} +{% load i18n staticfiles bootstrap3 %} -

The user {{user}} was deleted from our system.

-
-
- -
+{% block title %} + Deleted user {{user}} +{% endblock %} + + + +{% block content %} +
+
+
+
+
+

{% trans " User Removed " %}

+
+
+ +
+
+
+
+
+
+{% endblock %} diff --git a/dal/templates/error.html b/dal/templates/error.html index 2dba709..6726430 100644 --- a/dal/templates/error.html +++ b/dal/templates/error.html @@ -1,17 +1,34 @@ - An error has occurred! +{% extends "base_short.html" %} +{% load i18n staticfiles bootstrap3 %} + +{% block title %} + An error has occurred! +{% endblock %} + + +{% block content %} +
+
+
+
+
+

{% trans " We are sorry, an error has occurred. " %}

+
+
+ While trying to {{service}}, an error was encountered: {{error}} +
+ +
+ {% if urlname %} +
You can:

+ Go back and try again + {% endif %} + Go to the indexpage +
+
+
+
+
+{% endblock %} -

We are sorry, an error has occured while handling your request.

-While trying to {{service}}, an error was encountered: {{error}} -

-You can try to: -
-{% if urlname %} -
- -
-
or
-{% endif %} -
- -
diff --git a/dal/templates/includes/_footer.html b/dal/templates/includes/_footer.html index 800f7dc..16ada0e 100644 --- a/dal/templates/includes/_footer.html +++ b/dal/templates/includes/_footer.html @@ -1,7 +1,7 @@ {% load i18n %}