Enhance Category visibility

backend/templates/songs/index.html

@@ -4,6 +4,8 @@
 {% load static %}
 {% load i18n %}
 
+{% block title %}{{ title }}{% endblock %}
+
 {% block extra_head %}
     <script async src="{% static 'js/chords.js' %}"></script>
     <script defer type="text/javascript" src="{% static "datatables/datatables.min.js" %}"></script>

backend/views.py

@@ -40,6 +40,10 @@ def get_queryset(self):
             queryset = queryset.filter(archived=False)
         return queryset
 
+    def get_title(self):
+        """Return title of this song set"""
+        return self.request.tenant.display_name
+
     def get_context_data(self, *, object_list=None, **kwargs):
         context_data = super().get_context_data(object_list=object_list, **kwargs)
 
@@ -59,6 +63,7 @@ def get_context_data(self, *, object_list=None, **kwargs):
             i += 1
 
         context_data["songs"] = json.dumps(songs, cls=DjangoJSONEncoder)
+        context_data["title"] = self.get_title()
         return context_data
 
 
@@ -68,6 +73,10 @@ class AllSongListView(BaseSongListView):
     def get_queryset(self):
         return super().get_queryset().filter(categories__tenant=self.request.tenant)
 
+    def get_title(self):
+        """Return title of this song set"""
+        return f'{_("All Songs")} | {self.request.tenant.display_name}'
+
 
 class IndexSongListView(RedirectView):
     """Shows first available category"""

category/views.py

@@ -30,12 +30,20 @@ class CategorySongsListView(BaseSongListView, AnalyticsMixin):
     def get_key(self):
         return self.kwargs["slug"]
 
+    def category_queryset(self):
+        """Returns queryset for this category"""
+        return Category.objects.filter(slug=self.kwargs["slug"], tenant=self.request.tenant)
+
     def get_queryset(self):
         slug = self.kwargs["slug"]
-        if not Category.objects.filter(slug=slug, tenant=self.request.tenant).exists():
+        if not self.category_queryset().exists():
             raise Http404(_("Category with url /%(slug)s does not exist") % {"slug": slug})
         return super().get_queryset().filter(categories__slug=slug)
 
+    def get_title(self):
+        """Return title of this song set"""
+        return f"{self.category_queryset().get().name} | {self.request.tenant.display_name}"
+
 
 class CategoryListView(LocalAdminRequired, ListView):
     """Lists all categories"""

frontend/static/styles.sass

@@ -14,7 +14,7 @@ $border-color: $bgHighlight
 .dropdown-menu
   --bs-dropdown-link-color: #{$colDefault}
   --bs-dropdown-link-hover-color: #{$colHighlight}
-  --bs-dropdown-link-active-color: #{$colHighlight}
+  --bs-dropdown-link-active-bg: #{$colDefault}
 
 //.chord
 //  position: absolute

frontend/templates/menu/bootstrap4-menu-submenu.html

@@ -11,7 +11,7 @@
               <button type="submit" class="btn-link dropdown-item">{% if item.skip_translate %}{{ item.title }}{% else %}{% trans item.title %}{% endif %}</button>
             </form>
             {% else %}
-                <a class="dropdown-item" href="{{ item.url }}">{% if item.skip_translate %}{{ item.title }}{% else %}{% trans item.title %}{% endif %}</a>
+                <a class="dropdown-item {% if item.selected %}active{% endif %}" href="{{ item.url }}">{% if item.skip_translate %}{{ item.title }}{% else %}{% trans item.title %}{% endif %}</a>
             {% endif %}
         {% endif %}
     {% endfor %}