diff --git a/RIGS/static/imgs/400.jpg b/RIGS/static/imgs/400.jpg new file mode 100644 index 00000000..e4639f3e Binary files /dev/null and b/RIGS/static/imgs/400.jpg differ diff --git a/RIGS/static/imgs/401.jpg b/RIGS/static/imgs/401.jpg new file mode 100644 index 00000000..6a947ff8 Binary files /dev/null and b/RIGS/static/imgs/401.jpg differ diff --git a/RIGS/static/imgs/404.jpg b/RIGS/static/imgs/404.jpg new file mode 100644 index 00000000..bbbededa Binary files /dev/null and b/RIGS/static/imgs/404.jpg differ diff --git a/RIGS/static/imgs/500.jpg b/RIGS/static/imgs/500.jpg new file mode 100644 index 00000000..9e9f482b Binary files /dev/null and b/RIGS/static/imgs/500.jpg differ diff --git a/templates/400.html b/templates/400.html new file mode 100644 index 00000000..69c93032 --- /dev/null +++ b/templates/400.html @@ -0,0 +1,9 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block title %}Bad Request{% endblock %} + +{% block content %} +
+ +
+{% endblock %} diff --git a/templates/401.html b/templates/401.html new file mode 100644 index 00000000..6d930f91 --- /dev/null +++ b/templates/401.html @@ -0,0 +1,9 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block title %}Unauthorized{% endblock %} + +{% block content %} +
+ +
+{% endblock %} diff --git a/templates/403.html b/templates/403.html new file mode 100644 index 00000000..2bae9f1f --- /dev/null +++ b/templates/403.html @@ -0,0 +1,9 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% block title %}Forbidden{% endblock %} + +{% block content %} +
+ +
+{% endblock %} diff --git a/templates/404.html b/templates/404.html index 281fe9ca..81dc065f 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,6 +1,9 @@ {% extends 'base.html' %} -{% block title %}Page not found{% endblock %} +{% load staticfiles %} +{% block title %}Page Not Found{% endblock %} {% block content %} -The page you requested could not be found. +
+ +
{% endblock %} diff --git a/templates/500.html b/templates/500.html index ea97b712..3d93d52c 100644 --- a/templates/500.html +++ b/templates/500.html @@ -1,6 +1,9 @@ {% extends 'base.html' %} +{% load staticfiles %} {% block title %}Server error{% endblock %} {% block content %} -There was an error while handling your request. +
+ +
{% endblock %} diff --git a/templates/registration/acceptance_email.txt b/templates/registration/acceptance_email.txt deleted file mode 100644 index ece37f81..00000000 --- a/templates/registration/acceptance_email.txt +++ /dev/null @@ -1,12 +0,0 @@ -{% load url from future %} -Welcome {{ profile.first_name }}, - -You request to become a user on {{ site }} has been approved by an administrator. - -To continue the registration process please visit http://{{ site.domain }}{% url 'registration_activate' activation_key=activation_key %}. -This link will be active for the next {{ expiration_days }} days. - -{% if message %} -Message from administrator: -{{ message }} -{% endif %} \ No newline at end of file diff --git a/templates/registration/acceptance_email_subject.txt b/templates/registration/acceptance_email_subject.txt deleted file mode 100644 index cc20c8a7..00000000 --- a/templates/registration/acceptance_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{{ site }} user {{ user }} activation {{ activation_key }} \ No newline at end of file diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt index 6574286f..12c58ce7 100644 --- a/templates/registration/activation_email.txt +++ b/templates/registration/activation_email.txt @@ -1,5 +1,7 @@ -Congratulations {{ user.first_name }}. You are now fully registered on {{ site }}. +{% load url from future %} +Welcome {{ user }}, -{% if is_generated %} -You password for this site has been automatically set to {{ password }}. It is recommend you change this as soon as possible. -{% endif %} \ No newline at end of file +Thank you for registering on {{ site }} + +To continue the registration process please visit http://{{ site.domain }}{% url 'registration_activate' activation_key=activation_key %}. +This link will be active for the next {{ expiration_days }} days. diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt index e35ae77a..2237d0a8 100644 --- a/templates/registration/activation_email_subject.txt +++ b/templates/registration/activation_email_subject.txt @@ -1 +1 @@ -{{ user }} activation successful \ No newline at end of file +{{ user }} activation required \ No newline at end of file diff --git a/templates/registration/activation_form.html b/templates/registration/activation_form.html deleted file mode 100644 index 2df0849b..00000000 --- a/templates/registration/activation_form.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends 'base.html' %} -{% load widget_tweaks %} -{% block title %}Activation{% endblock %} - -{% block content %} -
{% csrf_token %} - {% for field in form %} -
- -
- {% render_field field class+="form-control" placeholder=field.label %} -
-
- {% endfor %} -

-
-{% endblock %} \ No newline at end of file diff --git a/templates/registration/notification_email.txt b/templates/registration/notification_email.txt deleted file mode 100644 index 33c46ba9..00000000 --- a/templates/registration/notification_email.txt +++ /dev/null @@ -1,3 +0,0 @@ -A new user has just registered on {{ site }} with username {{ user.username }} and email {{ user.email }}. - -Please visit {{ site.domain }}{% url admin:registration_registrationprofile_change user.registration_profile.id %} to moderate this activation. \ No newline at end of file diff --git a/templates/registration/notification_email_subject.txt b/templates/registration/notification_email_subject.txt deleted file mode 100644 index a7b01a57..00000000 --- a/templates/registration/notification_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{{ site }} New User Approval Require \ No newline at end of file diff --git a/templates/registration/registration_email.txt b/templates/registration/registration_email.txt deleted file mode 100644 index a32116ee..00000000 --- a/templates/registration/registration_email.txt +++ /dev/null @@ -1,3 +0,0 @@ -You account has been created but now requires approval by one of our moderation team. - -Please wait while this is done. \ No newline at end of file diff --git a/templates/registration/registration_email_subject.txt b/templates/registration/registration_email_subject.txt deleted file mode 100644 index 7d469366..00000000 --- a/templates/registration/registration_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{{ site }} User Awaiting Approval \ No newline at end of file