From 1b28a7ad269ec19575d58d5004e6c6ac64affc4f Mon Sep 17 00:00:00 2001 From: Y Date: Thu, 3 Oct 2024 23:20:33 -0400 Subject: [PATCH 01/10] restructure footer and its relation to the base.html extract footer from individual template and consolidate them in the base.html. push the footer to the bottom of the screen when the page's height is not tall enough to fill the entire viewport. --- apps/static/css/readux2/main.scss | 17 +++++++++++++++++ apps/templates/base.html | 3 ++- apps/templates/cms/collections_page.html | 2 -- apps/templates/cms/content_page.html | 2 -- apps/templates/cms/volumes_page.html | 2 -- apps/templates/collection.html | 1 - apps/templates/pages/home.html | 1 - apps/templates/search_results.html | 2 -- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss index a6d5e18e..ed005496 100644 --- a/apps/static/css/readux2/main.scss +++ b/apps/static/css/readux2/main.scss @@ -1,4 +1,21 @@ /* base.html */ +html, body { + height: 100%; + margin: 0; + display: flex; + flex-direction: column; +} + +#v-readux { + flex-grow: 1; + display: flex; + flex-direction: column; +} + +main { + flex-grow: 1; +} + .landing { margin: 0; padding: 0; diff --git a/apps/templates/base.html b/apps/templates/base.html index 8d4a9ae2..92a3b3f0 100644 --- a/apps/templates/base.html +++ b/apps/templates/base.html @@ -95,7 +95,7 @@ Jump to main content {# Primary container; host for Vue application #} -
+
{% comment %} TODO: Remove existing nav and replace with the following partial. It seems it may be added elsewhere; vue? needs investigation. @@ -124,6 +124,7 @@ {% block viewer %}{% endblock viewer %} + {% include '_home/_footer.html' %}
diff --git a/apps/templates/cms/collections_page.html b/apps/templates/cms/collections_page.html index 4c6c5b7c..6019d677 100644 --- a/apps/templates/cms/collections_page.html +++ b/apps/templates/cms/collections_page.html @@ -67,8 +67,6 @@

{{ collection.label|default:"[no title]"|truncatechars:200 }}

-{% include '_home/_footer.html' %} - {% include_block page.body %} + +{% endblock %} {% block inner %} -

{% trans "Sign Up" %}

+ +{% include '_home/_nav.html' %} -

{% blocktrans %}Already have an account? Then please sign in.{% endblocktrans %}

+
- + + + +

{% trans "Sign Up" %}

-{% endblock %} +

{% blocktrans %}Already have an account? Then please sign in.{% endblocktrans %}

+ + + + +
+{% endblock %} \ No newline at end of file From 7de2a6dd51564936849015d3f9830f01b71e45d4 Mon Sep 17 00:00:00 2001 From: Y Date: Sat, 5 Oct 2024 17:17:47 -0400 Subject: [PATCH 04/10] improve the "full description" button for collections --- apps/static/css/readux2/main.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss index ed005496..d586b0dc 100644 --- a/apps/static/css/readux2/main.scss +++ b/apps/static/css/readux2/main.scss @@ -613,4 +613,15 @@ iframe { .brand-tagline { font-size: small; color: white; +} + + +.description-button { + transition: ease 0.1s; + &:hover { + background-color: darken(#E60000, 10%); + } + &:active { + background-color: darken(#E60000, 25%); + } } \ No newline at end of file From 5b2db9090501e66f10931faf471c601192a9baf3 Mon Sep 17 00:00:00 2001 From: Y Date: Sat, 5 Oct 2024 17:17:56 -0400 Subject: [PATCH 05/10] improve the search button on the search page --- apps/static/css/readux2/search.scss | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/apps/static/css/readux2/search.scss b/apps/static/css/readux2/search.scss index 55d68a1e..29eba034 100644 --- a/apps/static/css/readux2/search.scss +++ b/apps/static/css/readux2/search.scss @@ -127,10 +127,6 @@ form#search-form input[type="search"][name="q"] { width: 100%; } -.uk-button-default { - font-size: 1.25rem; -} - #search-grid { gap: 1.5rem; } @@ -249,4 +245,20 @@ ol#search-results dl { .selectize-control.plugin-clear_button .clear { height: 85%; +} + +.search-button { + background-color: #E60000; + color: white; + padding: 0 9px; + border:none; + height: 40px; + font-size: 1.25rem; + transition: ease 0.1s; + &:hover { + background-color: darken(#E60000, 10%); + } + &:active { + background-color: darken(#E60000, 25%); + } } \ No newline at end of file From d62683432f68129cb0cdedecb2efc2e6648e4fa1 Mon Sep 17 00:00:00 2001 From: Y Date: Sat, 5 Oct 2024 17:18:21 -0400 Subject: [PATCH 06/10] remove inline style for a button --- apps/templates/search_results.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/templates/search_results.html b/apps/templates/search_results.html index 99d63494..b5204078 100644 --- a/apps/templates/search_results.html +++ b/apps/templates/search_results.html @@ -82,7 +82,7 @@
-
From 7bdba2261c5fefdd73aa5566e5e4fb130882814c Mon Sep 17 00:00:00 2001 From: Y Date: Sat, 5 Oct 2024 17:37:37 -0400 Subject: [PATCH 07/10] improve password reset page --- apps/static/css/readux2/main.scss | 4 ++ apps/templates/account/password_reset.html | 56 +++++++++++++++++++--- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss index d586b0dc..98537eb2 100644 --- a/apps/static/css/readux2/main.scss +++ b/apps/static/css/readux2/main.scss @@ -624,4 +624,8 @@ iframe { &:active { background-color: darken(#E60000, 25%); } +} + +.justify-content-normal { + justify-content: normal !important; } \ No newline at end of file diff --git a/apps/templates/account/password_reset.html b/apps/templates/account/password_reset.html index 845bbda7..70897e45 100644 --- a/apps/templates/account/password_reset.html +++ b/apps/templates/account/password_reset.html @@ -1,26 +1,68 @@ {% extends "account/base.html" %} - +{% load sass_tags %} {% load i18n %} {% load account %} {% load crispy_forms_tags %} {% block head_title %}{% trans "Password Reset" %}{% endblock %} +{% block extra_javascript %} + +{% endblock %} + {% block inner %} + + {% include '_home/_nav.html' %} + +
+ +
    +
  • Home
    • +
  • Password Reset
    • +
+ + +

{% trans "Password Reset" %}

-

{% trans "Password Reset" %}

{% if user.is_authenticated %} {% include "account/snippets/already_logged_in.html" %} {% endif %}

{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}

-
+ {% csrf_token %} - {{ form|crispy }} - -
+ +
+ + +
+ + +
+ + +
+ + +
+

{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}

+
+ -

{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}

+
{% endblock %} From 0e655e2e7f4a47b3edd62007c32c155818170bcd Mon Sep 17 00:00:00 2001 From: Y Date: Sat, 5 Oct 2024 17:38:04 -0400 Subject: [PATCH 08/10] left justified for the sign up page action buttons --- apps/templates/account/signup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/templates/account/signup.html b/apps/templates/account/signup.html index e10955ed..5228cc6d 100644 --- a/apps/templates/account/signup.html +++ b/apps/templates/account/signup.html @@ -76,7 +76,7 @@

{% trans "Sign Up" {% endif %} -
+
From 891cf5003f6be9c627f9d5a4ed16360b56741d36 Mon Sep 17 00:00:00 2001 From: Y Date: Sat, 5 Oct 2024 17:43:41 -0400 Subject: [PATCH 09/10] improve password reset done (confirmation) page --- .../account/password_reset_done.html | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/apps/templates/account/password_reset_done.html b/apps/templates/account/password_reset_done.html index c59534af..0af22bc9 100644 --- a/apps/templates/account/password_reset_done.html +++ b/apps/templates/account/password_reset_done.html @@ -1,4 +1,5 @@ {% extends "account/base.html" %} +{% load sass_tags %} {% load i18n %} {% load account %} @@ -6,12 +7,28 @@ {% block head_title %}{% trans "Password Reset" %}{% endblock %} {% block inner %} -

{% trans "Password Reset" %}

+ + +{% include '_home/_nav.html' %} + +
+ + +
    +
  • Home
    • +
  • Password Reset
    • +
+ + +

{% trans "Password Reset" %}

{% if user.is_authenticated %} {% include "account/snippets/already_logged_in.html" %} {% endif %} -

{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}

+

{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}

+
+ +
{% endblock %} From 6e6676d18c64551a9c827f33f0b3d8820ef6b698 Mon Sep 17 00:00:00 2001 From: Y Date: Sat, 5 Oct 2024 17:48:28 -0400 Subject: [PATCH 10/10] improve set password page --- apps/templates/account/password_set.html | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/templates/account/password_set.html b/apps/templates/account/password_set.html index 7786e9e5..336a2fed 100644 --- a/apps/templates/account/password_set.html +++ b/apps/templates/account/password_set.html @@ -1,4 +1,5 @@ {% extends "account/base.html" %} +{% load sass_tags %} {% load i18n %} {% load crispy_forms_tags %} @@ -6,12 +7,26 @@ {% block head_title %}{% trans "Set Password" %}{% endblock %} {% block inner %} -

{% trans "Set Password" %}

+ +{% include '_home/_nav.html' %} + +
+ + +
    +
  • Home
    • +
  • Set Password
    • +
+ + +

{% trans "Set Password" %}

{% csrf_token %} {{ form|crispy }}
+ +
{% endblock %}