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 @@ @@ -63,7 +63,7 @@ {%endif%}> Home - {%block breadcrumbs%}{%endblock%} + {%block lvl1_breadcrumbs%}{%endblock%} 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%} {%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 @@
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)}}
{%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%}> - List {%endblock%} @@ -35,7 +35,7 @@ exist, click on the "Create Population" button below to create a new one.

- 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%}

-{%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%}