Merge pull request #197 from rice-crc/apr4_requested_patches

Apr4 requested patches
rice-crc · Apr 6, 2023 · 408772f · 408772f
2 parents 7da3908 + 377dc33
commit 408772f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git 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,15 +124,15 @@ 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')
 
 
 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/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>

diff --git a/voyages/templates/topbar.html b/voyages/templates/topbar.html
@@ -86,8 +86,15 @@
 					<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='voyage-stories' %}">{% trans "Voyage Stories" %}</a>
+<!-- 						<a class="dropdown-item" href="{% url 'blog:tag' tag='intro-maps' %}">{% trans "Voyage Stories" %}</a> -->
 
 					</div>
 				</li>