From 8443ec7f426477a6093f705a153e166c2b07fb88 Mon Sep 17 00:00:00 2001
From: "John Connor (Mulligan)" <john.connor.mulligan@gmail.com>
Date: Wed, 5 Apr 2023 04:36:28 -0500
Subject: [PATCH 1/3] applying domingos bugfix for the blank enslaved page
 (when ook/ao dataset var is not set)

---
 voyages/apps/past/templates/past/database/tabs/tables.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/voyages/apps/past/templates/past/database/tabs/tables.html b/voyages/apps/past/templates/past/database/tabs/tables.html
index aaf45fda5..9c67b2603 100644
--- a/voyages/apps/past/templates/past/database/tabs/tables.html
+++ b/voyages/apps/past/templates/past/database/tabs/tables.html
@@ -3,13 +3,13 @@
 <div id="tabs-tables-control">
     <div class="row">
       <div class="col-md-6 col-sm-12 col-lg-3">
-        <v-dropdown title="{% trans 'Row' %}" description="{% trans '' %}" @changed="tabUpdate" :options="tabs[enslavedDataset].tables.row.options" :variable="tabs[enslavedDataset].tables.row" :clearable="false"></v-dropdown>
+        <v-dropdown title="{% trans 'Row' %}" description="{% trans '' %}" @changed="tabUpdate" :options="tabs[enslavedDataset ?? 0].tables.row.options" :variable="tabs[enslavedDataset ?? 0].tables.row" :clearable="false"></v-dropdown>
         </div>
       <div class="col-md-6 col-sm-12 col-lg-3">
-        <v-dropdown title="{% trans 'Column' %}" description="{% trans '' %}" @changed="tabUpdate" :options="tabs[enslavedDataset].tables.column.options" :variable="tabs[enslavedDataset].tables.column" :clearable="false"></v-dropdown>
+        <v-dropdown title="{% trans 'Column' %}" description="{% trans '' %}" @changed="tabUpdate" :options="tabs[enslavedDataset ?? 0].tables.column.options" :variable="tabs[enslavedDataset ?? 0].tables.column" :clearable="false"></v-dropdown>
       </div>
       <div class="col-md-6 col-sm-12 col-lg-3">
-        <v-dropdown title="{% trans 'Cell' %}" description="{% trans '' %}" @changed="tabUpdate" :options="tabs[enslavedDataset].tables.cell.options" :variable="tabs[enslavedDataset].tables.cell" :clearable="false"></v-dropdown>
+        <v-dropdown title="{% trans 'Cell' %}" description="{% trans '' %}" @changed="tabUpdate" :options="tabs[enslavedDataset ?? 0].tables.cell.options" :variable="tabs[enslavedDataset ?? 0].tables.cell" :clearable="false"></v-dropdown>
       </div>
       <table id="v-tables" class="table table-striped table-bordered nowrap" cellspacing="0" width="100%" >
         <thead>

From 9876755fb2a14261c4c3015ebdcbd281dd852845 Mon Sep 17 00:00:00 2001
From: "John Connor (Mulligan)" <john.connor.mulligan@gmail.com>
Date: Wed, 5 Apr 2023 06:42:18 -0500
Subject: [PATCH 2/3] changed blog dropdown menu options and blog pagination
 per committee's march 3-4 requests

---
 voyages/apps/blog/views.py    | 6 +++---
 voyages/templates/topbar.html | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/voyages/apps/blog/views.py b/voyages/apps/blog/views.py
index a9ff77a14..951ccaadb 100644
--- a/voyages/apps/blog/views.py
+++ b/voyages/apps/blog/views.py
@@ -8,7 +8,7 @@
 
 class PostList(generic.ListView):
     template_name = 'blog/index.html'
-    paginate_by = 10
+    paginate_by = 12
 
     base_query = Post.objects.select_related()
     
@@ -124,7 +124,7 @@ def get_context_data(self, **kwargs):
 
 class AuthorList(generic.ListView):    
     template_name = 'blog/authors.html'
-    paginate_by = 10
+    paginate_by = 12
 
     def get_queryset(self):
         return Author.objects.order_by('name')
@@ -132,7 +132,7 @@ def get_queryset(self):
 
 class InstitutionList(generic.ListView):    
     template_name = 'blog/institutions.html'
-    paginate_by = 10
+    paginate_by = 12
 
     def get_queryset(self):
         return Institution.objects.order_by('name')
diff --git a/voyages/templates/topbar.html b/voyages/templates/topbar.html
index 1396043e1..9172b2af0 100644
--- a/voyages/templates/topbar.html
+++ b/voyages/templates/topbar.html
@@ -86,8 +86,14 @@
 					<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" >{% trans 'Blog' %}</a>
 					<div class="dropdown-menu dropdown-menu-right">						
 						<a class="dropdown-item" href="{% url 'blog:blog' %}">{% trans "All Posts" %}</a>
+<!-- 
 						<a class="dropdown-item" href="{% url 'blog:institutions' %}">{% trans "Institutions" %}</a>
 						<a class="dropdown-item" href="{% url 'blog:authors' %}">{% trans "Authors" %}</a>
+ -->
+						<a class="dropdown-item" href="{% url 'blog:tag' tag='intro-maps' %}">{% trans "Maps" %}</a>
+						<a class="dropdown-item" href="{% url 'blog:tag' tag='news' %}">{% trans "News" %}</a>
+						<a class="dropdown-item" href="{% url 'blog:tag' tag='texas-bound' %}">{% trans "Texas Bound" %}</a>
+<!-- 						<a class="dropdown-item" href="{% url 'blog:tag' tag='intro-maps' %}">{% trans "Voyage Stories" %}</a> -->
 						
 					</div>
 				</li>						

From cf866c94d31cb41845e488784cb3cdb1f9530a2e Mon Sep 17 00:00:00 2001
From: John Connor <john.connor.mulligan@gmail.com>
Date: Wed, 5 Apr 2023 08:08:35 -0500
Subject: [PATCH 3/3] added voyage stories option -- kate mcmahon has a blog
 post coming imminently

---
 voyages/templates/topbar.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/voyages/templates/topbar.html b/voyages/templates/topbar.html
index 9172b2af0..5131b5ac2 100644
--- a/voyages/templates/topbar.html
+++ b/voyages/templates/topbar.html
@@ -93,6 +93,7 @@
 						<a class="dropdown-item" href="{% url 'blog:tag' tag='intro-maps' %}">{% trans "Maps" %}</a>
 						<a class="dropdown-item" href="{% url 'blog:tag' tag='news' %}">{% trans "News" %}</a>
 						<a class="dropdown-item" href="{% url 'blog:tag' tag='texas-bound' %}">{% trans "Texas Bound" %}</a>
+						<a class="dropdown-item" href="{% url 'blog:tag' tag='voyage-stories' %}">{% trans "Voyage Stories" %}</a>
 <!-- 						<a class="dropdown-item" href="{% url 'blog:tag' tag='intro-maps' %}">{% trans "Voyage Stories" %}</a> -->
 						
 					</div>