update templates & rendering for bootstrap 5

netbox/utilities/forms/fields.py

@@ -214,7 +214,7 @@ class CommentField(forms.CharField):
     widget = forms.Textarea
     default_label = ''
     # TODO: Port Markdown cheat sheet to internal documentation
-    default_helptext = '<i class="mdi mdi-information-outline"></i> '\
+    default_helptext = '<i class="bi bi-info-circle"></i> '\
                        '<a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">'\
                        'Markdown</a> syntax is supported'
 
@@ -390,7 +390,8 @@ class JSONField(_JSONField):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not self.help_text:
-            self.help_text = 'Enter context data in <a href="https://json.org/">JSON</a> format.'
+            
+            self.help_text = 'Enter context data in <a target="_blank" href="https://json.org/">JSON</a> format.'
             self.widget.attrs['placeholder'] = ''
 
     def prepare_value(self, value):

netbox/utilities/forms/forms.py

@@ -4,6 +4,8 @@ import re
 import yaml
 from django import forms
 
+from .widgets import APISelect, APISelectMultiple, StaticSelect2
+
 
 __all__ = (
     'BootstrapMixin',
@@ -28,18 +30,28 @@ class BootstrapMixin(forms.BaseForm):
             forms.CheckboxInput,
             forms.ClearableFileInput,
             forms.FileInput,
-            forms.RadioSelect
+            forms.RadioSelect,
+            APISelect,
+            APISelectMultiple,
+            StaticSelect2,
         ]
 
         for field_name, field in self.fields.items():
+
             if field.widget.__class__ not in exempt_widgets:
                 css = field.widget.attrs.get('class', '')
                 field.widget.attrs['class'] = ' '.join([css, 'form-control']).strip()
+
             if field.required and not isinstance(field.widget, forms.FileInput):
                 field.widget.attrs['required'] = 'required'
-            if 'placeholder' not in field.widget.attrs:
+
+            if 'placeholder' not in field.widget.attrs and field.label is not None:
                 field.widget.attrs['placeholder'] = field.label
 
+            if field.widget.__class__ == forms.CheckboxInput:
+                css = field.widget.attrs.get('class', '')
+                field.widget.attrs['class'] = ' '.join((css, 'form-check-input')).strip()
+
 
 class ReturnURLForm(forms.Form):
     """