diff --git a/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css b/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css index 142a595..90c44aa 100644 --- a/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css +++ b/polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/base.css @@ -21,4 +21,48 @@ .rug-breadcrumbs { display: none; +} + +p { + max-width: none; +} + +table { + width: 100%; +} + +input { + width: 100% +} + +.alert-warning { + color: #856404; + background-color: #fff3cd; + border-color: #ffeeba; +} + +.alert-success { + color: #155724; + background-color: #d4edda; + border-color: #c3e6cb; +} +.alert-danger { + color: #721c24; + background-color: #f8d7da; + border-color: #f5c6cb; +} +.form-control { + display: block; + width: 100%; + height: calc(1.5em + .75rem + 2px); + padding: .375rem .75rem; + font-size: 1rem; + font-weight: 400; + line-height: 1.5; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: .25rem; + transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; } \ No newline at end of file diff --git a/polyclinic_scheduling/apps/RUG_template/templates/index.html b/polyclinic_scheduling/apps/RUG_template/templates/index.html index a9987e0..b5e543e 100644 --- a/polyclinic_scheduling/apps/RUG_template/templates/index.html +++ b/polyclinic_scheduling/apps/RUG_template/templates/index.html @@ -4,8 +4,6 @@ {% block title %}{% trans "Welcome to the RUG Template page" %}{% endblock %} {% block pagetitle %}{% trans "Welcome to the RUG Template page" %}{% endblock %} {% block content %} -
-{% trans "Simple RUG Template" %} -
+{% trans "Simple RUG Template" %}
{% trans "Some more text" %}
{% endblock %} \ No newline at end of file diff --git a/polyclinic_scheduling/apps/RUG_template/templates/menu.html b/polyclinic_scheduling/apps/RUG_template/templates/menu.html index 3e9334a..e3d592a 100644 --- a/polyclinic_scheduling/apps/RUG_template/templates/menu.html +++ b/polyclinic_scheduling/apps/RUG_template/templates/menu.html @@ -1,13 +1,10 @@ {% load i18n %}
-{% trans "Login" %}
+ {% trans "Login" %}
+
+ {% blocktrans %}
+ You can login here to create your schedules. If you do not have a login, please contact: some_one@rug.nl
+ {% endblocktrans %}
-{% trans "Password reset complete" %}
-
-
Your new password has been set. You can log in now on the log in page.
- +{% trans "Password reset complete" %}
+{% url 'login' as login_url %} +{% blocktrans %}Your new password has been set. You can log in now on the log in page.{% endblocktrans %}
{% endblock %} diff --git a/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_confirm.html b/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_confirm.html index a89576a..e472c5e 100644 --- a/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_confirm.html +++ b/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_confirm.html @@ -4,22 +4,23 @@ {% block title %}{% trans "Set a new password!" %}{% endblock %} {% block pagetitle %}{% trans "Set a new password!" %}{% endblock %} {% block content %} --{% trans "Set a new password!" %} +
{% trans "Set a new password!" %}
{% if validlink %}
-
{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}
+ {% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %} {% endif %} - + {% endblock %} diff --git a/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_done.html b/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_done.html index 59135be..ffa7012 100644 --- a/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_done.html +++ b/polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_done.html @@ -8,6 +8,6 @@ {% trans "Reset password, email sent" %}
+{% url 'password_reset_confirm' uidb64=uid token=token as reset_url%}
+{% blocktrans %}
+You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
+
+Please go to the following page and choose a new password:
+
+{{ protocol}}://{{ domain }}{{ reset_url }}
+
+Your username, in case you’ve forgotten: {{ user }}
+
+Thanks for using our site!
+
+The {{ site_name }} team
+{% endblocktrans %}
+
{% trans "Reset password" %}
+
+{% blocktrans %}Here you can request a password reset. Please enter your email address that is used for registration.{% endblocktrans %}
-{% trans "Singup" %} -
+{% trans "Singup" %}