From da22ae8d679b01e6637fc2ed224d26f6f6c5a217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Tue, 23 Jun 2026 15:56:56 +0200
Subject: [PATCH 01/12] Add kiosk mode

---
 changelog.d/1938.added.md                     |  1 +
 src/argus/htmx/incident/urls.py               |  1 +
 src/argus/htmx/incident/views.py              | 24 +++++++++++++++----
 .../htmx/incident/_filter_controls.html       | 20 ++++++++++++++++
 .../incident/_filter_controls_script.html     |  7 ++++--
 .../htmx/incident/_incident_filterbox.html    |  7 +++++-
 .../incident/_incident_table_autorefresh.html |  2 +-
 .../htmx/incident/_incident_table_footer.html | 24 ++++++++++---------
 .../_incident_table_paginator_pageitem.html   |  2 +-
 .../htmx/incident/_incident_toolbar.html      | 10 ++++----
 .../cells/_incident_filter_dropdown_body.html |  6 ++++-
 .../cells/_incident_sort_button_element.html  |  2 +-
 .../cells/search_fields/input_search.html     |  1 -
 .../responses/_incident_list_refresh.html     |  4 ++++
 14 files changed, 84 insertions(+), 27 deletions(-)
 create mode 100644 changelog.d/1938.added.md

diff --git a/changelog.d/1938.added.md b/changelog.d/1938.added.md
new file mode 100644
index 000000000..c5f956cec
--- /dev/null
+++ b/changelog.d/1938.added.md
@@ -0,0 +1 @@
+Added a kiosk mode to the main view, providing a minimal version of the incident list suitable for passive Argus usage.
diff --git a/src/argus/htmx/incident/urls.py b/src/argus/htmx/incident/urls.py
index c33247357..8e34aeb01 100644
--- a/src/argus/htmx/incident/urls.py
+++ b/src/argus/htmx/incident/urls.py
@@ -6,6 +6,7 @@
 app_name = "htmx"
 urlpatterns = [
     path("", views.incident_list, name="incident-list"),
+    path("kiosk/", views.incident_list_kiosk, name="incident-list-kiosk"),
     path("<int:pk>/", views.incident_detail, name="incident-detail"),
     path("update/<str:action>/", views.incident_update, name="incident-update"),
     path("filter/", views.filter_form, name="incident-filter"),
diff --git a/src/argus/htmx/incident/views.py b/src/argus/htmx/incident/views.py
index d48322238..22f8e87a0 100644
--- a/src/argus/htmx/incident/views.py
+++ b/src/argus/htmx/incident/views.py
@@ -3,7 +3,7 @@
 import logging
 from collections.abc import Iterable
 from datetime import datetime
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urlparse
 from typing import Optional, Any
 
 from django import forms
@@ -18,6 +18,7 @@
     QueryDict,
 )
 from django.shortcuts import render, get_object_or_404
+from django.urls import reverse
 from django.utils.timezone import now as tznow
 from django.views.decorators.http import require_POST, require_GET
 
@@ -46,6 +47,7 @@
 
 User = get_user_model()
 LOG = logging.getLogger(__name__)
+KIOSK_URL_NAME = "htmx:incident-list-kiosk"
 
 
 # Map request trigger to parameters for incidents update
@@ -190,19 +192,22 @@ def delete_filter(request: HtmxHttpRequest, pk: int):
 
 @require_GET
 def filter_select(request: HtmxHttpRequest):
+    current_url = request.META.get("HTTP_HX_CURRENT_URL", "")
+    kiosk_mode = urlparse(current_url).path == reverse(KIOSK_URL_NAME) if current_url else False
+
     filter_id = request.GET.get("filter", None)
     if filter_id and get_object_or_404(Filter, id=filter_id):
         request.session["selected_filter"] = filter_id
         incident_list_filter = get_filter_function()
         filter_form, _ = incident_list_filter(request, None)
-        context = {"filter_form": filter_form}
+        context = {"filter_form": filter_form, "kiosk_mode": kiosk_mode}
         return render(request, "htmx/incident/_incident_filterbox.html", context=context)
     else:
         request.session["selected_filter"] = None
         if request.htmx.trigger:
             incident_list_filter = get_filter_function()
             filter_form, _ = incident_list_filter(request, None, use_empty_filter=True)
-            context = {"filter_form": filter_form}
+            context = {"filter_form": filter_form, "kiosk_mode": kiosk_mode}
             return render(request, "htmx/incident/_incident_filterbox.html", context=context)
         else:
             return retarget(HttpResponse(), "#incident-filter-select")
@@ -266,7 +271,7 @@ def search_tags(request):
 
 
 @require_GET
-def incident_list(request: HtmxHttpRequest) -> HttpResponse:
+def incident_list(request: HtmxHttpRequest, kiosk_mode: bool = False) -> HttpResponse:
     LOG = logging.getLogger(__name__ + ".incident_list")
     LOG.debug("GET at start: %s", request.GET)
     request.GET = dedupe_querydict(request.GET)
@@ -275,6 +280,8 @@ def incident_list(request: HtmxHttpRequest) -> HttpResponse:
     preferences = request.user.get_preferences_context()
     column_layout_name = preferences["argus_htmx"]["incidents_table_column_name"]
     columns = get_incident_table_columns(column_layout_name)
+    if kiosk_mode:
+        columns = [c for c in columns if c.name != "row_select"]
 
     # Handle sorting
     sort_form = SortForm(request.GET)
@@ -345,6 +352,8 @@ def incident_list(request: HtmxHttpRequest) -> HttpResponse:
     else:
         base_template = "htmx/incident/_base.html"
 
+    incident_list_url = reverse(KIOSK_URL_NAME if kiosk_mode else "htmx:incident-list")
+
     LOG.debug("GET at end: %s", request.GET)
     context = {
         "columns": columns,
@@ -358,5 +367,12 @@ def incident_list(request: HtmxHttpRequest) -> HttpResponse:
         "page": page,
         "last_page_num": last_page_num,
         "second_to_last_page": last_page_num - 1,
+        "kiosk_mode": kiosk_mode,
+        "incident_list_url": incident_list_url,
     }
     return render(request, "htmx/incident/incident_list.html", context=context)
+
+
+@require_GET
+def incident_list_kiosk(request: HtmxHttpRequest) -> HttpResponse:
+    return incident_list(request, kiosk_mode=True)
diff --git a/src/argus/htmx/templates/htmx/incident/_filter_controls.html b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
index 045f072fb..024793d6b 100644
--- a/src/argus/htmx/templates/htmx/incident/_filter_controls.html
+++ b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
@@ -49,4 +49,24 @@
     <i class="fa-solid fa-chevron-up fa-xs filter-collapse-icon"
        aria-hidden="true"></i>
   </button>
+  {% if kiosk_mode %}
+    <a href="{% url 'htmx:incident-list' %}" class="btn btn-sm btn-ghost">
+      <i class="fa-solid fa-xmark fa-xs" aria-hidden="true"></i>
+      Exit kiosk
+    </a>
+    <span class="text-sm font-medium ml-1">
+      <span class="opacity-60">After filtering:</span>
+      <span id="kiosk-filtered-count">{{ refresh_info.filtered_count }}</span>
+    </span>
+    <span class="text-sm font-medium ml-1">
+      <span class="opacity-60">Last refreshed:</span>
+      <span id="kiosk-last-refreshed">{{ refresh_info.last_refreshed|date:preferences.argus_htmx.datetime_format|default:"?" }}</span>
+    </span>
+  {% else %}
+    <a href="{% url 'htmx:incident-list-kiosk' %}"
+       class="btn btn-sm btn-ghost">
+      <i class="fa-solid fa-display fa-xs" aria-hidden="true"></i>
+      Kiosk
+    </a>
+  {% endif %}
 </div>
diff --git a/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html b/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html
index bd4dc04fc..9e31116d0 100644
--- a/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html
+++ b/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html
@@ -1,4 +1,5 @@
 <script>
+  const KIOSK_MODE = {{ kiosk_mode|yesno:"true,false" }};
   const FILTER_SELECT_URL = '{% url "htmx:select-filter" %}';
   const FILTER_UPDATE_URL_TEMPLATE = '{% url "htmx:filter-update" pk=0 %}'.replace('/0/', '/{id}/');
   const FILTER_DELETE_URL_TEMPLATE = '{% url "htmx:filter-delete" pk=0 %}'.replace('/0/', '/{id}/');
@@ -93,7 +94,9 @@
     const box = document.getElementById('filter-controls-box');
     box.classList.toggle('filters-collapsed');
     const collapsed = box.classList.contains('filters-collapsed');
-    localStorage.setItem('argus_show_filters', collapsed ? 'false' : 'true');
+    if (!KIOSK_MODE) {
+      localStorage.setItem('argus_show_filters', collapsed ? 'false' : 'true');
+    }
     btn.setAttribute('aria-expanded', collapsed ? 'false' : 'true');
   }
 
@@ -111,7 +114,7 @@
   });
 
   document.addEventListener('DOMContentLoaded', () => {
-    if (localStorage.getItem('argus_show_filters') === 'false') {
+    if (KIOSK_MODE || localStorage.getItem('argus_show_filters') === 'false') {
       document.getElementById('filter-controls-box')?.classList.add('filters-collapsed');
       document.getElementById('filter-toggle-btn')?.setAttribute('aria-expanded', 'false');
     }
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html b/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html
index 15f22e625..9847508fd 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html
@@ -1,7 +1,12 @@
 {% load widget_tweaks %}
+{% if kiosk_mode %}
+  {% url 'htmx:incident-list-kiosk' as incident_list_url %}
+{% else %}
+  {% url 'htmx:incident-list' as incident_list_url %}
+{% endif %}
 <form id="incident-filter-box"
       class="incident-list-param"
-      hx-get="{% url 'htmx:incident-list' %}"
+      hx-get="{{ incident_list_url }}"
       hx-include=".incident-list-param"
       {% block filter_trigger_control %}
       hx-trigger="keydown[keyCode==13], change delay:100ms, load once"
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html b/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html
index 009a3ef82..767e8dffd 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html
@@ -1,7 +1,7 @@
 {# djlint:off #}
 {% with preferences.argus_htmx.update_interval as update_interval %}
   {% if update_interval != 'never' %}
-    hx-get="{% url 'htmx:incident-list' %}"
+    hx-get="{{ incident_list_url }}"
     hx-vals='{"page": "{{ page.number }}"}'
     hx-target="this"
     hx-swap="outerHTML"
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_table_footer.html b/src/argus/htmx/templates/htmx/incident/_incident_table_footer.html
index b929b0346..5623910d4 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_table_footer.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_table_footer.html
@@ -1,21 +1,23 @@
 <!-- htmx/incident/_incident_table_footer.html -->
 <tfoot id="table-footer">
-  <tr class="sticky bottom-0 bg-base-100">
-    <td colspan="{{ columns|length }}" class="border-t border-primary">
-      <div class="flex justify-between items-center">
-        {% block refresh_info %}
-          {% include "htmx/incident/_incident_list_refresh_info.html" %}
-        {% endblock refresh_info %}
-        {% include "./_incident_table_paginator.html" %}
-      </div>
-    </td>
-  </tr>
+  {% if not kiosk_mode %}
+    <tr class="sticky bottom-0 bg-base-100">
+      <td colspan="{{ columns|length }}" class="border-t border-primary">
+        <div class="flex justify-between items-center">
+          {% block refresh_info %}
+            {% include "htmx/incident/_incident_list_refresh_info.html" %}
+          {% endblock refresh_info %}
+          {% include "./_incident_table_paginator.html" %}
+        </div>
+      </td>
+    </tr>
+  {% endif %}
 </tfoot>
 <!-- Include in footer of incident table to add scroll shadows to header and footer -->
 <script>
 (() => {
   const table = document.querySelector("#table");
-  const elements = [table.querySelector("thead tr"), table.querySelector("tfoot tr")]
+  const elements = [table.querySelector("thead tr"), table.querySelector("tfoot tr")].filter(Boolean);
 
   elements.forEach((el) => {
     const intercept = document.createElement("div");
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_table_paginator_pageitem.html b/src/argus/htmx/templates/htmx/incident/_incident_table_paginator_pageitem.html
index b3276f3fd..afbc86391 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_table_paginator_pageitem.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_table_paginator_pageitem.html
@@ -5,7 +5,7 @@
 displayed as clickable.
 -->
 <li>
-  <a hx-get="{% url 'htmx:incident-list' %}"
+  <a hx-get="{{ incident_list_url }}"
      hx-vals='{"page": "{{ page_number }}"}'
      href="{% querystring page=page_number %}"
      hx-indicator="#incident-list .htmx-indicator"
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html b/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html
index 337ab5b1a..f15bdf594 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html
@@ -6,8 +6,10 @@
       {% include "htmx/incident/_incident_filterbox.html" %}
     </div>
   </div>
-  <div id="bulk-actions"
-       class="hidden flex gap-2 w-fit border-2 border-primary/50 bg-primary/10 rounded-box p-1">
-    {% include "htmx/incident/_incident_list_update_menu.html" %}
-  </div>
+  {% if not kiosk_mode %}
+    <div id="bulk-actions"
+         class="hidden flex gap-2 w-fit border-2 border-primary/50 bg-primary/10 rounded-box p-1">
+      {% include "htmx/incident/_incident_list_update_menu.html" %}
+    </div>
+  {% endif %}
 </section>
diff --git a/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html b/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html
index 1107db72e..1c5ab3f70 100644
--- a/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html
+++ b/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html
@@ -4,7 +4,11 @@
      tabindex="-1">
   <form class="incident-list-param">
     {% if not dummy_column %}
-      {% url 'htmx:incident-list' as incident_list_url %}
+      {% if kiosk_mode %}
+        {% url 'htmx:incident-list-kiosk' as incident_list_url %}
+      {% else %}
+        {% url 'htmx:incident-list' as incident_list_url %}
+      {% endif %}
     {% endif %}
     {# djlint:off #}
     <div aria-labelledby="{{ field.name }}-label" {% if not dummy_column %}hx-get="{{ incident_list_url }}" hx-include=".incident-list-param" hx-target="#table-body" hx-select="#table-body" hx-select-oob="#table-footer" hx-swap="outerHTML" hx-push-url="true" hx-indicator="#incident-list .htmx-indicator" hx-trigger="change delay:500ms"{% endif %}>
diff --git a/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button_element.html b/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button_element.html
index e5846cdc3..6e1e3836d 100644
--- a/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button_element.html
+++ b/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button_element.html
@@ -4,7 +4,7 @@
         class="btn btn-xs btn-ghost p-0 aspect-square min-h-4 h-4 {% if active %}text-primary{% else %}text-base-content/50 hover:text-primary{% endif %}"
         aria-label="{{ label }}"
         {% if dummy_column %}disabled{% endif %}
-        hx-get="{% url 'htmx:incident-list' %}"
+        hx-get="{{ incident_list_url }}"
         hx-vals='{"sort": "{{ next_sort }}", "sort_order": "{{ next_order }}"}'
         hx-include=".incident-list-param"
         hx-target="#table"
diff --git a/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html b/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html
index 05f9caa0f..20afa1585 100644
--- a/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html
+++ b/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html
@@ -1,5 +1,4 @@
 <!-- htmx/incident/cells/search_fields/input_search.html -->
-{% url 'htmx:incident-list' as incident_list_url %}
 <div class="flex gap-1 input input-xs grow input-primary pr-0 group">
   <input name="{{ widget.name }}"
          type="text"
diff --git a/src/argus/htmx/templates/htmx/incident/responses/_incident_list_refresh.html b/src/argus/htmx/templates/htmx/incident/responses/_incident_list_refresh.html
index 7dded7ba9..cb3e68a9a 100644
--- a/src/argus/htmx/templates/htmx/incident/responses/_incident_list_refresh.html
+++ b/src/argus/htmx/templates/htmx/incident/responses/_incident_list_refresh.html
@@ -1,2 +1,6 @@
 {% block table %}
 {% endblock table %}
+{% if kiosk_mode %}
+  <span hx-swap-oob="innerHTML:#kiosk-filtered-count">{{ refresh_info.filtered_count }}</span>
+  <span hx-swap-oob="innerHTML:#kiosk-last-refreshed">{{ refresh_info.last_refreshed|date:preferences.argus_htmx.datetime_format|default:"?" }}</span>
+{% endif %}

From 81a8e6800051bb161641d5048f4269a46107844b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Tue, 23 Jun 2026 15:57:00 +0200
Subject: [PATCH 02/12] Add kiosk mode tests

---
 tests/htmx/test_incident_columns_rendering.py | 163 +++++++++++++++++-
 1 file changed, 162 insertions(+), 1 deletion(-)

diff --git a/tests/htmx/test_incident_columns_rendering.py b/tests/htmx/test_incident_columns_rendering.py
index 21bce0c5f..601a7be01 100644
--- a/tests/htmx/test_incident_columns_rendering.py
+++ b/tests/htmx/test_incident_columns_rendering.py
@@ -1,10 +1,25 @@
+from types import SimpleNamespace
+
 from django import forms, test
 from django.test.client import RequestFactory
+from django.urls import reverse
+
 from argus.auth.factories import PersonUserFactory
+from argus.filter.factories import FilterFactory
 from argus.filter.queryset_filters import QuerySetFilter
 from argus.htmx.incident.columns import IncidentTableColumn
-from argus.htmx.incident.views import incident_list
+from argus.htmx.incident.views import (
+    filter_form as filter_form_view,
+    filter_select,
+    get_form,
+    get_incident_ids_to_update,
+    incident_detail,
+    incident_list,
+    incident_list_kiosk,
+    KIOSK_URL_NAME,
+)
 from argus.htmx.user.factories import ArgusHtmxPreferencesFactory
+from argus.incident.factories import StatelessIncidentFactory
 
 
 class IncidentRegularFilterForm(forms.Form):
@@ -83,3 +98,149 @@ def test_adds_filter_button_to_header(self):
 
     def test_doesnt_add_filter_to_filterbox(self):
         self.assertNotContains(self.response, '<span class="label-text">Description</span>')
+
+
+@test.override_settings(INCIDENT_TABLE_COLUMNS=["row_select", "id"])
+class KioskModeTests(test.TestCase):
+    def setUp(self):
+        request = RequestFactory().get("/incidents/kiosk/")
+        request.session = {}
+        self.user = PersonUserFactory()
+        request.user = self.user
+        request.htmx = False
+        preferences = ArgusHtmxPreferencesFactory(user=request.user)
+        preferences.preferences["incidents_table_column_name"] = "default"
+        preferences.save()
+        self.kiosk_response = incident_list(request, kiosk_mode=True)
+        self.normal_response = incident_list(request)
+
+    def test_given_kiosk_mode_it_should_remove_interactive_controls(self):
+        self.assertNotContains(self.kiosk_response, 'id="col-row_select"')
+        self.assertNotContains(self.kiosk_response, 'id="bulk-actions"')
+
+    def test_given_kiosk_mode_it_should_move_stats_to_toolbar(self):
+        self.assertNotContains(self.kiosk_response, 'id="table-refresh-info"')
+        self.assertContains(self.kiosk_response, 'id="kiosk-filtered-count"')
+        self.assertContains(self.kiosk_response, 'id="kiosk-last-refreshed"')
+
+    def test_given_normal_mode_it_should_show_interactive_controls_and_footer(self):
+        self.assertContains(self.normal_response, 'id="bulk-actions"')
+        self.assertContains(self.normal_response, 'id="table-refresh-info"')
+        self.assertNotContains(self.normal_response, 'id="kiosk-filtered-count"')
+        self.assertNotContains(self.normal_response, 'id="kiosk-last-refreshed"')
+
+    def test_given_kiosk_mode_it_should_use_kiosk_url(self):
+        self.assertContains(self.kiosk_response, f'hx-get="{reverse(KIOSK_URL_NAME)}"')
+
+    def test_given_kiosk_mode_htmx_refresh_it_should_include_oob_swaps(self):
+        request = RequestFactory().get("/incidents/kiosk/")
+        request.session = {}
+        request.user = self.user
+        request.htmx = True
+        response = incident_list(request, kiosk_mode=True)
+        self.assertContains(response, 'hx-swap-oob="innerHTML:#kiosk-filtered-count"')
+        self.assertContains(response, 'hx-swap-oob="innerHTML:#kiosk-last-refreshed"')
+
+    def test_given_kiosk_endpoint_it_should_return_kiosk_response(self):
+        request = RequestFactory().get("/incidents/kiosk/")
+        request.session = {}
+        request.user = self.user
+        request.htmx = False
+        response = incident_list_kiosk(request)
+        self.assertContains(response, 'id="kiosk-filtered-count"')
+
+
+@test.override_settings(INCIDENT_TABLE_COLUMNS=["id"])
+class FilterSelectTests(test.TestCase):
+    def setUp(self):
+        self.user = PersonUserFactory()
+        ArgusHtmxPreferencesFactory(user=self.user)
+
+    def _make_request(self, params=None, hx_current_url="", trigger=None):
+        request = RequestFactory().get("/incidents/", params or {})
+        request.session = {}
+        request.user = self.user
+        request.htmx = SimpleNamespace(trigger=trigger)
+        if hx_current_url:
+            request.META["HTTP_HX_CURRENT_URL"] = hx_current_url
+        return request
+
+    def test_given_no_trigger_filter_select_it_should_retarget(self):
+        response = filter_select(self._make_request())
+        self.assertEqual(response.status_code, 200)
+
+    def test_given_trigger_filter_select_it_should_render_filterbox(self):
+        response = filter_select(self._make_request(trigger="some-element"))
+        self.assertContains(response, 'id="incident-filter-box"')
+
+    def test_given_kiosk_url_filter_select_it_should_detect_kiosk_mode(self):
+        kiosk_url = reverse(KIOSK_URL_NAME)
+        response = filter_select(
+            self._make_request(
+                hx_current_url=f"http://testserver{kiosk_url}",
+                trigger="some-element",
+            )
+        )
+        self.assertContains(response, kiosk_url)
+
+    def test_given_filter_id_filter_select_it_should_select_filter(self):
+        filter_obj = FilterFactory(user=self.user)
+        request = self._make_request(params={"filter": filter_obj.pk})
+        filter_select(request)
+        self.assertEqual(request.session.get("selected_filter"), str(filter_obj.pk))
+
+
+class FilterFormTests(test.TestCase):
+    def test_given_get_request_filter_form_it_should_render_filterbox(self):
+        request = RequestFactory().get("/incidents/filter-form/")
+        request.session = {}
+        request.user = PersonUserFactory()
+        request.htmx = False
+        response = filter_form_view(request)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn("selected_filter", request.session)
+        self.assertIsNone(request.session["selected_filter"])
+
+
+@test.override_settings(INCIDENT_TABLE_COLUMNS=["id"])
+class IncidentListVariantTests(test.TestCase):
+    def _make_request(self, params=None):
+        request = RequestFactory().get("/incidents/", params or {})
+        request.session = {}
+        request.user = PersonUserFactory()
+        request.htmx = False
+        ArgusHtmxPreferencesFactory(user=request.user)
+        return request
+
+    def test_given_non_default_sort_field_it_should_apply_secondary_sort(self):
+        response = incident_list(self._make_request({"sort": "level"}))
+        self.assertEqual(response.status_code, 200)
+
+    def test_given_timeframe_in_session_it_should_include_timeframe_in_query(self):
+        request = self._make_request()
+        request.session["timeframe"] = 60  # one hour, stored as int by the form
+        response = incident_list(request)
+        self.assertEqual(response.status_code, 200)
+
+
+class IncidentDetailTests(test.TestCase):
+    def test_given_existing_incident_it_should_render_detail(self):
+        incident = StatelessIncidentFactory()
+        request = RequestFactory().get(f"/incidents/{incident.pk}/")
+        request.user = PersonUserFactory()
+        request.htmx = False
+        response = incident_detail(request, pk=incident.pk)
+        self.assertEqual(response.status_code, 200)
+
+
+class UtilityFunctionTests(test.TestCase):
+    def test_get_incident_ids_to_update_it_should_return_post_ids(self):
+        self.assertEqual(get_incident_ids_to_update(RequestFactory().post("/")), [])
+        self.assertEqual(
+            get_incident_ids_to_update(RequestFactory().post("/", {"incident_ids": ["1", "2"]})),
+            ["1", "2"],
+        )
+
+    def test_get_form_it_should_return_form_only_when_post_data_present(self):
+        self.assertIsNone(get_form(RequestFactory().get("/"), forms.Form))
+        self.assertIsNotNone(get_form(RequestFactory().post("/", {"field": "value"}), forms.Form))

From e81ac2b7e2c3dfed7241319af5445d40f6d76644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Tue, 23 Jun 2026 15:57:01 +0200
Subject: [PATCH 03/12] Add kiosk mode documentation

---
 docs/user-manual.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/user-manual.rst b/docs/user-manual.rst
index 4abc4883c..f5641e880 100644
--- a/docs/user-manual.rst
+++ b/docs/user-manual.rst
@@ -187,6 +187,15 @@ Change how often the incidents table gets refreshed
 
 3. Select how often you want the incidents to be updated.
 
+Use kiosk mode
+--------------
+
+Kiosk mode is a read-only view of the incidents table intended for display
+screens such as NOC monitors, which frees up more vertical space by simplifying the interface.
+It can be accessed via the ``Kiosk`` button in the filter toolbar, or directly at **/incidents/kiosk/**.
+
+To exit kiosk mode, you can press the ``Exit kiosk`` button in the filter toolbar.
+
 Decide which incidents are shown in the table
 ---------------------------------------------
 

From 226cb7c008de0da8cb5b02c353dd76dd1d201364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Tue, 30 Jun 2026 11:41:55 +0200
Subject: [PATCH 04/12] Simplify current_url

---
 src/argus/htmx/incident/views.py              | 2 +-
 tests/htmx/test_incident_columns_rendering.py | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/argus/htmx/incident/views.py b/src/argus/htmx/incident/views.py
index 22f8e87a0..0e27614a5 100644
--- a/src/argus/htmx/incident/views.py
+++ b/src/argus/htmx/incident/views.py
@@ -192,7 +192,7 @@ def delete_filter(request: HtmxHttpRequest, pk: int):
 
 @require_GET
 def filter_select(request: HtmxHttpRequest):
-    current_url = request.META.get("HTTP_HX_CURRENT_URL", "")
+    current_url = request.htmx.current_url
     kiosk_mode = urlparse(current_url).path == reverse(KIOSK_URL_NAME) if current_url else False
 
     filter_id = request.GET.get("filter", None)
diff --git a/tests/htmx/test_incident_columns_rendering.py b/tests/htmx/test_incident_columns_rendering.py
index 601a7be01..f6cbe0785 100644
--- a/tests/htmx/test_incident_columns_rendering.py
+++ b/tests/htmx/test_incident_columns_rendering.py
@@ -156,13 +156,11 @@ def setUp(self):
         self.user = PersonUserFactory()
         ArgusHtmxPreferencesFactory(user=self.user)
 
-    def _make_request(self, params=None, hx_current_url="", trigger=None):
+    def _make_request(self, params=None, hx_current_url=None, trigger=None):
         request = RequestFactory().get("/incidents/", params or {})
         request.session = {}
         request.user = self.user
-        request.htmx = SimpleNamespace(trigger=trigger)
-        if hx_current_url:
-            request.META["HTTP_HX_CURRENT_URL"] = hx_current_url
+        request.htmx = SimpleNamespace(trigger=trigger, current_url=hx_current_url)
         return request
 
     def test_given_no_trigger_filter_select_it_should_retarget(self):

From 606542a3bf969395526ddf15ec08c8b665559b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Tue, 30 Jun 2026 15:00:53 +0200
Subject: [PATCH 05/12] Update src/argus/htmx/incident/views.py

Co-authored-by: Hanne Moa <hanne.moa@sikt.no>
---
 src/argus/htmx/incident/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/argus/htmx/incident/views.py b/src/argus/htmx/incident/views.py
index 0e27614a5..cf19245b8 100644
--- a/src/argus/htmx/incident/views.py
+++ b/src/argus/htmx/incident/views.py
@@ -193,7 +193,9 @@ def delete_filter(request: HtmxHttpRequest, pk: int):
 @require_GET
 def filter_select(request: HtmxHttpRequest):
     current_url = request.htmx.current_url
-    kiosk_mode = urlparse(current_url).path == reverse(KIOSK_URL_NAME) if current_url else False
+    kiosk_mode = False
+    if current_url and urlparse(current_url).path == reverse(KIOSK_URL_NAME):
+        kiosk_mode = True
 
     filter_id = request.GET.get("filter", None)
     if filter_id and get_object_or_404(Filter, id=filter_id):

From 7ce1b56d6d55a66255ea63e9b6c0f956cdaf7a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Tue, 30 Jun 2026 15:20:58 +0200
Subject: [PATCH 06/12] Solidify kiosk_mode logic

---
 src/argus/htmx/incident/views.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/argus/htmx/incident/views.py b/src/argus/htmx/incident/views.py
index cf19245b8..a531bf430 100644
--- a/src/argus/htmx/incident/views.py
+++ b/src/argus/htmx/incident/views.py
@@ -192,10 +192,7 @@ def delete_filter(request: HtmxHttpRequest, pk: int):
 
 @require_GET
 def filter_select(request: HtmxHttpRequest):
-    current_url = request.htmx.current_url
-    kiosk_mode = False
-    if current_url and urlparse(current_url).path == reverse(KIOSK_URL_NAME):
-        kiosk_mode = True
+    kiosk_mode = urlparse(request.htmx.current_url or "").path == reverse(KIOSK_URL_NAME)
 
     filter_id = request.GET.get("filter", None)
     if filter_id and get_object_or_404(Filter, id=filter_id):

From d5a9249a49a16949dd769eea60ab5cab3bec7306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Wed, 1 Jul 2026 10:33:02 +0200
Subject: [PATCH 07/12] Apply suggestions from code review

Co-authored-by: Hanne Moa <hanne.moa@sikt.no>
---
 src/argus/htmx/templates/htmx/incident/_filter_controls.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/argus/htmx/templates/htmx/incident/_filter_controls.html b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
index 024793d6b..5c4915096 100644
--- a/src/argus/htmx/templates/htmx/incident/_filter_controls.html
+++ b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
@@ -50,7 +50,7 @@
        aria-hidden="true"></i>
   </button>
   {% if kiosk_mode %}
-    <a href="{% url 'htmx:incident-list' %}" class="btn btn-sm btn-ghost">
+    <a href="{% url 'htmx:incident-list' %}" class="link btn btn-sm btn-ghost">
       <i class="fa-solid fa-xmark fa-xs" aria-hidden="true"></i>
       Exit kiosk
     </a>
@@ -64,7 +64,7 @@
     </span>
   {% else %}
     <a href="{% url 'htmx:incident-list-kiosk' %}"
-       class="btn btn-sm btn-ghost">
+       class="link btn btn-sm btn-ghost">
       <i class="fa-solid fa-display fa-xs" aria-hidden="true"></i>
       Kiosk
     </a>

From a33a196c87db743758468bd0af046aa77546c0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Wed, 1 Jul 2026 10:36:26 +0200
Subject: [PATCH 08/12] Undo changes in input_search.html

---
 .../htmx/incident/cells/search_fields/input_search.html          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html b/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html
index 20afa1585..05f9caa0f 100644
--- a/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html
+++ b/src/argus/htmx/templates/htmx/incident/cells/search_fields/input_search.html
@@ -1,4 +1,5 @@
 <!-- htmx/incident/cells/search_fields/input_search.html -->
+{% url 'htmx:incident-list' as incident_list_url %}
 <div class="flex gap-1 input input-xs grow input-primary pr-0 group">
   <input name="{{ widget.name }}"
          type="text"

From 22ae4d0fededf249d9da91ed3d087b48a8b084c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Wed, 1 Jul 2026 10:47:57 +0200
Subject: [PATCH 09/12] Limit scope of link keyword

---
 .../htmx/templates/htmx/incident/_filter_controls.html    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/argus/htmx/templates/htmx/incident/_filter_controls.html b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
index 5c4915096..9b89685c3 100644
--- a/src/argus/htmx/templates/htmx/incident/_filter_controls.html
+++ b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
@@ -50,9 +50,9 @@
        aria-hidden="true"></i>
   </button>
   {% if kiosk_mode %}
-    <a href="{% url 'htmx:incident-list' %}" class="link btn btn-sm btn-ghost">
+    <a href="{% url 'htmx:incident-list' %}" class="btn btn-sm btn-ghost">
       <i class="fa-solid fa-xmark fa-xs" aria-hidden="true"></i>
-      Exit kiosk
+      <span class="link">Exit kiosk</span>
     </a>
     <span class="text-sm font-medium ml-1">
       <span class="opacity-60">After filtering:</span>
@@ -64,9 +64,9 @@
     </span>
   {% else %}
     <a href="{% url 'htmx:incident-list-kiosk' %}"
-       class="link btn btn-sm btn-ghost">
+       class="btn btn-sm btn-ghost">
       <i class="fa-solid fa-display fa-xs" aria-hidden="true"></i>
-      Kiosk
+      <span class="link">Kiosk</span>
     </a>
   {% endif %}
 </div>

From 48cb6c4628fcc638fbf530e88b294797b1f61462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Wed, 1 Jul 2026 12:56:21 +0200
Subject: [PATCH 10/12] Rework kiosk layout to free up more space

---
 src/argus/htmx/incident/views.py              | 15 ++++++----
 src/argus/htmx/templates/htmx/base.html       |  2 ++
 .../htmx/incident/_filter_controls.html       | 26 ++++------------
 .../incident/_filter_controls_script.html     |  7 ++---
 .../htmx/incident/_incident_filterbox.html    |  7 +----
 .../incident/_incident_table_autorefresh.html |  2 +-
 .../htmx/incident/_incident_toolbar.html      | 14 ++++-----
 .../cells/_incident_filter_dropdown_body.html |  6 +---
 ...dent_filterable_column_header_content.html | 30 +++++++++++--------
 .../incident/cells/_incident_sort_button.html |  2 +-
 .../htmx/incident/incident_list.html          | 24 +++++++++++++++
 tests/htmx/test_incident_columns_rendering.py | 29 +++++++++---------
 12 files changed, 87 insertions(+), 77 deletions(-)

diff --git a/src/argus/htmx/incident/views.py b/src/argus/htmx/incident/views.py
index a531bf430..1e1c695e8 100644
--- a/src/argus/htmx/incident/views.py
+++ b/src/argus/htmx/incident/views.py
@@ -3,7 +3,7 @@
 import logging
 from collections.abc import Iterable
 from datetime import datetime
-from urllib.parse import urlencode, urlparse
+from urllib.parse import urlencode
 from typing import Optional, Any
 
 from django import forms
@@ -192,21 +192,19 @@ def delete_filter(request: HtmxHttpRequest, pk: int):
 
 @require_GET
 def filter_select(request: HtmxHttpRequest):
-    kiosk_mode = urlparse(request.htmx.current_url or "").path == reverse(KIOSK_URL_NAME)
-
     filter_id = request.GET.get("filter", None)
     if filter_id and get_object_or_404(Filter, id=filter_id):
         request.session["selected_filter"] = filter_id
         incident_list_filter = get_filter_function()
         filter_form, _ = incident_list_filter(request, None)
-        context = {"filter_form": filter_form, "kiosk_mode": kiosk_mode}
+        context = {"filter_form": filter_form}
         return render(request, "htmx/incident/_incident_filterbox.html", context=context)
     else:
         request.session["selected_filter"] = None
         if request.htmx.trigger:
             incident_list_filter = get_filter_function()
             filter_form, _ = incident_list_filter(request, None, use_empty_filter=True)
-            context = {"filter_form": filter_form, "kiosk_mode": kiosk_mode}
+            context = {"filter_form": filter_form}
             return render(request, "htmx/incident/_incident_filterbox.html", context=context)
         else:
             return retarget(HttpResponse(), "#incident-filter-select")
@@ -353,6 +351,12 @@ def incident_list(request: HtmxHttpRequest, kiosk_mode: bool = False) -> HttpRes
 
     incident_list_url = reverse(KIOSK_URL_NAME if kiosk_mode else "htmx:incident-list")
 
+    kiosk_filter_name = None
+    if kiosk_mode and not request.htmx:
+        selected_filter_id = request.session.get("selected_filter")
+        if selected_filter_id:
+            kiosk_filter_name = Filter.objects.filter(id=selected_filter_id).values_list("name", flat=True).first()
+
     LOG.debug("GET at end: %s", request.GET)
     context = {
         "columns": columns,
@@ -367,6 +371,7 @@ def incident_list(request: HtmxHttpRequest, kiosk_mode: bool = False) -> HttpRes
         "last_page_num": last_page_num,
         "second_to_last_page": last_page_num - 1,
         "kiosk_mode": kiosk_mode,
+        "kiosk_filter_name": kiosk_filter_name,
         "incident_list_url": incident_list_url,
     }
     return render(request, "htmx/incident/incident_list.html", context=context)
diff --git a/src/argus/htmx/templates/htmx/base.html b/src/argus/htmx/templates/htmx/base.html
index 8a369b713..6d683452e 100644
--- a/src/argus/htmx/templates/htmx/base.html
+++ b/src/argus/htmx/templates/htmx/base.html
@@ -27,6 +27,8 @@
           {% endcomment %}
         {% endblock navlinks %}
       </ul>
+      {% block navbar_kiosk %}
+      {% endblock navbar_kiosk %}
     </div>
     <div class="navbar-end">
       {% block userlink %}
diff --git a/src/argus/htmx/templates/htmx/incident/_filter_controls.html b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
index 9b89685c3..4633aad0b 100644
--- a/src/argus/htmx/templates/htmx/incident/_filter_controls.html
+++ b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
@@ -49,24 +49,10 @@
     <i class="fa-solid fa-chevron-up fa-xs filter-collapse-icon"
        aria-hidden="true"></i>
   </button>
-  {% if kiosk_mode %}
-    <a href="{% url 'htmx:incident-list' %}" class="btn btn-sm btn-ghost">
-      <i class="fa-solid fa-xmark fa-xs" aria-hidden="true"></i>
-      <span class="link">Exit kiosk</span>
-    </a>
-    <span class="text-sm font-medium ml-1">
-      <span class="opacity-60">After filtering:</span>
-      <span id="kiosk-filtered-count">{{ refresh_info.filtered_count }}</span>
-    </span>
-    <span class="text-sm font-medium ml-1">
-      <span class="opacity-60">Last refreshed:</span>
-      <span id="kiosk-last-refreshed">{{ refresh_info.last_refreshed|date:preferences.argus_htmx.datetime_format|default:"?" }}</span>
-    </span>
-  {% else %}
-    <a href="{% url 'htmx:incident-list-kiosk' %}"
-       class="btn btn-sm btn-ghost">
-      <i class="fa-solid fa-display fa-xs" aria-hidden="true"></i>
-      <span class="link">Kiosk</span>
-    </a>
-  {% endif %}
+  <a href="{% url 'htmx:incident-list-kiosk' %}"
+     onclick="this.href='{% url 'htmx:incident-list-kiosk' %}' + window.location.search"
+     class="btn btn-sm btn-ghost">
+    <i class="fa-solid fa-display fa-xs" aria-hidden="true"></i>
+    <span class="link">Kiosk</span>
+  </a>
 </div>
diff --git a/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html b/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html
index 9e31116d0..bd4dc04fc 100644
--- a/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html
+++ b/src/argus/htmx/templates/htmx/incident/_filter_controls_script.html
@@ -1,5 +1,4 @@
 <script>
-  const KIOSK_MODE = {{ kiosk_mode|yesno:"true,false" }};
   const FILTER_SELECT_URL = '{% url "htmx:select-filter" %}';
   const FILTER_UPDATE_URL_TEMPLATE = '{% url "htmx:filter-update" pk=0 %}'.replace('/0/', '/{id}/');
   const FILTER_DELETE_URL_TEMPLATE = '{% url "htmx:filter-delete" pk=0 %}'.replace('/0/', '/{id}/');
@@ -94,9 +93,7 @@
     const box = document.getElementById('filter-controls-box');
     box.classList.toggle('filters-collapsed');
     const collapsed = box.classList.contains('filters-collapsed');
-    if (!KIOSK_MODE) {
-      localStorage.setItem('argus_show_filters', collapsed ? 'false' : 'true');
-    }
+    localStorage.setItem('argus_show_filters', collapsed ? 'false' : 'true');
     btn.setAttribute('aria-expanded', collapsed ? 'false' : 'true');
   }
 
@@ -114,7 +111,7 @@
   });
 
   document.addEventListener('DOMContentLoaded', () => {
-    if (KIOSK_MODE || localStorage.getItem('argus_show_filters') === 'false') {
+    if (localStorage.getItem('argus_show_filters') === 'false') {
       document.getElementById('filter-controls-box')?.classList.add('filters-collapsed');
       document.getElementById('filter-toggle-btn')?.setAttribute('aria-expanded', 'false');
     }
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html b/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html
index 9847508fd..15f22e625 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_filterbox.html
@@ -1,12 +1,7 @@
 {% load widget_tweaks %}
-{% if kiosk_mode %}
-  {% url 'htmx:incident-list-kiosk' as incident_list_url %}
-{% else %}
-  {% url 'htmx:incident-list' as incident_list_url %}
-{% endif %}
 <form id="incident-filter-box"
       class="incident-list-param"
-      hx-get="{{ incident_list_url }}"
+      hx-get="{% url 'htmx:incident-list' %}"
       hx-include=".incident-list-param"
       {% block filter_trigger_control %}
       hx-trigger="keydown[keyCode==13], change delay:100ms, load once"
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html b/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html
index 767e8dffd..28039b293 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_table_autorefresh.html
@@ -2,7 +2,7 @@
 {% with preferences.argus_htmx.update_interval as update_interval %}
   {% if update_interval != 'never' %}
     hx-get="{{ incident_list_url }}"
-    hx-vals='{"page": "{{ page.number }}"}'
+    hx-vals='{"page": "{{ page.number }}"{% if kiosk_mode %}, "sort": "{{ current_sort }}", "sort_order": "{{ current_sort_order }}"{% endif %}'
     hx-target="this"
     hx-swap="outerHTML"
     hx-trigger="every {{ update_interval }}s"
diff --git a/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html b/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html
index f15bdf594..06bd2184b 100644
--- a/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html
+++ b/src/argus/htmx/templates/htmx/incident/_incident_toolbar.html
@@ -1,12 +1,12 @@
 <section class="flex flex-col gap-2">
-  <div id="filter-controls-box"
-       class="border-2 border-primary rounded-box p-2 flex flex-wrap gap-0.5 items-center">
-    {% include "htmx/incident/_filter_controls.html" %}
-    <div id="filterbox" class="flex flex-wrap items-center basis-full">
-      {% include "htmx/incident/_incident_filterbox.html" %}
-    </div>
-  </div>
   {% if not kiosk_mode %}
+    <div id="filter-controls-box"
+         class="border-2 border-primary rounded-box p-2 flex flex-wrap gap-0.5 items-center">
+      {% include "htmx/incident/_filter_controls.html" %}
+      <div id="filterbox" class="flex flex-wrap items-center basis-full">
+        {% include "htmx/incident/_incident_filterbox.html" %}
+      </div>
+    </div>
     <div id="bulk-actions"
          class="hidden flex gap-2 w-fit border-2 border-primary/50 bg-primary/10 rounded-box p-1">
       {% include "htmx/incident/_incident_list_update_menu.html" %}
diff --git a/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html b/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html
index 1c5ab3f70..1107db72e 100644
--- a/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html
+++ b/src/argus/htmx/templates/htmx/incident/cells/_incident_filter_dropdown_body.html
@@ -4,11 +4,7 @@
      tabindex="-1">
   <form class="incident-list-param">
     {% if not dummy_column %}
-      {% if kiosk_mode %}
-        {% url 'htmx:incident-list-kiosk' as incident_list_url %}
-      {% else %}
-        {% url 'htmx:incident-list' as incident_list_url %}
-      {% endif %}
+      {% url 'htmx:incident-list' as incident_list_url %}
     {% endif %}
     {# djlint:off #}
     <div aria-labelledby="{{ field.name }}-label" {% if not dummy_column %}hx-get="{{ incident_list_url }}" hx-include=".incident-list-param" hx-target="#table-body" hx-select="#table-body" hx-select-oob="#table-footer" hx-swap="outerHTML" hx-push-url="true" hx-indicator="#incident-list .htmx-indicator" hx-trigger="change delay:500ms"{% endif %}>
diff --git a/src/argus/htmx/templates/htmx/incident/cells/_incident_filterable_column_header_content.html b/src/argus/htmx/templates/htmx/incident/cells/_incident_filterable_column_header_content.html
index 6dd72e866..928e8b780 100644
--- a/src/argus/htmx/templates/htmx/incident/cells/_incident_filterable_column_header_content.html
+++ b/src/argus/htmx/templates/htmx/incident/cells/_incident_filterable_column_header_content.html
@@ -4,18 +4,22 @@
   <div class="flex items-center gap-1">
     <span id="{{ field.name }}-label">{{ column.label }}</span>
     {% include "htmx/incident/cells/_incident_sort_button.html" %}
-    {# Filter dropdown #}
-    <div id="{{ column.name }}-dropdown" class="dropdown dropdown-end">
-      <button type="button"
-              tabindex="0"
-              aria-label="Filter by {{ column.label|lower }}"
-              aria-controls="{{ column.name }}-dropdown-content"
-              class="filter-btn btn btn-xs {% if field.value %} btn-primary {% else %} btn-ghost text-primary {% endif %} min-h-4 h-4"
-              {% if dummy_column %}disabled{% endif %}>
-        <i class="fa-solid fa-magnifying-glass"></i>
-      </button>
-      {% include "htmx/incident/cells/_incident_filter_dropdown_body.html" %}
-    </div>
+    {% if not kiosk_mode %}
+      {# Filter dropdown #}
+      <div id="{{ column.name }}-dropdown" class="dropdown dropdown-end">
+        <button type="button"
+                tabindex="0"
+                aria-label="Filter by {{ column.label|lower }}"
+                aria-controls="{{ column.name }}-dropdown-content"
+                class="filter-btn btn btn-xs {% if field.value %} btn-primary {% else %} btn-ghost text-primary {% endif %} min-h-4 h-4"
+                {% if dummy_column %}disabled{% endif %}>
+          <i class="fa-solid fa-magnifying-glass"></i>
+        </button>
+        {% include "htmx/incident/cells/_incident_filter_dropdown_body.html" %}
+      </div>
+    {% endif %}
   </div>
 {% endwith %}
-{% include "htmx/incident/cells/_incident_filter_dropdown_script.html" %}
+{% if not kiosk_mode %}
+  {% include "htmx/incident/cells/_incident_filter_dropdown_script.html" %}
+{% endif %}
diff --git a/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button.html b/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button.html
index 1dd8cb18e..4838f19e5 100644
--- a/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button.html
+++ b/src/argus/htmx/templates/htmx/incident/cells/_incident_sort_button.html
@@ -1,7 +1,7 @@
 <!-- htmx/incident/cells/_incident_sort_button.html -->
 {# Reusable sort button for column headers. Requires: column, current_sort, current_sort_order #}
 {# Cycling order: inactive -> desc -> asc -> inactive (default) #}
-{% if column.sort_field %}
+{% if column.sort_field and not kiosk_mode %}
   {% if current_sort == column.sort_field %}
     {% if current_sort_order == "desc" %}
       {% with icon="fa-sort-down" next_sort=column.sort_field next_order="asc" label="Sort by "|add:column.label|lower|add:" ascending" active=True %}
diff --git a/src/argus/htmx/templates/htmx/incident/incident_list.html b/src/argus/htmx/templates/htmx/incident/incident_list.html
index d1af4da22..1453cb29e 100644
--- a/src/argus/htmx/templates/htmx/incident/incident_list.html
+++ b/src/argus/htmx/templates/htmx/incident/incident_list.html
@@ -1,4 +1,28 @@
 {% extends base %}
+{% block navbar_kiosk %}
+  {% if kiosk_mode %}
+    <div class="border-2 border-primary rounded-box px-3 py-1 bg-base-100 text-base-content flex gap-0.5 items-center">
+      <span class="text-sm font-medium ml-1">
+        <span class="opacity-60">Filter:</span>
+        {{ kiosk_filter_name|default:"None" }}
+      </span>
+      <span class="text-sm font-medium ml-1">
+        <span class="opacity-60">After filtering:</span>
+        <span id="kiosk-filtered-count">{{ refresh_info.filtered_count }}</span>
+      </span>
+      <span class="text-sm font-medium ml-1">
+        <span class="opacity-60">Last refreshed:</span>
+        <span id="kiosk-last-refreshed">{{ refresh_info.last_refreshed|date:preferences.argus_htmx.datetime_format|default:"?" }}</span>
+      </span>
+      <a href="{% url 'htmx:incident-list' %}"
+         onclick="this.href='{% url 'htmx:incident-list' %}' + window.location.search"
+         class="btn btn-sm btn-ghost">
+        <i class="fa-solid fa-xmark fa-xs" aria-hidden="true"></i>
+        <span class="link">Exit kiosk</span>
+      </a>
+    </div>
+  {% endif %}
+{% endblock navbar_kiosk %}
 {% block main %}
   {% if incidents_extra_widget %}
     <div class="flex">
diff --git a/tests/htmx/test_incident_columns_rendering.py b/tests/htmx/test_incident_columns_rendering.py
index f6cbe0785..bc52bdec3 100644
--- a/tests/htmx/test_incident_columns_rendering.py
+++ b/tests/htmx/test_incident_columns_rendering.py
@@ -117,14 +117,18 @@ def setUp(self):
     def test_given_kiosk_mode_it_should_remove_interactive_controls(self):
         self.assertNotContains(self.kiosk_response, 'id="col-row_select"')
         self.assertNotContains(self.kiosk_response, 'id="bulk-actions"')
+        self.assertNotContains(self.kiosk_response, "Sort by")
+        self.assertNotContains(self.kiosk_response, "filter-btn")
 
-    def test_given_kiosk_mode_it_should_move_stats_to_toolbar(self):
+    def test_given_kiosk_mode_it_should_move_stats_to_navbar(self):
         self.assertNotContains(self.kiosk_response, 'id="table-refresh-info"')
+        self.assertNotContains(self.kiosk_response, 'id="filter-controls-box"')
         self.assertContains(self.kiosk_response, 'id="kiosk-filtered-count"')
         self.assertContains(self.kiosk_response, 'id="kiosk-last-refreshed"')
 
     def test_given_normal_mode_it_should_show_interactive_controls_and_footer(self):
         self.assertContains(self.normal_response, 'id="bulk-actions"')
+        self.assertContains(self.normal_response, 'id="filter-controls-box"')
         self.assertContains(self.normal_response, 'id="table-refresh-info"')
         self.assertNotContains(self.normal_response, 'id="kiosk-filtered-count"')
         self.assertNotContains(self.normal_response, 'id="kiosk-last-refreshed"')
@@ -132,6 +136,12 @@ def test_given_normal_mode_it_should_show_interactive_controls_and_footer(self):
     def test_given_kiosk_mode_it_should_use_kiosk_url(self):
         self.assertContains(self.kiosk_response, f'hx-get="{reverse(KIOSK_URL_NAME)}"')
 
+    def test_given_kiosk_mode_it_should_show_exit_button_in_navbar(self):
+        self.assertContains(self.kiosk_response, f'href="{reverse("htmx:incident-list")}"')
+
+    def test_given_normal_mode_it_should_show_kiosk_button_in_filter_bar(self):
+        self.assertContains(self.normal_response, f'href="{reverse(KIOSK_URL_NAME)}"')
+
     def test_given_kiosk_mode_htmx_refresh_it_should_include_oob_swaps(self):
         request = RequestFactory().get("/incidents/kiosk/")
         request.session = {}
@@ -148,6 +158,7 @@ def test_given_kiosk_endpoint_it_should_return_kiosk_response(self):
         request.htmx = False
         response = incident_list_kiosk(request)
         self.assertContains(response, 'id="kiosk-filtered-count"')
+        self.assertContains(response, 'id="kiosk-last-refreshed"')
 
 
 @test.override_settings(INCIDENT_TABLE_COLUMNS=["id"])
@@ -156,11 +167,11 @@ def setUp(self):
         self.user = PersonUserFactory()
         ArgusHtmxPreferencesFactory(user=self.user)
 
-    def _make_request(self, params=None, hx_current_url=None, trigger=None):
+    def _make_request(self, params=None, trigger=None):
         request = RequestFactory().get("/incidents/", params or {})
         request.session = {}
         request.user = self.user
-        request.htmx = SimpleNamespace(trigger=trigger, current_url=hx_current_url)
+        request.htmx = SimpleNamespace(trigger=trigger)
         return request
 
     def test_given_no_trigger_filter_select_it_should_retarget(self):
@@ -171,16 +182,6 @@ def test_given_trigger_filter_select_it_should_render_filterbox(self):
         response = filter_select(self._make_request(trigger="some-element"))
         self.assertContains(response, 'id="incident-filter-box"')
 
-    def test_given_kiosk_url_filter_select_it_should_detect_kiosk_mode(self):
-        kiosk_url = reverse(KIOSK_URL_NAME)
-        response = filter_select(
-            self._make_request(
-                hx_current_url=f"http://testserver{kiosk_url}",
-                trigger="some-element",
-            )
-        )
-        self.assertContains(response, kiosk_url)
-
     def test_given_filter_id_filter_select_it_should_select_filter(self):
         filter_obj = FilterFactory(user=self.user)
         request = self._make_request(params={"filter": filter_obj.pk})
@@ -216,7 +217,7 @@ def test_given_non_default_sort_field_it_should_apply_secondary_sort(self):
 
     def test_given_timeframe_in_session_it_should_include_timeframe_in_query(self):
         request = self._make_request()
-        request.session["timeframe"] = 60  # one hour, stored as int by the form
+        request.session["timeframe"] = 60
         response = incident_list(request)
         self.assertEqual(response.status_code, 200)
 

From caaa79dacad9ecf44344a1fb307f443a9a1830d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Fri, 10 Jul 2026 10:22:25 +0200
Subject: [PATCH 11/12] Apply suggestions from code review

Co-authored-by: Johanna England <johanna.england@sikt.no>
---
 src/argus/htmx/templates/htmx/incident/_filter_controls.html | 2 +-
 src/argus/htmx/templates/htmx/incident/incident_list.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/argus/htmx/templates/htmx/incident/_filter_controls.html b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
index 4633aad0b..d393894e9 100644
--- a/src/argus/htmx/templates/htmx/incident/_filter_controls.html
+++ b/src/argus/htmx/templates/htmx/incident/_filter_controls.html
@@ -51,7 +51,7 @@
   </button>
   <a href="{% url 'htmx:incident-list-kiosk' %}"
      onclick="this.href='{% url 'htmx:incident-list-kiosk' %}' + window.location.search"
-     class="btn btn-sm btn-ghost">
+     class="link btn btn-sm btn-ghost">
     <i class="fa-solid fa-display fa-xs" aria-hidden="true"></i>
     <span class="link">Kiosk</span>
   </a>
diff --git a/src/argus/htmx/templates/htmx/incident/incident_list.html b/src/argus/htmx/templates/htmx/incident/incident_list.html
index 1453cb29e..730e412df 100644
--- a/src/argus/htmx/templates/htmx/incident/incident_list.html
+++ b/src/argus/htmx/templates/htmx/incident/incident_list.html
@@ -16,7 +16,7 @@
       </span>
       <a href="{% url 'htmx:incident-list' %}"
          onclick="this.href='{% url 'htmx:incident-list' %}' + window.location.search"
-         class="btn btn-sm btn-ghost">
+         class="link btn btn-sm btn-ghost">
         <i class="fa-solid fa-xmark fa-xs" aria-hidden="true"></i>
         <span class="link">Exit kiosk</span>
       </a>

From 1b2d585175fde876a6cec5f25eca074605738361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksander=20Fl=C3=B8tten?= <aleksander.flotten@sikt.no>
Date: Fri, 10 Jul 2026 12:55:49 +0200
Subject: [PATCH 12/12] Strengthen and clarify tests

---
 tests/htmx/test_incident_columns_rendering.py | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/tests/htmx/test_incident_columns_rendering.py b/tests/htmx/test_incident_columns_rendering.py
index bc52bdec3..1ef75f8cf 100644
--- a/tests/htmx/test_incident_columns_rendering.py
+++ b/tests/htmx/test_incident_columns_rendering.py
@@ -1,8 +1,10 @@
+from datetime import timedelta
 from types import SimpleNamespace
 
 from django import forms, test
 from django.test.client import RequestFactory
 from django.urls import reverse
+from django.utils import timezone
 
 from argus.auth.factories import PersonUserFactory
 from argus.filter.factories import FilterFactory
@@ -13,7 +15,6 @@
     filter_select,
     get_form,
     get_incident_ids_to_update,
-    incident_detail,
     incident_list,
     incident_list_kiosk,
     KIOSK_URL_NAME,
@@ -160,6 +161,15 @@ def test_given_kiosk_endpoint_it_should_return_kiosk_response(self):
         self.assertContains(response, 'id="kiosk-filtered-count"')
         self.assertContains(response, 'id="kiosk-last-refreshed"')
 
+    def test_given_kiosk_mode_with_selected_filter_it_should_display_filter_name(self):
+        filter_obj = FilterFactory(user=self.user, name="Kiosk Test Filter XYZ")
+        request = RequestFactory().get("/incidents/kiosk/")
+        request.session = {"selected_filter": str(filter_obj.pk)}
+        request.user = self.user
+        request.htmx = False
+        response = incident_list(request, kiosk_mode=True)
+        self.assertContains(response, "Kiosk Test Filter XYZ")
+
 
 @test.override_settings(INCIDENT_TABLE_COLUMNS=["id"])
 class FilterSelectTests(test.TestCase):
@@ -174,10 +184,6 @@ def _make_request(self, params=None, trigger=None):
         request.htmx = SimpleNamespace(trigger=trigger)
         return request
 
-    def test_given_no_trigger_filter_select_it_should_retarget(self):
-        response = filter_select(self._make_request())
-        self.assertEqual(response.status_code, 200)
-
     def test_given_trigger_filter_select_it_should_render_filterbox(self):
         response = filter_select(self._make_request(trigger="some-element"))
         self.assertContains(response, 'id="incident-filter-box"')
@@ -212,24 +218,27 @@ def _make_request(self, params=None):
         return request
 
     def test_given_non_default_sort_field_it_should_apply_secondary_sort(self):
-        response = incident_list(self._make_request({"sort": "level"}))
+        now = timezone.now()
+        older = StatelessIncidentFactory(level=3, start_time=now - timedelta(hours=2))
+        newer = StatelessIncidentFactory(level=3, start_time=now - timedelta(hours=1))
+        response = incident_list(self._make_request({"sort": "level", "maxlevel": 5}))
         self.assertEqual(response.status_code, 200)
+        content = response.content.decode()
+        self.assertLess(
+            content.index(f'id="incident-{newer.pk}-row"'),
+            content.index(f'id="incident-{older.pk}-row"'),
+        )
 
     def test_given_timeframe_in_session_it_should_include_timeframe_in_query(self):
+        now = timezone.now()
+        within_timeframe = StatelessIncidentFactory(start_time=now - timedelta(minutes=10))
+        outside_timeframe = StatelessIncidentFactory(start_time=now - timedelta(minutes=120))
         request = self._make_request()
         request.session["timeframe"] = 60
         response = incident_list(request)
         self.assertEqual(response.status_code, 200)
-
-
-class IncidentDetailTests(test.TestCase):
-    def test_given_existing_incident_it_should_render_detail(self):
-        incident = StatelessIncidentFactory()
-        request = RequestFactory().get(f"/incidents/{incident.pk}/")
-        request.user = PersonUserFactory()
-        request.htmx = False
-        response = incident_detail(request, pk=incident.pk)
-        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, f'id="incident-{within_timeframe.pk}-row"')
+        self.assertNotContains(response, f'id="incident-{outside_timeframe.pk}-row"')
 
 
 class UtilityFunctionTests(test.TestCase):