Merge branch 'ziotom78:master' into master

litebird · Dec 15, 2023 · 49c582b · 49c582b
2 parents 5b7d2a3 + e301d0e
commit 49c582b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # HEAD
 
+# Version 2.0.1
+
+-   Make the links in the top bar active when appropriate [#125](https://github.com/ziotom78/instrumentdb/pull/125)
+
 -   Permit cross-references in dependencies when importing databases [#124](https://github.com/ziotom78/instrumentdb/pull/124)
 
 -   Permit longer file names [#123](https://github.com/ziotom78/instrumentdb/pull/123)

diff --git a/browse/templates/browse/base_generic.html b/browse/templates/browse/base_generic.html
@@ -20,6 +20,7 @@
     <script>hljs.initHighlightingOnLoad();</script>
 
     {% load static %}
+    {% load active_link_tags %}
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
       <a class="navbar-brand" href="#"><img class="img-fluid" src="{% static "browse/logo.png" %}" style="max-width: 6rem"></a>
       <button class="navbar-toggler"
@@ -34,18 +35,18 @@
 
       <div class="collapse navbar-collapse order-1 col-auto" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
-          <li class="nav-item active">
+          <li class="nav-item {% active_link 'release-list-view' 'active' strict=True %}">
             <a class="nav-link" href="{% url 'release-list-view' %}">
               Home
               <span class="sr-only">(current)</span>
             </a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item {% active_link 'entity-list-view' 'active' %}">
             <a class="nav-link" href="{% url 'entity-list-view' %}">
               Entity tree
             </a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item {% active_link 'format-spec-list-view' 'active' %}">
             <a class="nav-link" href="{% url 'format-spec-list-view' %}">
               Format specifications
             </a>

diff --git a/instrumentdb/__init__.py b/instrumentdb/__init__.py
@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
diff --git a/instrumentdb/settings.py b/instrumentdb/settings.py
@@ -107,6 +107,7 @@
     "rest_framework.authtoken",
     "sslserver",
     "drf_yasg",
+    "active_link",
     "django_cleanup.apps.CleanupConfig",  # This must be the last one!
 ]
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "instrumentdb"
-version = "2.0.0"
+version = "2.0.1"
 description = ""
 authors = ["Maurizio Tomasi <[email protected]>"]
 
@@ -24,6 +24,7 @@ coverage = "^7.2.7"
 flake8 = "^6.0.0"
 black = "^23.7.0"
 django-cleanup = "^8.0.0"
+django-active-link = "^0.1.8"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.4"