From 2046919e5db5d1e7136f48641fe0adb701c145e4 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Tue, 3 Sep 2024 15:31:12 -0500
Subject: Put populations under species: improve hierarchy.

Populations cannot exist without the species they are related to. This
commit updates the URI hierarchy to reflect that expectation.
---
 uploader/templates/base.html                         | 4 ++--
 uploader/templates/populations/base.html             | 6 +++---
 uploader/templates/populations/index.html            | 2 +-
 uploader/templates/populations/list-populations.html | 4 ++--
 uploader/templates/species/base.html                 | 4 ++--
 uploader/templates/species/create-species.html       | 2 +-
 uploader/templates/species/view-species.html         | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'uploader/templates')

diff --git a/uploader/templates/base.html b/uploader/templates/base.html
index fd6010b..d9696d0 100644
--- a/uploader/templates/base.html
+++ b/uploader/templates/base.html
@@ -45,7 +45,7 @@
       <ul class="nav flex-column">
         <li><a href="/" >Home</a></li>
         <li><a href="{{url_for('species.list_species')}}" >Species</a></li>
-        <li><a href="{{url_for('populations.index')}}">Populations</a></li>
+        <li><a href="{{url_for('species.populations.index')}}">Populations</a></li>
         <li><a href="{{url_for('expression-data.index.index')}}" >Expression Data</a></li>
       </ul>
     </aside>
@@ -63,7 +63,7 @@
                 {%endif%}>
               <a href="{{url_for('base.index')}}">Home</a>
             </li>
-            {%block breadcrumbs%}{%endblock%}
+            {%block lvl1_breadcrumbs%}{%endblock%}
           </ol>
         </nav>
       </div>
diff --git a/uploader/templates/populations/base.html b/uploader/templates/populations/base.html
index 1033927..d763fc1 100644
--- a/uploader/templates/populations/base.html
+++ b/uploader/templates/populations/base.html
@@ -1,12 +1,12 @@
-{%extends "base.html"%}
+{%extends "species/base.html"%}
 
-{%block breadcrumbs%}
+{%block lvl2_breadcrumbs%}
 <li {%if activelink=="populations"%}
     class="breadcrumb-item active"
     {%else%}
     class="breadcrumb-item"
     {%endif%}>
-  <a href="{{url_for('populations.index')}}">Populations</a>
+  <a href="{{url_for('species.populations.index')}}">Populations</a>
 </li>
 {%block lvl3_breadcrumbs%}{%endblock%}
 {%endblock%}
diff --git a/uploader/templates/populations/index.html b/uploader/templates/populations/index.html
index 14cf547..061ca1d 100644
--- a/uploader/templates/populations/index.html
+++ b/uploader/templates/populations/index.html
@@ -11,6 +11,6 @@
 <div class="row">
   To continue, you need to select the species:
 
-  {{select_species_form(url_for("populations.index"), species)}}
+  {{select_species_form(url_for("species.populations.index"), species)}}
 </div>
 {%endblock%}
diff --git a/uploader/templates/populations/list-populations.html b/uploader/templates/populations/list-populations.html
index bf6cf98..c14a28c 100644
--- a/uploader/templates/populations/list-populations.html
+++ b/uploader/templates/populations/list-populations.html
@@ -12,7 +12,7 @@
     {%else%}
     class="breadcrumb-item"
     {%endif%}>
-  <a href="{{url_for('populations.list_species_populations',
+  <a href="{{url_for('species.populations.list_species_populations',
            species_id=species.SpeciesId)}}">List</a>
 </li>
 {%endblock%}
@@ -35,7 +35,7 @@
     exist, click on the "Create Population" button below to create a new one.
   </p>
   <p>
-    <a href="{{url_for('populations.create_population',
+    <a href="{{url_for('species.populations.create_population',
              species_id=species.SpeciesId)}}"
        title="Create a new population for species '{{species.FullName}}'."
        class="btn btn-danger">
diff --git a/uploader/templates/species/base.html b/uploader/templates/species/base.html
index 8fb697d..04391db 100644
--- a/uploader/templates/species/base.html
+++ b/uploader/templates/species/base.html
@@ -1,6 +1,6 @@
 {%extends "base.html"%}
 
-{%block breadcrumbs%}
+{%block lvl1_breadcrumbs%}
 <li {%if activelink=="species"%}
     class="breadcrumb-item active"
     {%else%}
@@ -8,5 +8,5 @@
     {%endif%}>
   <a href="{{url_for('species.list_species')}}">Species</a>
 </li>
-{%block lvl3_breadcrumbs%}{%endblock%}
+{%block lvl2_breadcrumbs%}{%endblock%}
 {%endblock%}
diff --git a/uploader/templates/species/create-species.html b/uploader/templates/species/create-species.html
index 678b010..1bc3b61 100644
--- a/uploader/templates/species/create-species.html
+++ b/uploader/templates/species/create-species.html
@@ -5,7 +5,7 @@
 
 {%block pagetitle%}Create Species{%endblock%}
 
-{%block lvl3_breadcrumbs%}
+{%block lvl2_breadcrumbs%}
 <li {%if activelink=="create-species"%}
     class="breadcrumb-item active"
     {%else%}
diff --git a/uploader/templates/species/view-species.html b/uploader/templates/species/view-species.html
index 0a3b0dd..0364c97 100644
--- a/uploader/templates/species/view-species.html
+++ b/uploader/templates/species/view-species.html
@@ -22,7 +22,7 @@
 </style>
 {%endblock%}
 
-{%block lvl3_breadcrumbs%}
+{%block lvl2_breadcrumbs%}
 <li {%if activelink=="view-species"%}
     class="breadcrumb-item active"
     {%else%}
-- 
cgit v1.2.3