From 908a2824bafddaca077ed9a6e515faea80b1eed7 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 23 Dec 2021 14:34:09 -0500 Subject: [PATCH 1/4] Reduce saturation of 'info' theme color --- netbox/project-static/dist/netbox-light.css | Bin 493807 -> 493807 bytes netbox/project-static/dist/netbox-print.css | Bin 1624275 -> 1624275 bytes netbox/project-static/styles/theme-light.scss | 1 + 3 files changed, 1 insertion(+) diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index 10c15397d1e4569f878cdc5a43c32ba37163dc76..23dc8d3821e58e7264fe4bd3109dea298dc227bf 100644 GIT binary patch delta 682 zcmaDqQSSXjxe2>iOifbEHtyT7Q4+*RGq6s|FG@)*(oN3K$uF`}1_@4X-((X`NAe|DV(xtlRvJMW-~EQGD}XLe()=!^yI?L4U*<&DXD43SPYx~kef+* zvilZ+$+?e(fOG{5NbBUoTRd<(uUTd5c9pG+^=7!0OyBdG(Lx%h2h$9u3!Y!^kzcdb7~<2RE3wK$4=<*S}?Cn||&MW1JLj!=^XBWKx-)^_Fov z#4Oc!j83dz<3w?m04u_w^Pi|p>BTI#G=Cjilyy>%`C$DQ0E71U=i7FyNP9}a7 z5P&e1zp#{l2V1}W00$d0qd;a}T7ETBBAUMO4XZvRK%Tr|4T8AT>MiRsFsuE^Th{GQ X-m>j0VS@zhbjB2R_3h`A*cH?O{P**% delta 427 zcmXw#O-mb56o$DUb0-Np4PqLjCe%VjAvPup5v1Zq1pk1pDr(hMu&p3iumx!rQVM=> z#n)A%?p$dS<$~5w=prIUr6Ra&aZ$yY7^SG2LT8k&&cl127Y^rQCUh|qn%>~`FM7L^ znboA++pUsQsTw?ZPh#>c6?33M&gGiqaC#iyHmOfe=LE(-kbrDk^U9%<5_`Urt2smF z)|#DuJiM;L>twV6om;dPyXU0FjvphT(=t3YNdqk1&TaC@v2+Q39#aqMP2$6fMFjRt z^8CNAVe*XnF=!Fxlng}jq!9%-jlw7peIk)3Dv_r@W-)NY0{EMxK6EWIgTH#+{|4Pl z>>)lcvLbaDXSc2Q&R8WcLu7|lqHxIk4%Iq~s6!Q4IAu@pHcNx}6y#oYy~BR1yXWB7 zM;=DUJTF$|aqfwrDZ>NmS&Dy&V%g$;b#=n)y!PD!nY1m%{_vMK>Z?oW%bw@0v$m#H*{8&`!0}rD=3b(zqh&SD|j&fDaOozcD(M}YJ_s3)zyyw_P+~cJ; zXh%Gzq|)vGD!%-f_Q1H0uEqC!^a&lKYVk`y9iSXle*oL8$(}6-Xo8Nw5LjFeAeZ8- zDoVqpn??ynpP^$=a2jo@)#s|7-UjalV>7&+Ku#Eajx11UHOArfB#LY9y588Kx^76; z=q2c#K{ZfM>7A8Tz{*c_96UM1;@kx4(fzNj(30M-rZSM6L3(h_AkyU(qggGpYRJyg&`G@(KwD zZb!B_hX{H?4Z%P#;^JKGn|Dk&9F4(-pR+j>B^^)8ht?*`>2_GSP`AK_`XkW@bbsR| z*b+q+U%Oa0SNbbQnjG$5<{gmqb3RC(;YFNm=0>RfEM8*bN-720pE)}e16(6`TDZub z)x$+qE8$c-iXFb?N)X1D_~vXP$Psv)2%65@Dht3~ZtV&PzV8U*dxg4lk`I3G3O4YRBr@$?;fOW}y#7PT(b`P57DZ2X ox-1Yxf{h^I>2iIj7iq@|RMOrFr*7DN`8F$pQQ2<7#Dlwk0GoGKp#T5? delta 760 zcmYk3OH30{6oxam?Ja#wJMB!T(28wsv8^Z;AAzXBl3;vbP#4C45o+26aiMI8nrKo& za25iEwDO}QN?fU60#S0~N|r7p5J?CtFmZ_sS2Px@-T^~ge98ZxbI&*|-9HUhkXhm9w;4n4f+z@@bTNA>9Z1v%Nj{1;&LS2|SWNpCf5!$e0znZO$ zx(y&zVOG&upcU{6<}em!EH!#R6C2LaR>N+?lRHCF1!{)Bz<1AHwMu%OhzEJ<#`*|P zIL4?AlX)t$T%Oh&@cAdT;DlgyZx^%mF&Y){=YypMYZLtW(lc6(rB_tmwT;^RIOUi* z6&wr4%I3#yZ|2ZAWpBn*n|%n`>-G?9zhuXX9t_}D)ZxW^O!Om}bOcyxzxYtlGgWwe zL9Es@`w%=R9{ZA&#?{0uR_k3gkiJMJ7XKuzCiT0;w7A8^akIEZE^n~l zMa3r|xhdbrwSG0ODmiKTcKBg*@ UIMq=Z$tTt6oafjP~0lGa6_5c6? 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, From 542534aeba65077d3c360f6ea07df0800aedabca Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 23 Dec 2021 14:41:39 -0500 Subject: [PATCH 2/4] Add direct link to preferences in user menu --- netbox/templates/inc/profile_button.html | 106 +++++++++++------------ 1 file changed, 53 insertions(+), 53 deletions(-) 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 %} From 1987647cc382e3f2274d1f65d086b18dd08917b1 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 28 Dec 2021 13:06:27 -0500 Subject: [PATCH 3/4] Closes #8175: Display parent object when attaching an image --- docs/release-notes/version-3.1.md | 1 + netbox/extras/views.py | 1 + .../templates/extras/imageattachment_edit.html | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 netbox/templates/extras/imageattachment_edit.html 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 d5d36d364..15f3ca48a 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -472,6 +472,7 @@ class ObjectChangeLogView(View): class ImageAttachmentEditView(generic.ObjectEditView): queryset = ImageAttachment.objects.all() model_form = forms.ImageAttachmentForm + template_name = 'extras/imageattachment_edit.html' def alter_obj(self, instance, request, args, kwargs): if not instance.pk: 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 %} +
+ +
+
+ {{ obj.parent }} +
+
+
+ {{ block.super }} +{% endblock form_fields %} From 35e346c4b97ab4142573c2dd1eb2fb164de10b85 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 28 Dec 2021 16:13:58 -0500 Subject: [PATCH 4/4] Fix circuit termination button style --- netbox/templates/circuits/inc/circuit_termination.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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