argus-server 2.2.1__tar.gz → 2.2.2__tar.gz

{argus_server-2.2.1 → argus_server-2.2.2}/CHANGELOG.md

@@ -8,6 +8,28 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [2.2.2] - 2025-11-03
+
+### Added
+
+- Added the beginnings of a style guide at /styleguide/. The look of the form
+  inputs that were not manually laid out have in some cases also changed, for
+  greater consistency. ([#1558](https://github.com/Uninett/Argus/issues/1558))
+- Added `zino-argus-glue` to documented list of known glue services
+
+### Changed
+
+- Increased logging verbosity when finding destinations for notifications and
+  actually sending the notifications, to aid in debugging production systems.
+  Now also logs which destination id's are found and used.
+  ([#1563](https://github.com/Uninett/Argus/issues/1563))
+
+### Fixed
+
+- The development docker compose had stopped working due to changes outside of
+  our control (pip, git, the very distro) and has been updated.
+
+
 ## [2.2.1] - 2025-09-18
 
 ### Fixed, frontend

{argus_server-2.2.1 → argus_server-2.2.2}/Dockerfile

@@ -1,15 +1,19 @@
 # This Dockerfile is designed to run a development environment for Argus,
 # with the Argus source code tree mounted at /argus
 #
-FROM python:3.12
+FROM python:3.13-trixie
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends tini \
-    build-essential libpq-dev libffi-dev libssl-dev
+    build-essential libpq-dev libffi-dev libssl-dev git
 RUN mkdir -p /argus
 COPY requirements.txt /argus
 COPY requirements/*.txt /argus/requirements/
 
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
 WORKDIR /argus
 RUN pip install gunicorn -r requirements.txt -r /argus/requirements/dev.txt
 

{argus_server-2.2.1 → argus_server-2.2.2}/Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean testclean distclean coverageclean cacheclean nuke tailwind docclean upgrade-tailwind
+.PHONY: clean testclean distclean coverageclean cacheclean nuke tailwind docclean upgrade-tailwind tailwind-watch
 
 TAILWINDDIR=src/argus/htmx/tailwindtheme
 STATICDIR=src/argus/htmx/static
@@ -32,7 +32,10 @@ testclean: coverageclean clean
 nuke: clean docclean distclean testclean cacheclean
 
 tailwind:
-	tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css
+	$(TAILWINDDIR)/tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css
+
+tailwind-watch:
+	$(TAILWINDDIR)/tailwindcss -c $(TAILWINDDIR)/tailwind.config.js -i $(TAILWINDDIR)/styles.css -o $(STATICDIR)/styles.css --watch
 
 upgrade-tailwind:
 	PYTHONPATH=$(PYTHONPATH) python3 src/argus/htmx/tailwindtheme/get_tailwind.py

{argus_server-2.2.1 → argus_server-2.2.2}/NOTES.md

@@ -3,6 +3,16 @@
 This file documents changes to Argus that are relevant for operations,
 customizers and end-users.
 
+## [2.2.2] - 2025-11-03
+
+To aid in development there a live styleguide for the frontend on
+`/styleguide`.
+
+Logging verbosity has increased for sending notifications.
+
+Otherwise: typos have been fixed, a new glue service has been added to the
+documentation, the development docker-compose setup should be working again.
+
 
 ## [2.2.1] - 2025-09-18
 

{argus_server-2.2.1 → argus_server-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-server
-Version: 2.2.1
+Version: 2.2.2
 Summary: Argus is an alert aggregator for monitoring systems
 Project-URL: Homepage, https://github.com/Uninett/Argus
 Author-email: Uninett Opensource <opensource@uninett.no>

{argus_server-2.2.1 → argus_server-2.2.2}/docs/development/howtos/howtos-for-github.rst

@@ -23,4 +23,4 @@ magic address GitHub provides for you, then you need to toggle "Keep my email
 addresses private" on the same page to "On". You can even prevent commits not
 using the magic address from being pushed to GitHub.
 
-See `Setting your commit email address at GitHub<https://docs.github.com/en/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address>`_ for more information.
+See `Setting your commit email address at GitHub <https://docs.github.com/en/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address>`_ for more information.

argus_server-2.2.2/docs/development/styleguide.rst

@@ -0,0 +1,23 @@
+============================
+Style guide for web frontend
+============================
+
+There's a live style guide on ``/styleguide/``. It contains a live form so that
+you can experiment with form input to see what a valid and invalid form looks
+like.
+
+The live style guide is not complete, and not fully implemented into the site
+yet. If you are looking for low hanging fruit:
+
+* The headers (h1-h3) needs to be styled as per the style guide.
+* The cards (all pages except the incident list and preferences page) should
+  look the same.
+* There should be no preferences directly in the user menu drop down.
+* There should be no use of the class "border-b" anywhere.
+
+More work is involved in making sure all form fields use the style guide
+designs for inputs/labels. Another larger task is issue #1557:
+`Restyling the preferences page <https://github.com/Uninett/Argus/issues/1557>`_.
+
+See also issue #1519:
+`Add styleguide <https://github.com/Uninett/Argus/issues/1519>`_.

{argus_server-2.2.1 → argus_server-2.2.2}/docs/development.rst

@@ -9,4 +9,5 @@ Development
    development/management-commands
    development/makefile-rules
    development/howtos
+   development/styleguide
    development/troubleshooting

{argus_server-2.2.1 → argus_server-2.2.2}/docs/integrations/glue-services/index.rst

@@ -33,6 +33,17 @@ Network Administration Visualized
 This is an extension of NAV, runs on the same server, and uses the NAV config
 files.
 
+Zino
+~~~~
+
+| Home: https://nordu.net/zino/
+| Source: https://github.com/Uninett/zino-argus-glue
+| PyPI: `zino-argus-glue <https://pypi.org/project/zino-argus-glue/>`_
+
+This is a standalone process that connects to both the Zino and Argus APIs and
+exchanges/synchronizes information between them.
+
+
 Mist Systems Administration (Juniper)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

{argus_server-2.2.1 → argus_server-2.2.2}/pyproject.toml

@@ -80,7 +80,12 @@ artifacts = ["src/argus/version.py"]
 packages = ["src/argus"]
 
 [tool.hatch.build.targets.sdist]
-exclude = ["/.github"]
+exclude = [
+    "/.github",
+    "/*.json",
+    "/*.py",
+    "/*.sh",
+]
 
 [tool.versioningit.write]
 file = "src/argus/version.py"

{argus_server-2.2.1 → argus_server-2.2.2}/requirements-django52.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --extra=htmx --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
+#    pip-compile --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
 #
 annotated-types==0.7.0
     # via pydantic
@@ -37,7 +37,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==2.3.0
     # via argus-server (pyproject.toml)
-django==5.2.6
+django==5.2.7
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)
@@ -139,7 +139,7 @@ rpds-py==0.25.1
     #   referencing
 sniffio==1.3.1
     # via anyio
-social-auth-app-django==5.4.3
+social-auth-app-django==5.6.0
     # via argus-server (pyproject.toml)
 social-auth-core==4.6.1
     # via

{argus_server-2.2.1 → argus_server-2.2.2}/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --extra=htmx --output-file=requirements.txt constraints.txt pyproject.toml requirements/django52.txt
+#    pip-compile --output-file=requirements-django52.txt constraints.txt pyproject.toml requirements/django52.txt
 #
 annotated-types==0.7.0
     # via pydantic
@@ -37,7 +37,7 @@ defusedxml==0.7.1
     #   social-auth-core
 dj-database-url==2.3.0
     # via argus-server (pyproject.toml)
-django==5.2.6
+django==5.2.7
     # via
     #   -r requirements/django52.txt
     #   argus-server (pyproject.toml)
@@ -139,7 +139,7 @@ rpds-py==0.25.1
     #   referencing
 sniffio==1.3.1
     # via anyio
-social-auth-app-django==5.4.3
+social-auth-app-django==5.6.0
     # via argus-server (pyproject.toml)
 social-auth-core==4.6.1
     # via

argus_server-2.2.2/src/argus/htmx/forms.py

@@ -0,0 +1,73 @@
+from django import forms
+from django.core.exceptions import ValidationError
+
+
+__all__ = ["StyleGuideForm"]
+
+
+class _ArgusBaseForm(forms.Form):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("label_suffix", "")
+        super().__init__(*args, **kwargs)
+
+
+# Turn off colons EVERYWHERE
+forms.Form = _ArgusBaseForm
+
+
+class StyleGuideForm(forms.Form):
+    ERROR_INPUT = "MXZ"
+    _choices = ("S", "Medium", "Loooooooong", "Multi word long choice")
+    CHOICES = tuple(enumerate(_choices, 1))
+
+    # field variations:
+    required = forms.CharField(required=True)
+    help_text = forms.CharField(
+        required=False, help_text="This is the help text for a specific field, should always be shown"
+    )
+    error = forms.CharField(required=True)
+
+    # field types:
+    input_ = forms.CharField(label="Input", required=False)
+    password = forms.Field(required=False, widget=forms.PasswordInput)
+    number = forms.IntegerField(required=False)
+    date = forms.DateField(required=False)
+    datetime = forms.DateTimeField(required=False)
+    time = forms.TimeField(required=False)
+    email = forms.EmailField(required=False)
+    url = forms.URLField(required=False)
+    checkbox = forms.BooleanField(required=False)
+    select = forms.ChoiceField(required=False, choices=CHOICES)
+    checkbox_select = forms.ChoiceField(
+        required=False,
+        choices=CHOICES,
+        widget=forms.CheckboxSelectMultiple,
+    )
+    radio_select = forms.ChoiceField(
+        required=False,
+        choices=CHOICES,
+        widget=forms.RadioSelect,
+    )
+
+    # special field types:
+    # level as range
+    # typeahead
+    # ..
+
+    def clean_error(self):
+        input = self.cleaned_data.get("error", "")
+        if input != self.ERROR_INPUT:
+            raise ValidationError(
+                'This field only accepts "%(correct)s" as a value',
+                params={"correct": self.ERROR_INPUT},
+                code="invalid",
+            )
+        return input
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if not (cleaned_data.get("error", None) and cleaned_data.get("required", None)):
+            raise ValidationError(
+                'Both of the fields "required" and "error" needs to be filled and valid',
+                code="invalid",
+            )

{argus_server-2.2.1 → argus_server-2.2.2}/src/argus/htmx/incident/filter.py

@@ -13,18 +13,22 @@ filter_backend = get_filter_backend()
 QuerySetFilter = filter_backend.QuerySetFilter
 
 
+class RangeInput(forms.NumberInput):
+    template_name = "django/forms/widgets/range.html"
+
+
 class IncidentFilterForm(forms.Form):
     open = forms.IntegerField(
-        widget=forms.NumberInput(
-            attrs={"type": "range", "step": "1", "min": min(OpenStatus).value, "max": max(OpenStatus).value}
+        widget=RangeInput(
+            attrs={"class": "range-primary", "step": "1", "min": min(OpenStatus).value, "max": max(OpenStatus).value}
         ),
         label="Open State",
         initial=OpenStatus.BOTH.value,
         required=False,
     )
     acked = forms.IntegerField(
-        widget=forms.NumberInput(
-            attrs={"type": "range", "step": "1", "min": min(AckedStatus).value, "max": max(AckedStatus).value}
+        widget=RangeInput(
+            attrs={"class": "range-primary", "step": "1", "min": min(AckedStatus).value, "max": max(AckedStatus).value}
         ),
         label="Acked",
         initial=AckedStatus.BOTH.value,
@@ -42,7 +46,7 @@ class IncidentFilterForm(forms.Form):
         widget=forms.TextInput(
             attrs={
                 "placeholder": "key=value, ...",
-                "class": "input input-primary input-bordered input-sm overflow-y-auto min-h-8 h-auto max-h-16 max-w-xs leading-tight",
+                "class": "input-primary input-sm overflow-y-auto min-h-8 h-auto max-h-16 max-w-xs leading-tight",
             }
         ),
         required=False,
@@ -50,8 +54,8 @@ class IncidentFilterForm(forms.Form):
         help_text='Press "Enter" after each completed tag',
     )
     maxlevel = forms.IntegerField(
-        widget=forms.NumberInput(
-            attrs={"type": "range", "step": "1", "min": min(Level).value, "max": max(Level).value}
+        widget=RangeInput(
+            attrs={"class": "range-primary", "step": "1", "min": min(Level).value, "max": max(Level).value}
         ),
         label="Level <=",
         initial=max(Level).value,

{argus_server-2.2.1 → argus_server-2.2.2}/src/argus/htmx/incident/forms.py

@@ -38,7 +38,7 @@ class TimeframeForm(forms.Form):
         initial=TIMEFRAME_DEFAULT,
         widget=forms.Select(
             attrs={
-                "class": "select select-xs bg-transparent text-base border-none -ml-2",
+                "class": "border-none select-xs bg-transparent text-base -ml-2",
                 "autocomplete": "off",
                 "hx-get": ".",
                 "hx-trigger": "change",

{argus_server-2.2.1 → argus_server-2.2.2}/src/argus/htmx/static/styles.css

@@ -3666,6 +3666,11 @@ details.collapse summary::-webkit-details-marker {
   position: relative;
 }
 
+[type="radio"].radio-xs {
+  height: 1rem;
+  width: 1rem;
+}
+
 .range-xs {
   height: 1rem;
 }
@@ -4203,6 +4208,10 @@ details.collapse summary::-webkit-details-marker {
   margin-left: -0.5rem;
 }
 
+.mb-4 {
+  margin-bottom: 1rem;
+}
+
 .mb-8 {
   margin-bottom: 2rem;
 }
@@ -4247,6 +4256,10 @@ details.collapse summary::-webkit-details-marker {
   display: table;
 }
 
+.grid {
+  display: grid;
+}
+
 .hidden {
   display: none;
 }
@@ -4327,10 +4340,6 @@ details.collapse summary::-webkit-details-marker {
   width: 66.666667%;
 }
 
-.w-24 {
-  width: 6rem;
-}
-
 .w-4 {
   width: 1rem;
 }
@@ -4440,6 +4449,10 @@ details.collapse summary::-webkit-details-marker {
   cursor: pointer;
 }
 
+.grid-cols-2 {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
 .flex-row {
   flex-direction: row;
 }
@@ -4517,16 +4530,18 @@ details.collapse summary::-webkit-details-marker {
        column-gap: 1rem;
 }
 
-.gap-y-2 {
-  row-gap: 0.5rem;
-}
-
 .space-y-2 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-y-reverse: 0;
   margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse)));
   margin-bottom: calc(0.5rem * var(--tw-space-y-reverse));
 }
 
+.space-y-4 > :not([hidden]) ~ :not([hidden]) {
+  --tw-space-y-reverse: 0;
+  margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse)));
+  margin-bottom: calc(1rem * var(--tw-space-y-reverse));
+}
+
 .self-end {
   align-self: flex-end;
 }
@@ -4593,6 +4608,10 @@ details.collapse summary::-webkit-details-marker {
   border-radius: 0.5rem;
 }
 
+.rounded-md {
+  border-radius: 0.375rem;
+}
+
 .\!rounded-l-none {
   border-top-left-radius: 0px !important;
   border-bottom-left-radius: 0px !important;
@@ -4695,7 +4714,7 @@ details.collapse summary::-webkit-details-marker {
 
 .bg-red-700 {
   --tw-bg-opacity: 1;
-  background-color: rgb(185 28 28 / var(--tw-bg-opacity));
+  background-color: rgb(185 28 28 / var(--tw-bg-opacity, 1));
 }
 
 .bg-severity-primary-1 {
@@ -4850,6 +4869,11 @@ details.collapse summary::-webkit-details-marker {
   line-height: 2rem;
 }
 
+.text-3xl {
+  font-size: 1.875rem;
+  line-height: 2.25rem;
+}
+
 .text-base {
   font-size: 1rem;
   line-height: 1.5rem;
@@ -4930,10 +4954,6 @@ details.collapse summary::-webkit-details-marker {
   color: var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity, 1)));
 }
 
-.text-neutral-content\/80 {
-  color: var(--fallback-nc,oklch(var(--nc)/0.8));
-}
-
 .text-primary {
   --tw-text-opacity: 1;
   color: var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity, 1)));
@@ -4971,7 +4991,7 @@ details.collapse summary::-webkit-details-marker {
 
 .text-white {
   --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: rgb(255 255 255 / var(--tw-text-opacity, 1));
 }
 
 .antialiased {
@@ -5108,4 +5128,20 @@ details.collapse summary::-webkit-details-marker {
   .sm\:w-96 {
     width: 24rem;
   }
+
+  .sm\:grid-cols-2 {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+@media (min-width: 1024px) {
+  .lg\:grid-cols-4 {
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+  }
+}
+
+@media (min-width: 1280px) {
+  .xl\:grid-cols-6 {
+    grid-template-columns: repeat(6, minmax(0, 1fr));
+  }
 }

{argus_server-2.2.1 → argus_server-2.2.2}/src/argus/htmx/tailwindtheme/config.py

@@ -13,6 +13,7 @@ ARCHITECTURE_MAP = {
     ("linux", "arm64"): "linux-arm64",
     ("linux", "arm7"): "linux-arm7",
     ("darwin", "x86_64"): "macos-x64",
+    ("darwin", "arm"): "macos-arm64",
     ("darwin", "arm64"): "macos-arm64",
     ("windows", "x86_64"): "windows-x64",
     ("windows", "arm64"): "windows-arm64",

argus_server-2.2.2/src/argus/htmx/templates/django/forms/errors/dict/ul.html

@@ -0,0 +1,5 @@
+{% if errors %}
+  <ul class="{{ error_class }} text-error label-text-alt">
+    {% for field, error in errors %}<li>{{ field }}{{ error }}</li>{% endfor %}
+  </ul>
+{% endif %}

argus_server-2.2.2/src/argus/htmx/templates/django/forms/errors/list/ul.html

@@ -0,0 +1,6 @@
+{% if errors %}
+  <ul class="{{ error_class }} text-error label-text-alt"
+      {% if errors.field_id %}id="{{ errors.field_id }}_error"{% endif %}>
+    {% for error in errors %}<li>{{ error }}</li>{% endfor %}
+  </ul>
+{% endif %}

argus_server-2.2.2/src/argus/htmx/templates/django/forms/field.html

@@ -0,0 +1,20 @@
+<!-- field.html -->
+{% if field.use_fieldset %}
+  <fieldset class="flex flex-col gap-2"
+            {% if field.aria_describedby %}aria-describedby="{{ field.aria_describedby }}"{% endif %}>
+    {% if field.label %}{{ field.legend_tag }}{% endif %}
+  {% else %}
+    <div class="flex flex-col gap-2">
+      {% if field.label %}{{ field.label_tag }}{% endif %}
+    {% endif %}
+    {% if field.help_text %}
+      <div class="helptext text-xs"
+           {% if field.auto_id %}id="{{ field.auto_id }}_helptext"{% endif %}>{{ field.help_text|safe }}</div>
+    {% endif %}
+    {{ field }}
+    {% if field.errors %}<div class="text-error">{{ field.errors }}</div>{% endif %}
+    {% if field.use_fieldset %}
+    </fieldset>
+  {% else %}
+  </div>
+{% endif %}

argus_server-2.2.2/src/argus/htmx/templates/django/forms/label.html

@@ -0,0 +1,13 @@
+<!-- label.html -->
+<div class="indicator">
+  {% if use_tag %}
+    <{{ tag }}
+    {% include "django/forms/attrs.html" %}
+    >
+  {% endif %}
+  <strong class="label-text">{{ label }}</strong>
+  {% if field.field.required %}
+    <span class="indicator-item badge border-none mask mask-circle text-warning text-base text-sm">＊</span>
+  {% endif %}
+  {% if use_tag %}</{{ tag }}>{% endif %}
+</div>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/checkbox.html

@@ -0,0 +1,6 @@
+<!-- checkbox.html -->
+<input type="checkbox"
+       name="{{ widget.name }}"
+       class="checkbox checkbox-sm {{ widget.attrs.class }}"
+       {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
+       {% include "django/forms/widgets/classless_attrs.html" %}>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/checkbox_option.html

@@ -0,0 +1,12 @@
+<!-- checkbox_option.html -->
+<span class="flex flex-nowrap items-center">
+  <label class="label cursor-pointer"
+         {% if widget.attrs.id %}for="{{ widget.attrs.id }}"{% endif %}>
+    <input type="checkbox"
+           name="{{ widget.name }}"
+           class="checkbox checkbox-sm {{ widget.attrs.class }}"
+           {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
+           {% include "django/forms/widgets/classless_attrs.html" %}>
+    <span class="label-text pl-2">{{ widget.label }}</span>
+  </label>
+</span>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/classless_attrs.html

@@ -0,0 +1,9 @@
+{% if not "autocomplete" in widget.attrs.keys %}autocomplete="off"{% endif %}
+{% for name, value in widget.attrs.items %}
+  {% if name != "class" %}
+    {% if value is not False %}
+      {{ name }}
+      {% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}
+    {% endif %}
+  {% endif %}
+{% endfor %}

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/date.html

@@ -0,0 +1,6 @@
+<!-- date.html -->
+<input type="date"
+       name="{{ widget.name }}"
+       class="input input-bordered {{ widget.attrs.class }}"
+       {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
+       {% include "django/forms/widgets/classless_attrs.html" %}>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/datetime.html

@@ -0,0 +1,6 @@
+<!-- datetime.html -->
+<input type="datetime"
+       name="{{ widget.name }}"
+       class="input input-bordered {{ widget.attrs.class }}"
+       {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
+       {% include "django/forms/widgets/classless_attrs.html" %}>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/input.html

@@ -0,0 +1,6 @@
+<!-- input.html -->
+<input type="{{ widget.type }}"
+       name="{{ widget.name }}"
+       class="input input-bordered {{ widget.attrs.class }}"
+       {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
+       {% include "django/forms/widgets/classless_attrs.html" %}>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/radio_option.html

@@ -0,0 +1,12 @@
+<!-- radio_option.html -->
+<span class="flex flex-nowrap items-center">
+  <label {% if widget.attrs.id %}for="{{ widget.attrs.id }}"{% endif %}
+         class="label cursor-pointer">
+    <input type="radio"
+           name="{{ widget.name }}"
+           class="radio radio-xs {{ widget.attrs.class }}"
+           {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
+           {% include "django/forms/widgets/classless_attrs.html" %}>
+    <span class="label-text pl-2">{{ widget.label }}</span>
+  </label>
+</span>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/range.html

@@ -0,0 +1,5 @@
+<input type="range"
+       name="{{ widget.name }}"
+       class="range range-primary range-xs {{ widget.attrs.class }}"
+       {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}
+       {% include "django/forms/widgets/classless_attrs.html" %}>

argus_server-2.2.2/src/argus/htmx/templates/django/forms/widgets/select.html

@@ -0,0 +1,12 @@
+<!-- select.html -->
+<select name="{{ widget.name }}"
+        class="select input input-bordered {{ widget.attrs.class }}"
+        {% include "django/forms/widgets/classless_attrs.html" %}>
+  {% for group_name, group_choices, group_index in widget.optgroups %}
+    {% if group_name %}<optgroup label="{{ group_name }}">{% endif %}
+      {% for option in group_choices %}
+        {% include option.template_name with widget=option %}
+      {% endfor %}
+      {% if group_name %}</optgroup>{% endif %}
+  {% endfor %}
+</select>