Merge branch 'develop' into feature

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
 

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:

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,

netbox/templates/circuits/inc/circuit_termination.html

@@ -10,7 +10,7 @@
                 </a>
             {% endif %}
             {% if termination and perms.circuits.change_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}" class="btn btn-sm btn-yellow lh-1">
+                <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}" class="btn btn-sm btn-warning lh-1">
                     <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
                 </a>
                 <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}" class="btn btn-sm btn-primary lh-1">

netbox/templates/extras/imageattachment_edit.html

@@ -0,0 +1,16 @@
+{% extends 'generic/object_edit.html' %}
+{% load helpers %}
+
+{% block form_fields %}
+  <div class="row mb-3">
+    <label class="col-sm-3 col-form-label text-lg-end required">
+      {{ obj.parent|meta:"verbose_name"|bettertitle }}
+    </label>
+    <div class="col-sm-9">
+      <div class="form-control-plaintext">
+        <a href="{{ obj.parent.get_absolute_url }}" class="">{{ obj.parent }}</a>
+      </div>
+    </div>
+  </div>
+  {{ block.super }}
+{% endblock form_fields %}

netbox/templates/inc/profile_button.html

@@ -1,56 +1,56 @@
 {% if request.user.is_authenticated %}
-<span class="dropdown profile-button">
-  <button
-    type="button"
-    aria-expanded="false"
-    data-bs-toggle="dropdown"
-    class="btn btn-outline-secondary dropdown-toggle w-100"
-  >
-    <i class="mdi mdi-account"></i>
-    <span id="navbar_user">{{ request.user|truncatechars:"30" }}</span>
-  </button>
-  <ul class="dropdown-menu dropdown-menu-end">
-    <li>
-      <button type="button" class="dropdown-item color-mode-toggle">
-        <i class="color-mode-icon mdi mdi-lightbulb"></i>&nbsp;
-        <span class="color-mode-text">Dark Mode</span>
-      </button>
-    </li>
-    <li>
-      {% if request.user.is_staff %}
-      <a class="dropdown-item" href="{% url 'admin:index' %}">
-        <i class="mdi mdi-cog"></i> Admin
-      </a>
-      {% endif %}
-    </li>
-    <li>
-      <a class="dropdown-item" href="{% url 'user:profile' %}">
-        <i class="mdi mdi-account"></i> Profile & Settings
-      </a>
-    </li>
-    <li><hr class="dropdown-divider" /></li>
-    <li>
-      <a class="dropdown-item" href="{% url 'logout' %}">
-        <i class="mdi mdi-logout-variant"></i> Log Out
-      </a>
-    </li>
-  </ul>
-</span>
+  <div class="dropdown profile-button">
+    <button type="button" aria-expanded="false" data-bs-toggle="dropdown" class="btn btn-outline-secondary dropdown-toggle w-100">
+      <i class="mdi mdi-account"></i>
+      <span id="navbar_user">{{ request.user|truncatechars:"30" }}</span>
+    </button>
+    <ul class="dropdown-menu dropdown-menu-end">
+      <li>
+        <button type="button" class="dropdown-item color-mode-toggle">
+          <i class="color-mode-icon mdi mdi-lightbulb"></i>
+          <span class="color-mode-text">Dark Mode</span>
+        </button>
+      </li>
+      <li>
+        {% if request.user.is_staff %}
+          <a class="dropdown-item" href="{% url 'admin:index' %}">
+            <i class="mdi mdi-cog"></i> Admin
+          </a>
+        {% endif %}
+      </li>
+      <li>
+        <a class="dropdown-item" href="{% url 'user:profile' %}">
+          <i class="mdi mdi-account"></i> Profile
+        </a>
+      </li>
+      <li>
+        <a class="dropdown-item" href="{% url 'user:preferences' %}">
+          <i class="mdi mdi-wrench"></i> Preferences
+        </a>
+      </li>
+      <li><hr class="dropdown-divider" /></li>
+      <li>
+        <a class="dropdown-item" href="{% url 'logout' %}">
+          <i class="mdi mdi-logout-variant"></i> Log Out
+        </a>
+      </li>
+    </ul>
+  </div>
 {% else %}
-<div class="btn-group">
-  <a class="btn btn-primary ws-nowrap" type="button" href="{% url 'login' %}">
-    <i class="mdi mdi-login-variant"></i> Log In
-  </a>
-  <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown">
-    <span class="visually-hidden">Toggle Dropdown</span>
-  </button>
-  <ul class="dropdown-menu dropdown-menu-end">
-    <li>
-      <button class="dropdown-item color-mode-toggle">
-        <i class="color-mode-icon mdi mdi-lightbulb"></i>&nbsp;
-        <span class="color-mode-text">Dark Mode</span>
-      </button>
-    </li>
-  </ul>
-</div>
+  <div class="btn-group">
+    <a class="btn btn-primary ws-nowrap" type="button" href="{% url 'login' %}">
+      <i class="mdi mdi-login-variant"></i> Log In
+    </a>
+    <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown">
+      <span class="visually-hidden">Toggle Dropdown</span>
+    </button>
+    <ul class="dropdown-menu dropdown-menu-end">
+      <li>
+        <button class="dropdown-item color-mode-toggle">
+          <i class="color-mode-icon mdi mdi-lightbulb"></i>
+          <span class="color-mode-text">Dark Mode</span>
+        </button>
+      </li>
+    </ul>
+  </div>
 {% endif %}