From 76462a6d70ab8b86c0058b4b78eba16a96ef70c7 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 11:48:03 -0400
Subject: [PATCH 01/41] Pull site name and tagline from wagtail/django

---
 apps/templates/_home/_hero.html | 5 +++--
 apps/templates/_home/_nav.html  | 4 +---
 config/settings/base.py         | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/templates/_home/_hero.html b/apps/templates/_home/_hero.html
index e47f0586..4d601748 100644
--- a/apps/templates/_home/_hero.html
+++ b/apps/templates/_home/_hero.html
@@ -1,6 +1,7 @@
+{% load wagtailcore_tags %}
 <div class="uk-container uk-text-center hero">
     <h1 class="uk-heading-primary" style="color: white; font-size: 3rem; font-weight: bold; margin-bottom: 1rem;">
-        Sounding Spirit</h1>
-    <p class="uk-text-lead" style="color: white; ">where sacred songbooks meet digital innovation</p>
+        {{ page.title }}</h1>
+    <p class="uk-text-lead" style="color: white; ">{{ page.tagline|richtext }}</p>
     {% include "snippets/_search_box.html" %}
 </div>
\ No newline at end of file
diff --git a/apps/templates/_home/_nav.html b/apps/templates/_home/_nav.html
index 4896dc49..41c045ab 100644
--- a/apps/templates/_home/_nav.html
+++ b/apps/templates/_home/_nav.html
@@ -1,11 +1,9 @@
-
-
 <nav class="uk-navbar-container" style="background:none;">
     <div class="uk-container">
         <div uk-navbar="mode: click">
             <div class="uk-navbar-left">
                 <div class="uk-logo">
-                    <div><a class="brand-logo" href="/">Sounding Spirit</a></div>
+                    <div><a class="brand-logo" href="/">{{ request.site.name }}</a></div>
                     <div class="brand-tagline">built on <a class="brand-readux">Readux</a></div>
                 </div>
 
diff --git a/config/settings/base.py b/config/settings/base.py
index 80283f29..20fae610 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -180,6 +180,7 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
     "allauth.account.middleware.AccountMiddleware",
+    "django.contrib.sites.middleware.CurrentSiteMiddleware",
 ]
 
 # STATIC

From a9ed8a0faa2668cb3055b23f49fcf380b2d1aca9 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 12:20:16 -0400
Subject: [PATCH 02/41] Fix bugs with IIIF viewer in new design

---
 apps/templates/base.html | 52 ++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/apps/templates/base.html b/apps/templates/base.html
index 1bcadee5..4fcae0d3 100644
--- a/apps/templates/base.html
+++ b/apps/templates/base.html
@@ -62,7 +62,7 @@
     <meta property="og:image" content="https://{{ request.META.HTTP_HOST }}/apps/static/images/readux_logo.jpg" />
     <meta property="og:description" content="Read, Annotate, Publish" />
     <meta name="twitter:description" content="Read, Annotate, Publish" />
-    <!--<meta property="og:url" content="https://readux.ecds.emory.edu" />-->
+    <meta property="og:url" content="https://{{ request.META.HTTP_HOST }}" />
     {% endif %}
     <meta name="twitter:image:alt" content="Readux Logo - Emory Center for Digital scholarship - Read, Annotate, Publish" />
     <meta property="og:site_name" content="{{ current_site.site_name }}" />
@@ -81,35 +81,45 @@
     {% block css %}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.17.0/css/uikit.min.css" />
     <link href="{% static 'css/selectize.css' %}" rel="stylesheet">
-    <!-- <link type="text/css" href="{% sass_src 'css/project.scss' %}" rel="stylesheet"> -->
-    <link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
+    <link type="text/css" href="{% sass_src 'css/project.scss' %}" rel="stylesheet">
     <link type="text/css" href="{% sass_src 'css/readux2/login.scss' %}" rel="stylesheet">
-    <!-- <link type="text/css" href="css/project.scss" rel="stylesheet"> -->
-
-    <style>
-      {{ css }}
-    </style>
     {% endblock %}
     {% block extra_css %}{% endblock extra_css %}
 
   </head>
 
   <body>
+    {# NOTE: Jump to main content required for accessibility #}
+    <a class="sr-only" href="#main">Jump to main content</a>
 
-  {% block content %}
-  
-  {% endblock content %}
+    {# Primary container; host for Vue application #}
+    <div class="uk-container" id="v-readux">
+      {# TODO: Remove  #}
+      {% comment %} {% include "_home/_nav.html" %} {% endcomment %}
 
-  <div id="v-readux"></div>
-  
-  <!-- <a class="sr-only" href="#main">Jump to main content</a> -->
-  {% if request.get_host == "readux2.ecdsdev.org" %}
-  {% elif request.get_host == "readux.ecdsdev.org" %}
-  <div style="background-color:sandybrown;width:100%;height:1.5em;color:darkslategrey;text-align:center;font-size:1.4em;">
-  DEVELOPMENT SITE: Go to <a href="https://readux2.ecdsdev.org" style="color:red;text-decoration:underline;">Beta</a> for beta-testing or go to fully functioning
-  <a href="https://readux.ecds.emory.edu/" style="color:darkblue;text-decoration:underline;">Readux</a>.
-  </div>
-  {% endif %}
+      {# Content container #}
+      <main id='main'>
+        {# Django errors and alerts #}
+        {% if messages %}
+            {% for message in messages %}
+              <div class="uk-alert-{{ message.tags }}" uk-alert>
+                <a class="uk-alert-close" uk-close></a>
+                <p>{{ message }}</p>
+              </div>
+            {% endfor %}
+        {% endif %}
+
+        {% block modal %}
+        {% endblock modal %}
+
+        {% block content %}
+        {% endblock content %}
+
+        {# IIIF viewer #}
+        {% block viewer %}{% endblock viewer %}
+      </main>
+
+    </div>
   
     <!-- Matomo Image Tracker-->
     <img referrerpolicy="no-referrer-when-downgrade" src="https://matomo.ecdsdev.org/matomo.php?idsite=3&amp;rec=1" hidden alt="" />

From af794cd97b88edd81ec8de5cba8745c0acce51ec Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 12:20:36 -0400
Subject: [PATCH 03/41] Allow new and old CSS to coexist

---
 apps/static/css/project.scss      | 6 ++++++
 apps/templates/cms/home_page.html | 5 +++++
 apps/templates/page.html          | 4 ----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/static/css/project.scss b/apps/static/css/project.scss
index 44ee3830..9dcf7b49 100644
--- a/apps/static/css/project.scss
+++ b/apps/static/css/project.scss
@@ -3656,3 +3656,9 @@ ol#search-results dl {
 // }
 /*# sourceMappingURL=project.css.map */
 
+
+// NOTE: Migrated from templates/page.html
+#v-readux.uk-container {
+  padding: 0;
+  max-width: none;
+}
diff --git a/apps/templates/cms/home_page.html b/apps/templates/cms/home_page.html
index e2e82daf..0b13ee69 100644
--- a/apps/templates/cms/home_page.html
+++ b/apps/templates/cms/home_page.html
@@ -4,6 +4,11 @@
 {% load wagtailcore_tags %}
 {% load has_user_annotations %}
 {% load user_annotation_count %}
+{% load sass_tags %}
+
+{% block extra_css %}
+<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
+{% endblock %}
 
 {% block content %}
 
diff --git a/apps/templates/page.html b/apps/templates/page.html
index 9bbbe2b8..0babab42 100644
--- a/apps/templates/page.html
+++ b/apps/templates/page.html
@@ -8,10 +8,6 @@
   #rx-nav {
     display: none;
   }
-  .uk-container {
-    padding: 0;
-    max-width: none;
-  }
 </style>
 {% endblock extra_css %}
 

From e1395c458f65466d1408a77191c6532be4d9912f Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 12:36:30 -0400
Subject: [PATCH 04/41] finish unfinished comment

---
 apps/templates/base.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/templates/base.html b/apps/templates/base.html
index 4fcae0d3..1afcc470 100644
--- a/apps/templates/base.html
+++ b/apps/templates/base.html
@@ -94,7 +94,10 @@
 
     {# Primary container; host for Vue application #}
     <div class="uk-container" id="v-readux">
-      {# TODO: Remove  #}
+      {% comment %}
+        TODO: Remove existing nav and replace with the following partial.
+        It seems it may be added elsewhere; vue? needs investigation.
+      {% endcomment %}
       {% comment %} {% include "_home/_nav.html" %} {% endcomment %}
 
       {# Content container #}

From 6f88f025ca6f4c82fbecdbdfa612213d5c58f2ee Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 14:28:40 -0400
Subject: [PATCH 05/41] Use Django site name in hero

---
 apps/templates/_home/_hero.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/templates/_home/_hero.html b/apps/templates/_home/_hero.html
index 4d601748..d2419505 100644
--- a/apps/templates/_home/_hero.html
+++ b/apps/templates/_home/_hero.html
@@ -1,7 +1,7 @@
 {% load wagtailcore_tags %}
 <div class="uk-container uk-text-center hero">
     <h1 class="uk-heading-primary" style="color: white; font-size: 3rem; font-weight: bold; margin-bottom: 1rem;">
-        {{ page.title }}</h1>
+        {{ request.site.name }}</h1>
     <p class="uk-text-lead" style="color: white; ">{{ page.tagline|richtext }}</p>
     {% include "snippets/_search_box.html" %}
 </div>
\ No newline at end of file

From 0a72a47846dccc25bc95fe048491b1d56c59e579 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 14:51:29 -0400
Subject: [PATCH 06/41] Use wagtail data for featured volumes/collections

---
 .../_home/_featured_collections.html          | 64 ++++++-------------
 apps/templates/_home/_featured_volumes.html   | 61 +++++-------------
 apps/templates/cms/home_page.html             |  8 ++-
 3 files changed, 40 insertions(+), 93 deletions(-)

diff --git a/apps/templates/_home/_featured_collections.html b/apps/templates/_home/_featured_collections.html
index b4e0957a..704d0574 100644
--- a/apps/templates/_home/_featured_collections.html
+++ b/apps/templates/_home/_featured_collections.html
@@ -1,55 +1,29 @@
+{% load readux_templatetags %}
+
 <div class="uk-section uk-section-default uk-padding-remove-top">
     <div class="uk-container">
-        <h2 class="uk-text-large uk-text-bold">Featured Collections <span><a class="text-anchor">(See All Collections)</a></span></h2>
+        <h2 class="uk-text-large uk-text-bold">
+            Featured Collection{{page.featured_collections.all.count|pluralize}}
+            <a class="text-anchor">(See All Collections)</a>
+        </h2>
         
         <div uk-slider>
             <div class="uk-position-relative">
                 <div class="uk-slider-container uk-light">
                     <div class="uk-slider-items uk-child-width-1-2 uk-child-width-1-3@s uk-child-width-1-4@m">
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                                
-                            </a>
-                            <div class="color-black">8 Volumes</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">12 Volumes</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">20 Volumes</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">29 Volumes</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">98 Volumes</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                                
-                            </a>
-                            <div class="color-black">82 Volumes</div>
-                        </div>
+                        {% for collection in page.featured_collections.all|order_by:page.featured_collections_sort_order %}
+                            <div class="uk-panel">
+                                <a href="#" class="volume-item">
+                                    <img src="/media/{{ collection.thumbnail }}" alt="{{ collection.label }}">
+                                    <h2>{{ collection.label }}</h2>
+                                </a>
+                                <div class="color-black">
+                                    {% with collection.manifests.all.count as n_volumes %}
+                                        {{ n_volumes }} Volume{{ n_volumes|pluralize }}
+                                    {% endwith %}
+                                </div>
+                            </div>
+                        {% endfor %}
                     </div>
                 </div>
         
diff --git a/apps/templates/_home/_featured_volumes.html b/apps/templates/_home/_featured_volumes.html
index 9c460be4..7a5da2ff 100644
--- a/apps/templates/_home/_featured_volumes.html
+++ b/apps/templates/_home/_featured_volumes.html
@@ -1,55 +1,24 @@
+{% load readux_templatetags %}
+
 <div class="uk-section uk-section-default uk-padding-remove-top">
     <div class="uk-container">
-        <h2 class="uk-text-large uk-text-bold">Featured Volumes <span><a class="text-anchor">(See All Volumes)</a></span></h2>
-        
+        <h2 class="uk-text-large uk-text-bold">
+            Featured Volume{{page.featured_volumes.all.count|pluralize}}
+            <a class="text-anchor">(See All Volumes)</a>
+        </h2>
         <div uk-slider>
             <div class="uk-position-relative">
                 <div class="uk-slider-container uk-light">
                     <div class="uk-slider-items uk-child-width-1-2 uk-child-width-1-3@s uk-child-width-1-4@m">
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                                
-                            </a>
-                            <div class="color-black">1653</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">1653</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">1653</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">1653</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                            </a>
-                            <div class="color-black">1653</div>
-                        </div>
-                        <div class="uk-panel">
-                            <a href="#" class="volume-item">
-                                <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-                                <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-                                
-                            </a>
-                            <div class="color-black">1653</div>
-                        </div>
+                        {% for volume in page.featured_volumes.all|order_by:page.featured_volumes_sort_order %}
+                            <div class="uk-panel">
+                                <a href="#" class="volume-item">
+                                    <img src="{{ volume.start_canvas.thumbnail_crop_tallwide }}" alt="{{ volume.label }}">
+                                    <h2>{{ volume.label }}</h2>
+                                </a>
+                                <div class="color-black">{{ volume.published_date }}</div>
+                            </div>
+                        {% endfor %}
                     </div>
                 </div>
         
diff --git a/apps/templates/cms/home_page.html b/apps/templates/cms/home_page.html
index e2e82daf..c6ea7130 100644
--- a/apps/templates/cms/home_page.html
+++ b/apps/templates/cms/home_page.html
@@ -14,8 +14,12 @@
       {% include '_home/_nav.html' %}
       {% include '_home/_hero.html' %}
       {% include '_home/_featured_story.html' %}
-      {% include '_home/_featured_volumes.html' %}
-      {% include '_home/_featured_collections.html' %}
+      {% if page.featured_volumes.all.count != 0 %}
+        {% include '_home/_featured_volumes.html' %}
+      {% endif %}
+      {% if page.featured_collections.all.count != 0 %}
+        {% include '_home/_featured_collections.html' %}
+      {% endif %}
       {% include '_home/_video.html' %}
       {% include '_home/_highlights.html' %}
       {% include '_home/_footer.html' %}

From defdde6ca217ea08a8f03a127709b5b295c4130f Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 14:51:42 -0400
Subject: [PATCH 07/41] Use some django urls in nav where possible

---
 apps/templates/_home/_nav.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/templates/_home/_nav.html b/apps/templates/_home/_nav.html
index 41c045ab..5ee617a5 100644
--- a/apps/templates/_home/_nav.html
+++ b/apps/templates/_home/_nav.html
@@ -38,7 +38,7 @@
                     </li>
                     <!-- Search with Icon -->
                     <li class="">
-                        <a href="/search/" class="menu-item" uk-icon="icon: search;" uk-tooltip="Search in this library"></a>
+                        <a href="{% url 'search' %}" class="menu-item" uk-icon="icon: search;" uk-tooltip="Search in this library"></a>
                     </li>
                 </ul>
             </div>
@@ -74,8 +74,8 @@ <h2 class="uk-text-x-large uk-text-bold">Log in to Readux</h2>
                     <button type="submit" class="uk-button sign-in-btn">Sign In</button>
                 </div>
                 <div class="uk-flex uk-flex-between">
-                    <a href="#" class="uk-link text-anchor-blue">Forgot Password?</a>
-                    <a href="#" class="uk-link text-anchor-blue">New User?</a>
+                    <a href="{% url 'account_reset_password' %}" class="uk-link text-anchor-blue">Forgot Password?</a>
+                    <a href="{% url 'account_signup' %}" class="uk-link text-anchor-blue">New User?</a>
                 </div>
             </form>
 

From bf42e4e1f430418e7a0caf6844bf1a8137858490 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 20 Aug 2024 15:16:49 -0400
Subject: [PATCH 08/41] Connect search box to search view

---
 apps/static/css/readux2/main.scss        |  2 +-
 apps/templates/snippets/_search_box.html | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss
index 6908440c..b5273ea4 100644
--- a/apps/static/css/readux2/main.scss
+++ b/apps/static/css/readux2/main.scss
@@ -308,7 +308,7 @@
 }
 
 /* search bar */
-.search-bar {
+.search-bar form {
     display: flex;
     align-items: center;
     width: 100%;
diff --git a/apps/templates/snippets/_search_box.html b/apps/templates/snippets/_search_box.html
index 1d624957..bd45a712 100644
--- a/apps/templates/snippets/_search_box.html
+++ b/apps/templates/snippets/_search_box.html
@@ -1,6 +1,8 @@
 <div class="search-bar">
-  <input class="uk-input" type="text" placeholder="Search...">
-  <button class="uk-button">
-      Search
-  </button>
-</div>
\ No newline at end of file
+  <form action="{% url 'search' %}" method="get">
+    <input class="uk-input" type="text" name="q" id="q" placeholder="Search...">
+    <button type="submit" class="uk-button">
+        Search
+    </button>
+  </form>
+</div>

From 8f2004698829cf4ead19a3724095bee67428863d Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 15:03:40 -0400
Subject: [PATCH 09/41] Remove unused Django "volumes list" view

---
 apps/readux/tests/tests.py  | 40 +-------------------------
 apps/readux/urls.py         |  1 -
 apps/readux/views.py        | 57 -------------------------------------
 apps/templates/volumes.html | 32 ---------------------
 4 files changed, 1 insertion(+), 129 deletions(-)
 delete mode 100644 apps/templates/volumes.html

diff --git a/apps/readux/tests/tests.py b/apps/readux/tests/tests.py
index 98a1be0e..4f22b696 100644
--- a/apps/readux/tests/tests.py
+++ b/apps/readux/tests/tests.py
@@ -9,7 +9,7 @@
 from apps import readux
 from ..models import UserAnnotation
 from ..context_processors import current_version
-from apps.readux.views import VolumesList, CollectionDetail, ExportOptions, AnnotationsCount
+from apps.readux.views import CollectionDetail, ExportOptions, AnnotationsCount
 from urllib.parse import urlencode
 from cssutils import parseString
 import json
@@ -417,44 +417,6 @@ def test_user_annotations_on_canvas(self):
         assert serialized_canvas['label'] == str(self.canvas.position)
         assert len(serialized_canvas['otherContent']) == 1
 
-    def test_volume_list_view_no_kwargs(self):
-        response = self.client.get(reverse('volumes list'))
-        context = response.context_data
-        assert context['order_url_params'] == urlencode({'sort': 'title', 'order': 'asc'})
-        assert context['object_list'].count() == Manifest.objects.all().count()
-
-    def test_volume_list_invalid_kwargs(self):
-        kwargs = {'blueberry': 'pizza', 'jay': 'awesome'}
-        response = self.client.get(reverse('volumes list'), data=kwargs)
-        context = response.context_data
-        assert context['order_url_params'] == urlencode({'sort': 'title', 'order': 'asc'})
-        assert context['object_list'].count() == Manifest.objects.all().count()
-
-    def test_volumes_list_view_sort_and_order(self):
-        view = VolumesList()
-        for sort in view.SORT_OPTIONS:
-            for order in view.ORDER_OPTIONS:
-                kwargs = {'sort': sort, 'order': order}
-                url = reverse('volumes list')
-                response = self.client.get(url, data=kwargs)
-                context = response.context_data
-                assert context['order_url_params'] == urlencode({'sort': sort, 'order': order})
-                assert context['object_list'].count() == Manifest.objects.all().count()
-                assert view.get_queryset().ordered
-
-    def test_collection_detail_view_no_kwargs(self):
-        response = self.client.get(reverse('volumes list'))
-        context = response.context_data
-        assert context['order_url_params'] == urlencode({'sort': 'title', 'order': 'asc'})
-        assert context['object_list'].count() == Manifest.objects.all().count()
-
-    def test_collection_detail_invalid_kwargs(self):
-        kwargs = {'blueberry': 'pizza', 'jay': 'awesome'}
-        response = self.client.get(reverse('volumes list'), data=kwargs)
-        context = response.context_data
-        assert context['order_url_params'] == urlencode({'sort': 'title', 'order': 'asc'})
-        assert context['object_list'].count() == Manifest.objects.all().count()
-
     # TODO are the volumes actually sorted?
     def test_collection_detail_view_sort_and_order(self):
         view = CollectionDetail()
diff --git a/apps/readux/urls.py b/apps/readux/urls.py
index b0188ffa..9b66412f 100644
--- a/apps/readux/urls.py
+++ b/apps/readux/urls.py
@@ -6,7 +6,6 @@
 
 urlpatterns = [
     path('collection/', views.CollectionsList.as_view(), name='collections list'),
-    path('volume/', views.VolumesList.as_view(), name='volumes list'),
     path('collection/<collection>/', views.CollectionDetail.as_view(), name="collection"),
     path('volume/<volume>', views.VolumeDetail.as_view(), name='volume'),
     path('volume/<volume>/page/all', views.PageDetail.as_view(), name='volumeall'),
diff --git a/apps/readux/views.py b/apps/readux/views.py
index 98b63010..725fbed9 100644
--- a/apps/readux/views.py
+++ b/apps/readux/views.py
@@ -32,63 +32,6 @@ class CollectionsList(ListView):
     context_object_name = 'collections'
     queryset = Collection.objects.all()
 
-class VolumesList(ListView):
-    """Django List View for :class:`apps.iiif.manifests.models.Manifest`s"""
-    template_name = "volumes.html"
-    SORT_OPTIONS = ['title', 'author', 'date published', 'date added']
-    ORDER_OPTIONS = ['asc', 'desc']
-    context_object_name = 'volumes'
-
-    def get_queryset(self):
-        return Manifest.objects.all()
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        sort = self.request.GET.get('sort', None)
-        order = self.request.GET.get('order', None)
-
-        q = self.get_queryset()
-
-        if sort not in SORT_OPTIONS:
-            sort = 'title'
-        if order not in ORDER_OPTIONS:
-            order = 'asc'
-
-        if sort == 'title':
-            if order == 'asc':
-                q = q.order_by('label')
-            elif order == 'desc':
-                q = q.order_by('-label')
-        elif sort == 'author':
-            if order == 'asc':
-                q = q.order_by('author')
-            elif order == 'desc':
-                q = q.order_by('-author')
-        elif sort == 'date published':
-            if order == 'asc':
-                q = q.order_by('published_date_edtf')
-            elif order == 'desc':
-                q = q.order_by('-published_date_edtf')
-        elif sort == 'date added':
-            if order == 'asc':
-                q = q.order_by('created_at')
-            elif order == 'desc':
-                q = q.order_by('-created_at')
-
-        sort_url_params = {'sort': sort, 'order': order}
-        order_url_params = {'sort': sort, 'order': order}
-        if 'sort' in sort_url_params:
-            del sort_url_params['sort']
-
-        context['volumes'] = q.all
-        context.update({
-            'sort_url_params': urlencode(sort_url_params),
-            'order_url_params': urlencode(order_url_params),
-            'sort': sort, 'SORT_OPTIONS': SORT_OPTIONS,
-            'order': order, 'ORDER_OPTIONS': ORDER_OPTIONS,
-        })
-        return context
-
 class CollectionDetail(ListView):
     """Django Template View for a :class:`apps.iiif.kollections.models.Collection`"""
     template_name = "collection.html"
diff --git a/apps/templates/volumes.html b/apps/templates/volumes.html
deleted file mode 100644
index e9625161..00000000
--- a/apps/templates/volumes.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "base.html" %}
-{% load wagtailcore_tags %}
-{% load static %}
-
-{% block body_class %}template-homepage{% endblock %}
-
-{% block content %}
-<h1 class='uk-heading-xlarge uk-text-center'>Readux</h1>
-<h2 class='uk-heading-medium uk-text-center'>Read. Annotate. Publish.</h2>
-<p class='uk-text-lead uk-text-center'>Log in to Readux to read digitized collections, make your own notes, and publish your marked-up edition online.</p>
-
-{% include "snippets/sort_dropdown.html" %}
-
-
-  <div id="wrap">
-  {% for volume in volumes %}
-    <div id="box">
-    <div id="boxInner">
-      <a class="nav-link" href="{% url 'page' volume.pid volume.canvas_set.first.pid %}">
-        <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';"/>
-      </a>
-      <div class="innerContent"><p>
-      <a class="nav-link" href="{% url 'page' volume.pid volume.canvas_set.first.pid %}">
-      <p>{{ volume.label }}</p>
-  </a></p>
-  <p><em>Author:</em> {{volume.author}}<br/>
-  <em>Date Published:</em> {{volume.published_date}}<br/>
-  Added {{volume.created_at}}</p></div>
-    </div></div>
-  {% endfor %}
-  </div>
-{% endblock content %}

From 779b15766f5f2be1af1fb17e49f5b2f5aed3a22d Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 15:04:08 -0400
Subject: [PATCH 10/41] Add a form and widget for handling all volumes options

---
 apps/readux/forms.py                          | 52 +++++++++++++++++++
 .../widgets/custom_dropdown_select.html       | 20 +++++++
 2 files changed, 72 insertions(+)
 create mode 100644 apps/readux/templates/widgets/custom_dropdown_select.html

diff --git a/apps/readux/forms.py b/apps/readux/forms.py
index aed1e2c7..561f6ccd 100644
--- a/apps/readux/forms.py
+++ b/apps/readux/forms.py
@@ -2,6 +2,7 @@
 
 from dateutil import parser
 from django import forms
+from django.forms import widgets
 from django.conf import settings
 from django.template.defaultfilters import truncatechars
 
@@ -181,3 +182,54 @@ def set_date(self, min_date, max_date):
         self.fields["start_date"].set_initial(min_date_object.strftime("%Y-%m-%d"))
         max_date_object = parser.isoparse(max_date)
         self.fields["end_date"].set_initial(max_date_object.strftime("%Y-%m-%d"))
+
+
+class CustomDropdownSelect(widgets.ChoiceWidget):
+    """A custom select widget that uses uk-navbar-dropdown to present its options,
+    and submits the form on any change"""
+    input_type = "radio"
+    template_name = "widgets/custom_dropdown_select.html"
+    option_template_name = "django/forms/widgets/radio_option.html"
+
+    def get_context(self, name, value, attrs):
+        """Add the label for the selected option to template context"""
+        context = super().get_context(name, value, attrs)
+        context["selected_value_label"] = dict(self.choices).get(value, None)
+        return context
+
+
+class AllVolumesForm(forms.Form):
+    """Simple form for sorting Manifests"""
+
+    SORT_CHOICES = [
+        ("title", "Title"),
+        ("author", "Author"),
+        ("date", "Publication Year"),
+        ("added", "Date Added"),
+    ]
+    ORDER_CHOICES = [
+        ("asc", "Ascending"),
+        ("desc", "Descending"),
+    ]
+    DISPLAY_CHOICES = [
+        ("grid", "Grid"),
+        ("list", "List"),
+    ]
+    sort = forms.ChoiceField(
+        label="Sort by",
+        choices=SORT_CHOICES,
+        required=False,
+        widget=CustomDropdownSelect,
+    )
+    order = forms.ChoiceField(
+        label="Order",
+        choices=ORDER_CHOICES,
+        required=False,
+        widget=CustomDropdownSelect,
+    )
+    display = forms.ChoiceField(
+        label="Display",
+        choices=DISPLAY_CHOICES,
+        required=False,
+        widget=CustomDropdownSelect,
+    )
diff --git a/apps/readux/templates/widgets/custom_dropdown_select.html b/apps/readux/templates/widgets/custom_dropdown_select.html
new file mode 100644
index 00000000..ea76cd5b
--- /dev/null
+++ b/apps/readux/templates/widgets/custom_dropdown_select.html
@@ -0,0 +1,20 @@
+{# Adapted from django/forms/widgets/radio.html to use uk-navbar-dropdown #}
+
+{% with id=widget.attrs.id %}
+<a href="#">{{ selected_value_label|default_if_none:widget.optgroups.0.1.0.label }}</a>
+<div class="uk-navbar-dropdown" uk-dropdown="mode: click">
+  <ul class="uk-nav uk-navbar-dropdown-nav sort-dropdown"{% if id %} id="{{ id }}"{% endif %}>
+    {% for group, options, index in widget.optgroups %}
+      {% for option in options %}
+        <li>
+          <label {% if option.attrs.id %} for="{{ option.attrs.id }}"{% endif %}>
+            {# NOTE: Uses a tiny bit of inline JS to submit the form on change #}
+            <input onclick="this.form.submit()" type="{{ option.type }}" name="{{ option.name }}" value="{{ option.value }}" {% include "django/forms/widgets/attrs.html" with widget=option %}>
+            {{ option.label }}
+          </label>
+        </li>
+      {% endfor %}
+    {% endfor %}
+  </ul>
+</div>
+{% endwith %}

From 84f3f6b53f8d0616d31f6620214870be44f4afec Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 15:05:14 -0400
Subject: [PATCH 11/41] Integrate Django form/wagtail with new design

---
 apps/cms/models.py                            | 124 ++++++++----------
 apps/static/css/readux2/main.scss             |  15 ++-
 apps/templates/cms/volumes_page.html          |  57 +++-----
 .../snippets/_volumes_page_information.html   |  88 +++++++++----
 4 files changed, 150 insertions(+), 134 deletions(-)

diff --git a/apps/cms/models.py b/apps/cms/models.py
index b12162f6..98bb036e 100644
--- a/apps/cms/models.py
+++ b/apps/cms/models.py
@@ -7,6 +7,7 @@
 from wagtailautocomplete.edit_handlers import AutocompletePanel
 from django.db import models
 from apps.cms.blocks import BaseStreamBlock
+from apps.readux.forms import AllVolumesForm
 from apps.readux.models import UserAnnotation
 from apps.iiif.kollections.models import Collection
 from apps.iiif.manifests.models import Manifest
@@ -70,59 +71,59 @@ class VolumesPage(Page):
         FieldPanel('paragraph', classname="full"),
         FieldPanel('layout', classname="full"),
     ]
+    initial = {"sort": "title", "order": "asc", "display": "grid"}
+    sort_fields = {
+        "title": "label",
+        "author": "author",
+        "date": "published_date_edtf",
+        "added": "created_at",
+    }
+
+    def get_form(self, request):
+        """Get the form for setting sort and order"""
+        # use GET instead of default POST/PUT for form data
+        form_data = request.GET.copy()
+
+        # sort by chosen sort
+        if "sort" in form_data and bool(form_data.get("sort")):
+            form_data["sort"] = form_data.get("sort")
+
+        # Otherwise set all form values to default
+        for key, val in self.initial.items():
+            form_data.setdefault(key, val)
+
+        return AllVolumesForm(data=form_data)
+
+    def get_queryset(self, form, queryset):
+        """Get the sorted set of objects to display"""
+
+        # return empty queryset if not valid
+        if not form.is_valid():
+            return queryset.none()
+
+        # get sort and order selections from form
+        search_opts = form.cleaned_data
+        sort = search_opts.get("sort", "title")
+        if sort not in self.sort_fields:
+            sort = "title"
+        order = search_opts.get("order", "asc")
+        sign = "-" if order == "desc" else ""
+
+        # build order_by query to sort results
+        queryset = queryset.order_by(f"{sign}{self.sort_fields[sort]}")
+
+        return queryset
 
     def get_context(self, request):
         """Context function."""
         context = super().get_context(request)
-        sort = request.GET.get('sort', None)
-        order = request.GET.get('order', None)
-        query_set = self.volumes
 
+        form = self.get_form(request)
+        query_set = self.get_queryset(form, self.volumes)
+
+        paginator = Paginator(query_set, 8) # Show 8 volumes per page
 
-        sort_options = ['title', 'author', 'date published', 'date added']
-        order_options = ['asc', 'desc']
-        if sort not in sort_options and order not in order_options:
-            sort = 'title'
-            order = 'asc'
-        elif sort not in sort_options:
-            sort = 'title'
-        elif order not in order_options:
-            order = 'asc'
-
-        if sort == 'title':
-            if order == 'asc':
-                query_set = query_set.order_by('label')
-            elif order == 'desc':
-                query_set = query_set.order_by('-label')
-        elif sort == 'author':
-            if order == 'asc':
-                query_set = query_set.order_by('author')
-            elif order == 'desc':
-                query_set = query_set.order_by('-author')
-        elif sort == 'date published':
-            if order == 'asc':
-                query_set = query_set.order_by('published_date_edtf')
-            elif order == 'desc':
-                query_set = query_set.order_by('-published_date_edtf')
-        elif sort == 'date added':
-            if order == 'asc':
-                query_set = query_set.order_by('created_at')
-            elif order == 'desc':
-                query_set = query_set.order_by('-created_at')
-
-        sort_url_params = request.GET.copy()
-        order_url_params = request.GET.copy()
-        if 'sort' in sort_url_params and 'order' in order_url_params:
-            del sort_url_params['sort']
-            del order_url_params['order']
-        elif 'sort' in sort_url_params:
-            del sort_url_params['sort']
-        elif 'order' in order_url_params:
-            del order_url_params['order']
-
-        paginator = Paginator(query_set, 10) # Show 10 volumes per page
-
-        page = request.GET.get('page')
+        page = request.GET.get("page", 1)
         try:
             volumes = paginator.page(page)
         except PageNotAnInteger:
@@ -130,31 +131,16 @@ def get_context(self, request):
             volumes = paginator.page(1)
         except EmptyPage:
             # If page is out of range (e.g. 9999), deliver last page of results.
-            volumes = paginator.page(paginator.num_pages)
-
-        # make the variable 'volumes' available on the template
-        context['volumes'] = volumes
-#        context['volumespage'] = query_set.all
-        context['user_annotation'] = UserAnnotation.objects.filter(owner_id=request.user.id)
-        # annocount_list = []
-        # canvaslist = []
-        # for volume in query_set:
-        #     user_annotation_count = UserAnnotation.objects.filter(owner_id=request.user.id).filter(canvas__manifest__id=volume.id).count()
-            # annocount_list.append({volume.pid: user_annotation_count})
-            # context['user_annotation_count'] = annocount_list
-        #     canvasquery = Canvas.objects.filter(is_starting_page=1).filter(manifest__id=volume.id)
-        #     canvasquery2 = list(canvasquery)
-        #     canvaslist.append({volume.pid: canvasquery2})
-        #     context['firstthumbnail'] = canvaslist
-        # value = 0
-        # context['value'] = value
+            page = paginator.num_pages
+            volumes = paginator.page(page)
 
         context.update({
-            'sort_url_params': urlencode(sort_url_params),
-            'order_url_params': urlencode(order_url_params),
-            'sort': sort, 'sort_options': sort_options,
-            'order': order, 'order_options': order_options,
+            "form": form,
+            "volumes": volumes,
+            "user_annotation": UserAnnotation.objects.filter(owner_id=request.user.id),
+            "paginator_range": paginator.get_elided_page_range(page, on_each_side=2),
         })
+
         return context
 
 
diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss
index 6908440c..09d36a7c 100644
--- a/apps/static/css/readux2/main.scss
+++ b/apps/static/css/readux2/main.scss
@@ -211,7 +211,9 @@
     min-width: 0 !important;
 }
 
-.uk-navbar-dropdown-nav a {
+.uk-navbar-dropdown-nav a,
+.uk-navbar-dropdown-nav.sort-dropdown label {
+    cursor: pointer;
     color: #1D3557 !important; /* Dark blue text color */
     font-weight: 600; /* Bold text */
     padding: 5px 15px !important; /* Add padding to the items */
@@ -219,10 +221,19 @@
     transition: background-color 0.1s ease;
 }
 
-.uk-navbar-dropdown-nav a:hover {
+.uk-navbar-dropdown-nav a:hover,
+.uk-navbar-dropdown-nav.sort-dropdown label:hover {
     background-color: rgba(29, 53, 87, 0.1); /* Light blue hover effect */
 }
 
+.uk-navbar-dropdown-nav.sort-dropdown label input {
+    display: none;
+}
+.pagination-nav span {
+    padding: 5px 15px !important;
+    display: block;
+}
+
 /* page */
 .page-title {
     font-size: xx-large;
diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 59f832b3..293bf5ab 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -11,6 +11,7 @@
 {% block body_class %}template-homepage{% endblock %}
 
 {% block content %}
+
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 
 {% include '_home/_nav.html' %}
@@ -29,54 +30,38 @@
         </ul>
       </div>
     </li>
-    <li>Volumes</li>
+    <li>{{ page.page_title|default:page.title }}</li>
   </ul>
   <!-- End -->
 
   <!-- Page title & text lead -->
-  <h1 class="page-title uk-margin-top uk-margin-remove-bottom">[All Volumes]{{ page.page_title }}</h1>
-  <p class="page-text-lead">
-    [PAGE_TAGLINE_IS_THIS_IN_USE?]{{page.tagline}}
-  </p>
-  <p class="page-text-lead uk-margin-small-top">
-    [These all volumes available in this Readux instance. You may use pagination to browse or use the search feature to locate a volume.]{{ page.paragraph }}
-  </p>
+  <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|default:page.title }}</h1>
+  <p class="page-text-lead uk-margin-small-top">{{ page.tagline }}</p>
+  <p class="uk-margin-small-top">{{ page.paragraph }}</p>
   <!-- End -->
 
+
   {% include "snippets/_search_box.html" %}
-  <!-- {% include "snippets/sort_dropdown.html" %} -->
 
   {% include "snippets/_volumes_page_information.html" %}
 
   <!-- Volume Grid -->
   <div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
-    <!-- Volume Item -->
-    <a href="#" class="volume-item">
-        <img src="https://via.placeholder.com/150x200" alt="Volume 1">
-        <h2>[Culpeper's complete herbal: with nearly four hundred medicines]</h2>
-        <div class="color-black">1653</div>
-    </a>
-    <!-- Repeat the volume item block for additional volumes -->
-    <a href="#" class="volume-item">
-        <img src="https://via.placeholder.com/150x200" alt="Volume 2">
-        <h2>[Il nuovo teatro delle fabbriche, et edificii, in prospettiva di Roma moderna. 5 vols.]</h2>
-        <div class="color-black">1663</div>
-      </a>
-    <a href="#" class="volume-item">
-        <img src="https://via.placeholder.com/150x200" alt="Volume 3">
-        <h2>[Magnenij Rabani Mauri de laudi[Bus] Sancte Crucis opus]</h2>
-        <div class="color-black">1233</div>
-    </a>
-    <a href="#" class="volume-item">
-        <img src="https://via.placeholder.com/150x200" alt="Volume 4">
-        <h2>[Breue racconto della trasportatione del corpo di Papa Paolo V]</h2>
-        <div class="color-black">1590</div>
-    </a>
-    <a href="#" class="volume-item">
-        <img src="https://via.placeholder.com/150x200" alt="Volume 5">
-        <h2>[Breue racconto della trasportatione del corpo di Papa Paolo V]</h2>
-        <div class="color-black">1590</div>
-    </a>
+    {% for volume in volumes %}
+        <!-- Volume Item -->
+        <a class="volume-item" href="{% url 'volumeall' volume.pid %}">
+            <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
+            <h2>{{ volume.label }}</h2>
+            <div class="color-black">{{ volume.published_date|default_if_none:"Unknown date" }}</div>
+            {# TODO: Do we want the following metadata visible here? If not, we can remove. #}
+            {% comment %}
+              <em>Author:</em> {{volume.author}}<br/>
+              Added {{volume.created_at}}
+            {% endcomment %}
+        </a>
+      {% empty %}
+        There are no volumes available to browse.
+      {% endfor %}
   </div>
 </div>
 
diff --git a/apps/templates/snippets/_volumes_page_information.html b/apps/templates/snippets/_volumes_page_information.html
index fbb9041b..b234ba91 100644
--- a/apps/templates/snippets/_volumes_page_information.html
+++ b/apps/templates/snippets/_volumes_page_information.html
@@ -1,37 +1,71 @@
+{% load url_replace %}
 <!-- Information Line -->
 <div class="info-line">
   <div class="info-group">
-    <span>Showing 8 of 28 volumes</span>
+    {# numeric pagination #}
+    <span>Showing {{ volumes.start_index }}-{{ volumes.end_index }} of {{ volumes.paginator.count }} volumes</span>
     <span class="slash-gap">/</span> Page
-    <a href="#">[1]</a>
+    <a href="#">{{ volumes.number }}</a>
     <div class="uk-navbar-dropdown" uk-dropdown="mode: click">
-      <ul class="uk-nav uk-navbar-dropdown-nav">
-        <li><a href="#">1</a></li>
-        <li><a href="#">2</a></li>
-        <li><a href="#">3</a></li>
-        <li><a href="#">4</a></li>
+      <ul class="uk-nav uk-navbar-dropdown-nav pagination-nav"> 
+        {% for pg in paginator_range %}
+          <li>
+            {% if pg == "…" %}
+              <span>{{ pg }}</span>
+            {% else %}
+              <a href="?{% url_replace page=pg %}">{{ pg }}</a>
+            {% endif %}
+            
+          </li>
+        {% endfor %}
       </ul>
-    </div> of [4]
+    </div> of {{ volumes.paginator.num_pages }} 
     <span class="slash-gap">/</span>
-    Sort by
-    <a href="#"> Title </a>
-    <div class="uk-navbar-dropdown" uk-dropdown="mode: click">
-      <ul class="uk-nav uk-navbar-dropdown-nav">
-        <li><a href="#">Title</a></li>
-        <li><a href="#">Publication Year</a></li>
-      </ul>
-    </div>
-    <span class="slash-gap">/</span>Display in
-    <a href="#">Grid</a>
-    <div class="uk-navbar-dropdown" uk-dropdown="mode: click">
-      <ul class="uk-nav uk-navbar-dropdown-nav">
-        <li><a href="#">Grid</a></li>
-        <li><a href="#">List</a></li>
-      </ul>
-    </div>
+
+    {# form for setting sort, order, and page display (list/grid) #}
+    <form method="get">
+      <label for="{{ form.sort.auto_id }}">
+          <span class="fieldname">{{ form.sort.label }}</span>
+          {{ form.sort }}
+      </label>
+      <span class="slash-gap">/</span>
+      <label for="{{ form.order.auto_id }}">
+          <span class="fieldname">{{ form.order.label }}</span>
+          {{ form.order }}
+      </label>
+      <span class="slash-gap">/</span>
+      <label for="{{ form.display.auto_id }}">
+          <span class="fieldname">{{ form.display.label }}</span>
+          {{ form.display }}
+      </label>
+    </form>
   </div>
+
+  {# previous and next page pagination #}
   <div class="pagination-controls">
-    <button class="uk-icon-button" uk-icon="chevron-left" uk-tooltip="This is the first page" disabled></button>
-    <button class="uk-icon-button" uk-icon="chevron-right" uk-tooltip="Go to next page"></button>
+    <a
+      class="uk-icon-button"
+      uk-icon="chevron-left"
+      {% if volumes.has_previous %}
+        uk-tooltip="Go to previous page"
+        href="?{% url_replace page=volumes.previous_page_number %}"
+      {% else %}
+        uk-tooltip="This is the first page"
+        disabled
+      {% endif %}
+    >
+    </a>
+    <a
+      class="uk-icon-button"
+      uk-icon="chevron-right"
+      {% if volumes.has_next %}
+        uk-tooltip="Go to next page"
+        href="?{% url_replace page=volumes.next_page_number %}"
+      {% else %}
+        uk-tooltip="This is the last page"
+        disabled
+      {% endif %}
+    >
+    </a>
   </div>
-</div>
\ No newline at end of file
+</div>

From a3e0040ac791e25e2ae7601a499724f929895451 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 15:47:36 -0400
Subject: [PATCH 12/41] Apply redesign to main_menu template and use in nav

---
 apps/templates/_home/_nav.html      | 20 +++-----------------
 apps/templates/menus/main_menu.html | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/apps/templates/_home/_nav.html b/apps/templates/_home/_nav.html
index 5ee617a5..2f7fe078 100644
--- a/apps/templates/_home/_nav.html
+++ b/apps/templates/_home/_nav.html
@@ -1,3 +1,5 @@
+{% load menu_tags %}
+
 <nav class="uk-navbar-container" style="background:none;">
     <div class="uk-container">
         <div uk-navbar="mode: click">
@@ -7,23 +9,7 @@
                     <div class="brand-tagline">built on <a class="brand-readux">Readux</a></div>
                 </div>
 
-                <ul class="uk-navbar-nav">
-                    <li class=""><a href="/all-collections/" class="menu-item">Collections</a></li>
-                    <li class=""><a href="/all-volumes/" class="menu-item">Volumes</a></li>
-                    <li>
-                        <a href="#" class="menu-item">About <span uk-drop-parent-icon></span></a>
-                        <div class="uk-navbar-dropdown uk-padding-remove"
-                            uk-dropdown="mode: click; pos: bottom-left; offset: -20;">
-                            <ul class="uk-nav uk-navbar-dropdown-nav">
-                                <li class="uk-active"><a href="#">What is Sounding Spirit?</a></li>
-                                <li><a href="#">What is Readux?</a></li>
-                                <li><a href="#">Team</a></li>
-                                <li><a href="#">Terms of Service</a></li>
-                                <li><a href="#">Contact us</a></li>
-                            </ul>
-                        </div>
-                    </li>
-                </ul>
+                {% main_menu add_sub_menus_inline=True %}
             </div>
 
             <div class="uk-navbar-right">
diff --git a/apps/templates/menus/main_menu.html b/apps/templates/menus/main_menu.html
index c064a05b..a1f3c3bb 100644
--- a/apps/templates/menus/main_menu.html
+++ b/apps/templates/menus/main_menu.html
@@ -1,9 +1,21 @@
 {% load menu_tags %}
 {% if menu_items %}
-  <ul class="uk-navbar-nav rx-navbar-nav">
+  <ul class="uk-navbar-nav">
     {% for item in menu_items %}
       <li>
-        <a href="{{ item.href }}" class="rx-nav-item">{{ item.text }}</a> {% if item.has_children_in_menu %}{% sub_menu item %}{% endif %}
+        {% if item.sub_menu %}
+          <a href="#" class="menu-item">{{ item.text }} <span uk-drop-parent-icon></span></a>
+          <div class="uk-navbar-dropdown uk-padding-remove"
+              uk-dropdown="mode: click; pos: bottom-left; offset: -20;">
+              <ul class="uk-nav uk-navbar-dropdown-nav">
+                  {% for sub_item in item.sub_menu.items %}
+                  <li class="{{ sub_item.active_class }}"><a href="{{ sub_item.href }}">{{ sub_item.text }}</a></li>
+                  {% endfor %}
+              </ul>
+          </div>
+        {% else %}
+          <a href="{{ item.href }}" class="menu-item">{{ item.text }}</a>
+        {% endif %}
       </li>
     {% endfor %}
   </ul>

From bc5dadabbe28d1e46f3299abeacc306311273da0 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 15:54:58 -0400
Subject: [PATCH 13/41] minor edit to revert accidental design change

---
 apps/templates/cms/volumes_page.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 293bf5ab..bdc34252 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -36,8 +36,8 @@
 
   <!-- Page title & text lead -->
   <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|default:page.title }}</h1>
-  <p class="page-text-lead uk-margin-small-top">{{ page.tagline }}</p>
-  <p class="uk-margin-small-top">{{ page.paragraph }}</p>
+  <p class="page-text-lead">{{ page.tagline }}</p>
+  <p class="page-text-lead uk-margin-small-top">{{ page.paragraph }}</p>
   <!-- End -->
 
 

From 5ccd7a804cf745143d7fab7e85147cfc4d7f633f Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 16:10:25 -0400
Subject: [PATCH 14/41] Add author and date added metadata to volume items

---
 apps/templates/cms/volumes_page.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index bdc34252..126dc338 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -51,13 +51,10 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
         <!-- Volume Item -->
         <a class="volume-item" href="{% url 'volumeall' volume.pid %}">
             <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
-            <h2>{{ volume.label }}</h2>
-            <div class="color-black">{{ volume.published_date|default_if_none:"Unknown date" }}</div>
-            {# TODO: Do we want the following metadata visible here? If not, we can remove. #}
-            {% comment %}
-              <em>Author:</em> {{volume.author}}<br/>
-              Added {{volume.created_at}}
-            {% endcomment %}
+            <h2>{{ volume.label|default:"[no title]" }}</h2>
+            {% if volume.published_date %}<div class="color-black">{{ volume.published_date }}</div>{% endif %}
+            {% if volume.author %}<div class="color-black">{{ volume.author }}</div>{% endif %}
+            <div class="color-black">Added {{volume.created_at}}</div>
         </a>
       {% empty %}
         There are no volumes available to browse.

From f2eaa5239cf4214da88c31d1e7d421554511fbd9 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 16:10:37 -0400
Subject: [PATCH 15/41] Remove display option from frontend user form

---
 apps/readux/forms.py                                   | 10 ----------
 apps/templates/snippets/_volumes_page_information.html |  5 -----
 2 files changed, 15 deletions(-)

diff --git a/apps/readux/forms.py b/apps/readux/forms.py
index 561f6ccd..7dbe31ee 100644
--- a/apps/readux/forms.py
+++ b/apps/readux/forms.py
@@ -211,10 +211,6 @@ class AllVolumesForm(forms.Form):
         ("asc", "Ascending"),
         ("desc", "Descending"),
     ]
-    DISPLAY_CHOICES = [
-        ("grid", "Grid"),
-        ("list", "List"),
-    ]
     sort = forms.ChoiceField(
         label="Sort by",
         choices=SORT_CHOICES,
@@ -227,9 +223,3 @@ class AllVolumesForm(forms.Form):
         required=False,
         widget=CustomDropdownSelect,
     )
-    display = forms.ChoiceField(
-        label="Display",
-        choices=DISPLAY_CHOICES,
-        required=False,
-        widget=CustomDropdownSelect,
-    )
diff --git a/apps/templates/snippets/_volumes_page_information.html b/apps/templates/snippets/_volumes_page_information.html
index b234ba91..5e385e49 100644
--- a/apps/templates/snippets/_volumes_page_information.html
+++ b/apps/templates/snippets/_volumes_page_information.html
@@ -33,11 +33,6 @@
           <span class="fieldname">{{ form.order.label }}</span>
           {{ form.order }}
       </label>
-      <span class="slash-gap">/</span>
-      <label for="{{ form.display.auto_id }}">
-          <span class="fieldname">{{ form.display.label }}</span>
-          {{ form.display }}
-      </label>
     </form>
   </div>
 

From 621a97996863b23b2cf15c4625ead9f9b14e018b Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 21 Aug 2024 16:12:37 -0400
Subject: [PATCH 16/41] Truncate volume label and author strings

---
 apps/templates/cms/volumes_page.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 126dc338..6f557c2f 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -51,10 +51,10 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
         <!-- Volume Item -->
         <a class="volume-item" href="{% url 'volumeall' volume.pid %}">
             <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
-            <h2>{{ volume.label|default:"[no title]" }}</h2>
+            <h2>{{ volume.label|default:"[no title]"|truncatechars:200 }}</h2>
             {% if volume.published_date %}<div class="color-black">{{ volume.published_date }}</div>{% endif %}
-            {% if volume.author %}<div class="color-black">{{ volume.author }}</div>{% endif %}
-            <div class="color-black">Added {{volume.created_at}}</div>
+            {% if volume.author %}<div class="color-black">{{ volume.author|truncatechars:150 }}</div>{% endif %}
+            <div class="color-black">Added {{ volume.created_at }}</div>
         </a>
       {% empty %}
         There are no volumes available to browse.

From 6ac5c562eba20389790c9f9c9047fa02e8ac91ae Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Wed, 4 Sep 2024 18:42:12 +0800
Subject: [PATCH 17/41] add a test about page

---
 apps/static/css/readux2/static.scss  | 44 ++++++++++++++++
 apps/templates/cms/content_page.html | 75 +++++++++++++++++++++++++++-
 2 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 apps/static/css/readux2/static.scss

diff --git a/apps/static/css/readux2/static.scss b/apps/static/css/readux2/static.scss
new file mode 100644
index 00000000..e3f5a26b
--- /dev/null
+++ b/apps/static/css/readux2/static.scss
@@ -0,0 +1,44 @@
+.navigation-wrapper {
+  margin-left: -2rem;
+}
+.navigation {
+  background-color: #F1FAEE;
+  padding: 30px;
+  position: sticky;
+  top: 20px;
+  border-radius: 10px 10px; /* Rounded corners on the right-hand side */
+  width: auto; /* Fit to content width */
+  margin-right: 1.5rem;
+}
+.navigation a {
+  color: #1D3557;
+  text-decoration: none;
+  display: block;
+  padding: 10px 0;
+  position: relative;
+  font-weight: normal;
+  font-size: medium;
+}
+.navigation a.active {
+  font-weight: bold; /* Bold text for active item */
+  color: #1D3557;
+  &:hover {
+    color: darken(#1D3557, 10%) !important;
+  }
+}
+.navigation a.active::before {
+  content: '';
+  position: absolute;
+  left: -12px;
+  top: 50%;
+  transform: translateY(-50%);
+  height: 75%;
+  width: 4px;
+  background-color: #1D3557;
+}
+.content {
+  padding: 20px;
+}
+.section {
+  padding-bottom: 40px;
+}
\ No newline at end of file
diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html
index 2ab391a0..fed12410 100644
--- a/apps/templates/cms/content_page.html
+++ b/apps/templates/cms/content_page.html
@@ -1,14 +1,85 @@
 {% extends "base.html" %}
 {% load wagtailcore_tags %}
+{% load sass_tags %}
 
 {% block body_class %}template-homepage{% endblock %}
 
 {% block content %}
-<h1>{{ page.title }}</h1>
+<link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
+<link type="text/css" href="{% sass_src 'css/readux2/static.scss' %}" rel="stylesheet">
+
+{% include '_home/_nav.html' %}
+
+
+<div class="uk-container">
+
+  <!-- Breadcrumb -->
+  <ul class="breadcrumb uk-margin-small-top">
+    <li><a href="/">Home</a></li>
+    <li>
+      <a href="#">About<span class="icon-chevron-down" uk-icon="icon: chevron-down; ratio: 0.5"></span></a>
+      <div class="uk-navbar-dropdown uk-padding-remove" uk-dropdown="mode: click; pos: bottom-left;">
+        <ul class="uk-nav uk-navbar-dropdown-nav">
+            <li><a href="#">[What Is Readux?]</a></li>
+            <li><a href="#">[What Is Sounding Spirit?]</a></li>
+            <li><a href="#">[Team]</a></li>
+            <li><a href="#">[Terms of Service]</a></li>
+            <li><a href="#">[Contact Us]</a></li>
+        </ul>
+      </div>
+    </li>
+    <li>{{ page.page_title|default:page.title }}</li>
+  </ul>
+  <!-- End -->
+
+  <!-- Page title & text lead -->
+  <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|default:page.title }}</h1>
+  <p class="page-text-lead">{{ page.tagline }}</p>
+  <p class="page-text-lead uk-margin-small-top">{{ page.paragraph }}</p>
+  <!-- End -->
+ 
+  <div class="uk-grid-collapse uk-child-width-expand" uk-grid>
+    <!-- Left Column: Navigation -->
+    <div class="uk-width-1-4@m navigation-wrapper">
+        <nav class="navigation">
+            <ul class="uk-nav uk-nav-default">
+                <li><a href="#features" class="active">Features</a></li>
+                <li><a href="#collections">Collections</a></li>
+                <li><a href="#users-guidelines">Users Guidelines</a></li>
+                <li><a href="#partners">Partners</a></li>
+            </ul>
+        </nav>
+    </div>
+
+    <!-- Right Column: Content -->
+    <div class="uk-width-expand@m content">
+        <div id="features" class="section">
+            <h2>Features</h2>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+        </div>
+        <div id="collections" class="section">
+            <h2>Collections</h2>
+            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
+        </div>
+        <div id="users-guidelines" class="section">
+            <h2>Users Guidelines</h2>
+            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
+        </div>
+        <div id="partners" class="section">
+            <h2>Partners</h2>
+            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
+        </div>
+    </div>
+</div>
+
 
 {% if page.tagline %}
 <p class="lead">{{page.tagline}}</p>
 {% endif %}
 
-  {% include_block page.body %}
+{% include_block page.body %}
+<script>
+
+</script>
 {% endblock %}
+

From 88bd552dc55c0bf63a175dcca7c14c164d24960c Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Thu, 5 Sep 2024 22:33:06 +0800
Subject: [PATCH 18/41] adjust how the css stylesheets are loaded as we
 transition to the new readux ui

---
 apps/static/css/project.scss           | 16 ++++++++--------
 apps/static/css/readux2/migration.scss | 16 ++++++++++++++++
 apps/templates/base.html               |  4 +++-
 apps/templates/cms/content_page.html   |  2 ++
 apps/templates/cms/volumes_page.html   |  1 +
 apps/templates/page.html               |  2 ++
 6 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 apps/static/css/readux2/migration.scss

diff --git a/apps/static/css/project.scss b/apps/static/css/project.scss
index 9dcf7b49..25764038 100644
--- a/apps/static/css/project.scss
+++ b/apps/static/css/project.scss
@@ -11,10 +11,10 @@
   --contrast: 200%;
 }
 
-.uk-input {
-  border-width: 3px;
-  width: 50%;
-}
+// .uk-input {
+//   border-width: 3px;
+//   width: 50%;
+// }
 
 .uk-link, a {
   color: var(--link-color);
@@ -1718,10 +1718,10 @@ fieldset {
   --contrast: 200%;
 }
 
-.uk-input {
-  border-width: 3px;
-  width: 50%;
-}
+// .uk-input {
+//   border-width: 3px;
+//   width: 50%;
+// }
 
 .uk-link, a {
   color: var(--link-color);
diff --git a/apps/static/css/readux2/migration.scss b/apps/static/css/readux2/migration.scss
new file mode 100644
index 00000000..7759c9b6
--- /dev/null
+++ b/apps/static/css/readux2/migration.scss
@@ -0,0 +1,16 @@
+// NOTE: Migrated from templates/page.html
+#v-readux.uk-container {
+  padding: 0;
+  max-width: none;
+}
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
\ No newline at end of file
diff --git a/apps/templates/base.html b/apps/templates/base.html
index 1afcc470..8d4a9ae2 100644
--- a/apps/templates/base.html
+++ b/apps/templates/base.html
@@ -81,7 +81,9 @@
     {% block css %}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.17.0/css/uikit.min.css" />
     <link href="{% static 'css/selectize.css' %}" rel="stylesheet">
-    <link type="text/css" href="{% sass_src 'css/project.scss' %}" rel="stylesheet">
+    <!-- <link type="text/css" href="{% sass_src 'css/project.scss' %}" rel="stylesheet"> -->
+    <link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
+    <link type="text/css" href="{% sass_src 'css/readux2/migration.scss' %}" rel="stylesheet">
     <link type="text/css" href="{% sass_src 'css/readux2/login.scss' %}" rel="stylesheet">
     {% endblock %}
     {% block extra_css %}{% endblock extra_css %}
diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html
index fed12410..e4c68a80 100644
--- a/apps/templates/cms/content_page.html
+++ b/apps/templates/cms/content_page.html
@@ -5,6 +5,8 @@
 {% block body_class %}template-homepage{% endblock %}
 
 {% block content %}
+<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
+<link type="text/css" href="{% sass_src 'css/readux2/login.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/static.scss' %}" rel="stylesheet">
 
diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 6f557c2f..722b75c9 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -12,6 +12,7 @@
 
 {% block content %}
 
+<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 
 {% include '_home/_nav.html' %}
diff --git a/apps/templates/page.html b/apps/templates/page.html
index 0babab42..d473bc89 100644
--- a/apps/templates/page.html
+++ b/apps/templates/page.html
@@ -2,6 +2,7 @@
 {% load static i18n %}
 {% load account socialaccount %}
 {% load crispy_forms_tags %}
+{% load sass_tags %}
 
 {% block extra_css %}
 <style>
@@ -9,6 +10,7 @@
     display: none;
   }
 </style>
+<link type="text/css" href="{% sass_src 'css/project.scss' %}" rel="stylesheet">
 {% endblock extra_css %}
 
 {% block content %}

From 771c203a85f8ee0def6625d58199d1a7cde27329 Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Thu, 5 Sep 2024 22:33:24 +0800
Subject: [PATCH 19/41] adjust label language for home hero and search

---
 apps/templates/_home/_hero.html          | 2 ++
 apps/templates/snippets/_search_box.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/templates/_home/_hero.html b/apps/templates/_home/_hero.html
index d2419505..9b13dc2a 100644
--- a/apps/templates/_home/_hero.html
+++ b/apps/templates/_home/_hero.html
@@ -2,6 +2,8 @@
 <div class="uk-container uk-text-center hero">
     <h1 class="uk-heading-primary" style="color: white; font-size: 3rem; font-weight: bold; margin-bottom: 1rem;">
         {{ request.site.name }}</h1>
+    <div class="uk-text-large">Read, remark, and research with Readux, 
+        an interactive digital reading platform and research tool.</div>
     <p class="uk-text-lead" style="color: white; ">{{ page.tagline|richtext }}</p>
     {% include "snippets/_search_box.html" %}
 </div>
\ No newline at end of file
diff --git a/apps/templates/snippets/_search_box.html b/apps/templates/snippets/_search_box.html
index bd45a712..bf7fb8e2 100644
--- a/apps/templates/snippets/_search_box.html
+++ b/apps/templates/snippets/_search_box.html
@@ -1,6 +1,6 @@
 <div class="search-bar">
   <form action="{% url 'search' %}" method="get">
-    <input class="uk-input" type="text" name="q" id="q" placeholder="Search...">
+    <input class="uk-input" type="text" name="q" id="q" placeholder="Search for a volume in the library">
     <button type="submit" class="uk-button">
         Search
     </button>

From 3b5d431ed1008912c455d09a503a0d3bcaa1d5d5 Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 6 Sep 2024 00:41:23 +0800
Subject: [PATCH 20/41] update the grid-item class and related page elements

---
 apps/static/css/readux2/main.scss               | 12 +++++++-----
 apps/templates/_home/_featured_collections.html |  2 +-
 apps/templates/_home/_featured_volumes.html     |  2 +-
 apps/templates/cms/content_page.html            |  2 --
 apps/templates/cms/volumes_page.html            |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss
index c41bf0ea..6c07353e 100644
--- a/apps/static/css/readux2/main.scss
+++ b/apps/static/css/readux2/main.scss
@@ -288,17 +288,18 @@
     gap: 2.5rem; /* Space between items */
 }
 
-.volume-item {
+.grid-item {
     text-align: left;
     background-color: transparent;
     cursor: pointer;
     text-decoration: none;
     color: #1D3557; /* Title text color */
-    opacity: 0.9; /* Normal state opacity */
+    opacity: 0.75; /* Normal state opacity */
     transition: opacity 0.1s ease;
+    display: block;
 }
 
-.volume-item img {
+.grid-item img {
     width: 100%;
     height: auto; /* Maintain aspect ratio of images */
     display: block;
@@ -306,11 +307,12 @@
     border-radius: 4px;
 }
 
-.volume-item:hover {
+.grid-item:hover {
     opacity: 1.0; /* Change opacity on hover */
+    text-decoration: none;
 }
 
-.volume-item h2 {
+.grid-item h2 {
     text-decoration: underline; /* Underline for title */
     color: #1D3557;
     font-weight: 600;
diff --git a/apps/templates/_home/_featured_collections.html b/apps/templates/_home/_featured_collections.html
index 704d0574..194ab67a 100644
--- a/apps/templates/_home/_featured_collections.html
+++ b/apps/templates/_home/_featured_collections.html
@@ -13,7 +13,7 @@ <h2 class="uk-text-large uk-text-bold">
                     <div class="uk-slider-items uk-child-width-1-2 uk-child-width-1-3@s uk-child-width-1-4@m">
                         {% for collection in page.featured_collections.all|order_by:page.featured_collections_sort_order %}
                             <div class="uk-panel">
-                                <a href="#" class="volume-item">
+                                <a href="#" class="grid-item">
                                     <img src="/media/{{ collection.thumbnail }}" alt="{{ collection.label }}">
                                     <h2>{{ collection.label }}</h2>
                                 </a>
diff --git a/apps/templates/_home/_featured_volumes.html b/apps/templates/_home/_featured_volumes.html
index 7a5da2ff..481b1352 100644
--- a/apps/templates/_home/_featured_volumes.html
+++ b/apps/templates/_home/_featured_volumes.html
@@ -12,7 +12,7 @@ <h2 class="uk-text-large uk-text-bold">
                     <div class="uk-slider-items uk-child-width-1-2 uk-child-width-1-3@s uk-child-width-1-4@m">
                         {% for volume in page.featured_volumes.all|order_by:page.featured_volumes_sort_order %}
                             <div class="uk-panel">
-                                <a href="#" class="volume-item">
+                                <a href="#" class="grid-item">
                                     <img src="{{ volume.start_canvas.thumbnail_crop_tallwide }}" alt="{{ volume.label }}">
                                     <h2>{{ volume.label }}</h2>
                                 </a>
diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html
index e4c68a80..59a1e070 100644
--- a/apps/templates/cms/content_page.html
+++ b/apps/templates/cms/content_page.html
@@ -12,9 +12,7 @@
 
 {% include '_home/_nav.html' %}
 
-
 <div class="uk-container">
-
   <!-- Breadcrumb -->
   <ul class="breadcrumb uk-margin-small-top">
     <li><a href="/">Home</a></li>
diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 722b75c9..8c159728 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -50,7 +50,7 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
   <div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
     {% for volume in volumes %}
         <!-- Volume Item -->
-        <a class="volume-item" href="{% url 'volumeall' volume.pid %}">
+        <a class="grid-item" href="{% url 'volumeall' volume.pid %}">
             <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
             <h2>{{ volume.label|default:"[no title]"|truncatechars:200 }}</h2>
             {% if volume.published_date %}<div class="color-black">{{ volume.published_date }}</div>{% endif %}

From aa53a107c7109297fa37e0845e6830881c9f0f1b Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 6 Sep 2024 01:33:17 +0800
Subject: [PATCH 21/41] add a sample list view

---
 apps/static/css/readux2/main.scss        |  37 +++++-
 apps/templates/cms/collections_page.html | 137 ++++++++++-------------
 2 files changed, 94 insertions(+), 80 deletions(-)

diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss
index 6c07353e..c54ab283 100644
--- a/apps/static/css/readux2/main.scss
+++ b/apps/static/css/readux2/main.scss
@@ -293,10 +293,10 @@
     background-color: transparent;
     cursor: pointer;
     text-decoration: none;
-    color: #1D3557; /* Title text color */
     opacity: 0.75; /* Normal state opacity */
     transition: opacity 0.1s ease;
     display: block;
+    color: black;
 }
 
 .grid-item img {
@@ -310,6 +310,7 @@
 .grid-item:hover {
     opacity: 1.0; /* Change opacity on hover */
     text-decoration: none;
+    color: black;
 }
 
 .grid-item h2 {
@@ -320,6 +321,40 @@
     margin: 0;
 }
 
+.grid-item p {
+    margin: 0;
+}
+
+/* list view table */
+.list-view-table {
+    margin-left: -0.5rem;
+}
+
+.list-view-table thead th {
+    color: #1D3557;
+    font-weight: bold;
+}
+
+.list-view-table tbody tr:hover {
+    background-color: #F1FAEE !important;
+}
+.list-view-table tbody tr {
+    color: rgba(0, 0, 0, 0.75);
+    transition: color 0.3s ease;
+}
+.list-view-table tbody tr:hover {
+    color: rgba(0, 0, 0, 1);
+}
+.list-item:hover {
+    cursor: pointer;
+}
+.clickable-row {
+    cursor: pointer;
+}
+.list-view-table th, .list-view-table td {
+    padding: 0.5rem;
+}
+
 /* search bar */
 .search-bar form {
     display: flex;
diff --git a/apps/templates/cms/collections_page.html b/apps/templates/cms/collections_page.html
index f3c88397..6b698f09 100644
--- a/apps/templates/cms/collections_page.html
+++ b/apps/templates/cms/collections_page.html
@@ -1,97 +1,76 @@
 {% extends "base.html" %}
 {% load wagtailcore_tags %}
+{% load sass_tags %}
 
 {% block body_class %}template-homepage{% endblock %}
 
 {% block content %}
+<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
+<link type="text/css" href="{% sass_src 'css/readux2/login.scss' %}" rel="stylesheet">
+<link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
+<link type="text/css" href="{% sass_src 'css/readux2/static.scss' %}" rel="stylesheet">
 
-<h1>WARNING </h1>
+{% include '_home/_nav.html' %}
 
-<div class="rx-title-container">
-  <ul class="rx-breadcrumb uk-text-truncate">
-    <li class="rx-breadcrumb-item"><a href="/" alt="Home">Home</a></li>
-    <li class="rx-breadcrumb-item">Collections</li>
+<div class="uk-container">
+  <!-- Breadcrumb -->
+  <ul class="breadcrumb uk-margin-small-top">
+    <li><a href="/">Home</a></li>
+    <li>{{ page.page_title|default:page.title }}</li>
   </ul>
+  <!-- End -->
 
-  <div><h2 class="rx-title" style="margin-bottom:0;line-height: 1.5;">{{ page.page_title }}</div>
-  <div class="rx-title-tagline">{{page.tagline}}</div>
-</div>
-
-<div class="rx-head-container">
-  <p>{{ page.paragraph }}</p>
-</div>
-
-
-{% if page.layout == 'Banner' %}
-<div class="rx-banner-layout">
-  {% for collection in page.collections %}
-  <div class="rx-volume-in-banner">
-    <a class="nav-link" href="{% url 'collection' collection.pid %}">
-    <div class="rx-banner-image-container"><img src="/media/{{collection.header}}" alt="Banner image for collection {{collection.label}}"></div>
-    <div class="rx-banner-text-container">
-      <div class="rx-title-tagline rx-title-tagline-banner">{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</div>
-      <div class="rx-collection-title rx-collection-title-banner">{{ collection.label }}</div>
-    </div>
-    </a>
-  </div>
-  {% endfor %}
-</div>
-{% endif %}
+  <!-- Page title & text lead -->
+  <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|default:page.title }}</h1>
+  <p class="page-text-lead">{{ page.tagline }}</p>
+  <p class="page-text-lead uk-margin-small-top">{{ page.paragraph }}</p>
+  <!-- End -->
 
+  {% include "snippets/_collections_page_information.html" %}
 
-{% if page.layout == 'Grid' %}
-<div class="rx-grid">
-{% for collection in page.collections %}
-<article class="rx-grid-layout">
-  <a class="nav-link" href="{% url 'collection' collection.pid %}">
-  <div class="rx-volume-in-grid">
-    <div class="rx-grid-image-container"><img src="/media/{{collection.thumbnail}}"  alt="Thumbnail image for collection {{collection.label}}"></div>
-    <div class="rx-title-tagline uk-margin-small-top">{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</div>
-    <div class="rx-collection-title">{{ collection.label }}</div>
-  </div>
-  </a>
-  <!-- <div class="rx-image-container">
-    <figure style="background-image: url('/media/{{collection.thumbnail}}'"></figure>
-    <p>{{ collection.label }}<br/>
-      {{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</p>
-  </div>
-    <div class="rx-card-image-container">
-      <img src="/media/{{collection.thumbnail}}" alt="Thumbnail image for collection {{collection.label}}" />
-      <div class="rx-top-left">
-    </div>
-  </div> -->
-</article>
-{% endfor %}
-</div>
-{% endif %}
-
-
-{% if page.layout == 'List' %}
-<div class="collectionswrapper uk-padding-remove-left">
-  <div class="uk-grid-match uk-child-width-expand@s uk-grid-large" uk-grid>
+  {% if page.layout == 'Grid' %}
+  <!-- Collection Grid -->
+  <div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
     {% for collection in page.collections %}
-    <div class="uk-width-1-2@m uk-grid-medium">
-      <div class=" uk-width-1-4@m">
-        <img src="/media/{{collection.thumbnail}}" alt="Banner image for collection {{collection.label}}" />
-      </div>
-      <div class="uk-width-3-4@m" tabindex="0">
-        <a class="nav-link" href="{% url 'collection' collection.pid %}">
-          <h3 class="rx-card-title uk-margin-remove-bottom">{{ collection.label }}</h3>
+        <!-- Collection Item -->
+        <a class="grid-item" href="{% url 'collection' collection.pid %}">
+            <img src="/media/{{collection.thumbnail}}" alt="Thumbnail image for collection {{collection.label}}"> <!-- TODO: Not sure how to correctly insert the onerror handler -->
+            <h2>{{ collection.label|default:"[no title]"|truncatechars:200 }}</h2>
+            {% if collection.manifests.all %}<div class="color-black">{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</div>{% endif %}
+            {{collection.summary|truncatewords_html:50|safe}}
         </a>
-        <div class="rx-title-tagline">
-          {{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}
-        </div>
-        <p>
-          {{collection.summary|truncatewords_html:50|safe}}
-        </p>
-      </div>
-    </div>
-    {% endfor %}
+      {% empty %}
+        There are no volumes available to browse.
+      {% endfor %}
   </div>
-</div>
-{% endif %}
+  {% endif %}
+  
+  {% if page.layout == 'List' %}
+  <!-- Collection List -->
+  <table class="uk-table uk-table-divider list-view-table uk-margin-large-bottom">
+    <thead>
+        <tr>
+            <th>Collection</th>
+            <th>Number of Volumes</th>
+            <th>Summary</th>
+        </tr>
+    </thead>
+    <tbody>
+      {% for collection in page.collections %}
+          <tr class="clickable-row" data-ref="{% url 'collection' collection.pid %}">
+              <td>{{ collection.label|default:"[no title]"|truncatechars:200 }}</td>
+              <td>{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</td>
+              <td class="uk-table-expand">{{collection.summary|truncatewords_html:50|safe}}</td>
+          </tr>
+      {% empty %}
+        There are no volumes available to browse.
+      {% endfor %}
+    </tbody>
+  </table>
+  {% endif %}
 
-{% include "footer.html" %}
+</div>
 
+{% include '_home/_footer.html' %}
 
-{% endblock content %}
+{% endblock content %}
\ No newline at end of file

From 171cd169a7f5945ece54842f7eac137b464cf149 Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 6 Sep 2024 01:36:08 +0800
Subject: [PATCH 22/41] add footer to the search page

---
 apps/templates/search_results.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/templates/search_results.html b/apps/templates/search_results.html
index 409f0935..74a5b41d 100644
--- a/apps/templates/search_results.html
+++ b/apps/templates/search_results.html
@@ -68,6 +68,7 @@
     action="{% url 'search' %}"
     method="get"
     accept-charset="utf-8"
+    class="uk-margin-bottom"
 >
 
     <div class="uk-margin-small-top uk-margin-bottom uk-grid uk-grid-small">
@@ -169,4 +170,7 @@
     </div>
 </form>
 </div>
+
+{% include '_home/_footer.html' %}
+
 {% endblock content %}
\ No newline at end of file

From e54170b26c6b93e1ab5cb18499d057773500b855 Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 6 Sep 2024 01:36:49 +0800
Subject: [PATCH 23/41] duplicated the _volumes_page_information.html (function
 not implemented)

---
 .../_collections_page_information.html        | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 apps/templates/snippets/_collections_page_information.html

diff --git a/apps/templates/snippets/_collections_page_information.html b/apps/templates/snippets/_collections_page_information.html
new file mode 100644
index 00000000..7af7f365
--- /dev/null
+++ b/apps/templates/snippets/_collections_page_information.html
@@ -0,0 +1,69 @@
+{% load url_replace %}
+<!-- Information Line -->
+<!-- TODO: This page was duplicated from the _volumes_page_information.html.
+           Need to be adjusted for the Collection page(s)
+-->
+<div class="info-line">
+  <div class="info-group">
+    {# numeric pagination #}
+    <span>Showing {{ collections.start_index }}-{{ collections.end_index }} of {{ collections.paginator.count }} collections</span>
+    <span class="slash-gap">/</span> Page
+    <a href="#">{{ collections.number }}</a>
+    <div class="uk-navbar-dropdown" uk-dropdown="mode: click">
+      <ul class="uk-nav uk-navbar-dropdown-nav pagination-nav"> 
+        {% for pg in paginator_range %}
+          <li>
+            {% if pg == "…" %}
+              <span>{{ pg }}</span>
+            {% else %}
+              <a href="?{% url_replace page=pg %}">{{ pg }}</a>
+            {% endif %}
+            
+          </li>
+        {% endfor %}
+      </ul>
+    </div> of {{ collections.paginator.num_pages }} 
+    <span class="slash-gap">/</span>
+
+    {# form for setting sort, order, and page display (list/grid) #}
+    <form method="get">
+      <label for="{{ form.sort.auto_id }}">
+          <span class="fieldname">{{ form.sort.label }}</span>
+          {{ form.sort }}
+      </label>
+      <span class="slash-gap">/</span>
+      <label for="{{ form.order.auto_id }}">
+          <span class="fieldname">{{ form.order.label }}</span>
+          {{ form.order }}
+      </label>
+    </form>
+  </div>
+
+  {# previous and next page pagination #}
+  <div class="pagination-controls">
+    <a
+      class="uk-icon-button"
+      uk-icon="chevron-left"
+      {% if collections.has_previous %}
+        uk-tooltip="Go to previous page"
+        href="?{% url_replace page=collections.previous_page_number %}"
+      {% else %}
+        uk-tooltip="This is the first page"
+        disabled
+      {% endif %}
+    >
+    </a>
+    <a
+      class="uk-icon-button"
+      uk-icon="chevron-right"
+      {% if collections.has_next %}
+        uk-tooltip="Go to next page"
+        href="?{% url_replace page=collections.next_page_number %}"
+      {% else %}
+        uk-tooltip="This is the last page"
+        disabled
+      {% endif %}
+    >
+    </a>
+  </div>
+</div>

From c9b3d761ca665c439f4ea9e08d7e134d5ce59b42 Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 6 Sep 2024 02:19:30 +0800
Subject: [PATCH 24/41] adjust styles for static (flat) pages and the
 collection list view

---
 apps/static/css/readux2/main.scss        |  2 +-
 apps/static/css/readux2/static.scss      | 15 +++-
 apps/templates/cms/collections_page.html | 18 ++++-
 apps/templates/cms/content_page.html     | 99 +++++++++++++++++++++---
 4 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/apps/static/css/readux2/main.scss b/apps/static/css/readux2/main.scss
index c54ab283..a6d5e18e 100644
--- a/apps/static/css/readux2/main.scss
+++ b/apps/static/css/readux2/main.scss
@@ -348,7 +348,7 @@
 .list-item:hover {
     cursor: pointer;
 }
-.clickable-row {
+.clickable-row:hover {
     cursor: pointer;
 }
 .list-view-table th, .list-view-table td {
diff --git a/apps/static/css/readux2/static.scss b/apps/static/css/readux2/static.scss
index e3f5a26b..b14c8927 100644
--- a/apps/static/css/readux2/static.scss
+++ b/apps/static/css/readux2/static.scss
@@ -8,13 +8,12 @@
   top: 20px;
   border-radius: 10px 10px; /* Rounded corners on the right-hand side */
   width: auto; /* Fit to content width */
-  margin-right: 1.5rem;
 }
 .navigation a {
   color: #1D3557;
   text-decoration: none;
   display: block;
-  padding: 10px 0;
+  padding: 5px 15px !important;
   position: relative;
   font-weight: normal;
   font-size: medium;
@@ -29,7 +28,7 @@
 .navigation a.active::before {
   content: '';
   position: absolute;
-  left: -12px;
+  left: 3px;
   top: 50%;
   transform: translateY(-50%);
   height: 75%;
@@ -37,8 +36,16 @@
   background-color: #1D3557;
 }
 .content {
-  padding: 20px;
+  padding: 40px;
 }
 .section {
   padding-bottom: 40px;
+}
+.static-content-title {
+  font-size: 1.5rem;
+  font-weight: bold;
+}
+.section p {
+  margin: 0.5rem 0;
+  color: black;
 }
\ No newline at end of file
diff --git a/apps/templates/cms/collections_page.html b/apps/templates/cms/collections_page.html
index 6b698f09..2c4bb85a 100644
--- a/apps/templates/cms/collections_page.html
+++ b/apps/templates/cms/collections_page.html
@@ -57,7 +57,7 @@ <h2>{{ collection.label|default:"[no title]"|truncatechars:200 }}</h2>
     </thead>
     <tbody>
       {% for collection in page.collections %}
-          <tr class="clickable-row" data-ref="{% url 'collection' collection.pid %}">
+          <tr class="clickable-row" data-href="{% url 'collection' collection.pid %}">
               <td>{{ collection.label|default:"[no title]"|truncatechars:200 }}</td>
               <td>{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</td>
               <td class="uk-table-expand">{{collection.summary|truncatewords_html:50|safe}}</td>
@@ -73,4 +73,18 @@ <h2>{{ collection.label|default:"[no title]"|truncatechars:200 }}</h2>
 
 {% include '_home/_footer.html' %}
 
-{% endblock content %}
\ No newline at end of file
+{% include_block page.body %}
+<script>
+  // JavaScript to make list view table rows clickable
+  document.addEventListener('DOMContentLoaded', function() {
+      var rows = document.querySelectorAll('.clickable-row');
+      rows.forEach(function(row) {
+          row.addEventListener('click', function() {
+              window.location.href = row.getAttribute('data-href');
+          });
+      });
+  });
+</script>
+
+{% endblock %}
+
diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html
index 59a1e070..aa54a72e 100644
--- a/apps/templates/cms/content_page.html
+++ b/apps/templates/cms/content_page.html
@@ -43,33 +43,59 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
     <div class="uk-width-1-4@m navigation-wrapper">
         <nav class="navigation">
             <ul class="uk-nav uk-nav-default">
-                <li><a href="#features" class="active">Features</a></li>
-                <li><a href="#collections">Collections</a></li>
-                <li><a href="#users-guidelines">Users Guidelines</a></li>
-                <li><a href="#partners">Partners</a></li>
+                <li><a href="#features" data-section="features" class="active">Features</a></li>
+                <li><a href="#collections" data-section="collections">Collections</a></li>
+                <li><a href="#users-guidelines" data-section="users-guidelines">Users Guidelines</a></li>
+                <li><a href="#partners" data-section="partners">Partners</a></li>
             </ul>
         </nav>
     </div>
 
     <!-- Right Column: Content -->
-    <div class="uk-width-expand@m content">
+    <div class="uk-width-expand@m content uk-padding-remove-top">
         <div id="features" class="section">
-            <h2>Features</h2>
+            <h2 class="text-black static-content-title">Features</h2>
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
+        
+        
         </div>
         <div id="collections" class="section">
-            <h2>Collections</h2>
+            <h2 class="text-black static-content-title">Collections</h2>
             <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
+            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
+            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
+            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
+            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
+            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
+        
         </div>
         <div id="users-guidelines" class="section">
-            <h2>Users Guidelines</h2>
+            <h2 class="text-black static-content-title">Users Guidelines</h2>
+            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
+            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
+            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
+            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
+            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
             <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
         </div>
         <div id="partners" class="section">
-            <h2>Partners</h2>
+            <h2 class="text-black static-content-title">Partners</h2>
+            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
+            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
+            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
+            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
+            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
+            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
             <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
         </div>
     </div>
+  </div>
 </div>
 
 
@@ -77,9 +103,60 @@ <h2>Partners</h2>
 <p class="lead">{{page.tagline}}</p>
 {% endif %}
 
+{% include '_home/_footer.html' %}
+
 {% include_block page.body %}
 <script>
-
-</script>
+    document.addEventListener('DOMContentLoaded', function () {
+        const navLinks = document.querySelectorAll('.navigation a');
+        const sections = document.querySelectorAll('.section');
+    
+        // Function to remove the 'active' class from all navigation links
+        function removeActiveClass() {
+            navLinks.forEach(link => link.classList.remove('active'));
+        }
+    
+        // Function to add 'active' class to the corresponding navigation link
+        function setActiveLink(sectionId) {
+            removeActiveClass();
+            const activeLink = document.querySelector(`.navigation a[data-section="${sectionId}"]`);
+            if (activeLink) {
+                activeLink.classList.add('active');
+            }
+        }
+    
+        // Smooth scroll to the corresponding section when a navigation link is clicked
+        navLinks.forEach(link => {
+            link.addEventListener('click', function (e) {
+                e.preventDefault();
+                const targetId = this.getAttribute('href').substring(1);
+                const targetSection = document.getElementById(targetId);
+    
+                // Scroll to the target section
+                targetSection.scrollIntoView({ behavior: 'smooth' });
+    
+                // Set the active link manually since we're not scrolling naturally
+                setActiveLink(targetId);
+            });
+        });
+    
+        // Add scroll event listener to highlight the current section in view
+        window.addEventListener('scroll', function () {
+            let currentSection = '';
+            sections.forEach(section => {
+                const sectionTop = section.offsetTop - 50; // Offset for sticky navigation
+                const sectionHeight = section.clientHeight;
+                if (window.scrollY >= sectionTop && window.scrollY < sectionTop + sectionHeight) {
+                    currentSection = section.getAttribute('id');
+                }
+            });
+    
+            if (currentSection) {
+                setActiveLink(currentSection);
+            }
+        });
+    });
+    </script>
+    
 {% endblock %}
 

From c18f0f37337e984bc8423178b1d9c85de76935d2 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 9 Sep 2024 11:01:32 -0400
Subject: [PATCH 25/41] Remove unused Django CollectionsList view/template

---
 apps/readux/urls.py             |  1 -
 apps/readux/views.py            |  7 -------
 apps/templates/collections.html | 21 ---------------------
 3 files changed, 29 deletions(-)
 delete mode 100644 apps/templates/collections.html

diff --git a/apps/readux/urls.py b/apps/readux/urls.py
index 9b66412f..899f1ca8 100644
--- a/apps/readux/urls.py
+++ b/apps/readux/urls.py
@@ -5,7 +5,6 @@
 from .search import SearchManifestCanvas
 
 urlpatterns = [
-    path('collection/', views.CollectionsList.as_view(), name='collections list'),
     path('collection/<collection>/', views.CollectionDetail.as_view(), name="collection"),
     path('volume/<volume>', views.VolumeDetail.as_view(), name='volume'),
     path('volume/<volume>/page/all', views.PageDetail.as_view(), name='volumeall'),
diff --git a/apps/readux/views.py b/apps/readux/views.py
index 725fbed9..0d42fd4d 100644
--- a/apps/readux/views.py
+++ b/apps/readux/views.py
@@ -25,13 +25,6 @@
 SORT_OPTIONS = ['title', 'author', 'date published', 'date added']
 ORDER_OPTIONS = ['asc', 'desc']
 
-class CollectionsList(ListView):
-    """Django List View for :class:`apps.iiif.kollections.models.Collection`s"""
-    template_name = "collections.html"
-
-    context_object_name = 'collections'
-    queryset = Collection.objects.all()
-
 class CollectionDetail(ListView):
     """Django Template View for a :class:`apps.iiif.kollections.models.Collection`"""
     template_name = "collection.html"
diff --git a/apps/templates/collections.html b/apps/templates/collections.html
deleted file mode 100644
index 1c804f80..00000000
--- a/apps/templates/collections.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-<h1 class='uk-heading-xlarge uk-text-center'>Readux</h1>
-<h2 class='uk-heading-medium uk-text-center'>Read. Annotate. Publish.</h2>
-<p class='uk-text-lead uk-text-center'>Log in to Readux to read digitized collections, make your own notes, and publish your marked-up edition online.</p>
-<div>
-<ul>
-  {% for collection in collections %}
-  <li>
-  <div class="collectionbox">
-    <div class="collectioncontainer">
-      <img src="/media/{{collection.header}}" alt="Banner image for collection {{collection.label}}" style="width:100%;"/><br />
-        <div class="collection-label"><a class="nav-link" href="{% url 'collection' collection.pid %}"><span>
-          {{ collection.label }}<button>{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</button>
-        </span></a></div>
-    </div></div>
-  </li>
-  {% endfor %}
-</ul>
-</div>
-{% endblock content %}

From 29c523eb2f2e281e7b469fc78db24beeea406487 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 9 Sep 2024 11:18:57 -0400
Subject: [PATCH 26/41] Connect "all collections" wagtail page to django

---
 apps/cms/models.py                       | 81 ++++++++++++++++++++++--
 apps/readux/forms.py                     | 25 ++++++++
 apps/templates/cms/collections_page.html | 10 ++-
 3 files changed, 105 insertions(+), 11 deletions(-)

diff --git a/apps/cms/models.py b/apps/cms/models.py
index 98bb036e..66066655 100644
--- a/apps/cms/models.py
+++ b/apps/cms/models.py
@@ -1,5 +1,4 @@
 """CMS Models."""
-from urllib.parse import urlencode
 from modelcluster.fields import ParentalManyToManyField
 from wagtail.models import Page
 from wagtail.fields import RichTextField, StreamField
@@ -7,11 +6,10 @@
 from wagtailautocomplete.edit_handlers import AutocompletePanel
 from django.db import models
 from apps.cms.blocks import BaseStreamBlock
-from apps.readux.forms import AllVolumesForm
+from apps.readux.forms import AllCollectionsForm, AllVolumesForm
 from apps.readux.models import UserAnnotation
 from apps.iiif.kollections.models import Collection
 from apps.iiif.manifests.models import Manifest
-from apps.iiif.canvases.models import Canvas
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 
 
@@ -40,14 +38,87 @@ class CollectionsPage(Page):
         default="List",
         help_text="Select to show all volumes as a list or a grid of icons."
     )
-    collections = Collection.objects.all
-    volumes = Manifest.objects.all
+    collections = Collection.objects.all()
+    volumes = Manifest.objects.all()
     content_panels = Page.content_panels + [
         FieldPanel('page_title', classname="full"),
         FieldPanel('tagline', classname="full"),
         FieldPanel('paragraph', classname="full"),
         FieldPanel('layout', classname="full"),
     ]
+    initial = {"sort": "title", "order": "asc", "display": "grid"}
+    sort_fields = {
+        "title": "label",
+        "added": "created_at",
+        "volumes": "volumes_count",
+    }
+
+    def get_form(self, request):
+        """Get the form for setting sort and order"""
+        # use GET instead of default POST/PUT for form data
+        form_data = request.GET.copy()
+
+        # sort by chosen sort
+        if "sort" in form_data and bool(form_data.get("sort")):
+            form_data["sort"] = form_data.get("sort")
+
+        # Otherwise set all form values to default
+        for key, val in self.initial.items():
+            form_data.setdefault(key, val)
+
+        return AllCollectionsForm(data=form_data)
+
+    def get_queryset(self, form, queryset):
+        """Get the sorted set of objects to display"""
+
+        # return empty queryset if not valid
+        if not form.is_valid():
+            return queryset.none()
+
+        # get sort and order selections from form
+        search_opts = form.cleaned_data
+        sort = search_opts.get("sort", "title")
+        if sort not in self.sort_fields:
+            sort = "title"
+        order = search_opts.get("order", "asc")
+        sign = "-" if order == "desc" else ""
+
+        # include volume count in queryset if sort 
+        if "volumes" in sort:
+            queryset = queryset.annotate(volumes_count=models.Count("manifests"))
+
+        # build order_by query to sort results
+        queryset = queryset.order_by(f"{sign}{self.sort_fields[sort]}")
+
+        return queryset
+
+    def get_context(self, request):
+        """Context function."""
+        context = super().get_context(request)
+
+        form = self.get_form(request)
+        query_set = self.get_queryset(form, self.collections)
+
+        paginator = Paginator(query_set, 8) # Show 8 collections per page
+
+        page = request.GET.get("page", 1)
+        try:
+            collections = paginator.page(page)
+        except PageNotAnInteger:
+            # If page is not an integer, deliver first page.
+            collections = paginator.page(1)
+        except EmptyPage:
+            # If page is out of range (e.g. 9999), deliver last page of results.
+            page = paginator.num_pages
+            collections = paginator.page(page)
+
+        context.update({
+            "form": form,
+            "collections": collections,
+            "paginator_range": paginator.get_elided_page_range(page, on_each_side=2),
+        })
+
+        return context
 
 class VolumesPage(Page):
     """Content page"""
diff --git a/apps/readux/forms.py b/apps/readux/forms.py
index 7dbe31ee..74bdf68f 100644
--- a/apps/readux/forms.py
+++ b/apps/readux/forms.py
@@ -223,3 +223,28 @@ class AllVolumesForm(forms.Form):
         required=False,
         widget=CustomDropdownSelect,
     )
+
+class AllCollectionsForm(forms.Form):
+    """Simple form for sorting Collections"""
+
+    SORT_CHOICES = [
+        ("title", "Title"),
+        ("added", "Date Added"),
+        ("volumes", "Number of Volumes"),
+    ]
+    ORDER_CHOICES = [
+        ("asc", "Ascending"),
+        ("desc", "Descending"),
+    ]
+    sort = forms.ChoiceField(
+        label="Sort by",
+        choices=SORT_CHOICES,
+        required=False,
+        widget=CustomDropdownSelect,
+    )
+    order = forms.ChoiceField(
+        label="Order",
+        choices=ORDER_CHOICES,
+        required=False,
+        widget=CustomDropdownSelect,
+    )
diff --git a/apps/templates/cms/collections_page.html b/apps/templates/cms/collections_page.html
index 2c4bb85a..332cfdc4 100644
--- a/apps/templates/cms/collections_page.html
+++ b/apps/templates/cms/collections_page.html
@@ -31,7 +31,7 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
   {% if page.layout == 'Grid' %}
   <!-- Collection Grid -->
   <div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
-    {% for collection in page.collections %}
+    {% for collection in collections %}
         <!-- Collection Item -->
         <a class="grid-item" href="{% url 'collection' collection.pid %}">
             <img src="/media/{{collection.thumbnail}}" alt="Thumbnail image for collection {{collection.label}}"> <!-- TODO: Not sure how to correctly insert the onerror handler -->
@@ -40,12 +40,10 @@ <h2>{{ collection.label|default:"[no title]"|truncatechars:200 }}</h2>
             {{collection.summary|truncatewords_html:50|safe}}
         </a>
       {% empty %}
-        There are no volumes available to browse.
+        There are no collections available to browse.
       {% endfor %}
   </div>
-  {% endif %}
-  
-  {% if page.layout == 'List' %}
+  {% elif page.layout == 'List' %}
   <!-- Collection List -->
   <table class="uk-table uk-table-divider list-view-table uk-margin-large-bottom">
     <thead>
@@ -56,7 +54,7 @@ <h2>{{ collection.label|default:"[no title]"|truncatechars:200 }}</h2>
         </tr>
     </thead>
     <tbody>
-      {% for collection in page.collections %}
+      {% for collection in collections %}
           <tr class="clickable-row" data-href="{% url 'collection' collection.pid %}">
               <td>{{ collection.label|default:"[no title]"|truncatechars:200 }}</td>
               <td>{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</td>

From 5ff641ff3405bafecfb3d3eead20f303e47c7b48 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 9 Sep 2024 11:25:24 -0400
Subject: [PATCH 27/41] Implement onerror handler for collection thumbnail

---
 apps/templates/cms/collections_page.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/templates/cms/collections_page.html b/apps/templates/cms/collections_page.html
index 332cfdc4..fe89e8fd 100644
--- a/apps/templates/cms/collections_page.html
+++ b/apps/templates/cms/collections_page.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load wagtailcore_tags %}
-{% load sass_tags %}
+{% load wagtailcore_tags sass_tags static %}
 
 {% block body_class %}template-homepage{% endblock %}
 
@@ -34,7 +33,7 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
     {% for collection in collections %}
         <!-- Collection Item -->
         <a class="grid-item" href="{% url 'collection' collection.pid %}">
-            <img src="/media/{{collection.thumbnail}}" alt="Thumbnail image for collection {{collection.label}}"> <!-- TODO: Not sure how to correctly insert the onerror handler -->
+            <img src="/media/{{collection.thumbnail}}" alt="Thumbnail image for collection {{collection.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
             <h2>{{ collection.label|default:"[no title]"|truncatechars:200 }}</h2>
             {% if collection.manifests.all %}<div class="color-black">{{collection.manifests.all|length}} volume{{collection.manifests.all|length|pluralize}}</div>{% endif %}
             {{collection.summary|truncatewords_html:50|safe}}

From eec4aa0bb8988ab999ca2063f7ab9e9b224b73c5 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 9 Sep 2024 11:26:06 -0400
Subject: [PATCH 28/41] minor: "no volumes" --> "no collections"

---
 apps/templates/cms/collections_page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/templates/cms/collections_page.html b/apps/templates/cms/collections_page.html
index fe89e8fd..568c2168 100644
--- a/apps/templates/cms/collections_page.html
+++ b/apps/templates/cms/collections_page.html
@@ -60,7 +60,7 @@ <h2>{{ collection.label|default:"[no title]"|truncatechars:200 }}</h2>
               <td class="uk-table-expand">{{collection.summary|truncatewords_html:50|safe}}</td>
           </tr>
       {% empty %}
-        There are no volumes available to browse.
+        There are no collections available to browse.
       {% endfor %}
     </tbody>
   </table>

From 38dc55e81a4a85ee10f7573e5da703d669147f82 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 9 Sep 2024 13:37:59 -0400
Subject: [PATCH 29/41] Add volumes list view with new design

---
 apps/templates/cms/volumes_page.html | 248 ++++++---------------------
 1 file changed, 56 insertions(+), 192 deletions(-)

diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 8c159728..ee833316 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -1,11 +1,9 @@
 {% extends "base.html" %}
-{% load wagtailcore_tags %}
-{% load sass_tags %}
+{% load wagtailcore_tags sass_tags %}
 
 {% load static %}
 {% load has_user_annotations %}
 {% load user_annotation_count %}
-{% load url_replace %}
 
 
 {% block body_class %}template-homepage{% endblock %}
@@ -46,199 +44,65 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
 
   {% include "snippets/_volumes_page_information.html" %}
 
-  <!-- Volume Grid -->
-  <div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
-    {% for volume in volumes %}
-        <!-- Volume Item -->
-        <a class="grid-item" href="{% url 'volumeall' volume.pid %}">
-            <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
-            <h2>{{ volume.label|default:"[no title]"|truncatechars:200 }}</h2>
-            {% if volume.published_date %}<div class="color-black">{{ volume.published_date }}</div>{% endif %}
-            {% if volume.author %}<div class="color-black">{{ volume.author|truncatechars:150 }}</div>{% endif %}
-            <div class="color-black">Added {{ volume.created_at }}</div>
-        </a>
-      {% empty %}
-        There are no volumes available to browse.
-      {% endfor %}
-  </div>
-</div>
-
-<!-- TODO: Integrate GRID content into design -->
-{% if page.layout == 'Grid_COMMENTED_OUT' %}
-<div class="pagination" style="margin-bottom:20px">
-    <span class="step-links">
-        {% if volumes.has_previous %}
-            <a href="?{% url_replace page=volumes %}" style="margin-right:5px;">&laquo; first</a>
-            <a href="?{% url_replace page=volumes.previous_page_number %}" style="margin-right:5px;">previous</a>
-        {% endif %}
-
-        <span class="current" style="margin:0px,5px;">
-            Page {{ volumes.number }} of {{ volumes.paginator.num_pages }}
-        </span>
-
-        {% if volumes.has_next %}
-            <a href="?{% url_replace page=volumes.next_page_number %}" style="margin-left:5px;">next</a>
-            <a href="?{% url_replace page=volumes.num_pages %}" style="margin-left:5px;">last &raquo;</a>
-        {% endif %}
-    </span>
-</div>
-<div class="wrap">
-  {% for volume in volumes %}
-  {% if volume.start_canvas.pid is null %}
-  <div class="box">
-    <div class="boxInner">
-      <v-volume-image style="padding:80px !important"></v-volume-image>
-      <div class="innerContent">
-        <p>
-          <p title="{{ volume.label }}">{{ volume.label|truncatechars:200 }}</p>
-        </p>
-        <p><em>Author:</em> {{volume.author|truncatechars:150}}<br />
-          <em>Date Published:</em> {{volume.published_date}}<br />
-          Added {{volume.created_at}}</p>
-      </div>
-    </div>
-  </div>
-  {% else %}
-  <div class="box">
-    <div class="boxInner">
-      <a class="nav-link" href="{% url 'page' volume.pid volume.start_canvas.pid %}">
-          <v-volume-image
-            img-src="{{ volume.start_canvas.thumbnail_crop_volume }}"
-            volume-label="{{volume.label}}" style="height:300px !important">
-          </v-volume-image>
-      </a>
-      <div class="innerContent">
-        <p>
-          <a class="nav-link" href="{% url 'page' volume.pid volume.start_canvas.pid %}">
-            <p title="{{ volume.label }}">{{ volume.label|truncatechars:200 }}</p>
-          </a></p>
-        <p><em>Author:</em> {{volume.author|truncatechars:150}}<br />
-          <em>Date Published:</em> {{volume.published_date}}<br />
-          Added {{volume.created_at}}</p>
-      </div>
+  {% if page.layout == 'Grid' %}
+    <!-- Volume Grid -->
+    <div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
+      {% for volume in volumes %}
+          <!-- Volume Item -->
+          <a class="grid-item" href="{% url 'volumeall' volume.pid %}">
+              <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
+              <h2>{{ volume.label|default:"[no title]"|truncatechars:200 }}</h2>
+              {% if volume.published_date or volume.published_date_edtf %}
+                <div class="color-black">{{ volume.published_date|default:volume.published_date_edtf }}</div>
+              {% endif %}
+              {% if volume.author %}<div class="color-black">{{ volume.author|truncatechars:150 }}</div>{% endif %}
+              <div class="color-black">Added {{ volume.created_at }}</div>
+          </a>
+        {% empty %}
+          There are no volumes available to browse.
+        {% endfor %}
     </div>
-  </div>
+  {% elif page.layout == 'List' %}
+    <!-- Volume List -->
+    <table class="uk-table uk-table-divider list-view-table uk-margin-large-bottom">
+      <thead>
+          <tr>
+              <th>Volume</th>
+              <th>Author</th>
+              <th>Publication Date</th>
+              <th>Date Added</th>
+          </tr>
+      </thead>
+      <tbody>
+        {% for volume in volumes %}
+            <tr class="clickable-row" data-href="{% url 'volumeall' volume.pid %}">
+                <td>{{ volume.label|default:"-"|truncatechars:200 }}</td>
+                <td>{{ volume.author|default:"-"|truncatechars:150 }}</td>
+                <td>{{ volume.published_date|default:volume.published_date_edtf|default_if_none:"-" }}</td>
+                <td>{{ volume.created_at }}</td>
+            </tr>
+        {% empty %}
+          There are no volumes available to browse.
+        {% endfor %}
+      </tbody>
+    </table>
   {% endif %}
-  {% endfor %}
-</div>
-<div class="pagination" style="margin-bottom:20px">
-    <span class="step-links">
-        {% if volumes.has_previous %}
-            <a href="?{% url_replace page=volumes %}" style="margin-right:5px;">&laquo; first</a>
-            <a href="?{% url_replace page=volumes.previous_page_number %}" style="margin-right:5px;">previous</a>
-        {% endif %}
-
-        <span class="current" style="margin:0px,5px;">
-            Page {{ volumes.number }} of {{ volumes.paginator.num_pages }}
-        </span>
-
-        {% if volumes.has_next %}
-            <a href="?{% url_replace page=volumes.next_page_number %}" style="margin-left:5px;">next</a>
-            <a href="?{% url_replace page=volumes.num_pages %}" style="margin-left:5px;">last &raquo;</a>
-        {% endif %}
-    </span>
-</div>
-{% endif %}
-<!-- END -->
-
-<!-- TODO: Integrate LIST content into design -->
-{% if page.layout == 'List_COMMENTED_OUT' %}
-<div class="pagination" style="margin-bottom:20px">
-    <span class="step-links">
-        {% if volumes.has_previous %}
-            <a href="?{% url_replace page=1 %}" style="margin-right:5px;">&laquo; first</a>
-            <a href="?{% url_replace page=volumes.previous_page_number %}" style="margin-right:5px;">previous</a>
-        {% endif %}
-
-        <span class="current" style="margin:0px,5px;">
-            Page {{ volumes.number }} of {{ volumes.paginator.num_pages }}
-        </span>
-
-        {% if volumes.has_next %}
-            <a href="?{% url_replace page=volumes.next_page_number %}" style="margin-left:5px;">next</a>
-            <a href="?{% url_replace page=volumes.paginator.num_pages %}" style="margin-left:5px;">last &raquo;</a>
-        {% endif %}
-    </span>
 </div>
 
-<div class="uk-grid-match uk-child-width-expand@s uk-grid-large uk-margin-bottom" uk-grid>
-  {% for volume in volumes %}
-  {% if volume.start_canvas.pid is null %}
-  <div class="uk-width-1-2@m uk-grid-medium">
-    <div class="uk-width-1-4@m">
-      <a class="nav-link" href="#">
-        <v-volume-image></v-volume-image>
-      </a>
-    </div>
-    <div class="uk-width-3-4@m">
-      <a class="nav-link" href="#">
-        <h3 class="rx-card-title uk-margin-remove-bottom" title="{{ volume.label }}">{{ volume.label|truncatechars:100 }}</h3>
-      </a>
-      <ul class="uk-padding-remove uk-margin-remove">
-        <li>Author: {{volume.author|truncatechars:150}}</li>
-        <li>Published: {{volume.published_date}}</li>
-        <li>Added: {{volume.created_at}}</li>
-      </ul>
-    </div>
-  </div>
-  {% else %}
-  <div class="uk-width-1-2@m uk-grid-medium">
-
-    <div class="uk-width-1-4@m rx-volume-image">
-      <a class="nav-link" href="{% url 'page' volume.pid volume.start_canvas.pid %}">
-          <v-volume-image
-            img-src="{{ volume.start_canvas.thumbnail_crop_tallwide }}"
-            volume-label="{{volume.label|truncatechars:50}}">
-          </v-volume-image>
-      </a>
-    </div>
-    <div class="uk-width-3-4@m">
-      <a class="nav-link" href="{% url 'page' volume.pid volume.start_canvas.pid %}">
-        <h3 class="rx-card-title uk-margin-remove-bottom" title="{{ volume.label }}">{{ volume.label|truncatechars:100 }}</h3>
-      </a>
-      <ul class="uk-padding-remove uk-margin-remove rx-card-text">
-        <li>Author: {{volume.author|truncatechars:150}}</li>
-        <li>Published: {{volume.published_date}} | Added: {{volume.created_at}}</li>
-        <li>
-        {% if user.is_authenticated %}
-          {% has_user_annotations volume user as result %}
-          {% if result %}
-          <span class="count-icon">
-            <span class="uk-icon" uk-icon="icon: comments; ratio: 1.5;"
-              uk-tooltip="title: Number of your annotations; pos: bottom"></span>
-            <span class="count">{% user_annotation_count volume user %}</span>
-          </span>
-          {% endif %}
-        {% endif %}
-        </li>
-      </ul>
-    </div>
-  </div>
-  {% endif %}
-  {% endfor %}
-</div>
-<div class="pagination" style="margin-bottom:20px">
-  <span class="step-links">
-      {% if volumes.has_previous %}
-          <a href="?{% url_replace page=1 %}" style="margin-right:5px;">&laquo; first</a>
-          <a href="?{% url_replace page=volumes.previous_page_number %}" style="margin-right:5px;">previous</a>
-      {% endif %}
-
-      <span class="current" style="margin:0px,5px;">
-          Page {{ volumes.number }} of {{ volumes.paginator.num_pages }}
-      </span>
-
-      {% if volumes.has_next %}
-          <a href="?{% url_replace page=volumes.next_page_number %}" style="margin-left:5px;">next</a>
-          <a href="?{% url_replace page=volumes.paginator.num_pages %}" style="margin-left:5px;">last &raquo;</a>
-      {% endif %}
-  </span>
-</div>
-{% endif %}
-
-<!-- END -->
-
-
 {% include '_home/_footer.html' %}
 
 {% endblock content %}
+
+{% block extra_javascript %}
+<script>
+  // JavaScript to make list view table rows clickable
+  document.addEventListener('DOMContentLoaded', function() {
+      var rows = document.querySelectorAll('.clickable-row');
+      rows.forEach(function(row) {
+          row.addEventListener('click', function() {
+              window.location.href = row.getAttribute('data-href');
+          });
+      });
+  });
+</script>
+{% endblock %}
\ No newline at end of file

From 1eef018b393b0464aab2efd8171c36cb27932973 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 9 Sep 2024 13:38:10 -0400
Subject: [PATCH 30/41] Fix date sort for volumes to use EDTF correctly

---
 apps/cms/models.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/cms/models.py b/apps/cms/models.py
index 98bb036e..952fdab9 100644
--- a/apps/cms/models.py
+++ b/apps/cms/models.py
@@ -75,7 +75,7 @@ class VolumesPage(Page):
     sort_fields = {
         "title": "label",
         "author": "author",
-        "date": "published_date_edtf",
+        "date": "date_sort_ascending",
         "added": "created_at",
     }
 
@@ -110,7 +110,12 @@ def get_queryset(self, form, queryset):
         sign = "-" if order == "desc" else ""
 
         # build order_by query to sort results
-        queryset = queryset.order_by(f"{sign}{self.sort_fields[sort]}")
+        if sort == "date" and order == "desc":
+            # special case for date, descending: need to use date_sort_descending field
+            # and sort nulls last
+            queryset = queryset.order_by(models.F("date_sort_descending").desc(nulls_last=True))
+        else:
+            queryset = queryset.order_by(f"{sign}{self.sort_fields[sort]}")
 
         return queryset
 

From 7b18029913625327ac1c8c6bbb5b632595167db6 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 10 Sep 2024 16:49:15 -0400
Subject: [PATCH 31/41] Remove duplicate main.scss includes

---
 apps/templates/cms/collections_page.html | 1 -
 apps/templates/cms/content_page.html     | 1 -
 apps/templates/cms/home_page.html        | 1 -
 apps/templates/cms/volumes_page.html     | 1 -
 apps/templates/search_results.html       | 1 -
 apps/templates/wagtailadmin/home.html    | 1 -
 6 files changed, 6 deletions(-)

diff --git a/apps/templates/cms/collections_page.html b/apps/templates/cms/collections_page.html
index 2c4bb85a..40fb316a 100644
--- a/apps/templates/cms/collections_page.html
+++ b/apps/templates/cms/collections_page.html
@@ -5,7 +5,6 @@
 {% block body_class %}template-homepage{% endblock %}
 
 {% block content %}
-<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/login.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/static.scss' %}" rel="stylesheet">
diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html
index aa54a72e..4a07a697 100644
--- a/apps/templates/cms/content_page.html
+++ b/apps/templates/cms/content_page.html
@@ -5,7 +5,6 @@
 {% block body_class %}template-homepage{% endblock %}
 
 {% block content %}
-<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/login.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/static.scss' %}" rel="stylesheet">
diff --git a/apps/templates/cms/home_page.html b/apps/templates/cms/home_page.html
index bd170f7a..6e67492c 100644
--- a/apps/templates/cms/home_page.html
+++ b/apps/templates/cms/home_page.html
@@ -7,7 +7,6 @@
 {% load sass_tags %}
 
 {% block extra_css %}
-<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
 {% endblock %}
 
 {% block content %}
diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 8c159728..c4428469 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -12,7 +12,6 @@
 
 {% block content %}
 
-<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 
 {% include '_home/_nav.html' %}
diff --git a/apps/templates/search_results.html b/apps/templates/search_results.html
index 74a5b41d..f699b007 100644
--- a/apps/templates/search_results.html
+++ b/apps/templates/search_results.html
@@ -46,7 +46,6 @@
 
 {% block content %}
 <link type="text/css" href="{% sass_src 'css/readux2/search.scss' %}" rel="stylesheet">
-<link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 
 <!-- <link type="text/css" href="{% sass_src 'css/project.scss' %}" rel="stylesheet"> -->
diff --git a/apps/templates/wagtailadmin/home.html b/apps/templates/wagtailadmin/home.html
index d0e85141..d8a642c9 100644
--- a/apps/templates/wagtailadmin/home.html
+++ b/apps/templates/wagtailadmin/home.html
@@ -10,7 +10,6 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.17.0/css/uikit.min.css" />
     <link href="{% static 'css/selectize.css' %}" rel="stylesheet">
     <link type="text/css" href="{% sass_src 'css/project.scss' %}" rel="stylesheet">
-    <link type="text/css" href="{% sass_src 'css/readux2/main.scss' %}" rel="stylesheet">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.13.7/js/uikit.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.13.7/js/uikit-icons.min.js"></script>
     <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/home.css' %}" type="text/css" />

From 448060720507f00bcfd43a354ad4590f129d0530 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 10 Sep 2024 16:55:36 -0400
Subject: [PATCH 32/41] Fix bug with collection page css and remove backup
 template

---
 apps/static/css/readux2/collection.scss |  71 +++++++++++++
 apps/templates/collection.html          |  80 +--------------
 apps/templates/collection_backup.html   | 128 ------------------------
 3 files changed, 72 insertions(+), 207 deletions(-)
 create mode 100644 apps/static/css/readux2/collection.scss
 delete mode 100644 apps/templates/collection_backup.html

diff --git a/apps/static/css/readux2/collection.scss b/apps/static/css/readux2/collection.scss
new file mode 100644
index 00000000..143ac5ca
--- /dev/null
+++ b/apps/static/css/readux2/collection.scss
@@ -0,0 +1,71 @@
+.full-width-bg {
+    background-image: url('https://ukmars.org/ukmars/wp-content/uploads/2020/07/pexels-photo-507410.jpeg');
+    background-size: cover;
+    background-position: center;
+    position: relative;
+    height: 50vh;
+    color: white;
+}
+.overlay {
+    background: linear-gradient(to right, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0) 100%);
+    height: 50vh;
+    width: 33%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 50px;
+    box-sizing: border-box;
+    min-height: 0;
+}
+.overlay h1 {
+    font-size: 2rem; /* Reduced title size */
+    margin-bottom: 15px;
+}
+.overlay p {
+    font-size: 1rem; /* Adjusted font size */
+    line-height: 1.5; /* Reduced line-height */
+}
+.description-button {
+    margin-top: 20px;
+    background-color: #f0506e; /* Removed gradient background */
+    border: none;
+    color: white;
+}
+.uk-button-default {
+    background-color: #222; /* Removed gradient background */
+    border: none;
+    color: white;
+}
+
+.modal-bg {
+    background-image: url('https://ukmars.org/ukmars/wp-content/uploads/2020/07/pexels-photo-507410.jpeg');
+    background-size: cover;
+    background-position: center;
+    position: relative;
+    height: 100%;
+    width: 100%;
+    color: white;
+}
+.modal-overlay {
+    background: rgba(0, 0, 0, 0.6); /* Dark overlay */
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 50px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.modal-overlay h2,
+.modal-overlay p {
+    position: relative;
+    z-index: 1;
+}
+.uk-modal-close-full {
+    color: white; /* Set the close button color to white */
+    background: none; /* Remove the background */
+    border: none; /* Remove any borders */
+}
\ No newline at end of file
diff --git a/apps/templates/collection.html b/apps/templates/collection.html
index db8c109d..a24fb9d1 100644
--- a/apps/templates/collection.html
+++ b/apps/templates/collection.html
@@ -5,84 +5,9 @@
 {% load user_annotation_count %}
 {% block content %}
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
+<link type="text/css" href="{% sass_src 'css/readux2/collection.scss' %}" rel="stylesheet">
 
 {% include '_home/_nav.html' %}
-<style>
-  
-  .full-width-bg {
-            background-image: url('https://ukmars.org/ukmars/wp-content/uploads/2020/07/pexels-photo-507410.jpeg');
-            background-size: cover;
-            background-position: center;
-            position: relative;
-            height: 50vh;
-            color: white;
-        }
-        .overlay {
-            background: linear-gradient(to right, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0) 100%);
-            height: 50vh;
-            width: 33%;
-            position: absolute;
-            top: 0;
-            left: 0;
-            padding: 50px;
-            box-sizing: border-box;
-            min-height: 0;
-        }
-        .overlay h1 {
-            font-size: 2rem; /* Reduced title size */
-            margin-bottom: 15px;
-        }
-        .overlay p {
-            font-size: 1rem; /* Adjusted font size */
-            line-height: 1.5; /* Reduced line-height */
-        }
-        .description-button {
-            margin-top: 20px;
-            background-color: #f0506e; /* Removed gradient background */
-            border: none;
-            color: white;
-        }
-        .uk-button-default {
-            background-color: #222; /* Removed gradient background */
-            border: none;
-            color: white;
-        }
-
-        .modal-bg {
-            background-image: url('https://ukmars.org/ukmars/wp-content/uploads/2020/07/pexels-photo-507410.jpeg');
-            background-size: cover;
-            background-position: center;
-            position: relative;
-            height: 100%;
-            width: 100%;
-            color: white;
-        }
-        .modal-overlay {
-            background: rgba(0, 0, 0, 0.6); /* Dark overlay */
-            height: 100%;
-            width: 100%;
-            position: absolute;
-            top: 0;
-            left: 0;
-            padding: 50px;
-            box-sizing: border-box;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-        }
-        .modal-overlay h2,
-        .modal-overlay p {
-            position: relative;
-            z-index: 1;
-        }
-        .uk-modal-close-full {
-            color: white; /* Set the close button color to white */
-            background: none; /* Remove the background */
-            border: none; /* Remove any borders */
-        }
-</style>
-
-
 
 <div class="uk-container">
 <!-- Breadcrumb -->
@@ -128,9 +53,6 @@ <h2 style="color: white; font-weight: bold;">African American</h2>
 
 <div>
 
-  {% include "_home/_featured_collections.html" %}
-
-
   <header class="page-header" id="page-bg">
     <div class="container">
       <img src="/media/{{collection.header}}" alt="Header image for collection {{collection.label}}"
diff --git a/apps/templates/collection_backup.html b/apps/templates/collection_backup.html
deleted file mode 100644
index c2d560e3..00000000
--- a/apps/templates/collection_backup.html
+++ /dev/null
@@ -1,128 +0,0 @@
-{% extends "base.html" %}
-{% load static %}
-{% load has_user_annotations %}
-{% load user_annotation_count %}
-{% block content %}
-<div>
-
-  <header class="page-header" id="page-bg">
-    <div class="container">
-      <img src="/media/{{collection.header}}" alt="Header image for collection {{collection.label}}"
-        style="width:100%;" />
-    </div>
-    <div class="collection-image-info collapsed"  tabindex="0" aria-label="about this collection" uk-tooltip="title: About this collection; pos: right">
-      <div class="info">
-        <p style="font-size:130%">{{ collection.collection_image_title }}</p>{% if collection.collection_image_summary %}
-        <p>{{ collection.collection_image_summary }}</p> {% endif %}
-        <p>{{ collection.collection_image_creator }}</p>
-      </div>
-    </div>
-  </header>
-
-  <div class="rx-title-container">
-    <ul class="rx-breadcrumb uk-text-truncate">
-      <li class="rx-breadcrumb-item"><a href="/" alt="Home">Home</a></li>
-      <li class="rx-breadcrumb-item"><a href="/{{ collectionlink.slug }}" alt="Home">Collections</a></li>
-      <li class="rx-breadcrumb-item">{{ collection.label }}</li>
-    </ul>
-    <h2 class="rx-title" id="main">{{ collection.label }}</h2>
-    <div class="rx-title-tagline">{{volumes|length}} volume{{volumes|length|pluralize}}</div>
-  </div>
-
-  <div class="rx-head-container">
-    <p>{{ collection.summary|safe }}</p>
-  </div>
-
-  {% include "snippets/sort_dropdown.html" %}
-  <!--TODO: include ascending/descending sort feature-->
-
-  {% include "snippets/pagination.html" %}
-
-
-   <div class="uk-grid-match uk-child-width-expand@s uk-grid-large" uk-grid>
-   {% for volume in page_obj %}
-  {% if volume.canvas_set.first.pid is null %}
-      <div class="uk-width-1-2@m uk-grid-medium">
-        <div class=" uk-width-1-4@m">
-          <a class="nav-link" href="#">
-            <v-volume-image></v-volume-image>
-          </a>
-        </div>
-        <div class="uk-width-3-4@m" tabindex="0">
-          <a class="nav-link" href="#">
-            <h3 class="rx-card-title uk-margin-remove-bottom" title="{{ volume.label }}">{{ volume.label|truncatechars:100 }}</h3>
-          </a>
-          <ul class="uk-padding-remove rx-card-text">
-            <li>Author: {{volume.author|truncatechars:150}}</li>
-            <li>Published: {{volume.published_date}}</li>
-            <li>Publisher: {{volume.published_city}}: {{volume.publisher}}</li>
-            <li>Added: {{volume.created_at}}</li>
-            <li>
-                {% if user.is_authenticated %}
-                  {% has_user_annotations volume user as result %}
-                  {% if result %}
-                    <span class="count-icon">
-                      <span class="uk-icon" uk-icon="icon: comments; ratio: 1.5"
-                        uk-tooltip="title: Number of your annotations; pos: bottom"></span>
-                      <span class="count">{% user_annotation_count volume user %}</span>
-                    </span>
-                  {% endif %}
-                {% endif %}
-            </li>
-          </ul>
-        </div>
-      </div>
-
-    {% else %}
-    <div class="uk-width-1-2@m uk-grid-medium">
-      <div class=" uk-width-1-4@m">
-        <a class="nav-link" href="{% url 'page' volume.pid volume.canvas_set.first.pid %}">
-        {% if volume.start_canvas.pid %}
-           <v-volume-image
-            img-src="{{ volume.start_canvas.thumbnail_crop_tallwide }}"
-            volume-label="{{volume.label|truncatechars:50}}">
-          </v-volume-image>
-        {% elif volume.pid == fir|safe|slice:"2:-6" and "[]" in fir|safe %}
-        {% if forloop.last %}
-          <v-volume-image
-            img-src="{{ volume.canvas_set.first.thumbnail_crop_tallwide }}"
-            volume-label="{{volume.label|truncatechars:50}}">
-          </v-volume-image>
-        {% endif %}
-        {% endif %}
-        </a>
-      </div>
-      <div class="uk-width-3-4@m" tabindex="0" aria-label="Volume Information">
-        <a class="nav-link" href="{% url 'page' volume.pid volume.canvas_set.first.pid %}">
-          <h3 class="rx-card-title uk-margin-remove-bottom" title="{{ volume.label }}">{{ volume.label|truncatechars:100 }}</h3>
-        </a>
-        <ul class="uk-padding-remove rx-card-text">
-          <li>Author: {{volume.author|truncatechars:150}}</li>
-          <li>Published: {{volume.published_date}}</li>
-          <li>Publisher: {{volume.published_city}}: {{volume.publisher}}</li>
-          <li>Added: {{volume.created_at}}</li>
-          <li>
-              {% if user.is_authenticated %}
-                {% has_user_annotations volume user as result %}
-                {% if result %}
-                  <span class="count-icon">
-                    <span class="uk-icon" uk-icon="icon: comments; ratio: 1.5"
-                      uk-tooltip="title: Number of your annotations; pos: bottom"></span>
-                    <span class="count">{% user_annotation_count volume user %}</span>
-                  </span>
-                {% endif %}
-              {% endif %}
-          </li>
-        </ul>
-      </div>
-    </div>
-    {% endif %}
-    {% endfor %}
-  </div>
-</div>
-
-{% include "snippets/pagination.html" %}
-
-{% include "footer.html" %}
-
-{% endblock content %}

From 6c2c81e2ef3599e1a0501aff8656ddfa2668f4d0 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 10 Sep 2024 17:43:15 -0400
Subject: [PATCH 33/41] Refactor single collection page to use volume list
 logic

---
 apps/readux/views.py                       | 164 ++++++++++----------
 apps/templates/cms/volumes_page.html       |  17 +--
 apps/templates/collection.html             | 170 +++++----------------
 apps/templates/snippets/_volumes_grid.html |  18 +++
 4 files changed, 140 insertions(+), 229 deletions(-)
 create mode 100644 apps/templates/snippets/_volumes_grid.html

diff --git a/apps/readux/views.py b/apps/readux/views.py
index 725fbed9..8a604fc4 100644
--- a/apps/readux/views.py
+++ b/apps/readux/views.py
@@ -5,15 +5,16 @@
 from django.http import HttpResponse
 from django.views.generic import ListView
 from django.views.generic.base import TemplateView, View
+from django.views.generic.detail import DetailView
 from django.views.generic.edit import FormMixin
 from django.contrib.sitemaps import Sitemap
-from django.db.models import Max, Count
+from django.db.models import Max, Count, F
 from django.urls import reverse
 from elasticsearch_dsl import Q, NestedFacet, TermsFacet
 from elasticsearch_dsl.query import MultiMatch
 import config.settings.local as settings
 from apps.iiif.manifests.documents import ManifestDocument
-from apps.readux.forms import ManifestSearchForm
+from apps.readux.forms import AllVolumesForm, ManifestSearchForm
 from apps.export.export import JekyllSiteExport
 from apps.export.forms import JekyllExportForm
 from .models import UserAnnotation
@@ -21,6 +22,7 @@
 from ..iiif.kollections.models import Collection
 from ..iiif.canvases.models import Canvas
 from ..iiif.manifests.models import Manifest
+from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 
 SORT_OPTIONS = ['title', 'author', 'date published', 'date added']
 ORDER_OPTIONS = ['asc', 'desc']
@@ -30,99 +32,91 @@ class CollectionsList(ListView):
     template_name = "collections.html"
 
     context_object_name = 'collections'
-    queryset = Collection.objects.all()
 
-class CollectionDetail(ListView):
+class CollectionDetail(DetailView, FormMixin):
     """Django Template View for a :class:`apps.iiif.kollections.models.Collection`"""
     template_name = "collection.html"
-    SORT_OPTIONS = ['title', 'author', 'date published', 'date added']
-    ORDER_OPTIONS = ['asc', 'desc']
-    paginate_by = 10
+    slug_field = "pid"
+    slug_url_kwarg = "collection"
+    form_class = AllVolumesForm
+    model = Collection
+    initial = {"sort": "title", "order": "asc", "display": "grid"}
+    sort_fields = {
+        "title": "label",
+        "author": "author",
+        "date": "date_sort_ascending",
+        "added": "created_at",
+    }
 
-    def get_queryset(self):
-        sort = self.request.GET.get('sort', None)
-        order = self.request.GET.get('order', None)
-        q = Collection.objects.filter(pid=self.kwargs['collection']).first().manifests.all()
-
-        if sort is None:
-            sort = 'title'
-        if order is None:
-            order = 'asc'
-
-        if sort == 'title':
-            if order == 'asc':
-                q = q.order_by('label')
-            elif order == 'desc':
-                q = q.order_by('-label')
-        elif sort == 'author':
-            if order == 'asc':
-                q = q.order_by('author')
-            elif order == 'desc':
-                q = q.order_by('-author')
-        elif sort == 'date published':
-            if order == 'asc':
-                q = q.order_by('published_date_edtf')
-            elif order == 'desc':
-                q = q.order_by('-published_date_edtf')
-        elif sort == 'date added':
-            if order == 'asc':
-                q = q.order_by('created_at')
-            elif order == 'desc':
-                q = q.order_by('-created_at')
-
-        return 	q
+    def get_form_kwargs(self):
+        """get form arguments from request and configured defaults"""
+        kwargs = super().get_form_kwargs()
+
+        # use GET instead of default POST/PUT for form data
+        form_data = self.request.GET.copy()
+
+        # set all form values to default
+        for key, val in self.initial.items():
+            form_data.setdefault(key, val)
+
+        kwargs["data"] = form_data
+
+        return kwargs
+
+    def get_volumes(self):
+        """Get the sorted set of volumes to display"""
+        form = self.get_form()
+        collection = self.get_object()
+        queryset = collection.manifests.all()
+
+        # return empty queryset if not valid
+        if not form.is_valid():
+            return queryset.none()
+
+        # get sort and order selections from form
+        search_opts = form.cleaned_data
+        sort = search_opts.get("sort", "title")
+        if sort not in self.sort_fields:
+            sort = "title"
+        order = search_opts.get("order", "asc")
+        sign = "-" if order == "desc" else ""
+
+        # build order_by query to sort results
+        if sort == "date" and order == "desc":
+            # special case for date, descending: need to use date_sort_descending field
+            # and sort nulls last
+            queryset = queryset.order_by(F("date_sort_descending").desc(nulls_last=True))
+        else:
+            queryset = queryset.order_by(f"{sign}{self.sort_fields[sort]}")
+
+        return queryset
 
     def get_context_data(self, **kwargs):
+        """Context function."""
         context = super().get_context_data(**kwargs)
-        sort = self.request.GET.get('sort', None)
-        order = self.request.GET.get('order', None)
-
-        q = Collection.objects.filter(pid=self.kwargs['collection']).first().manifests
-
-        if sort is None:
-            sort = 'title'
-        if order is None:
-            order = 'asc'
-
-        if sort == 'title':
-            if order == 'asc':
-                q = q.order_by('label')
-            elif order == 'desc':
-                q = q.order_by('-label')
-        elif sort == 'author':
-            if order == 'asc':
-                q = q.order_by('author')
-            elif order == 'desc':
-                q = q.order_by('-author')
-        elif sort == 'date published':
-            if order == 'asc':
-                q = q.order_by('published_date_edtf')
-            elif order == 'desc':
-                q = q.order_by('-published_date_edtf')
-        elif sort == 'date added':
-            if order == 'asc':
-                q = q.order_by('created_at')
-            elif order == 'desc':
-                q = q.order_by('-created_at')
-
-        sort_url_params = self.request.GET.copy()
-        order_url_params = self.request.GET.copy()
-#         if 'sort' in sort_url_params:
-#             del sort_url_params['sort']
 
-        context['collectionlink'] = Page.objects.type(CollectionsPage).first()
-        context['collection'] = Collection.objects.filter(pid=self.kwargs['collection']).first()
-        context['volumes'] = q.all
-        context['manifest_query_set'] = q
-        context['user_annotation'] = UserAnnotation.objects.filter(owner_id=self.request.user.id)
-        value = 0
-        context['value'] = value
+        volumes = self.get_volumes()
+
+        # add paginator manually since this isn't a ListView
+        paginator = Paginator(volumes, 8) # Show 8 volumes per page
+
+        page = self.request.GET.get("page", 1)
+        try:
+            volumes = paginator.page(page)
+        except PageNotAnInteger:
+            # If page is not an integer, deliver first page.
+            volumes = paginator.page(1)
+        except EmptyPage:
+            # If page is out of range (e.g. 9999), deliver last page of results.
+            page = paginator.num_pages
+            volumes = paginator.page(page)
+
         context.update({
-            'sort_url_params': urlencode(sort_url_params),
-            'order_url_params': urlencode(order_url_params),
-            'sort': sort, 'SORT_OPTIONS': SORT_OPTIONS,
-            'order': order, 'ORDER_OPTIONS': ORDER_OPTIONS,
+            "volumes": volumes,
+            "user_annotation": UserAnnotation.objects.filter(owner_id=self.request.user.id),
+            "paginator_range": paginator.get_elided_page_range(page, on_each_side=2),
         })
+
         return context
 
 class VolumeDetail(TemplateView):
diff --git a/apps/templates/cms/volumes_page.html b/apps/templates/cms/volumes_page.html
index 7c81d103..60688397 100644
--- a/apps/templates/cms/volumes_page.html
+++ b/apps/templates/cms/volumes_page.html
@@ -45,22 +45,7 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
 
   {% if page.layout == 'Grid' %}
     <!-- Volume Grid -->
-    <div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
-      {% for volume in volumes %}
-          <!-- Volume Item -->
-          <a class="grid-item" href="{% url 'volumeall' volume.pid %}">
-              <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
-              <h2>{{ volume.label|default:"[no title]"|truncatechars:200 }}</h2>
-              {% if volume.published_date or volume.published_date_edtf %}
-                <div class="color-black">{{ volume.published_date|default:volume.published_date_edtf }}</div>
-              {% endif %}
-              {% if volume.author %}<div class="color-black">{{ volume.author|truncatechars:150 }}</div>{% endif %}
-              <div class="color-black">Added {{ volume.created_at }}</div>
-          </a>
-        {% empty %}
-          There are no volumes available to browse.
-        {% endfor %}
-    </div>
+     {% include "snippets/_volumes_grid.html" %}
   {% elif page.layout == 'List' %}
     <!-- Volume List -->
     <table class="uk-table uk-table-divider list-view-table uk-margin-large-bottom">
diff --git a/apps/templates/collection.html b/apps/templates/collection.html
index a24fb9d1..84c72f60 100644
--- a/apps/templates/collection.html
+++ b/apps/templates/collection.html
@@ -3,6 +3,8 @@
 {% load sass_tags %}
 {% load has_user_annotations %}
 {% load user_annotation_count %}
+
+
 {% block content %}
 <link type="text/css" href="{% sass_src 'css/readux2/menu-inverse.scss' %}" rel="stylesheet">
 <link type="text/css" href="{% sass_src 'css/readux2/collection.scss' %}" rel="stylesheet">
@@ -10,48 +12,46 @@
 {% include '_home/_nav.html' %}
 
 <div class="uk-container">
-<!-- Breadcrumb -->
-<ul class="breadcrumb uk-margin-small-top">
-  <li><a href="/">Home</a></li>
-  <li>
-    <a href="#">Collections<span class="icon-chevron-down" uk-icon="icon: chevron-down; ratio: 0.5"></span></a>
-    <div class="uk-navbar-dropdown uk-padding-remove" uk-dropdown="mode: click; pos: bottom-left;">
-      <ul class="uk-nav uk-navbar-dropdown-nav">
-          <li><a href="#">[All Collections]</a></li>
-          <li><a href="#">[Featured Collections]</a></li>
-      </ul>
-    </div>
-  </li>
-  <li>Collection</li>
-</ul>
-<!-- End -->
-</div>
-
-<div class="uk-section uk-padding-remove full-width-bg uk-margin-bottom uk-margin-top">
-  <div class="overlay">
-      <h1 class="uk-text-large" style="color: white; font-weight: bold;">African American</h1>
-      <p class="uk-text-medium">In the late nineteenth and early twentieth centuries, African American sacred music was published for black congregational use and staged performance...</p>
-      <button class="uk-button description-button" uk-toggle="target: #modal-full">Full Description</button>
-      <br><br>
-      <!-- <a href="#collection" class="uk-button uk-button-default">Jump to Collection</a> -->
+  <!-- Breadcrumb -->
+  <ul class="breadcrumb uk-margin-small-top">
+    <li><a href="/">Home</a></li>
+    <li>
+      <a href="#">Collections<span class="icon-chevron-down" uk-icon="icon: chevron-down; ratio: 0.5"></span></a>
+      <div class="uk-navbar-dropdown uk-padding-remove" uk-dropdown="mode: click; pos: bottom-left;">
+        <ul class="uk-nav uk-navbar-dropdown-nav">
+            <li><a href="#">[All Collections]</a></li>
+            <li><a href="#">[Featured Collections]</a></li>
+        </ul>
+      </div>
+    </li>
+    <li>Collection</li>
+  </ul>
+  <!-- End -->
   </div>
-</div>
 
-<div id="modal-full" class="uk-modal-full uk-modal" uk-modal>
-  <div class="uk-modal-dialog uk-flex uk-flex-center uk-flex-middle modal-bg" uk-height-viewport>
-      <button class="uk-modal-close-full uk-close-large" type="button" uk-close></button>
-      <div class="modal-overlay">
-          <div class="uk-width-1-1 uk-padding-large">
-              <h2 style="color: white; font-weight: bold;">African American</h2>
-              <p style="font-size: large;">In the late nineteenth and early twentieth centuries, African American sacred music was published for black congregational use and staged performance...</p>
-              <p style="font-size: large;">Additional details can go here...</p>
-              <!-- Add the rest of the content here -->
-          </div>
-      </div>
+  <div class="uk-section uk-padding-remove full-width-bg uk-margin-bottom uk-margin-top">
+    <div class="overlay">
+        <h1 class="uk-text-large" style="color: white; font-weight: bold;">African American</h1>
+        <p class="uk-text-medium">In the late nineteenth and early twentieth centuries, African American sacred music was published for black congregational use and staged performance...</p>
+        <button class="uk-button description-button" uk-toggle="target: #modal-full">Full Description</button>
+        <br><br>
+        <!-- <a href="#collection" class="uk-button uk-button-default">Jump to Collection</a> -->
+    </div>
   </div>
-</div>
 
-<div>
+  <div id="modal-full" class="uk-modal-full uk-modal" uk-modal>
+    <div class="uk-modal-dialog uk-flex uk-flex-center uk-flex-middle modal-bg" uk-height-viewport>
+        <button class="uk-modal-close-full uk-close-large" type="button" uk-close></button>
+        <div class="modal-overlay">
+            <div class="uk-width-1-1 uk-padding-large">
+                <h2 style="color: white; font-weight: bold;">African American</h2>
+                <p style="font-size: large;">In the late nineteenth and early twentieth centuries, African American sacred music was published for black congregational use and staged performance...</p>
+                <p style="font-size: large;">Additional details can go here...</p>
+                <!-- Add the rest of the content here -->
+            </div>
+        </div>
+    </div>
+  </div>
 
   <header class="page-header" id="page-bg">
     <div class="container">
@@ -74,103 +74,17 @@ <h2 style="color: white; font-weight: bold;">African American</h2>
       <li class="rx-breadcrumb-item">{{ collection.label }}</li>
     </ul>
     <h2 class="rx-title" id="main">{{ collection.label }}</h2>
-    <div class="rx-title-tagline">{{volumes|length}} volume{{volumes|length|pluralize}}</div>
+    <div class="rx-title-tagline">{{ volumes.paginator.count }} volume{{ volumes.paginator.count|pluralize }}</div>
   </div>
 
   <div class="rx-head-container">
     <p>{{ collection.summary|safe }}</p>
   </div>
 
-  {% include "snippets/sort_dropdown.html" %}
-  <!--TODO: include ascending/descending sort feature-->
+  {% include "snippets/_volumes_page_information.html" %}
+  {% include "snippets/_volumes_grid.html" %}
 
-  {% include "snippets/pagination.html" %}
-
-
-   <div class="uk-grid-match uk-child-width-expand@s uk-grid-large" uk-grid>
-   {% for volume in page_obj %}
-  {% if volume.canvas_set.first.pid is null %}
-      <div class="uk-width-1-2@m uk-grid-medium">
-        <div class=" uk-width-1-4@m">
-          <a class="nav-link" href="#">
-            <v-volume-image></v-volume-image>
-          </a>
-        </div>
-        <div class="uk-width-3-4@m" tabindex="0">
-          <a class="nav-link" href="#">
-            <h3 class="rx-card-title uk-margin-remove-bottom" title="{{ volume.label }}">{{ volume.label|truncatechars:100 }}</h3>
-          </a>
-          <ul class="uk-padding-remove rx-card-text">
-            <li>Author: {{volume.author|truncatechars:150}}</li>
-            <li>Published: {{volume.published_date}}</li>
-            <li>Publisher: {{volume.published_city}}: {{volume.publisher}}</li>
-            <li>Added: {{volume.created_at}}</li>
-            <li>
-                {% if user.is_authenticated %}
-                  {% has_user_annotations volume user as result %}
-                  {% if result %}
-                    <span class="count-icon">
-                      <span class="uk-icon" uk-icon="icon: comments; ratio: 1.5"
-                        uk-tooltip="title: Number of your annotations; pos: bottom"></span>
-                      <span class="count">{% user_annotation_count volume user %}</span>
-                    </span>
-                  {% endif %}
-                {% endif %}
-            </li>
-          </ul>
-        </div>
-      </div>
-
-    {% else %}
-    <div class="uk-width-1-2@m uk-grid-medium">
-      <div class=" uk-width-1-4@m">
-        <a class="nav-link" href="{% url 'page' volume.pid volume.canvas_set.first.pid %}">
-        {% if volume.start_canvas.pid %}
-           <v-volume-image
-            img-src="{{ volume.start_canvas.thumbnail_crop_tallwide }}"
-            volume-label="{{volume.label|truncatechars:50}}">
-          </v-volume-image>
-        {% elif volume.pid == fir|safe|slice:"2:-6" and "[]" in fir|safe %}
-        {% if forloop.last %}
-          <v-volume-image
-            img-src="{{ volume.canvas_set.first.thumbnail_crop_tallwide }}"
-            volume-label="{{volume.label|truncatechars:50}}">
-          </v-volume-image>
-        {% endif %}
-        {% endif %}
-        </a>
-      </div>
-      <div class="uk-width-3-4@m" tabindex="0" aria-label="Volume Information">
-        <a class="nav-link" href="{% url 'page' volume.pid volume.canvas_set.first.pid %}">
-          <h3 class="rx-card-title uk-margin-remove-bottom" title="{{ volume.label }}">{{ volume.label|truncatechars:100 }}</h3>
-        </a>
-        <ul class="uk-padding-remove rx-card-text">
-          <li>Author: {{volume.author|truncatechars:150}}</li>
-          <li>Published: {{volume.published_date}}</li>
-          <li>Publisher: {{volume.published_city}}: {{volume.publisher}}</li>
-          <li>Added: {{volume.created_at}}</li>
-          <li>
-              {% if user.is_authenticated %}
-                {% has_user_annotations volume user as result %}
-                {% if result %}
-                  <span class="count-icon">
-                    <span class="uk-icon" uk-icon="icon: comments; ratio: 1.5"
-                      uk-tooltip="title: Number of your annotations; pos: bottom"></span>
-                    <span class="count">{% user_annotation_count volume user %}</span>
-                  </span>
-                {% endif %}
-              {% endif %}
-          </li>
-        </ul>
-      </div>
-    </div>
-    {% endif %}
-    {% endfor %}
-  </div>
 </div>
-
-{% include "snippets/pagination.html" %}
-
-{% include "footer.html" %}
+{% include '_home/_footer.html' %}
 
 {% endblock content %}
diff --git a/apps/templates/snippets/_volumes_grid.html b/apps/templates/snippets/_volumes_grid.html
new file mode 100644
index 00000000..bc8dfe65
--- /dev/null
+++ b/apps/templates/snippets/_volumes_grid.html
@@ -0,0 +1,18 @@
+{% load static %}
+
+<div class="uk-grid-match uk-child-width-1-4@m uk-margin-large-bottom" uk-grid>
+    {% for volume in volumes %}
+        <!-- Volume Item -->
+        <a class="grid-item" href="{% url 'volumeall' volume.pid %}">
+            <img src="{{ volume.canvas_set.first.thumbnail_crop_volume }}" alt="First page of {{volume.label}}" onerror="this.onerror=null;this.src='{% static '/images/image_not_found.jpg' %}';">
+            <h2>{{ volume.label|default:"[no title]"|truncatechars:200 }}</h2>
+            {% if volume.published_date or volume.published_date_edtf %}
+              <div class="color-black">{{ volume.published_date|default:volume.published_date_edtf }}</div>
+            {% endif %}
+            {% if volume.author %}<div class="color-black">{{ volume.author|truncatechars:150 }}</div>{% endif %}
+            <div class="color-black">Added {{ volume.created_at }}</div>
+        </a>
+      {% empty %}
+        There are no volumes available to browse.
+      {% endfor %}
+  </div>
\ No newline at end of file

From 2db2aa4983c6c11799491017997d5501d466e32c Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 11 Sep 2024 14:15:46 -0400
Subject: [PATCH 34/41] Fix broken summernote editor

---
 apps/iiif/kollections/admin.py |  5 +++--
 apps/iiif/manifests/admin.py   | 13 ++++++++++++-
 config/settings/base.py        |  7 +++++++
 config/urls.py                 |  5 +----
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/apps/iiif/kollections/admin.py b/apps/iiif/kollections/admin.py
index e2416e11..571c8aed 100644
--- a/apps/iiif/kollections/admin.py
+++ b/apps/iiif/kollections/admin.py
@@ -4,7 +4,8 @@
 from django.contrib import admin
 from import_export import resources
 from import_export.admin import ImportExportModelAdmin
-from django_summernote.admin import SummernoteModelAdmin
+
+from apps.iiif.manifests.admin import SummernoteMixin
 from .models import Collection
 from ..manifests.models import Manifest
 
@@ -37,7 +38,7 @@ def manifest_pid(self, instance):
 
     manifest_pid.short_description = 'Manifest Local ID'
 
-class CollectionAdmin(ImportExportModelAdmin, SummernoteModelAdmin, admin.ModelAdmin):
+class CollectionAdmin(ImportExportModelAdmin, SummernoteMixin, admin.ModelAdmin):
     """Django admin configuration for a collection."""
     inlines = [
         ManifestInline,
diff --git a/apps/iiif/manifests/admin.py b/apps/iiif/manifests/admin.py
index 2b9d77d5..b4c0964c 100644
--- a/apps/iiif/manifests/admin.py
+++ b/apps/iiif/manifests/admin.py
@@ -47,7 +47,18 @@ class RelatedLinksInline(admin.TabularInline):
     extra = 1
     min_num = 0
 
-class ManifestAdmin(ImportExportModelAdmin, SummernoteModelAdmin, admin.ModelAdmin):
+class SummernoteMixin(SummernoteModelAdmin):
+    class Media:
+        # NOTE: have to include these js and css dependencies for summernote when not using iframe
+        js = (
+            "//code.jquery.com/jquery-3.7.1.min.js",
+            "//cdn.jsdelivr.net/npm/jquery.ui.widget@1.10.3/jquery.ui.widget.min.js",
+        )
+        css = {
+            "all": ["//cdn.jsdelivr.net/npm/summernote@0.8.20/dist/summernote-lite.min.css"],
+        }
+
+class ManifestAdmin(ImportExportModelAdmin, SummernoteMixin, admin.ModelAdmin):
     """Django admin configuration for manifests"""
     resource_class = ManifestResource
     exclude = ('id',)
diff --git a/config/settings/base.py b/config/settings/base.py
index 20fae610..fd3d75fd 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -336,3 +336,10 @@
 }
 
 SOCIALACCOUNT_STORE_TOKENS = True
+
+# django-summernote rich text editor settings. see https://github.com/hackerwins/django-summernote
+# NOTE: consider replacing after django 4 upgrade
+SUMMERNOTE_CONFIG = {
+    'iframe': False,
+}
+SUMMERNOTE_THEME = "lite"
diff --git a/config/urls.py b/config/urls.py
index 6f508bfd..2ef7e66c 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -62,10 +62,7 @@
     re_path(r'^', include('apps.ocr.urls')),
     re_path(r'^', include('apps.readux.urls')),
     re_path(r'', include(wagtail_urls)),
-    path(r'^summernote/', include('django_summernote.urls')),
-
-
-
+    re_path(r'^summernote/', include('django_summernote.urls')),
 ] + static(
     settings.MEDIA_URL, document_root=settings.MEDIA_ROOT
 )

From 8ea5323a0836b6196b0f20cda08f547a09e1d3e4 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 11 Sep 2024 14:24:24 -0400
Subject: [PATCH 35/41] Hook up collection label, header, summary to frontend

---
 apps/static/css/readux2/collection.scss |  2 -
 apps/templates/collection.html          | 57 +++++++++----------------
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/apps/static/css/readux2/collection.scss b/apps/static/css/readux2/collection.scss
index 143ac5ca..bea164d4 100644
--- a/apps/static/css/readux2/collection.scss
+++ b/apps/static/css/readux2/collection.scss
@@ -1,5 +1,4 @@
 .full-width-bg {
-    background-image: url('https://ukmars.org/ukmars/wp-content/uploads/2020/07/pexels-photo-507410.jpeg');
     background-size: cover;
     background-position: center;
     position: relative;
@@ -38,7 +37,6 @@
 }
 
 .modal-bg {
-    background-image: url('https://ukmars.org/ukmars/wp-content/uploads/2020/07/pexels-photo-507410.jpeg');
     background-size: cover;
     background-position: center;
     position: relative;
diff --git a/apps/templates/collection.html b/apps/templates/collection.html
index 84c72f60..90b523e3 100644
--- a/apps/templates/collection.html
+++ b/apps/templates/collection.html
@@ -29,58 +29,39 @@
   <!-- End -->
   </div>
 
-  <div class="uk-section uk-padding-remove full-width-bg uk-margin-bottom uk-margin-top">
+  <div
+    class="uk-section uk-padding-remove full-width-bg uk-margin-bottom uk-margin-top"
+    style="background-image: url('/media/{{collection.header}}');"
+  >
     <div class="overlay">
-        <h1 class="uk-text-large" style="color: white; font-weight: bold;">African American</h1>
-        <p class="uk-text-medium">In the late nineteenth and early twentieth centuries, African American sacred music was published for black congregational use and staged performance...</p>
+        <h1 class="uk-text-large" style="color: white; font-weight: bold;">{{ collection.label }}</h1>
+        <div class="rx-title-tagline">{{ volumes.paginator.count }} volume{{ volumes.paginator.count|pluralize }}</div>
+        <p class="uk-text-medium">{{ collection.summary|striptags|truncatechars:200 }}</p>
         <button class="uk-button description-button" uk-toggle="target: #modal-full">Full Description</button>
-        <br><br>
-        <!-- <a href="#collection" class="uk-button uk-button-default">Jump to Collection</a> -->
+
+        {# TODO: image metadata, style or remove #}
+        {% if collection.collection_image_title %}<p>{{ collection.collection_image_title }}</p>{% endif %}
+        {% if collection.collection_image_summary %}<p>{{ collection.collection_image_summary }}</p>{% endif %}
+        {% if collection.collection_image_summary %}<p>{{ collection.collection_image_creator }}</p>{% endif %}
     </div>
   </div>
 
   <div id="modal-full" class="uk-modal-full uk-modal" uk-modal>
-    <div class="uk-modal-dialog uk-flex uk-flex-center uk-flex-middle modal-bg" uk-height-viewport>
+    <div
+      class="uk-modal-dialog uk-flex uk-flex-center uk-flex-middle modal-bg"
+      uk-height-viewport
+      style="background-image: url('/media/{{collection.header}}');"
+    >
         <button class="uk-modal-close-full uk-close-large" type="button" uk-close></button>
         <div class="modal-overlay">
             <div class="uk-width-1-1 uk-padding-large">
-                <h2 style="color: white; font-weight: bold;">African American</h2>
-                <p style="font-size: large;">In the late nineteenth and early twentieth centuries, African American sacred music was published for black congregational use and staged performance...</p>
-                <p style="font-size: large;">Additional details can go here...</p>
-                <!-- Add the rest of the content here -->
+                <h2 style="color: white; font-weight: bold;">{{ collection.label }}</h2>
+                {{ collection.summary|safe }}
             </div>
         </div>
     </div>
   </div>
 
-  <header class="page-header" id="page-bg">
-    <div class="container">
-      <img src="/media/{{collection.header}}" alt="Header image for collection {{collection.label}}"
-        style="width:100%;" />
-    </div>
-    <div class="collection-image-info collapsed"  tabindex="0" aria-label="about this collection" uk-tooltip="title: About this collection; pos: right">
-      <div class="info">
-        <p style="font-size:130%">{{ collection.collection_image_title }}</p>{% if collection.collection_image_summary %}
-        <p>{{ collection.collection_image_summary }}</p> {% endif %}
-        <p>{{ collection.collection_image_creator }}</p>
-      </div>
-    </div>
-  </header>
-
-  <div class="rx-title-container">
-    <ul class="rx-breadcrumb uk-text-truncate">
-      <li class="rx-breadcrumb-item"><a href="/" alt="Home">Home</a></li>
-      <li class="rx-breadcrumb-item"><a href="/{{ collectionlink.slug }}" alt="Home">Collections</a></li>
-      <li class="rx-breadcrumb-item">{{ collection.label }}</li>
-    </ul>
-    <h2 class="rx-title" id="main">{{ collection.label }}</h2>
-    <div class="rx-title-tagline">{{ volumes.paginator.count }} volume{{ volumes.paginator.count|pluralize }}</div>
-  </div>
-
-  <div class="rx-head-container">
-    <p>{{ collection.summary|safe }}</p>
-  </div>
-
   {% include "snippets/_volumes_page_information.html" %}
   {% include "snippets/_volumes_grid.html" %}
 

From f753145c6f5a2f383a87a6547168dac65148d921 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 11 Sep 2024 15:08:51 -0400
Subject: [PATCH 36/41] Connect content page redesign to wagtail backend

---
 apps/readux/templatetags/readux_extras.py |   6 ++
 apps/templates/blocks/heading_block.html  |  15 ++--
 apps/templates/cms/content_page.html      | 104 ++++++++--------------
 3 files changed, 50 insertions(+), 75 deletions(-)

diff --git a/apps/readux/templatetags/readux_extras.py b/apps/readux/templatetags/readux_extras.py
index 40674584..a7dbb1a1 100644
--- a/apps/readux/templatetags/readux_extras.py
+++ b/apps/readux/templatetags/readux_extras.py
@@ -71,3 +71,9 @@ def group_by_canvas(inner_hits, limit=3):
         ):
             grouped.append(canvas)
     return grouped
+
+
+@register.filter
+def get_headers(block_list):
+    # filter to get just the headers in a wagtail page, in order to render a table of contents
+    return list(filter(lambda b: b.value and b.block_type == "heading_block", block_list))
diff --git a/apps/templates/blocks/heading_block.html b/apps/templates/blocks/heading_block.html
index a5a953e0..60331328 100644
--- a/apps/templates/blocks/heading_block.html
+++ b/apps/templates/blocks/heading_block.html
@@ -3,13 +3,10 @@
     class within `blocks.py`
 {% endcomment %}
 
-{% if self.size == 'h2' %}
-        <h2>{{ self.heading_text }}</h2>
-
-    {% elif self.size == 'h3' %}
-        <h3>{{ self.heading_text }}</h3>
-
-    {% elif self.size == 'h4' %}
-        <h4>{{ self.heading_text }}</h4>
-
+{% if self.size == 'h2' or not self.size %}
+    <h2 class="text-black static-content-title" id="{{ block_id }}">{{ self.heading_text }}</h2>
+{% elif self.size == 'h3' %}
+    <h3 class="text-black static-content-title" id="{{ block_id }}">{{ self.heading_text }}</h3>
+{% elif self.size == 'h4' %}
+    <h4 class="text-black static-content-title" id="{{ block_id }}">{{ self.heading_text }}</h4>
 {% endif %}
diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html
index aa54a72e..013eb50a 100644
--- a/apps/templates/cms/content_page.html
+++ b/apps/templates/cms/content_page.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load wagtailcore_tags %}
-{% load sass_tags %}
+{% load wagtailcore_tags sass_tags readux_extras menu_tags %}
 
 {% block body_class %}template-homepage{% endblock %}
 
@@ -16,18 +15,24 @@
   <!-- Breadcrumb -->
   <ul class="breadcrumb uk-margin-small-top">
     <li><a href="/">Home</a></li>
-    <li>
-      <a href="#">About<span class="icon-chevron-down" uk-icon="icon: chevron-down; ratio: 0.5"></span></a>
-      <div class="uk-navbar-dropdown uk-padding-remove" uk-dropdown="mode: click; pos: bottom-left;">
-        <ul class="uk-nav uk-navbar-dropdown-nav">
-            <li><a href="#">[What Is Readux?]</a></li>
-            <li><a href="#">[What Is Sounding Spirit?]</a></li>
-            <li><a href="#">[Team]</a></li>
-            <li><a href="#">[Terms of Service]</a></li>
-            <li><a href="#">[Contact Us]</a></li>
-        </ul>
-      </div>
-    </li>
+    {% for p in page.get_ancestors %}
+        {% if not p.is_root and p.show_in_menus %}
+        <li>
+            {% if p.get_children|length %}
+                <a href="#">{{ p.title }}<span class="icon-chevron-down" uk-icon="icon: chevron-down; ratio: 0.5"></span></a>
+                <div class="uk-navbar-dropdown uk-padding-remove" uk-dropdown="mode: click; pos: bottom-left;">
+                    <ul class="uk-nav uk-navbar-dropdown-nav">
+                        {% for subpage in p.get_children %}
+                            <li><a href="{{ subpage.url }}">{{ subpage.title }}</a></li>
+                        {% endfor %}
+                    </ul>
+                  </div>
+            {% else %}
+                <a href="{{ p.url }}">{{ p.title }}</a>
+            {% endif %}
+        </li>
+        {% endif %}
+    {% endfor %}
     <li>{{ page.page_title|default:page.title }}</li>
   </ul>
   <!-- End -->
@@ -40,60 +45,28 @@ <h1 class="page-title uk-margin-top uk-margin-remove-bottom">{{ page.page_title|
  
   <div class="uk-grid-collapse uk-child-width-expand" uk-grid>
     <!-- Left Column: Navigation -->
-    <div class="uk-width-1-4@m navigation-wrapper">
-        <nav class="navigation">
-            <ul class="uk-nav uk-nav-default">
-                <li><a href="#features" data-section="features" class="active">Features</a></li>
-                <li><a href="#collections" data-section="collections">Collections</a></li>
-                <li><a href="#users-guidelines" data-section="users-guidelines">Users Guidelines</a></li>
-                <li><a href="#partners" data-section="partners">Partners</a></li>
-            </ul>
-        </nav>
-    </div>
+    {% if page.body|get_headers|length %}
+        {# NOTE: requires the use of header blocks for entries to appear #}
+        <div class="uk-width-1-4@m navigation-wrapper">
+            <nav class="navigation">
+                <ul class="uk-nav uk-nav-default">
+                    {% for block in page.body|get_headers %}
+                        <li><a href="#{{ block.id }}" data-section="{{ block.id }}">{{ block|striptags }}</a></li>
+                    {% endfor %}
+                </ul>
+            </nav>
+        </div>
+    {% endif %}
 
     <!-- Right Column: Content -->
     <div class="uk-width-expand@m content uk-padding-remove-top">
-        <div id="features" class="section">
-            <h2 class="text-black static-content-title">Features</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur et felis nec ipsum dictum faucibus. Cras ultricies arcu sed massa facilisis, eget vulputate nulla viverra.</p>
-        
-        
-        </div>
-        <div id="collections" class="section">
-            <h2 class="text-black static-content-title">Collections</h2>
-            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
-            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
-            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
-            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
-            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
-            <p>Nullam hendrerit, sapien nec ullamcorper viverra, urna erat cursus lectus, a scelerisque mi turpis sit amet arcu. Sed ac justo urna.</p>
-        
-        </div>
-        <div id="users-guidelines" class="section">
-            <h2 class="text-black static-content-title">Users Guidelines</h2>
-            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
-            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
-            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
-            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
-            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
-            <p>Quisque auctor vel nisi at pulvinar. Donec vel dapibus ligula. Vivamus vel malesuada nisl, eget tincidunt lacus. Phasellus tincidunt sit amet nisi id gravida.</p>
-        </div>
-        <div id="partners" class="section">
-            <h2 class="text-black static-content-title">Partners</h2>
-            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
-            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
-            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
-            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
-            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
-            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
-            <p>Praesent vitae quam ac libero cursus dignissim. Fusce nec ligula at nulla ultricies tempor. Cras a urna et tortor bibendum auctor.</p>
-        </div>
+        {% for block in page.body %}
+            {% if block.block_type == 'heading_block' %}
+                {% include_block block with block_id=block.id %}
+            {% else %}
+                {% include_block block %}
+            {% endif %}
+        {% endfor %}
     </div>
   </div>
 </div>
@@ -105,7 +78,6 @@ <h2 class="text-black static-content-title">Partners</h2>
 
 {% include '_home/_footer.html' %}
 
-{% include_block page.body %}
 <script>
     document.addEventListener('DOMContentLoaded', function () {
         const navLinks = document.querySelectorAll('.navigation a');

From 8d928b8659ab8508387df579564ffd765c898cab Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 13 Sep 2024 04:04:21 +0800
Subject: [PATCH 37/41] replace current image not found with the new design

---
 apps/static/images/image_not_found.jpg | Bin 22548 -> 59746 bytes
 apps/static/images/image_not_found.svg |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 apps/static/images/image_not_found.svg

diff --git a/apps/static/images/image_not_found.jpg b/apps/static/images/image_not_found.jpg
index d20295ff11dbef9e2bcfc219802812925ce8b34c..1d166add5d74736810e04e5cedaf03dee9c3854d 100644
GIT binary patch
literal 59746
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
F{uj_a`Pcve

literal 22548
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

diff --git a/apps/static/images/image_not_found.svg b/apps/static/images/image_not_found.svg
new file mode 100644
index 00000000..0f7b9bf8
--- /dev/null
+++ b/apps/static/images/image_not_found.svg
@@ -0,0 +1,8 @@
+<svg width="234" height="234" viewBox="0 0 234 234" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="234" height="234" fill="#F1FAEE"/>
+<path d="M213 100C213 136.727 183.727 156.5 147 156.5C110.273 156.5 74 177.727 74 141C74 104.273 102.273 48.5 139 48.5C175.727 48.5 213 63.2731 213 100Z" fill="#FFFBE3"/>
+<path d="M134.871 70.6215C132.865 69.3367 131.395 67.2584 131.745 65.0914C131.815 64.6575 132.075 64.2777 132.455 64.0565C132.835 63.835 133.294 63.7954 133.706 63.9484C139.047 65.9315 145.004 64.7013 150.28 59.6937C150.643 59.3483 151.158 59.2126 151.645 59.3333C152.132 59.4543 152.523 59.8153 152.683 60.2906C153.363 62.314 152.754 65.0441 151.272 67.2869C149.739 69.6081 147.138 71.6388 143.477 72.179C139.957 72.6986 136.968 71.9645 134.871 70.6215ZM187.59 70.6215C189.597 69.3367 191.067 67.2584 190.717 65.0914C190.647 64.6575 190.387 64.2777 190.007 64.0565C189.627 63.835 189.168 63.7954 188.756 63.9484C183.415 65.9315 177.458 64.7013 172.182 59.6937C171.819 59.3483 171.304 59.2126 170.817 59.3333C170.33 59.4543 169.939 59.8153 169.779 60.2906C169.098 62.314 169.708 65.0441 171.19 67.2869C172.723 69.6081 175.324 71.6388 178.984 72.179C182.505 72.6986 185.494 71.9645 187.59 70.6215Z" fill="#457B9D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M142.475 93.9389C141.929 94.7752 141.494 95.8483 141.209 96.8929C140.921 97.9436 140.717 99.2129 140.811 100.458C140.901 101.635 141.315 103.368 142.864 104.503C144.48 105.686 146.424 105.569 148.068 105.052L148.091 105.045L148.115 105.037C155.273 102.656 158.685 101.707 161.961 101.726C165.248 101.744 168.582 102.734 175.615 105.031C177.102 105.553 178.943 105.665 180.479 104.46C181.86 103.378 182.248 101.78 182.359 100.735C182.48 99.5998 182.354 98.4286 182.137 97.434C181.922 96.4476 181.571 95.4156 181.089 94.5764C180.836 94.1349 180.42 93.587 180.272 93.3923C180.246 93.3582 180.228 93.335 180.221 93.3247C176.384 87.9702 169.329 84.625 161.558 84.625C153.504 84.625 146.201 88.2229 142.475 93.9389ZM146.695 100.198C146.698 100.211 146.701 100.216 146.701 100.216C146.701 100.216 146.699 100.206 146.693 100.189L146.695 100.198ZM146.876 98.4424C146.79 98.7564 146.732 99.0531 146.699 99.3172C153.422 97.0865 157.675 95.8266 161.994 95.851C166.171 95.8745 170.242 97.1023 176.478 99.1327C176.457 98.9891 176.43 98.8387 176.396 98.6842C176.269 98.099 176.093 97.6746 175.993 97.4995C175.938 97.4028 175.908 97.3641 175.836 97.2712C175.766 97.1813 175.656 97.0403 175.446 96.7469C172.89 93.1813 167.764 90.5 161.558 90.5C155.111 90.5 149.846 93.3887 147.396 97.1473C147.275 97.3326 147.052 97.7997 146.876 98.4424ZM176.488 100.287C176.482 100.303 176.481 100.313 176.481 100.313C176.481 100.313 176.485 100.303 176.491 100.28L176.488 100.287Z" fill="#457B9D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M214.75 72.875C214.75 102.077 191.077 125.75 161.875 125.75C132.673 125.75 109 102.077 109 72.875C109 43.673 132.673 20 161.875 20C191.077 20 214.75 43.673 214.75 72.875ZM208.875 72.875C208.875 98.8325 187.833 119.875 161.875 119.875C135.917 119.875 114.875 98.8325 114.875 72.875C114.875 46.9175 135.917 25.875 161.875 25.875C187.833 25.875 208.875 46.9175 208.875 72.875Z" fill="#457B9D"/>
+<path d="M18.312 173.44V170.68H30.312V173.44H25.752V187H22.872V173.44H18.312ZM38.4808 177.16C38.0808 177.16 37.6248 177.256 37.1128 177.448C36.6008 177.64 35.9928 178.016 35.2888 178.576V187H32.5288V169.24H35.2888V176.344C36.0248 175.72 36.7128 175.272 37.3528 175C37.9928 174.728 38.6488 174.592 39.3208 174.592C40.4888 174.592 41.3768 174.968 41.9848 175.72C42.5928 176.456 42.8968 177.496 42.8968 178.84V187H40.1368V179.176C40.1368 177.832 39.5848 177.16 38.4808 177.16ZM49.3764 172.528H46.4724V169.672H49.3764V172.528ZM49.3044 187H46.5444V174.832H49.3044V187ZM56.5149 184.84C57.1069 184.84 57.5949 184.744 57.9789 184.552C58.3629 184.344 58.5549 184.04 58.5549 183.64C58.5549 183.288 58.4269 183.016 58.1709 182.824C57.9309 182.616 57.4909 182.432 56.8509 182.272L55.4829 181.912C54.4269 181.64 53.6429 181.184 53.1309 180.544C52.6349 179.904 52.3869 179.144 52.3869 178.264C52.3869 177.224 52.7469 176.352 53.4669 175.648C54.1869 174.944 55.2989 174.592 56.8029 174.592C57.4109 174.592 58.0509 174.664 58.7229 174.808C59.3949 174.952 60.0989 175.184 60.8349 175.504L60.0429 177.856C59.3709 177.536 58.7629 177.312 58.2189 177.184C57.6749 177.056 57.1949 176.992 56.7789 176.992C55.6429 176.992 55.0749 177.376 55.0749 178.144C55.0749 178.448 55.1709 178.688 55.3629 178.864C55.5709 179.04 55.9469 179.2 56.4909 179.344L57.8589 179.704C59.0269 180.008 59.8749 180.472 60.4029 181.096C60.9469 181.72 61.2189 182.504 61.2189 183.448C61.2189 184.568 60.8349 185.48 60.0669 186.184C59.3149 186.888 58.1229 187.24 56.4909 187.24C55.0989 187.24 53.6349 186.92 52.0989 186.28L52.8429 184C53.5949 184.304 54.2749 184.52 54.8829 184.648C55.4909 184.776 56.0349 184.84 56.5149 184.84ZM71.4249 180.544C71.4249 181.712 71.6809 182.672 72.1929 183.424C72.7049 184.16 73.5449 184.528 74.7129 184.528C75.1929 184.528 75.6889 184.464 76.2009 184.336C76.7289 184.208 77.3769 183.992 78.1449 183.688L79.0329 186.184C78.1689 186.568 77.3689 186.84 76.6329 187C75.9129 187.16 75.2169 187.24 74.5449 187.24C73.2009 187.24 72.0729 186.952 71.1609 186.376C70.2649 185.8 69.5929 185.008 69.1449 184C68.6969 182.992 68.4729 181.84 68.4729 180.544V177.112C68.4729 175.816 68.6969 174.664 69.1449 173.656C69.5929 172.648 70.2649 171.864 71.1609 171.304C72.0729 170.728 73.2009 170.44 74.5449 170.44C75.2009 170.44 75.8809 170.52 76.5849 170.68C77.2889 170.824 78.0569 171.08 78.8889 171.448L78.0009 173.992C77.2649 173.688 76.6489 173.472 76.1529 173.344C75.6569 173.216 75.1769 173.152 74.7129 173.152C73.5449 173.152 72.7049 173.52 72.1929 174.256C71.6809 174.992 71.4249 175.944 71.4249 177.112V180.544ZM91.1685 180.184V181.624C91.1685 183.32 90.7045 184.68 89.7765 185.704C88.8485 186.728 87.5365 187.24 85.8405 187.24C84.1445 187.24 82.8325 186.728 81.9045 185.704C80.9765 184.68 80.5125 183.32 80.5125 181.624V180.184C80.5125 178.488 80.9685 177.136 81.8805 176.128C82.8085 175.104 84.1285 174.592 85.8405 174.592C87.5525 174.592 88.8645 175.104 89.7765 176.128C90.7045 177.136 91.1685 178.488 91.1685 180.184ZM88.3365 180.184C88.3365 179.208 88.1205 178.448 87.6885 177.904C87.2565 177.344 86.6405 177.064 85.8405 177.064C85.0405 177.064 84.4245 177.344 83.9925 177.904C83.5605 178.448 83.3445 179.208 83.3445 180.184V181.624C83.3445 182.6 83.5605 183.368 83.9925 183.928C84.4245 184.488 85.0405 184.768 85.8405 184.768C86.6405 184.768 87.2565 184.488 87.6885 183.928C88.1205 183.368 88.3365 182.6 88.3365 181.624V180.184ZM103.701 174.832L99.3808 187H96.8608L92.5408 174.832H95.3248L97.4128 180.904L98.2048 183.424L98.9728 180.904L100.965 174.832H103.701ZM115.011 186.304C114.179 186.64 113.395 186.88 112.659 187.024C111.923 187.168 111.227 187.24 110.571 187.24C108.763 187.24 107.395 186.728 106.467 185.704C105.539 184.68 105.075 183.32 105.075 181.624V180.184C105.075 179.048 105.283 178.064 105.699 177.232C106.115 176.4 106.707 175.752 107.475 175.288C108.243 174.824 109.147 174.592 110.187 174.592C111.035 174.592 111.827 174.768 112.563 175.12C113.315 175.456 113.923 175.992 114.387 176.728C114.867 177.448 115.107 178.376 115.107 179.512C115.107 179.848 115.083 180.208 115.035 180.592C114.987 180.96 114.907 181.352 114.795 181.768H107.739C107.771 182.76 108.019 183.504 108.483 184C108.947 184.496 109.691 184.744 110.715 184.744C111.259 184.744 111.819 184.68 112.395 184.552C112.987 184.424 113.595 184.232 114.219 183.976L115.011 186.304ZM110.187 176.92C109.451 176.92 108.875 177.16 108.459 177.64C108.059 178.104 107.827 178.776 107.763 179.656H112.371C112.387 179.576 112.395 179.504 112.395 179.44C112.395 179.36 112.395 179.288 112.395 179.224C112.395 178.456 112.179 177.88 111.747 177.496C111.315 177.112 110.795 176.92 110.187 176.92ZM125.151 177.352C124.399 177.352 123.679 177.472 122.991 177.712C122.319 177.936 121.671 178.304 121.047 178.816V187H118.287V174.832H120.903V176.704C121.719 175.936 122.447 175.392 123.087 175.072C123.727 174.752 124.415 174.592 125.151 174.592V177.352ZM135.613 187H132.733V170.68H135.613V187ZM143.163 184.84C143.755 184.84 144.243 184.744 144.627 184.552C145.011 184.344 145.203 184.04 145.203 183.64C145.203 183.288 145.075 183.016 144.819 182.824C144.579 182.616 144.139 182.432 143.499 182.272L142.131 181.912C141.075 181.64 140.291 181.184 139.779 180.544C139.283 179.904 139.035 179.144 139.035 178.264C139.035 177.224 139.395 176.352 140.115 175.648C140.835 174.944 141.947 174.592 143.451 174.592C144.059 174.592 144.699 174.664 145.371 174.808C146.043 174.952 146.747 175.184 147.483 175.504L146.691 177.856C146.019 177.536 145.411 177.312 144.867 177.184C144.323 177.056 143.843 176.992 143.427 176.992C142.291 176.992 141.723 177.376 141.723 178.144C141.723 178.448 141.819 178.688 142.011 178.864C142.219 179.04 142.595 179.2 143.139 179.344L144.507 179.704C145.675 180.008 146.523 180.472 147.051 181.096C147.595 181.72 147.867 182.504 147.867 183.448C147.867 184.568 147.483 185.48 146.715 186.184C145.963 186.888 144.771 187.24 143.139 187.24C141.747 187.24 140.283 186.92 138.747 186.28L139.491 184C140.243 184.304 140.923 184.52 141.531 184.648C142.139 184.776 142.683 184.84 143.163 184.84ZM27.216 215.592C26.8 215.784 26.32 215.936 25.776 216.048C25.232 216.176 24.68 216.24 24.12 216.24C23.192 216.24 22.448 216.048 21.888 215.664C21.328 215.28 20.92 214.744 20.664 214.056C20.424 213.368 20.304 212.584 20.304 211.704V206.232H18.336V203.832H20.304V200.664H23.064V203.832H26.856V206.232H23.064V211.704C23.064 212.44 23.2 212.952 23.472 213.24C23.76 213.512 24.168 213.648 24.696 213.648C24.952 213.648 25.224 213.624 25.512 213.576C25.816 213.512 26.152 213.408 26.52 213.264L27.216 215.592ZM39.3951 209.184V210.624C39.3951 212.32 38.9311 213.68 38.0031 214.704C37.0751 215.728 35.7631 216.24 34.0671 216.24C32.3711 216.24 31.0591 215.728 30.1311 214.704C29.2031 213.68 28.7391 212.32 28.7391 210.624V209.184C28.7391 207.488 29.1951 206.136 30.1071 205.128C31.0351 204.104 32.3551 203.592 34.0671 203.592C35.7791 203.592 37.0911 204.104 38.0031 205.128C38.9311 206.136 39.3951 207.488 39.3951 209.184ZM36.5631 209.184C36.5631 208.208 36.3471 207.448 35.9151 206.904C35.4831 206.344 34.8671 206.064 34.0671 206.064C33.2671 206.064 32.6511 206.344 32.2191 206.904C31.7871 207.448 31.5711 208.208 31.5711 209.184V210.624C31.5711 211.6 31.7871 212.368 32.2191 212.928C32.6511 213.488 33.2671 213.768 34.0671 213.768C34.8671 213.768 35.4831 213.488 35.9151 212.928C36.3471 212.368 36.5631 211.6 36.5631 210.624V209.184ZM47.6544 216V199.68H52.6224C53.8384 199.68 54.7984 199.856 55.5024 200.208C56.2224 200.56 56.7344 201.056 57.0384 201.696C57.3584 202.336 57.5184 203.088 57.5184 203.952V204.624C57.5184 205.888 56.9744 206.856 55.8864 207.528C56.6544 207.832 57.2384 208.272 57.6384 208.848C58.0384 209.424 58.2384 210.112 58.2384 210.912V211.584C58.2384 212.464 58.0784 213.24 57.7584 213.912C57.4384 214.568 56.9104 215.08 56.1744 215.448C55.4384 215.816 54.4544 216 53.2224 216H47.6544ZM52.6224 202.32H50.5344V206.4H52.6224C53.2624 206.4 53.7424 206.256 54.0624 205.968C54.3984 205.664 54.5664 205.256 54.5664 204.744V203.952C54.5664 203.44 54.3984 203.04 54.0624 202.752C53.7424 202.464 53.2624 202.32 52.6224 202.32ZM53.2224 209.04H50.5344V213.36H53.2224C53.8944 213.36 54.4064 213.2 54.7584 212.88C55.1104 212.56 55.2864 212.128 55.2864 211.584V210.792C55.2864 210.248 55.1104 209.824 54.7584 209.52C54.4064 209.2 53.8944 209.04 53.2224 209.04ZM70.5735 215.304C69.7415 215.64 68.9575 215.88 68.2215 216.024C67.4855 216.168 66.7895 216.24 66.1335 216.24C64.3255 216.24 62.9575 215.728 62.0295 214.704C61.1015 213.68 60.6375 212.32 60.6375 210.624V209.184C60.6375 208.048 60.8455 207.064 61.2615 206.232C61.6775 205.4 62.2695 204.752 63.0375 204.288C63.8055 203.824 64.7095 203.592 65.7495 203.592C66.5975 203.592 67.3895 203.768 68.1255 204.12C68.8775 204.456 69.4855 204.992 69.9495 205.728C70.4295 206.448 70.6695 207.376 70.6695 208.512C70.6695 208.848 70.6455 209.208 70.5975 209.592C70.5495 209.96 70.4695 210.352 70.3575 210.768H63.3015C63.3335 211.76 63.5815 212.504 64.0455 213C64.5095 213.496 65.2535 213.744 66.2775 213.744C66.8215 213.744 67.3815 213.68 67.9575 213.552C68.5495 213.424 69.1575 213.232 69.7815 212.976L70.5735 215.304ZM65.7495 205.92C65.0135 205.92 64.4375 206.16 64.0215 206.64C63.6215 207.104 63.3895 207.776 63.3255 208.656H67.9335C67.9495 208.576 67.9575 208.504 67.9575 208.44C67.9575 208.36 67.9575 208.288 67.9575 208.224C67.9575 207.456 67.7415 206.88 67.3095 206.496C66.8775 206.112 66.3575 205.92 65.7495 205.92ZM79.0138 216V199.68H84.5338C86.4858 199.68 87.9738 200.224 88.9978 201.312C90.0218 202.4 90.5338 204 90.5338 206.112V209.544C90.5338 211.672 90.0218 213.28 88.9978 214.368C87.9738 215.456 86.4858 216 84.5338 216H79.0138ZM84.4138 202.44H81.8938V213.24H84.4138C85.5498 213.24 86.3578 212.96 86.8378 212.4C87.3338 211.84 87.5818 210.888 87.5818 209.544V206.112C87.5818 204.784 87.3338 203.84 86.8378 203.28C86.3578 202.72 85.5498 202.44 84.4138 202.44ZM96.8139 201.528H93.9099V198.672H96.8139V201.528ZM96.7419 216H93.9819V203.832H96.7419V216ZM103.952 213.84C104.544 213.84 105.032 213.744 105.416 213.552C105.8 213.344 105.992 213.04 105.992 212.64C105.992 212.288 105.864 212.016 105.608 211.824C105.368 211.616 104.928 211.432 104.288 211.272L102.92 210.912C101.864 210.64 101.08 210.184 100.568 209.544C100.072 208.904 99.8244 208.144 99.8244 207.264C99.8244 206.224 100.184 205.352 100.904 204.648C101.624 203.944 102.736 203.592 104.24 203.592C104.848 203.592 105.488 203.664 106.16 203.808C106.832 203.952 107.536 204.184 108.272 204.504L107.48 206.856C106.808 206.536 106.2 206.312 105.656 206.184C105.112 206.056 104.632 205.992 104.216 205.992C103.08 205.992 102.512 206.376 102.512 207.144C102.512 207.448 102.608 207.688 102.8 207.864C103.008 208.04 103.384 208.2 103.928 208.344L105.296 208.704C106.464 209.008 107.312 209.472 107.84 210.096C108.384 210.72 108.656 211.504 108.656 212.448C108.656 213.568 108.272 214.48 107.504 215.184C106.752 215.888 105.56 216.24 103.928 216.24C102.536 216.24 101.072 215.92 99.5364 215.28L100.28 213C101.032 213.304 101.712 213.52 102.32 213.648C102.928 213.776 103.472 213.84 103.952 213.84ZM113.602 209.208V210.624C113.602 211.648 113.786 212.416 114.154 212.928C114.522 213.44 115.114 213.696 115.93 213.696C116.33 213.696 116.778 213.648 117.274 213.552C117.786 213.44 118.338 213.272 118.93 213.048L119.722 215.376C119.002 215.664 118.322 215.88 117.682 216.024C117.042 216.168 116.41 216.24 115.786 216.24C114.186 216.24 112.962 215.728 112.114 214.704C111.266 213.68 110.842 212.32 110.842 210.624V209.208C110.842 207.496 111.266 206.136 112.114 205.128C112.962 204.104 114.186 203.592 115.786 203.592C116.394 203.592 117.01 203.664 117.634 203.808C118.258 203.952 118.914 204.16 119.602 204.432L118.81 206.808C117.658 206.36 116.698 206.136 115.93 206.136C115.114 206.136 114.522 206.392 114.154 206.904C113.786 207.4 113.602 208.168 113.602 209.208ZM132.208 209.184V210.624C132.208 212.32 131.744 213.68 130.816 214.704C129.888 215.728 128.576 216.24 126.88 216.24C125.184 216.24 123.872 215.728 122.944 214.704C122.016 213.68 121.552 212.32 121.552 210.624V209.184C121.552 207.488 122.008 206.136 122.92 205.128C123.848 204.104 125.168 203.592 126.88 203.592C128.592 203.592 129.904 204.104 130.816 205.128C131.744 206.136 132.208 207.488 132.208 209.184ZM129.376 209.184C129.376 208.208 129.16 207.448 128.728 206.904C128.296 206.344 127.68 206.064 126.88 206.064C126.08 206.064 125.464 206.344 125.032 206.904C124.6 207.448 124.384 208.208 124.384 209.184V210.624C124.384 211.6 124.6 212.368 125.032 212.928C125.464 213.488 126.08 213.768 126.88 213.768C127.68 213.768 128.296 213.488 128.728 212.928C129.16 212.368 129.376 211.6 129.376 210.624V209.184ZM144.74 203.832L140.42 216H137.9L133.58 203.832H136.364L138.452 209.904L139.244 212.424L140.012 209.904L142.004 203.832H144.74ZM156.05 215.304C155.218 215.64 154.434 215.88 153.698 216.024C152.962 216.168 152.266 216.24 151.61 216.24C149.802 216.24 148.434 215.728 147.506 214.704C146.578 213.68 146.114 212.32 146.114 210.624V209.184C146.114 208.048 146.322 207.064 146.738 206.232C147.154 205.4 147.746 204.752 148.514 204.288C149.282 203.824 150.186 203.592 151.226 203.592C152.074 203.592 152.866 203.768 153.602 204.12C154.354 204.456 154.962 204.992 155.426 205.728C155.906 206.448 156.146 207.376 156.146 208.512C156.146 208.848 156.122 209.208 156.074 209.592C156.026 209.96 155.946 210.352 155.834 210.768H148.778C148.81 211.76 149.058 212.504 149.522 213C149.986 213.496 150.73 213.744 151.754 213.744C152.298 213.744 152.858 213.68 153.434 213.552C154.026 213.424 154.634 213.232 155.258 212.976L156.05 215.304ZM151.226 205.92C150.49 205.92 149.914 206.16 149.498 206.64C149.098 207.104 148.866 207.776 148.802 208.656H153.41C153.426 208.576 153.434 208.504 153.434 208.44C153.434 208.36 153.434 208.288 153.434 208.224C153.434 207.456 153.218 206.88 152.786 206.496C152.354 206.112 151.834 205.92 151.226 205.92ZM166.19 206.352C165.438 206.352 164.718 206.472 164.03 206.712C163.358 206.936 162.71 207.304 162.086 207.816V216H159.326V203.832H161.942V205.704C162.758 204.936 163.486 204.392 164.126 204.072C164.766 203.752 165.454 203.592 166.19 203.592V206.352ZM177.847 215.304C177.015 215.64 176.231 215.88 175.495 216.024C174.759 216.168 174.063 216.24 173.407 216.24C171.599 216.24 170.231 215.728 169.303 214.704C168.375 213.68 167.911 212.32 167.911 210.624V209.184C167.911 208.048 168.119 207.064 168.535 206.232C168.951 205.4 169.543 204.752 170.311 204.288C171.079 203.824 171.983 203.592 173.023 203.592C173.871 203.592 174.663 203.768 175.399 204.12C176.151 204.456 176.759 204.992 177.223 205.728C177.703 206.448 177.943 207.376 177.943 208.512C177.943 208.848 177.919 209.208 177.871 209.592C177.823 209.96 177.743 210.352 177.631 210.768H170.575C170.607 211.76 170.855 212.504 171.319 213C171.783 213.496 172.527 213.744 173.551 213.744C174.095 213.744 174.655 213.68 175.231 213.552C175.823 213.424 176.431 213.232 177.055 212.976L177.847 215.304ZM173.023 205.92C172.287 205.92 171.711 206.16 171.295 206.64C170.895 207.104 170.663 207.776 170.599 208.656H175.207C175.223 208.576 175.231 208.504 175.231 208.44C175.231 208.36 175.231 208.288 175.231 208.224C175.231 207.456 175.015 206.88 174.583 206.496C174.151 206.112 173.631 205.92 173.023 205.92ZM188.251 216V214.344C187.515 215.08 186.875 215.584 186.331 215.856C185.803 216.112 185.251 216.24 184.675 216.24C183.363 216.24 182.339 215.744 181.603 214.752C180.883 213.76 180.523 212.368 180.523 210.576V209.28C180.523 207.536 180.963 206.152 181.843 205.128C182.723 204.104 183.995 203.592 185.659 203.592C186.075 203.592 186.483 203.632 186.883 203.712C187.299 203.792 187.707 203.904 188.107 204.048V198.24H190.867V216H188.251ZM183.355 210.576C183.355 211.648 183.531 212.432 183.883 212.928C184.251 213.424 184.763 213.672 185.419 213.672C185.787 213.672 186.179 213.568 186.595 213.36C187.011 213.136 187.515 212.72 188.107 212.112V206.544C187.323 206.224 186.603 206.064 185.947 206.064C185.019 206.064 184.355 206.352 183.955 206.928C183.555 207.504 183.355 208.288 183.355 209.28V210.576Z" fill="#457B9D"/>
+</svg>

From fb996dac5e83f1598af3a2f9f214e24cca4366d8 Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 13 Sep 2024 04:17:07 +0800
Subject: [PATCH 38/41] tweak the full description button's aesthetics

---
 apps/static/css/readux2/collection.scss | 10 +++++++++-
 apps/templates/collection.html          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/static/css/readux2/collection.scss b/apps/static/css/readux2/collection.scss
index bea164d4..6c68ddfb 100644
--- a/apps/static/css/readux2/collection.scss
+++ b/apps/static/css/readux2/collection.scss
@@ -26,9 +26,17 @@
 }
 .description-button {
     margin-top: 20px;
-    background-color: #f0506e; /* Removed gradient background */
+    background-color: #E60000; /* Removed gradient background */
     border: none;
     color: white;
+    font-weight: bold;
+    height: 40px;
+    border-radius: 5px;
+    font-size: 1em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: background-color 0.3s ease;
 }
 .uk-button-default {
     background-color: #222; /* Removed gradient background */
diff --git a/apps/templates/collection.html b/apps/templates/collection.html
index 90b523e3..c38c8a46 100644
--- a/apps/templates/collection.html
+++ b/apps/templates/collection.html
@@ -34,7 +34,7 @@
     style="background-image: url('/media/{{collection.header}}');"
   >
     <div class="overlay">
-        <h1 class="uk-text-large" style="color: white; font-weight: bold;">{{ collection.label }}</h1>
+        <h1 class="uk-text-large uk-margin-remove" style="color: white; font-weight: bold;">{{ collection.label }}</h1>
         <div class="rx-title-tagline">{{ volumes.paginator.count }} volume{{ volumes.paginator.count|pluralize }}</div>
         <p class="uk-text-medium">{{ collection.summary|striptags|truncatechars:200 }}</p>
         <button class="uk-button description-button" uk-toggle="target: #modal-full">Full Description</button>

From ef96df54689a3aa22640685fed3fa59705ada19e Mon Sep 17 00:00:00 2001
From: Y <yl5682@icloud.com>
Date: Fri, 13 Sep 2024 04:17:47 +0800
Subject: [PATCH 39/41] wrap grid in the uk-container element

---
 apps/templates/collection.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/templates/collection.html b/apps/templates/collection.html
index c38c8a46..55be4de2 100644
--- a/apps/templates/collection.html
+++ b/apps/templates/collection.html
@@ -62,8 +62,10 @@ <h2 style="color: white; font-weight: bold;">{{ collection.label }}</h2>
     </div>
   </div>
 
-  {% include "snippets/_volumes_page_information.html" %}
-  {% include "snippets/_volumes_grid.html" %}
+  <div class="uk-container">
+    {% include "snippets/_volumes_page_information.html" %}
+    {% include "snippets/_volumes_grid.html" %}
+  </div>
 
 </div>
 {% include '_home/_footer.html' %}

From 437952cf467c01e21a1ddf6eedd4511cd3e506df Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Fri, 13 Sep 2024 11:57:50 -0400
Subject: [PATCH 40/41] Fix issue with home page appearing in breadcrumbs

---
 apps/templates/cms/content_page.html | 36 +++++++++++++++-------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html
index 89841415..dd17bd91 100644
--- a/apps/templates/cms/content_page.html
+++ b/apps/templates/cms/content_page.html
@@ -14,24 +14,26 @@
   <!-- Breadcrumb -->
   <ul class="breadcrumb uk-margin-small-top">
     <li><a href="/">Home</a></li>
-    {% for p in page.get_ancestors %}
-        {% if not p.is_root and p.show_in_menus %}
-        <li>
-            {% if p.get_children|length %}
-                <a href="#">{{ p.title }}<span class="icon-chevron-down" uk-icon="icon: chevron-down; ratio: 0.5"></span></a>
-                <div class="uk-navbar-dropdown uk-padding-remove" uk-dropdown="mode: click; pos: bottom-left;">
-                    <ul class="uk-nav uk-navbar-dropdown-nav">
-                        {% for subpage in p.get_children %}
-                            <li><a href="{{ subpage.url }}">{{ subpage.title }}</a></li>
-                        {% endfor %}
-                    </ul>
-                  </div>
-            {% else %}
-                <a href="{{ p.url }}">{{ p.title }}</a>
-            {% endif %}
-        </li>
+    {# For breadcrumbs, display the parent, if it is not a home page #}
+    {% with page.get_parent as p %}
+        {% if not p.page_type_display_name == "Home page" %}
+            <li>
+                {# Display siblings of this page #}
+                {% if p.get_children|length %}
+                    <a href="#">{{ p.title }}<span class="icon-chevron-down" uk-icon="icon: chevron-down; ratio: 0.5"></span></a>
+                    <div class="uk-navbar-dropdown uk-padding-remove" uk-dropdown="mode: click; pos: bottom-left;">
+                        <ul class="uk-nav uk-navbar-dropdown-nav">
+                            {% for subpage in p.get_children %}
+                                <li><a href="{{ subpage.url }}">{{ subpage.title }}</a></li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% else %}
+                    <a href="{{ p.url }}">{{ p.title }}</a>
+                {% endif %}
+            </li>
         {% endif %}
-    {% endfor %}
+    {% endwith %}
     <li>{{ page.page_title|default:page.title }}</li>
   </ul>
   <!-- End -->

From 291b169063a926fc76fabe1932d096591f7f462d Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Thu, 19 Sep 2024 16:18:49 -0400
Subject: [PATCH 41/41] Fix homepage featured collections/volumes links

---
 apps/templates/_home/_featured_collections.html | 8 +++++---
 apps/templates/_home/_featured_volumes.html     | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/templates/_home/_featured_collections.html b/apps/templates/_home/_featured_collections.html
index 194ab67a..86c3ebc2 100644
--- a/apps/templates/_home/_featured_collections.html
+++ b/apps/templates/_home/_featured_collections.html
@@ -1,10 +1,12 @@
-{% load readux_templatetags %}
+{% load readux_templatetags wagtailcore_tags %}
 
 <div class="uk-section uk-section-default uk-padding-remove-top">
     <div class="uk-container">
         <h2 class="uk-text-large uk-text-bold">
             Featured Collection{{page.featured_collections.all.count|pluralize}}
-            <a class="text-anchor">(See All Collections)</a>
+            {% if collectionsurl %}
+                <a class="text-anchor" href="{% pageurl collectionsurl %}">(See All Collections)</a>
+            {% endif %}
         </h2>
         
         <div uk-slider>
@@ -13,7 +15,7 @@ <h2 class="uk-text-large uk-text-bold">
                     <div class="uk-slider-items uk-child-width-1-2 uk-child-width-1-3@s uk-child-width-1-4@m">
                         {% for collection in page.featured_collections.all|order_by:page.featured_collections_sort_order %}
                             <div class="uk-panel">
-                                <a href="#" class="grid-item">
+                                <a href="{% url 'collection' collection.pid %}" class="grid-item">
                                     <img src="/media/{{ collection.thumbnail }}" alt="{{ collection.label }}">
                                     <h2>{{ collection.label }}</h2>
                                 </a>
diff --git a/apps/templates/_home/_featured_volumes.html b/apps/templates/_home/_featured_volumes.html
index 481b1352..c0ef4bbc 100644
--- a/apps/templates/_home/_featured_volumes.html
+++ b/apps/templates/_home/_featured_volumes.html
@@ -1,10 +1,12 @@
-{% load readux_templatetags %}
+{% load readux_templatetags wagtailcore_tags %}
 
 <div class="uk-section uk-section-default uk-padding-remove-top">
     <div class="uk-container">
         <h2 class="uk-text-large uk-text-bold">
             Featured Volume{{page.featured_volumes.all.count|pluralize}}
-            <a class="text-anchor">(See All Volumes)</a>
+            {% if volumesurl %}
+                <a class="text-anchor" href="{% pageurl volumesurl %}">(See All Volumes)</a>
+            {% endif %}
         </h2>
         <div uk-slider>
             <div class="uk-position-relative">
@@ -12,7 +14,7 @@ <h2 class="uk-text-large uk-text-bold">
                     <div class="uk-slider-items uk-child-width-1-2 uk-child-width-1-3@s uk-child-width-1-4@m">
                         {% for volume in page.featured_volumes.all|order_by:page.featured_volumes_sort_order %}
                             <div class="uk-panel">
-                                <a href="#" class="grid-item">
+                                <a href="{% url 'volumeall' volume.pid %}" class="grid-item">
                                     <img src="{{ volume.start_canvas.thumbnail_crop_tallwide }}" alt="{{ volume.label }}">
                                     <h2>{{ volume.label }}</h2>
                                 </a>