feat: remove the need for context processor and improve base template (#2106)

tdruez · web-flow · commit dce8dbd8e9bd · 2026-03-18T18:42:28.000+04:00
Signed-off-by: tdruez &lt;tdruez@aboutcode.org&gt;
diff --git a/scancodeio/settings.py b/scancodeio/settings.py
@@ -252,7 +252,6 @@
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
                 "django.template.context_processors.request",
-                "scancodeio.context_processors.versions",
             ],
         },
     },
diff --git a/scanpipe/templates/account/profile.html b/scanpipe/templates/account/profile.html
@@ -2,9 +2,6 @@
 
 {% block content %}
 <div class="container is-max-widescreen">
-  {% include 'scanpipe/includes/navbar_header.html' %}
-  <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
-
   <section class="section pt-0">
     <div class="is-flex is-justify-content-space-between mb-2">
       <nav class="breadcrumb is-medium mb-1" aria-label="breadcrumbs">
diff --git a/scanpipe/templates/registration/login.html b/scanpipe/templates/registration/login.html
@@ -2,9 +2,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
-
     {% if form.errors %}
       <article class="message is-danger">
         <div class="message-body">
diff --git a/scanpipe/templates/scanpipe/app_monitoring.html b/scanpipe/templates/scanpipe/app_monitoring.html
diff --git a/scanpipe/templates/scanpipe/base.html b/scanpipe/templates/scanpipe/base.html
@@ -18,6 +18,12 @@
     {% block extrahead %}{% endblock %}
   </head>
   <body class="pb-5" hx-headers='{"x-csrftoken": "{{ csrf_token }}"}'>
+    {% block header %}
+      <div id="header" class="container is-max-widescreen">
+        {% include 'scanpipe/includes/navbar_header.html' %}
+        <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
+      </div>
+    {% endblock %}
     {% block content %}{% endblock %}
     {% block modals %}{% endblock %}
     {% block scripts %}{% endblock %}
diff --git a/scanpipe/templates/scanpipe/dependency_detail.html b/scanpipe/templates/scanpipe/dependency_detail.html
@@ -5,8 +5,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
     {% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title=object.package_url url_name="project_dependencies" %}
     <div class="mx-5">{% include 'scanpipe/tabset/tabset.html' %}</div>
   </div>
diff --git a/scanpipe/templates/scanpipe/dependency_list.html b/scanpipe/templates/scanpipe/dependency_list.html
@@ -4,7 +4,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Dependencies" %}
diff --git a/scanpipe/templates/scanpipe/dependency_tree.html b/scanpipe/templates/scanpipe/dependency_tree.html
@@ -10,7 +10,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Dependency tree" %}
diff --git a/scanpipe/templates/scanpipe/includes/navbar_header.html b/scanpipe/templates/scanpipe/includes/navbar_header.html
@@ -1,3 +1,6 @@
+{% load scanpipe_tags %}
+{% scancodeio_version_tag as SCANCODEIO_VERSION %}
+{% scancode_toolkit_version_tag as SCANCODE_TOOLKIT_VERSION %}
 <nav class="navbar is-dark mb-4 border-bottom-radius" aria-label="main navigation">
   <div class="navbar-brand ml-3">
     <a class="navbar-item is-block is-size-4 has-text-weight-bold" href="/">
diff --git a/scanpipe/templates/scanpipe/license_detail.html b/scanpipe/templates/scanpipe/license_detail.html
@@ -5,8 +5,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
     <section class="mx-5 mb-3">
       <nav class="breadcrumb is-medium has-succeeds-separator mb-1" aria-label="breadcrumbs">
         <ul>
diff --git a/scanpipe/templates/scanpipe/license_detection_detail.html b/scanpipe/templates/scanpipe/license_detection_detail.html
@@ -5,8 +5,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
     {% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title=object.identifier url_name="project_licenses" %}
     <div class="mx-5">{% include 'scanpipe/tabset/tabset.html' %}</div>
   </div>
diff --git a/scanpipe/templates/scanpipe/license_detection_list.html b/scanpipe/templates/scanpipe/license_detection_list.html
@@ -4,7 +4,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="License Detections" %}
diff --git a/scanpipe/templates/scanpipe/license_list.html b/scanpipe/templates/scanpipe/license_list.html
@@ -5,7 +5,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <nav class="breadcrumb is-medium has-succeeds-separator mb-1" aria-label="breadcrumbs">
         <ul>
diff --git a/scanpipe/templates/scanpipe/message_list.html b/scanpipe/templates/scanpipe/message_list.html
@@ -4,7 +4,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Messages" %}
diff --git a/scanpipe/templates/scanpipe/package_detail.html b/scanpipe/templates/scanpipe/package_detail.html
@@ -1,12 +1,10 @@
 {% extends "scanpipe/base.html" %}
-{% load static humanize %}
+{% load static %}
 
 {% block title %}ScanCode.io: {{ project.name }} - {{ object.name }}{% endblock %}
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
     {% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title=object.package_url url_name="project_packages" %}
     <div class="mx-5">{% include 'scanpipe/tabset/tabset.html' %}</div>
   </div>
diff --git a/scanpipe/templates/scanpipe/package_list.html b/scanpipe/templates/scanpipe/package_list.html
@@ -5,7 +5,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Packages" %}
diff --git a/scanpipe/templates/scanpipe/project_detail.html b/scanpipe/templates/scanpipe/project_detail.html
@@ -10,9 +10,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
-
     <section class="is-flex is-justify-content-space-between mx-5 mb-2">
       <div>
         <nav class="breadcrumb has-succeeds-separator is-medium mb-1" aria-label="breadcrumbs">
diff --git a/scanpipe/templates/scanpipe/project_form.html b/scanpipe/templates/scanpipe/project_form.html
@@ -7,8 +7,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-
     <section class="mx-5 pt-0 pb-1">
       <h2 class="subtitle mb-0 mb-4">
         Create a <strong>Project</strong>
diff --git a/scanpipe/templates/scanpipe/project_list.html b/scanpipe/templates/scanpipe/project_list.html
@@ -5,9 +5,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
-
     <section class="mx-5 mb-5">
       <div class="is-flex is-justify-content-space-between mb-2">
         <div id="project-list-header">
diff --git a/scanpipe/templates/scanpipe/project_settings.html b/scanpipe/templates/scanpipe/project_settings.html
@@ -2,8 +2,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
     {% include 'scanpipe/includes/breadcrumb_detail_view.html' with object_title="Settings" %}
     <hr class="mx-5 mt-0">
 
diff --git a/scanpipe/templates/scanpipe/relation_list.html b/scanpipe/templates/scanpipe/relation_list.html
@@ -5,7 +5,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Relations" %}
diff --git a/scanpipe/templates/scanpipe/resource_detail.html b/scanpipe/templates/scanpipe/resource_detail.html
@@ -11,8 +11,6 @@
 
 {% block content %}
   <div class="container is-max-widescreen">
-    {% include 'scanpipe/includes/navbar_header.html' %}
-    <div class="mx-5 mb-2">{% include 'scanpipe/includes/messages.html' %}</div>
     {% include 'scanpipe/includes/breadcrumb_detail_view.html' with template_title="scanpipe/includes/resource_path_links.html" url_name="project_resources" %}
     <div class="mx-5">
       {% block partial-content %}
diff --git a/scanpipe/templates/scanpipe/resource_list.html b/scanpipe/templates/scanpipe/resource_list.html
@@ -5,7 +5,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Resources" %}
diff --git a/scanpipe/templates/scanpipe/resource_tree.html b/scanpipe/templates/scanpipe/resource_tree.html
@@ -11,7 +11,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       <div class="is-flex is-justify-content-space-between">
         {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Resources tree" %}
diff --git a/scanpipe/templates/scanpipe/vulnerability_list.html b/scanpipe/templates/scanpipe/vulnerability_list.html
@@ -5,7 +5,6 @@
 
 {% block content %}
   <div id="content-header" class="container is-max-widescreen mb-3">
-    {% include 'scanpipe/includes/navbar_header.html' %}
     <section class="mx-5">
       {% include 'scanpipe/includes/breadcrumb.html' with linked_project=True current="Vulnerabilities" %}
       <div>{{ object_list|length|intcomma }} results</div>
diff --git a/scanpipe/templatetags/__init__.py b/scanpipe/templatetags/__init__.py
diff --git a/scanpipe/templatetags/scanpipe_tags.py b/scanpipe/templatetags/scanpipe_tags.py
@@ -20,14 +20,22 @@
 # ScanCode.io is a free software code scanning tool from nexB Inc. and others.
 # Visit https://github.com/aboutcode-org/scancode.io for support and download.
 
+from django import template
 
 from scancode_config import __version__ as scancode_toolkit_version
 
 from scancodeio import __version__ as scancodeio_version
 
+register = template.Library()
 
-def versions(request):
-    return {
-        "SCANCODEIO_VERSION": scancodeio_version.lstrip("v"),
-        "SCANCODE_TOOLKIT_VERSION": scancode_toolkit_version,
-    }
+
+@register.simple_tag
+def scancodeio_version_tag():
+    """Return the ScanCode.io version string."""
+    return scancodeio_version.lstrip("v")
+
+
+@register.simple_tag
+def scancode_toolkit_version_tag():
+    """Return the ScanCode toolkit version string."""
+    return scancode_toolkit_version
diff --git a/scanpipe/urls.py b/scanpipe/urls.py
@@ -20,7 +20,6 @@
 # ScanCode.io is a free software code scanning tool from nexB Inc. and others.
 # Visit https://github.com/aboutcode-org/scancode.io for support and download.
 
-from django.urls import include
 from django.urls import path
 
 from scanpipe import views
@@ -276,5 +275,4 @@
         views.LicenseListView.as_view(),
         name="license_list",
     ),
-    path("monitor/", include("django_rq.urls")),
 ]
