diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index d50404261..2b8744032 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -6,6 +6,7 @@ * [#6782](https://github.com/netbox-community/netbox/issues/6782) - Enable the inclusion of custom links in tables * [#8100](https://github.com/netbox-community/netbox/issues/8100) - Add "other" choice for FHRP group protocol +* [#8175](https://github.com/netbox-community/netbox/issues/8175) - Display parent object when attaching an image ### Bug Fixes diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 1660f8210..0df4d6905 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -473,6 +473,7 @@ class ObjectChangeLogView(View): class ImageAttachmentEditView(generic.ObjectEditView): queryset = ImageAttachment.objects.all() model_form = forms.ImageAttachmentForm + template_name = 'extras/imageattachment_edit.html' def alter_object(self, instance, request, args, kwargs): if not instance.pk: diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index 10c15397d..23dc8d382 100644 Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index 4562597d8..dde212a6c 100644 Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ diff --git a/netbox/project-static/styles/theme-light.scss b/netbox/project-static/styles/theme-light.scss index c14f7f314..4e638c75e 100644 --- a/netbox/project-static/styles/theme-light.scss +++ b/netbox/project-static/styles/theme-light.scss @@ -8,6 +8,7 @@ $theme-colors: map-merge( $theme-colors, ( 'primary': #337ab7, + 'info': #54d6f0, 'red': $red-500, 'yellow': $yellow-500, 'green': $green-500, diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 5c224f7c0..89b7891a2 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -10,7 +10,7 @@ {% endif %} {% if termination and perms.circuits.change_circuittermination %} - + Edit diff --git a/netbox/templates/extras/imageattachment_edit.html b/netbox/templates/extras/imageattachment_edit.html new file mode 100644 index 000000000..cd7d40a8e --- /dev/null +++ b/netbox/templates/extras/imageattachment_edit.html @@ -0,0 +1,16 @@ +{% extends 'generic/object_edit.html' %} +{% load helpers %} + +{% block form_fields %} +
+ +
+ +
+
+ {{ block.super }} +{% endblock form_fields %} diff --git a/netbox/templates/inc/profile_button.html b/netbox/templates/inc/profile_button.html index 876ee31dc..230aa02ad 100644 --- a/netbox/templates/inc/profile_button.html +++ b/netbox/templates/inc/profile_button.html @@ -1,56 +1,56 @@ {% if request.user.is_authenticated %} - - - - + {% else %} -
- - Log In - - - -
+
+ + Log In + + + +
{% endif %}