From d12a5a018faf9cba5a19ebb1bda79ad2ffbbd69f Mon Sep 17 00:00:00 2001 From: luxagraf Date: Mon, 19 Nov 2018 11:52:49 -0600 Subject: updated requirements, rolled in style changes and js --- design/sass/_forms.scss | 13 ++++++++- design/sass/_global.scss | 7 +++++ design/sass/screenv1.scss | 1 + design/templates/base.html | 28 +++++++++++++++--- .../templates/django_registration/logged_out.html | 9 ++++++ .../django_registration/registration_form.html | 7 +++++ design/templates/lib/login.html | 34 ++++++++++++++++++++++ design/templates/notes/note_list.html | 9 ------ design/templates/pages/page.html | 8 +++++ design/templates/registration/login.html | 27 ++++++++--------- 10 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 design/templates/django_registration/logged_out.html create mode 100644 design/templates/lib/login.html delete mode 100644 design/templates/notes/note_list.html (limited to 'design') diff --git a/design/sass/_forms.scss b/design/sass/_forms.scss index 3dc8ee4..cac2442 100644 --- a/design/sass/_forms.scss +++ b/design/sass/_forms.scss @@ -1,3 +1,6 @@ +form { + +} form fieldset { margin: 1rem 0; padding: 0; @@ -76,10 +79,18 @@ table { background: $link_color; color: #fff !important; border: 1px solid $link_color; - padding: 5px 9px; + padding: 7px 9px; white-space: nowrap; &:hover { background: $link_hover_color; border: 1px solid $link_hover_color; } } +.form-narrow { + margin: 0 auto; + max-width: 60%; +} +.fancy-legend { + @include fontsize(24); + @include fancy-serif; +} diff --git a/design/sass/_global.scss b/design/sass/_global.scss index 9a01c61..e852855 100644 --- a/design/sass/_global.scss +++ b/design/sass/_global.scss @@ -153,6 +153,7 @@ h3 { } .wrapper { @include constrain_wide; + margin-top: 5rem; } //************** Universals ************************ .hide { @@ -176,6 +177,12 @@ h3 { .alert, .error { color: red !important; } +.text-center { + text-align: center; +} +.sm { + max-width: 80px; +} //************** other global classes ************************ .sans { @include generic_sans; diff --git a/design/sass/screenv1.scss b/design/sass/screenv1.scss index a9e582e..a818f08 100644 --- a/design/sass/screenv1.scss +++ b/design/sass/screenv1.scss @@ -5,3 +5,4 @@ @import "_header.scss"; @import "_footer.scss"; @import "_forms.scss"; +@import "_model.scss"; diff --git a/design/templates/base.html b/design/templates/base.html index 45291d0..6b6ef8c 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -27,10 +27,10 @@ @@ -53,4 +53,24 @@ + {% block extra %} + {%endblock%} + + diff --git a/design/templates/django_registration/logged_out.html b/design/templates/django_registration/logged_out.html new file mode 100644 index 0000000..cccb58b --- /dev/null +++ b/design/templates/django_registration/logged_out.html @@ -0,0 +1,9 @@ +{% extends 'base.html' %} + +{% block title %}Logged Out{% endblock %} + +{% block primary %} +

You're logged out

+

Thanks for visiting the site today

+Login again +{% endblock %} diff --git a/design/templates/django_registration/registration_form.html b/design/templates/django_registration/registration_form.html index 54e01c5..8573918 100644 --- a/design/templates/django_registration/registration_form.html +++ b/design/templates/django_registration/registration_form.html @@ -15,3 +15,10 @@

Already have an account? Log in.

{% endblock %} +{% block extra %} + +{{site.name}} +{%endblock%} diff --git a/design/templates/lib/login.html b/design/templates/lib/login.html new file mode 100644 index 0000000..de2300d --- /dev/null +++ b/design/templates/lib/login.html @@ -0,0 +1,34 @@ +

Login to {{site.name}}

+{% if form.errors %} +

Your username and password didn't match. Please try again.

+{% endif %} + +{% if next %} + {% if user.is_authenticated %} +

Your account doesn't have access to this page. To proceed, + please login with an account that has access.

+ {% else %} +

Please login to see this page.

+ {% endif %} +{% endif %} + +
+{% csrf_token %} +
+ {{ form.username.label_tag }} + {{ form.username }} +
+
+ {{ form.password.label_tag }} + {{ form.password }} +
+ + + +Cancel +
+ +{# Assumes you setup the password_reset view in your URLconf #} +
+

No account yet? Sign up.
+Forgot your password?

diff --git a/design/templates/notes/note_list.html b/design/templates/notes/note_list.html deleted file mode 100644 index 762d05a..0000000 --- a/design/templates/notes/note_list.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -
-

Notes

- -
-{% endblock %} diff --git a/design/templates/pages/page.html b/design/templates/pages/page.html index 3ac5795..91d4732 100644 --- a/design/templates/pages/page.html +++ b/design/templates/pages/page.html @@ -5,3 +5,11 @@ {{page.body_html|safe}} {% endblock %} + +{% block extra %} +{% if login_form %} + +{% endif %} +{%endblock%} diff --git a/design/templates/registration/login.html b/design/templates/registration/login.html index 13b1c6c..a481556 100644 --- a/design/templates/registration/login.html +++ b/design/templates/registration/login.html @@ -1,5 +1,7 @@ {% extends 'base.html' %} {% block content %} +
+Login to {{site.name}} {% if form.errors %}

Your username and password didn't match. Please try again.

{% endif %} @@ -13,23 +15,22 @@ {% endif %} {% endif %} - {% csrf_token %} - - - - - - - - - -
{{ form.username.label_tag }}{{ form.username }}
{{ form.password.label_tag }}{{ form.password }}
+
+ {{ form.username.label_tag }} + {{ form.username }} +
+
+ {{ form.password.label_tag }} + {{ form.password }} +
- +
{# Assumes you setup the password_reset view in your URLconf #} -

Lost password?

+
+

No account yet? Sign up.
+Forgot your password?

{% endblock %} -- cgit v1.2.3-70-g09d2