diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 261bb8bd693..126b2a47b15 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -107,9 +107,15 @@ class ProviderBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBu class ProviderFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = Provider field_groups = [ + ['q'], ['region_id', 'site_id'], ['asn', 'tag'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -196,7 +202,12 @@ class ProviderNetworkBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomField class ProviderNetworkFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = ProviderNetwork - field_order = ['provider_id'] + field_order = ['q', 'provider_id', 'tag'] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) provider_id = DynamicModelMultipleChoiceField( queryset=Provider.objects.all(), required=False, @@ -358,16 +369,22 @@ class CircuitBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBul class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): model = Circuit field_order = [ - 'type_id', 'provider_id', 'provider_network_id', 'status', 'region_id', 'site_id', 'tenant_group_id', 'tenant_id', - 'commit_rate', + 'q', 'type_id', 'provider_id', 'provider_network_id', 'status', 'region_id', 'site_id', 'tenant_group_id', + 'tenant_id', 'commit_rate', ] field_groups = [ + ['q'], ['type_id', 'status', 'commit_rate'], ['provider_id', 'provider_network_id'], ['region_id', 'site_id'], ['tenant_group_id', 'tenant_id'], ['tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) type_id = DynamicModelMultipleChoiceField( queryset=CircuitType.objects.all(), required=False, diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index da9030ca998..348cb3b62b3 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -56,12 +56,18 @@ def get_device_by_name_or_pk(name): class DeviceComponentFilterForm(BootstrapMixin, CustomFieldModelFilterForm): field_order = [ - 'name', 'label', 'region_id', 'site_group_id', 'site_id', + 'q', 'name', 'label', 'region_id', 'site_group_id', 'site_id', ] field_groups = [ + ['q'], ['name', 'label'], ['region_id', 'site_group_id', 'site_id'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) name = forms.CharField( required=False ) @@ -452,12 +458,18 @@ class SiteBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEd class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): model = Site - field_order = ['status', 'region_id', 'tenant_group_id', 'tenant_id'] + field_order = ['q', 'status', 'region_id', 'tenant_group_id', 'tenant_id'] field_groups = [ + ['q'], ['status', 'region_id'], ['tenant_group_id', 'tenant_id'], ['tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) status = forms.MultipleChoiceField( choices=SiteStatusChoices, required=False, @@ -568,6 +580,11 @@ class LocationBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditForm): class LocationFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = Location + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -862,12 +879,18 @@ class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEd class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): model = Rack - field_order = ['region_id', 'site_id', 'location_id', 'status', 'role_id', 'tenant_group_id', 'tenant_id'] + field_order = ['q', 'region_id', 'site_id', 'location_id', 'status', 'role_id', 'tenant_group_id', 'tenant_id'] field_groups = [ + ['q'], ['status', 'role_id'], ['region_id', 'site_id', 'location_id'], ['tenant_group_id', 'tenant_id'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -927,7 +950,8 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFo class RackElevationFilterForm(RackFilterForm): field_order = [ - 'region_id', 'site_id', 'location_id', 'id', 'status', 'role_id', 'tenant_group_id', 'tenant_id', + 'q', 'region_id', 'site_id', 'location_id', 'id', 'status', 'role_id', 'tenant_group_id', + 'tenant_id', ] id = DynamicModelMultipleChoiceField( queryset=Rack.objects.all(), @@ -1092,11 +1116,17 @@ class RackReservationBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomField class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): model = RackReservation - field_order = ['region_id', 'site_id', 'location_id', 'user_id', 'tenant_group_id', 'tenant_id'] + field_order = ['q', 'region_id', 'site_id', 'location_id', 'user_id', 'tenant_group_id', 'tenant_id'] field_groups = [ + ['q'], ['region_id', 'site_id', 'location_id'], ['user_id', 'tenant_group_id', 'tenant_id'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -1246,12 +1276,18 @@ class DeviceTypeBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModel class DeviceTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = DeviceType field_groups = [ + ['q'], ['manufacturer_id', 'subdevice_role'], ['console_ports', 'console_server_ports'], ['power_ports', 'power_outlets'], ['interfaces', 'pass_through_ports'], ['tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) manufacturer_id = DynamicModelMultipleChoiceField( queryset=Manufacturer.objects.all(), required=False, @@ -2058,6 +2094,11 @@ class PlatformBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditForm): class PlatformFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = Platform + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) manufacturer_id = DynamicModelMultipleChoiceField( queryset=Manufacturer.objects.all(), required=False, @@ -2465,16 +2506,23 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulk class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldModelFilterForm): model = Device field_order = [ - 'region_id', 'site_id', 'location_id', 'rack_id', 'status', 'role_id', 'tenant_group_id', 'tenant_id', - 'manufacturer_id', 'device_type_id', 'asset_tag', 'mac_address', 'has_primary_ip', + 'q', 'region_id', 'site_id', 'location_id', 'rack_id', 'status', 'role_id', + 'tenant_group_id', 'tenant_id', 'manufacturer_id', 'device_type_id', 'asset_tag', + 'mac_address', 'has_primary_ip', ] field_groups = [ + ['q'], ['region_id', 'site_id', 'location_id', 'rack_id'], ['status', 'role_id', 'asset_tag'], ['tenant_group_id', 'tenant_id'], ['manufacturer_id', 'device_type_id'], ['mac_address', 'has_primary_ip'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -2654,6 +2702,7 @@ class DeviceBulkAddComponentForm(BootstrapMixin, CustomFieldsMixin, ComponentFor class ConsolePortFilterForm(DeviceComponentFilterForm): model = ConsolePort field_groups = [ + ['q'], ['name', 'label'], ['type', 'speed'], ['region_id', 'site_group_id', 'site_id'], @@ -2761,6 +2810,7 @@ class ConsolePortCSVForm(CustomFieldModelCSVForm): class ConsoleServerPortFilterForm(DeviceComponentFilterForm): model = ConsoleServerPort field_groups = [ + ['q'], ['name', 'label'], ['type', 'speed'], ['region_id', 'site_group_id', 'site_id'], @@ -2868,6 +2918,7 @@ class ConsoleServerPortCSVForm(CustomFieldModelCSVForm): class PowerPortFilterForm(DeviceComponentFilterForm): model = PowerPort field_groups = [ + ['q'], ['name', 'label', 'type'], ['region_id', 'site_group_id', 'site_id'], ['tag'], @@ -2973,6 +3024,7 @@ class PowerPortCSVForm(CustomFieldModelCSVForm): class PowerOutletFilterForm(DeviceComponentFilterForm): model = PowerOutlet field_groups = [ + ['q'], ['name', 'label', 'type'], ['region_id', 'site_group_id', 'site_id'], ['tag'], @@ -3145,6 +3197,7 @@ class PowerOutletCSVForm(CustomFieldModelCSVForm): class InterfaceFilterForm(DeviceComponentFilterForm): model = Interface field_groups = [ + ['q'], ['name', 'label', 'type', 'enabled'], ['mgmt_only', 'mac_address'], ['region_id', 'site_group_id', 'site_id'], @@ -3493,6 +3546,7 @@ class InterfaceCSVForm(CustomFieldModelCSVForm): class FrontPortFilterForm(DeviceComponentFilterForm): field_groups = [ + ['q'], ['name', 'label', 'type', 'color'], ['region_id', 'site_group_id', 'site_id'], ['tag'] @@ -3682,6 +3736,7 @@ class FrontPortCSVForm(CustomFieldModelCSVForm): class RearPortFilterForm(DeviceComponentFilterForm): model = RearPort field_groups = [ + ['q'], ['name', 'label', 'type', 'color'], ['region_id', 'site_group_id', 'site_id'], ['tag'] @@ -3783,6 +3838,7 @@ class RearPortCSVForm(CustomFieldModelCSVForm): class DeviceBayFilterForm(DeviceComponentFilterForm): model = DeviceBay field_groups = [ + ['q'], ['name', 'label'], ['region_id', 'site_group_id', 'site_id'], ['tag'] @@ -4013,6 +4069,7 @@ class InventoryItemBulkEditForm( class InventoryItemFilterForm(DeviceComponentFilterForm): model = InventoryItem field_groups = [ + ['q'], ['name', 'label', 'manufacturer_id'], ['serial', 'asset_tag', 'discovered'], ['region_id', 'site_group_id', 'site_id'], @@ -4488,11 +4545,17 @@ class CableBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkE class CableFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = Cable field_groups = [ + ['q'], ['type', 'status', 'color'], ['device_id', 'rack_id'], ['region_id', 'site_id', 'tenant_id'], ['tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -4556,6 +4619,11 @@ class CableFilterForm(BootstrapMixin, CustomFieldModelFilterForm): # class ConsoleConnectionFilterForm(BootstrapMixin, forms.Form): + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -4583,6 +4651,11 @@ class ConsoleConnectionFilterForm(BootstrapMixin, forms.Form): class PowerConnectionFilterForm(BootstrapMixin, forms.Form): + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -4610,6 +4683,11 @@ class PowerConnectionFilterForm(BootstrapMixin, forms.Form): class InterfaceConnectionFilterForm(BootstrapMixin, forms.Form): + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -4877,12 +4955,18 @@ class VirtualChassisCSVForm(CustomFieldModelCSVForm): class VirtualChassisFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): model = VirtualChassis - field_order = ['region_id', 'site_group_id', 'site_id', 'tenant_group_id', 'tenant_id'] + field_order = ['q', 'region_id', 'site_group_id', 'site_id', 'tenant_group_id', 'tenant_id'] field_groups = [ + ['q'], ['region_id', 'site_group_id', 'site_id'], ['tenant_group_id', 'tenant_id'], ['tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -5022,6 +5106,11 @@ class PowerPanelBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModel class PowerPanelFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = PowerPanel + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -5260,12 +5349,18 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelB class PowerFeedFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = PowerFeed field_groups = [ + ['q'], ['region_id', 'site_group_id', 'site_id'], ['power_panel_id', 'rack_id'], ['type', 'supply', 'max_utilization'], ['phase', 'voltage', 'amperage'], ['status', 'tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 86860b0bca5..4452b5aad70 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -46,28 +46,40 @@ class CustomFieldFilterLogicChoices(ChoiceSet): class CustomLinkButtonClassChoices(ChoiceSet): CLASS_DEFAULT = 'outline-dark' - CLASS_PRIMARY = 'primary' - CLASS_SUCCESS = 'success' - CLASS_INFO = 'info' - CLASS_WARNING = 'warning' - CLASS_DANGER = 'danger' - CLASS_LINK = 'link' + CLASS_LINK = 'ghost-dark' + CLASS_BLUE = 'blue' + CLASS_INDIGO = 'indigo' + CLASS_PURPLE = 'purple' + CLASS_PINK = 'pink' + CLASS_RED = 'red' + CLASS_ORANGE = 'orange' + CLASS_YELLOW = 'yellow' + CLASS_GREEN = 'green' + CLASS_TEAL = 'teal' + CLASS_CYAN = 'cyan' + CLASS_GRAY = 'secondary' CHOICES = ( (CLASS_DEFAULT, 'Default'), - (CLASS_PRIMARY, 'Primary (blue)'), - (CLASS_SUCCESS, 'Success (green)'), - (CLASS_INFO, 'Info (aqua)'), - (CLASS_WARNING, 'Warning (orange)'), - (CLASS_DANGER, 'Danger (red)'), - (CLASS_LINK, 'None (link)'), + (CLASS_LINK, 'Link'), + (CLASS_BLUE, 'Blue'), + (CLASS_INDIGO, 'Indigo'), + (CLASS_PURPLE, 'Purple'), + (CLASS_PINK, 'Pink'), + (CLASS_RED, 'Red'), + (CLASS_ORANGE, 'Orange'), + (CLASS_YELLOW, 'Yellow'), + (CLASS_GREEN, 'Green'), + (CLASS_TEAL, 'Teal'), + (CLASS_CYAN, 'Cyan'), + (CLASS_GRAY, 'Gray'), ) - # # ObjectChanges # + class ObjectChangeActionChoices(ChoiceSet): ACTION_CREATE = 'create' diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index 16091885c07..98f34dfa96f 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -77,9 +77,15 @@ class CustomFieldBulkEditForm(BootstrapMixin, BulkEditForm): class CustomFieldFilterForm(BootstrapMixin, forms.Form): field_groups = [ + ['q'], ['type', 'content_types'], ['weight', 'required'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) content_types = ContentTypeMultipleChoiceField( queryset=ContentType.objects.all(), limit_choices_to=FeatureQuery('custom_fields') @@ -167,9 +173,15 @@ class CustomLinkBulkEditForm(BootstrapMixin, BulkEditForm): class CustomLinkFilterForm(BootstrapMixin, forms.Form): field_groups = [ + ['q'], ['content_type'], ['weight', 'new_window'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) content_type = ContentTypeChoiceField( queryset=ContentType.objects.all(), limit_choices_to=FeatureQuery('custom_fields') @@ -252,9 +264,15 @@ class ExportTemplateBulkEditForm(BootstrapMixin, BulkEditForm): class ExportTemplateFilterForm(BootstrapMixin, forms.Form): field_groups = [ + ['q'], ['content_type', 'mime_type'], ['file_extension', 'as_attachment'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) content_type = ContentTypeChoiceField( queryset=ContentType.objects.all(), limit_choices_to=FeatureQuery('custom_fields') @@ -358,9 +376,15 @@ class WebhookBulkEditForm(BootstrapMixin, BulkEditForm): class WebhookFilterForm(BootstrapMixin, forms.Form): field_groups = [ + ['q'], ['content_types', 'http_method'], ['enabled', 'type_create', 'type_update', 'type_delete'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) content_types = ContentTypeMultipleChoiceField( queryset=ContentType.objects.all(), limit_choices_to=FeatureQuery('custom_fields') @@ -664,15 +688,21 @@ class ConfigContextBulkEditForm(BootstrapMixin, BulkEditForm): class ConfigContextFilterForm(BootstrapMixin, forms.Form): field_order = [ - 'region_id', 'site_group_id', 'site_id', 'role_id', 'platform_id', 'cluster_group_id', 'cluster_id', - 'tenant_group_id', 'tenant_id', + 'q', 'region_id', 'site_group_id', 'site_id', 'role_id', 'platform_id', 'cluster_group_id', + 'cluster_id', 'tenant_group_id', 'tenant_id', ] field_groups = [ + ['q'], ['region_id', 'site_group_id', 'site_id'], ['device_type_id', 'role_id', 'platform_id'], ['cluster_group_id', 'cluster_id'], ['tenant_group_id', 'tenant_id', 'tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) region_id = DynamicModelMultipleChoiceField( queryset=Region.objects.all(), required=False, @@ -812,9 +842,15 @@ class JournalEntryBulkEditForm(BootstrapMixin, BulkEditForm): class JournalEntryFilterForm(BootstrapMixin, forms.Form): model = JournalEntry field_groups = [ + ['q'], ['created_before', 'created_after', 'created_by_id'], ['assigned_object_type_id', 'kind'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) created_after = forms.DateTimeField( required=False, label=_('After'), @@ -857,9 +893,15 @@ class JournalEntryFilterForm(BootstrapMixin, forms.Form): class ObjectChangeFilterForm(BootstrapMixin, forms.Form): model = ObjectChange field_groups = [ + ['q'], ['time_before', 'time_after', 'action'], ['user_id', 'changed_object_type_id'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) time_after = forms.DateTimeField( required=False, label=_('After'), diff --git a/netbox/extras/templatetags/custom_links.py b/netbox/extras/templatetags/custom_links.py index 814acbbcb96..fec5cf65ac3 100644 --- a/netbox/extras/templatetags/custom_links.py +++ b/netbox/extras/templatetags/custom_links.py @@ -10,10 +10,10 @@ from utilities.utils import render_jinja2 register = template.Library() -LINK_BUTTON = '{}\n' +LINK_BUTTON = '{}\n' GROUP_BUTTON = """ -
+
- -
-{% endif %} {% endblock %} {% block tab_items %} - -{% with interface_count=object.interfaces_count %} -{% if interface_count %} - -{% endif %} -{% endwith %} - -{% with frontport_count=object.frontports.count %} -{% if frontport_count %} - -{% endif %} -{% endwith %} - -{% with rearport_count=object.rearports.count %} -{% if rearport_count %} - -{% endif %} -{% endwith %} - -{% with consoleport_count=object.consoleports.count %} -{% if consoleport_count %} - -{% endif %} -{% endwith %} - -{% with consoleserverport_count=object.consoleserverports.count %} -{% if consoleserverport_count %} -{% endif %} -{% endwith %} - -{% with powerport_count=object.powerports.count %} -{% if powerport_count %} - -{% endif %} -{% endwith %} - -{% with poweroutlet_count=object.poweroutlets.count %} -{% if poweroutlet_count %} - -{% endif %} -{% endwith %} - -{% with devicebay_count=object.devicebays.count %} -{% if devicebay_count %} - -{% endif %} -{% endwith %} - -{% with inventoryitem_count=object.inventoryitems.count %} -{% if inventoryitem_count %} - -{% endif %} -{% endwith %} -{% if perms.dcim.napalm_read_device and object.status == 'active' and object.primary_ip and object.platform.napalm_driver %} -{# NAPALM-enabled tabs #} - - - -{% endif %} -{% if perms.extras.view_configcontext %} - -{% endif %} + + {% with interface_count=object.interfaces_count %} + {% if interface_count %} + + {% endif %} + {% endwith %} + + {% with frontport_count=object.frontports.count %} + {% if frontport_count %} + + {% endif %} + {% endwith %} + + {% with rearport_count=object.rearports.count %} + {% if rearport_count %} + + {% endif %} + {% endwith %} + + {% with consoleport_count=object.consoleports.count %} + {% if consoleport_count %} + + {% endif %} + {% endwith %} + + {% with consoleserverport_count=object.consoleserverports.count %} + {% if consoleserverport_count %} + + {% endif %} + {% endwith %} + + {% with powerport_count=object.powerports.count %} + {% if powerport_count %} + + {% endif %} + {% endwith %} + + {% with poweroutlet_count=object.poweroutlets.count %} + {% if poweroutlet_count %} + + {% endif %} + {% endwith %} + + {% with devicebay_count=object.devicebays.count %} + {% if devicebay_count %} + + {% endif %} + {% endwith %} + + {% with inventoryitem_count=object.inventoryitems.count %} + {% if inventoryitem_count %} + + {% endif %} + {% endwith %} + + {% if perms.dcim.napalm_read_device and object.status == 'active' and object.primary_ip and object.platform.napalm_driver %} + {# NAPALM-enabled tabs #} + + + + {% endif %} + + {% if perms.extras.view_configcontext %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 40772d4af06..2a9f4a93bf7 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -12,7 +12,7 @@ {% block extra_controls %} {% if perms.dcim.change_devicetype %} -
+
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index d57b2fe898d..3a4d16db30e 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -5,7 +5,7 @@ {% block extra_controls %} {% if perms.dcim.add_interface and not object.is_virtual %} - + Add Child Interface {% endif %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 0a278f2d6e8..e7bad2badca 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -18,14 +18,14 @@ {% endblock %} {% block extra_controls %} - - + Previous - + Next {% endblock %} diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index 55e1eeacc43..c9f0080dafd 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -5,16 +5,16 @@ {% block title %}Rack Elevations{% endblock %} {% block controls %} -
-
- -
+
Front Rear
-
+
Normal Reversed
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html index e4b4885f3be..480dab59426 100644 --- a/netbox/templates/generic/object.html +++ b/netbox/templates/generic/object.html @@ -20,20 +20,19 @@ {% block title %}{{ object }}{% endblock %} {% block subtitle %} - - Created {{ object.created|annotated_date }} · - Updated {{ object.last_updated|timesince }} ago - {{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }} - +
+ Created {{ object.created|annotated_date }} + · + Updated {{ object.last_updated|timesince }} ago +
{% endblock %} {% block controls %} {# Clone/Edit/Delete Buttons #} -
-
- {% custom_links object %} +
+
{% plugin_buttons object %} - + {# Extra buttons #} {% block extra_controls %}{% endblock %} @@ -48,6 +47,9 @@ {% endif %}
+
+ {% custom_links object %} +
{% endblock controls %} diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index 69176250801..b5e73ab1674 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -8,10 +8,12 @@ {% block controls %} {% if settings.DOCS_ROOT %} -
- +
+
+ +
{% endif %} {% endblock controls %} diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index 9ac48422763..e00b47a02c6 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -7,8 +7,8 @@ {% block title %}{{ content_type.model_class|meta:"verbose_name_plural"|bettertitle }}{% endblock %} {% block controls %} -
-
+
+
{% block extra_controls %}{% endblock %} {% if permissions.add and 'add' in action_buttons %} {% add_button content_type.model_class|validated_viewname:"add" %} diff --git a/netbox/templates/inc/filter_list.html b/netbox/templates/inc/filter_list.html index 07aa2249bc9..8837a75e2e2 100644 --- a/netbox/templates/inc/filter_list.html +++ b/netbox/templates/inc/filter_list.html @@ -22,7 +22,7 @@ {{ field }}
{% else %} -
+
{{ field }}
@@ -30,17 +30,20 @@ {% endwith %} {% endfor %}
+ {% if forloop.counter != filter_form.field_groups|length %} +
+ {% endif %} {% endfor %} {% else %} {% for field in filter_form.visible_fields %} -
+
{% if field|widget_type == 'checkboxinput' %}
{{ field }}
{% else %} -
+
{{ field }}
diff --git a/netbox/templates/ipam/inc/toggle_available.html b/netbox/templates/ipam/inc/toggle_available.html index e732576050d..234218a0194 100644 --- a/netbox/templates/ipam/inc/toggle_available.html +++ b/netbox/templates/ipam/inc/toggle_available.html @@ -1,10 +1,11 @@ {% load helpers %} + {% if show_available is not None %} -
- +
+ Show Available - + Hide Available
diff --git a/netbox/templates/ipam/iprange/ip_addresses.html b/netbox/templates/ipam/iprange/ip_addresses.html index 2db243e1dea..f034d5622bb 100644 --- a/netbox/templates/ipam/iprange/ip_addresses.html +++ b/netbox/templates/ipam/iprange/ip_addresses.html @@ -2,7 +2,7 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and object.first_available_ip %} - + Add IP Address {% endif %} diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html index d51790c75a3..6291befcff4 100644 --- a/netbox/templates/ipam/prefix/ip_addresses.html +++ b/netbox/templates/ipam/prefix/ip_addresses.html @@ -2,7 +2,7 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %} - + Add IP Address {% endif %} diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html index 1b4a48433b6..f65d45c58a2 100644 --- a/netbox/templates/ipam/prefix_list.html +++ b/netbox/templates/ipam/prefix_list.html @@ -2,7 +2,7 @@ {% load helpers %} {% block extra_controls %} -
+
@@ -19,7 +19,7 @@ {% endfor %}
-
+
diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html index dbcd08ea014..fec0da22054 100644 --- a/netbox/templates/virtualization/cluster/base.html +++ b/netbox/templates/virtualization/cluster/base.html @@ -13,35 +13,36 @@ {% block extra_controls %} {% if perms.virtualization.change_cluster and perms.virtualization.add_virtualmachine %} - + Add Virtual Machine {% endif %} + {% if perms.virtualization.change_cluster %} - + Assign Device {% endif %} {% endblock %} {% block tab_items %} - + -{% with virtualmachine_count=object.virtual_machines.count %} - -{% endwith %} + {% with virtualmachine_count=object.virtual_machines.count %} + + {% endwith %} -{% with device_count=object.devices.count %} - -{% endwith %} + {% with device_count=object.devices.count %} + + {% endwith %} {% endblock %} diff --git a/netbox/templates/virtualization/virtualmachine/base.html b/netbox/templates/virtualization/virtualmachine/base.html index 83b134230d4..4869a56ce19 100644 --- a/netbox/templates/virtualization/virtualmachine/base.html +++ b/netbox/templates/virtualization/virtualmachine/base.html @@ -10,8 +10,8 @@ {% block extra_controls %} {% if perms.virtualization.add_vminterface %} - - Add Interfaces + + Add Interfaces {% endif %} {% endblock %} diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py index 05b47ad4cdf..58c1ae60a0b 100644 --- a/netbox/tenancy/forms.py +++ b/netbox/tenancy/forms.py @@ -64,6 +64,11 @@ class TenantGroupBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditForm): class TenantGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = TenantGroup + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) parent_id = DynamicModelMultipleChoiceField( queryset=TenantGroup.objects.all(), required=False, @@ -132,6 +137,7 @@ class TenantFilterForm(BootstrapMixin, CustomFieldModelFilterForm): model = Tenant q = forms.CharField( required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), label=_('Search') ) group_id = DynamicModelMultipleChoiceField( diff --git a/netbox/utilities/templates/buttons/add.html b/netbox/utilities/templates/buttons/add.html index ba0e363810e..60767951a3f 100644 --- a/netbox/utilities/templates/buttons/add.html +++ b/netbox/utilities/templates/buttons/add.html @@ -1,6 +1,9 @@ -
+{% comment %}
 Add -
+
{% endcomment %} + + Add + diff --git a/netbox/utilities/templates/buttons/clone.html b/netbox/utilities/templates/buttons/clone.html index cddd15632b1..24e685c3d0a 100644 --- a/netbox/utilities/templates/buttons/clone.html +++ b/netbox/utilities/templates/buttons/clone.html @@ -1,3 +1,3 @@ - +  Clone diff --git a/netbox/utilities/templates/buttons/delete.html b/netbox/utilities/templates/buttons/delete.html index 760b530f767..6fe3fe7d88f 100644 --- a/netbox/utilities/templates/buttons/delete.html +++ b/netbox/utilities/templates/buttons/delete.html @@ -1,3 +1,3 @@ - +  Delete diff --git a/netbox/utilities/templates/buttons/edit.html b/netbox/utilities/templates/buttons/edit.html index 821b668d643..b2bfe5da7e7 100644 --- a/netbox/utilities/templates/buttons/edit.html +++ b/netbox/utilities/templates/buttons/edit.html @@ -1,3 +1,3 @@ - +  Edit diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html index a655556f149..20ecc2dff07 100644 --- a/netbox/utilities/templates/buttons/export.html +++ b/netbox/utilities/templates/buttons/export.html @@ -1,5 +1,5 @@ -
-
    diff --git a/netbox/utilities/templates/buttons/import.html b/netbox/utilities/templates/buttons/import.html index 98fc0f95e86..9df619607d0 100644 --- a/netbox/utilities/templates/buttons/import.html +++ b/netbox/utilities/templates/buttons/import.html @@ -1,3 +1,3 @@ - +  Import diff --git a/netbox/utilities/templates/search/searchbar.html b/netbox/utilities/templates/search/searchbar.html index daf9b334bd3..d71fd8e69ec 100644 --- a/netbox/utilities/templates/search/searchbar.html +++ b/netbox/utilities/templates/search/searchbar.html @@ -12,7 +12,7 @@ All Objects - diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index 7cef7434b05..2b352ed3fac 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -225,14 +225,20 @@ class ClusterBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBul class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): model = Cluster field_order = [ - 'type_id', 'region_id', 'site_id', 'group_id', 'tenant_group_id', 'tenant_id', + 'q', 'type_id', 'region_id', 'site_id', 'group_id', 'tenant_group_id', 'tenant_id', ] field_groups = [ + ['q'], ['type_id'], ['region_id', 'site_id'], ['tenant_group_id', 'tenant_id'], ['tag'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) type_id = DynamicModelMultipleChoiceField( queryset=ClusterType.objects.all(), required=False, @@ -540,6 +546,7 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldMod 'site_id', 'tenant_group_id', 'tenant_id', 'platform_id', 'mac_address', ] field_groups = [ + ['q'], ['status', 'role_id'], ['platform_id', 'mac_address'], ['cluster_group_id', 'cluster_type_id', 'cluster_id'], @@ -547,6 +554,11 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldMod ['tenant_group_id', 'tenant_id'], ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) cluster_group_id = DynamicModelMultipleChoiceField( queryset=ClusterGroup.objects.all(), required=False, @@ -855,10 +867,16 @@ class VMInterfaceBulkRenameForm(BulkRenameForm): class VMInterfaceFilterForm(BootstrapMixin, forms.Form): model = VMInterface field_groups = [ + ['q'], ['cluster_id', 'virtual_machine_id'], ['enabled', 'mac_address'], ['tag'] ] + q = forms.CharField( + required=False, + widget=forms.TextInput(attrs={'placeholder': _('All Fields')}), + label=_('Search') + ) cluster_id = DynamicModelMultipleChoiceField( queryset=Cluster.objects.all(), required=False,