From 8348c5a67429a8656306fe1048f8b0652257005e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 10 Nov 2020 16:00:21 -0500 Subject: [PATCH] Fix side panel width --- netbox/dcim/views.py | 21 ++++++++++++++++--- netbox/project-static/css/base.css | 5 +++++ ...ctions_list.html => connections_list.html} | 10 ++++----- .../dcim/interface_connections_list.html | 18 ---------------- .../dcim/power_connections_list.html | 18 ---------------- .../templates/dcim/rack_elevation_list.html | 16 +++++++------- netbox/templates/utilities/obj_list.html | 14 ++++++------- 7 files changed, 42 insertions(+), 60 deletions(-) rename netbox/templates/dcim/{console_connections_list.html => connections_list.html} (60%) delete mode 100644 netbox/templates/dcim/interface_connections_list.html delete mode 100644 netbox/templates/dcim/power_connections_list.html diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c0e93b18e..60ed0e7b2 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2144,7 +2144,7 @@ class ConsoleConnectionsListView(ObjectListView): filterset = filters.ConsoleConnectionFilterSet filterset_form = forms.ConsoleConnectionFilterForm table = tables.ConsoleConnectionTable - template_name = 'dcim/console_connections_list.html' + template_name = 'dcim/connections_list.html' def queryset_to_csv(self): csv_data = [ @@ -2163,13 +2163,18 @@ class ConsoleConnectionsListView(ObjectListView): return '\n'.join(csv_data) + def extra_context(self): + return { + 'title': 'Console Connections' + } + class PowerConnectionsListView(ObjectListView): queryset = PowerPort.objects.filter(_path__isnull=False).order_by('device') filterset = filters.PowerConnectionFilterSet filterset_form = forms.PowerConnectionFilterForm table = tables.PowerConnectionTable - template_name = 'dcim/power_connections_list.html' + template_name = 'dcim/connections_list.html' def queryset_to_csv(self): csv_data = [ @@ -2188,6 +2193,11 @@ class PowerConnectionsListView(ObjectListView): return '\n'.join(csv_data) + def extra_context(self): + return { + 'title': 'Power Connections' + } + class InterfaceConnectionsListView(ObjectListView): queryset = Interface.objects.filter( @@ -2198,7 +2208,7 @@ class InterfaceConnectionsListView(ObjectListView): filterset = filters.InterfaceConnectionFilterSet filterset_form = forms.InterfaceConnectionFilterForm table = tables.InterfaceConnectionTable - template_name = 'dcim/interface_connections_list.html' + template_name = 'dcim/connections_list.html' def queryset_to_csv(self): csv_data = [ @@ -2219,6 +2229,11 @@ class InterfaceConnectionsListView(ObjectListView): return '\n'.join(csv_data) + def extra_context(self): + return { + 'title': 'Interface Connections' + } + # # Virtual chassis diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 212196d05..c5c7e6aa0 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -33,6 +33,11 @@ footer p { #navbar_search { padding: 0 8px; } +.right-side-panel { + max-width: 400px; + min-width: 300px; + padding-right: 0; +} /* Hide the username in the navigation menu on displays less than 1400px wide */ @media (max-width: 1399px) { diff --git a/netbox/templates/dcim/console_connections_list.html b/netbox/templates/dcim/connections_list.html similarity index 60% rename from netbox/templates/dcim/console_connections_list.html rename to netbox/templates/dcim/connections_list.html index 15f7a36bb..80d76e7d1 100644 --- a/netbox/templates/dcim/console_connections_list.html +++ b/netbox/templates/dcim/connections_list.html @@ -5,14 +5,14 @@
{% export_button content_type %}
-

{% block title %}Console Connections{% endblock %}

+

{% block title %}{{ title }}{% endblock %}

-
+
+
+ {% include 'inc/search_panel.html' %} +
{% include 'responsive_table.html' %} {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
-
- {% include 'inc/search_panel.html' %} -
{% endblock %} diff --git a/netbox/templates/dcim/interface_connections_list.html b/netbox/templates/dcim/interface_connections_list.html deleted file mode 100644 index 606505e9e..000000000 --- a/netbox/templates/dcim/interface_connections_list.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends 'base.html' %} -{% load buttons %} - -{% block content %} -
- {% export_button content_type %} -
-

{% block title %}Interface Connections{% endblock %}

-
-
- {% include 'responsive_table.html' %} - {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %} -
-
- {% include 'inc/search_panel.html' %} -
-
-{% endblock %} diff --git a/netbox/templates/dcim/power_connections_list.html b/netbox/templates/dcim/power_connections_list.html deleted file mode 100644 index 7e791d6fe..000000000 --- a/netbox/templates/dcim/power_connections_list.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends 'base.html' %} -{% load buttons %} - -{% block content %} -
- {% export_button content_type %} -
-

{% block title %}Power Connections{% endblock %}

-
-
- {% include 'responsive_table.html' %} - {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %} -
-
- {% include 'inc/search_panel.html' %} -
-
-{% endblock %} diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index 439eb9dbe..081533ae9 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -18,8 +18,11 @@

{% block title %}Rack Elevations{% endblock %}

- {% if page %} -
+
+
+ {% include 'inc/search_panel.html' %} +
+ {% if page %}
{% for rack in page %}
@@ -45,14 +48,9 @@

{% include 'inc/paginator.html' %} -
- {% else %} -
+ {% else %}

No racks found

-
- {% endif %} -
- {% include 'inc/search_panel.html' %} + {% endif %}
{% endblock %} diff --git a/netbox/templates/utilities/obj_list.html b/netbox/templates/utilities/obj_list.html index bc483ceeb..738cbca49 100644 --- a/netbox/templates/utilities/obj_list.html +++ b/netbox/templates/utilities/obj_list.html @@ -21,7 +21,13 @@

{% block title %}{{ content_type.model_class|meta:"verbose_name_plural"|bettertitle }}{% endblock %}

-
+
+ {% if filter_form %} +
+ {% include 'inc/search_panel.html' %} + {% block sidebar %}{% endblock %} +
+ {% endif %} {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %} {% if permissions.change or permissions.delete %}
@@ -73,12 +79,6 @@ {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
- {% if filter_form %} -
- {% include 'inc/search_panel.html' %} - {% block sidebar %}{% endblock %} -
- {% endif %}
{% table_config_form table table_name="ObjectTable" %} {% endblock %}