From 1757102536981ed1d26bab3b346a602fb9a91a6f Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 09:34:30 -0400 Subject: [PATCH 01/22] Fixes #7442: Fix missing actions column on user-configured tables --- docs/release-notes/version-3.0.md | 8 ++++++++ netbox/utilities/tables.py | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 978c860ea..1e718a226 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -1,5 +1,13 @@ # NetBox v3.0 +## v3.0.6 (FUTURE) + +### Bug Fixes + +* [#7442](https://github.com/netbox-community/netbox/issues/7442) - Fix missing actions column on user-configured tables + +--- + ## v3.0.5 (2021-10-04) ### Enhancements diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index c8d0a0e43..d37f24543 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -57,14 +57,14 @@ class BaseTable(tables.Table): if user is not None and not isinstance(user, AnonymousUser): selected_columns = user.config.get(f"tables.{self.__class__.__name__}.columns") if selected_columns: - pk = self.base_columns.pop('pk', None) - actions = self.base_columns.pop('actions', None) + # Show only persistent or selected columns for name, column in self.columns.items(): - if name in selected_columns: + if name in ['pk', 'actions', *selected_columns]: self.columns.show(name) else: self.columns.hide(name) + # Rearrange the sequence to list selected columns first, followed by all remaining columns # TODO: There's probably a more clever way to accomplish this self.sequence = [ @@ -72,12 +72,14 @@ class BaseTable(tables.Table): *[c for c in self.columns.names() if c not in selected_columns] ] - # Always include PK and actions column, if defined on the table - if pk: - self.base_columns['pk'] = pk + # PK column should always come first + if 'pk' in self.sequence: + self.sequence.remove('pk') self.sequence.insert(0, 'pk') - if actions: - self.base_columns['actions'] = actions + + # Actions column should always come last + if 'actions' in self.sequence: + self.sequence.remove('actions') self.sequence.append('actions') # Dynamically update the table's QuerySet to ensure related fields are pre-fetched From e09024e86f68dbd60f1c32b94abd6a64d54e7cc6 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 12:07:03 -0400 Subject: [PATCH 02/22] Fixes #7446: Fix exception when viewing a large number of child IPs within a prefix --- docs/release-notes/version-3.0.md | 1 + netbox/utilities/tables.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 1e718a226..6b72482e2 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -5,6 +5,7 @@ ### Bug Fixes * [#7442](https://github.com/netbox-community/netbox/issues/7442) - Fix missing actions column on user-configured tables +* [#7446](https://github.com/netbox-community/netbox/issues/7446) - Fix exception when viewing a large number of child IPs within a prefix --- diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index d37f24543..42c9ffb56 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -130,7 +130,7 @@ class BaseTable(tables.Table): prefixes/IP addresses/etc., where some table rows may represent available address space. """ if not hasattr(self, '_objects_count'): - self._objects_count = sum(1 for obj in self.data if getattr(obj, 'pk')) + self._objects_count = sum(1 for obj in self.data if hasattr(obj, 'pk')) return self._objects_count From 087a018fafbfbe2a619bf85e4c1642c87afcd78d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 12:08:07 -0400 Subject: [PATCH 03/22] Fix changelog for v3.0.5 --- docs/release-notes/version-3.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 6b72482e2..d2739251e 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -17,7 +17,6 @@ * [#6423](https://github.com/netbox-community/netbox/issues/6423) - Cache rendered REST API specifications * [#6708](https://github.com/netbox-community/netbox/issues/6708) - Add image attachment support for circuits, power panels * [#7387](https://github.com/netbox-community/netbox/issues/7387) - Enable arbitrary ordering of custom scripts -* [#7427](https://github.com/netbox-community/netbox/issues/7427) - Don't select hidden rows when selecting all in a table ### Bug Fixes @@ -32,6 +31,7 @@ * [#7412](https://github.com/netbox-community/netbox/issues/7412) - Fix exception in UI when adding child device to device bay * [#7417](https://github.com/netbox-community/netbox/issues/7417) - Prevent exception when filtering objects list by invalid tag * [#7425](https://github.com/netbox-community/netbox/issues/7425) - Housekeeping command should honor zero verbosity +* [#7427](https://github.com/netbox-community/netbox/issues/7427) - Don't select hidden rows when selecting all in a table --- From 548a8c3be3e391786a98b990b21966bc5a3e2713 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 14:01:24 -0400 Subject: [PATCH 04/22] #7449: Fix login banner color --- netbox/project-static/dist/netbox-dark.css | Bin 807537 -> 788119 bytes netbox/project-static/dist/netbox-light.css | Bin 502362 -> 493144 bytes netbox/project-static/dist/netbox-print.css | Bin 1658484 -> 1622142 bytes netbox/project-static/styles/netbox.scss | 10 ---------- 4 files changed, 10 deletions(-) diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index 7104afe1cd0acd9d1528247471a7f000c350b6e5..96b20717171467706e52f9db1db1850b8116e52a 100644 GIT binary patch delta 1130 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 delta 5829 zcmZ`-e`wWJ6vw^2`%qZ!ZEt%jH8(7h=5%f9{KYiZLMw5)KSYz-bDL{8x4F%1NU>lj zg^31v%gUr62*vzSeW@rLmSke6C}@Sr2C@Wo{g7g&cFwuy{&?T_{r)q~z4voI=brPq z@1FbJ#qC8upD*g`AJd=JAL-BjG`f1|=~P>DSI>0%Th`gtx*^roTiiKKP57p}H>BFy zf|sV#nzwW)x+Sv0rR;8Q>}YQaAhintw04n+zq%T2jL1X7(L`3~H2KMJv_L2~Wiu*% zExIsLCbh zw={PZ2L$024m0#u^r?tEcPpBQX`Q_l&DUv>&8U)p{Aoc!*Zb3=xxk2kWv2SkXk}!P zTcEDyCO;8Q1@PcB)AZiK#E;+0OuV8Do|!6Rz$ClJig<-js>a?_d(eJqUU|!#zllO`%Q*2EP+S&y zRsJ2cwl}r5bOf>R3iFiY#0tIdbC9QIROC_a`^Jle7M*Oyrl!UcUQS$;rXT3e*7gkL zX)d4uG|vSnO^B6|C9d*#Uf_)S%E7Y%Y`nsJo06h2l6HB}dUsDCAxwuc!V*)Sn&elz zr7M+j8PQw-8O?L;1|AdzUS5${9g#<;h`4yPyd1VA>xxC8E;ZOm^)r@)?kQn(!8~6@ zkhrV@7(#;58m9nM9V%vZCB;m;M~MmN!qr)|qZcnM9n-xNb z^I>$j=FTU*yVCtVY0a{ODc3-L={Dri)LCR*^Jyj3y~jIi2~%iTV+vT zvtnM(Tthck(KXDsK(IBiV}bva!Yx*&jzgL>dO9F?y~L?+d_p9=OAE!a^wW=bZmc(MEHYIBZMPCQ=DI;js&4uEXH6a`yz7BuH_%|038bV~`>}f4F$b!B z0Rz>%=m=z$RcI@x9M}cz`a-X0j>xrJMV`L?Q(Hy8tE(Avkg}J=7WPoTWJw5n_1iIf zywhhqSWWV9)HGxE7~9Vtg?Q3nHK|1edjh{JH*Z4_ypHk&>$mY$3nW|7sZ4LbhM6K< z*1fLIB8H`b!%h?WFj9$HcNoWposJ_8(i~}mGXPJ$ITnv{bi^}bcaybm>R1AmQpx9! zb5tZZM@4x2CA`CLiDx3Rey?rfBYW&k54LXNsrRAfC*H-51n7(=j&H%RCT`X^L!g2d zgfWAfIH9e=XoMm8-+4(d?-F$Emk z?3@r}_n?vlNzv99FOFrypm{z(Hc78<$n1?f1MS8B;8h?T^WMm9^r~^woqgDOKKyQ; z4}|WyX3+eEqabcq$LyT0PHs1@8#h*$+?>W>#$1Huf9N9UoX43%)oYh&*#gDTELjXo+Z|{H~FR z!qnX}yHh`2N!0cSYsc>He$0yLq*z&SGcUZ{XiUHGs05D-gJwY~2-^JcGGh)xZr_YG zZmcZ99A(Xz%K&a%2En2d!V%Ss-9SfjO(0Ycx;?=hWzCq~;NKku-Xn<^TqTvov3PaB zHyZvsBkY1VYrOBx$r#)q$RztF#^~F$ePYaf{gchmOOrHIKgrMBZ;@m(a()pb>DzQi zu|Ys3>^zOGQ|SH)>k5BoOlQ`u75a|@nWHjte|N(omu0J0TpLkt#r*qTaAO) x6qBS)T`V;+DA6-r>;VW~bLr;Ih^>mqisD#awK@!$F7{vquW_E+Dq?5r{|68Fc2@uZ diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index b8157e2e35342939d763b560e3e7902966355a1d..8d5faa8a80812c9cc852de1146d2f1e9bbba2dc2 100644 GIT binary patch delta 1926 zcmY+EU2GIp6vtE8c6Vm`HQhTin<9xu6pg!W>4P7%#)d>n3?`^N)I{2brip2cHj$S2 z6_zm3M6{JC90`3eAUqh;-A3$5fJUDPA~9g$#ZZ(dp=_ifr5cUm|9(xoPxCu-e&>Jh z?%bKhiNXI01BIw6S{1F15>a(j6D6Zm}OqpeA=mbTAk zS`HS3OM8-@Bde#V1meYOnWDq~d}hg^Pf}izNAG6#Ip1y(OAa4Ri=Q376o^TO{%Az+ z>H}gQw6s^lCv&3Tp~qI-;=9y*DbkgwUe4Z z&9DSL46@PtSNVFM5_A`Y?m{zu&{&;++u)6CjGNZQIMEv8(nfH9VK%f>hR zB@^(~3$dEm5o7PG67g7E`u9zLgL>j$to7XKU4F*Z_tzA#vwrehNYbIac!UZ?KgpXMcd zQ6W*CwAZfrkGmT0n~(9r-5B4k3XDJt58}-p%+#zv1@1=O6 zJHVlmNJn1^1eLmjoTi2DAkVmmhpXD_`)pg0YJ*Ih9~-hkTpF=R(|hfZA~giEnH?Y7 zwj$LA>2{jF83~@|J)Z|Sn`#Tsera_@N(Vv5%b23`#Xx)(=G66ISD0tqFg^b1l-!fj zE}zw!yebWVHw`_!Y0}^wbFn;dQ_J$IWPn}o#-i@YtLg#ldgXg@MAK-f4{B?>S52ro zsSm_=(jjboJ6w7%36N0rI}8HXoZLY!Kq|G3et zsuJrvFsy8lO}x3eB2ksf0olZ7UPK}z5ocHBzCC1y7{P1xO};oH*Tq-Qq4M6aUA>mu z8t@rKg`cMy?pWy4w&P(7rNJgMv2v=!~KWDm$l9v$1T#4DLXkaRWXUu zOw#C#b#~8GI4EuUg>!La?uym(S1NRrHZpnLI;raw4odALsIVoQ;8)5a&X)YFLw delta 13172 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 Date: Tue, 5 Oct 2021 14:03:14 -0400 Subject: [PATCH 05/22] #7449: Remove color from panel headers on home view --- netbox/templates/home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/templates/home.html b/netbox/templates/home.html index a2b09c8ae..8dc5ab4f9 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -30,7 +30,7 @@ {% for section, items, icon in stats %}
-
+
{{ section }}
@@ -67,7 +67,7 @@
-
+
Change Log
From cf173d4f508411b6c7ebf8cd49d80d0e18716d7d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 14:16:19 -0400 Subject: [PATCH 06/22] #7449: Remove color from table header links --- netbox/project-static/dist/netbox-dark.css | Bin 788119 -> 788253 bytes netbox/project-static/dist/netbox-light.css | Bin 493144 -> 493213 bytes netbox/project-static/dist/netbox-print.css | Bin 1622142 -> 1622441 bytes netbox/project-static/styles/netbox.scss | 24 ++++++++++++++------ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index 96b20717171467706e52f9db1db1850b8116e52a..c02d104c2718266bbe9ca2423f54035bf6099ea8 100644 GIT binary patch delta 108 zcmbQ~vDZOE!nlA(||*-=~>B+1E`IKAOEo7&{H(qKOO_SmW1-iz delta 77 zcmbQ+XE43jprM7ag{g(Pg{6hHg{_6Xg`5kJ_Ev5%d;bsG}{YzNI frwg3s)&U8yPLH0!UAsMHD)$ej?Kfv|yW{}?;ny08 diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index 8308861bd44b6b0015ed571f73051c4503bce7a8..542f27bad53883838fccb0890e020210a1ac113e 100644 GIT binary patch delta 95 zcmcc7BR98KuAzmog{g(Pg{6hHg>4J_21}-rlxuRZm{HOn7>^D>MIgPb>B`#_3-z*`v0vvu0oA1pxNGAY}jm delta 66 zcmV-I0KNa6jUL#H9)N@agaU*Egam{Iga)(+usH%@dy~PY6bOBEVPb4$AYqq~Wdj$N YY+VNmmy_Dz?HzbS46 zq6Kb=TMH|cWGE!+WR&FQD3l~7<)i}nV1+CoahP%Jj2U2E5J9NH>=Hl~RvGzasYTVv u`8oMTR?0?(My5uV*3%EVOK40N$dq8;ZgX2aiG8}yE%A5T=ROjDcozU4P*Fnw delta 126 zcmZ44ocymLxuJ!zg{g(Pg{6hHg{_6Xg`_D#mb$p;0Lrx%1vumPEdy(-fiZi)k$)7LZch)rK`Q(SU-;Vp54=@)N_8%`JZ ek}#eA;GsC{^qY^w-)}FwEuO-@{p4fu2X_I>7%%St diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index 87a277639..bd081f569 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -190,16 +190,21 @@ div#advanced-search-content div.card div.card-body div.col:not(:last-child) { } table { - a { - text-decoration: none; - &:hover { - text-decoration: underline; + td { + a { + text-decoration: none; + &:hover { + text-decoration: underline; + } } } - &.table > :not(caption) > * > * { - padding-right: $table-cell-padding-x-sm !important; - padding-left: $table-cell-padding-x-sm !important; + th { + a, a:hover { + color: $body-color; + text-decoration: none; + } } + td, th { font-size: $font-size-sm; @@ -224,6 +229,11 @@ table { } } + &.table > :not(caption) > * > * { + padding-right: $table-cell-padding-x-sm !important; + padding-left: $table-cell-padding-x-sm !important; + } + &.object-list { th { font-size: $font-size-xs; From 854a12982f1a20cf3966d76257ed345e53933c26 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 14:36:33 -0400 Subject: [PATCH 07/22] #7449: Lighten dropdown widget caret color --- netbox/project-static/dist/netbox-dark.css | Bin 788253 -> 788267 bytes netbox/project-static/dist/netbox-light.css | Bin 493213 -> 493227 bytes netbox/project-static/dist/netbox-print.css | Bin 1622441 -> 1622455 bytes netbox/project-static/styles/select.scss | 1 + 4 files changed, 1 insertion(+) diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index c02d104c2718266bbe9ca2423f54035bf6099ea8..0e870b682ca34ecaabd7a9c46372579cfd37f2a7 100644 GIT binary patch delta 53 zcmbQ+XRx}@prM7ag{g(Pg{6hHg{_6Xg<}indrwB|>3$QK4W~bFGgYQPaO0G2xAEcxVy^8rUfl2Z F007F}5(@wT diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index 542f27bad53883838fccb0890e020210a1ac113e..a15ed074d9a53f384698d825053dbfd94efd9a17 100644 GIT binary patch delta 36 scmbQ+E4R8=uAzmog{g(Pg=GtC@D@hv>8Izg>a-VaVclM|g-!bs0Q;&9_5c6? delta 29 lcmZ48D>t`SuAzmog{g(Pg=GtC@Rs((Ev(xUx3GC#0syF$3y1&! diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index 6e6222695d98ef84268b5f99a5c19af3c56dba42..967361fe60f04c459fd8021cf24dfa9c3cf8abfa 100644 GIT binary patch delta 80 zcmZ44oV>j`xuJ!zg{g(Pg{6hHg{_6Xg`4_z5BJC$)gn<}DivqD25Q}d=5hL+11pr;29XC*xuJ!zg{g(Pg{6hHg{_6Xg` Date: Tue, 5 Oct 2021 14:52:10 -0400 Subject: [PATCH 08/22] #7449: Use original primary color --- netbox/project-static/dist/netbox-light.css | Bin 493227 -> 493227 bytes netbox/project-static/dist/netbox-print.css | Bin 1622455 -> 1622455 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 a15ed074d9a53f384698d825053dbfd94efd9a17..bd6c6eeb27cb3e1cae8c439b6baf2c7fc95a2763 100644 GIT binary patch delta 749 zcmZ48E4R8=ZbBuSv9Wn#lKIB^MJuEsOzWilqLkDk-Q@h7{30u5h~Q+Km4;GANoE$7 z$!PLMmS#qllP_+Pm^^=_g*0v@Mw1&?NU@q4S)?XU7ZhidnfzfD`(%?<9a3NejL=Or zGflRbzHu$1^kltNY?EbH^GrW`oKbkP*y?6Buo*^^=dborz~katy`+-7>HD9tiZ&~( z*{-mL@vNW;_5hWZn}-H&(FK(+fSAg{N=$$S678|0yG9yWCU8 z?Q&0jZ(~0EvI`lF)OnfS{f&sT5KXY?~kJwu5*?WV{%+bdJ(pnZAC$dMi<@GA5b_^yHnVOkYI?Dm=_L$ zFZ2*7o1wU~Biac3sswqZ;nkoE>9Wm5NTMJXNT53|f80Iq^L*Y1-q%T5PSSciBtpHB zzL&kZkq;Rdv)qG^UF53luy10oi`G5w3)z^=(! z;B3%pb$^3qSO32dJELW){|&2A&2bhB$}fWg$wO9y)F&oXF2`0{kvL>tHC$xZ4ELPV z{EEsPuz$am!-P(d|G{-EabdYCP=Wq(VL%l4V~k`(EusaULf95&!YFcO6vgw`6>gwM LZ&vT4y0_^BU@5ov diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index 967361fe60f04c459fd8021cf24dfa9c3cf8abfa..58aa363d3962c649ff273fd6ec4e79997d0b836b 100644 GIT binary patch delta 1017 zcmaKqUr19?9LG8Lde8oOx7poxb+?%^Ee2Wa>gMjWQUV{^gGeD!nQnIz4ViNZ84(&5 zdnjTN^uwrBdgxVqIpB-)!6GQbhxJDx?IC)xQ0OtMv)zd?(1#D4-|u{XzwbZw()ryTJI6tzeoD}Gsl z>Jpuc`2HXdlJ-`~uza&b;^aU~mEqP4uA0pKMHW`dw~&kb`h99Zf$(GI5Y({@Ppm9+ zp2fa=HHl*;fSh|fhFQs80dr=?2+c;u_2@KXf|FLpkc;G0o1UStloAR@+Vps-d%td9 z7maop>%$&Mh&o$t)wl1sw$^bC^u)1_9P7tzJEMlyfXM^teyoEZ1K2?_S8zAGZ=bRW z;}KX-U^h^$9p2GWG8M-USuTHdSVnqB?i@V?uVNn3n8A>EYBb~=VltA%0xBpw*6=Cl zxrPlec^$i;Y61(88P>vJDm08KI*OiRpcqML*z_gKd3zfaKWu&HZBo=9Yv}bBJ(DU& z8)FJ|ohg0Jd6oLG50;zk5~&K6{#^R67;D9_5HXj-n3J!B%w7H<8Flja(XPzSdetaQ zjq(*hcPb%0X>QJ`T`<$hpU_r`5MS%eyNVTA(X0-=orf7cES;@?t(r(U4*$ z^DfJ4sqp#9J;h=}oc4#&ZHq)QLCd+%g_#XG%Bo?Lw_?&_v;LYbWKq^yOD?~%zG>N& zxl`@BGRgtct`k<@V$C0!c8hidn^^%vC@b73=pU$JZ7%t&U;@wuu?C)e6h!j=gW%hl z$AXF+knXYZgKV@L_CRa2fcm>-^tHP|8o2bv@!Sr$N!BN|B2b0Zit}!$@np|pji-j&6 z{%V!z-4?nN!j0BGF}W2Lz(j*tnmuq))kV?Fu-;;tsQf0vn?i!S58nYkY# zOnT<6k!>$_a-)MnA|<%Mz(k&ju|6Sa__9z83%^7Yx~~ZnQ`bchp@%{tGvwH4GCm|U zE{$7bYVs&PpwS5bLreX*IKeXHBvew~FL$WbVkFq}5%9 zja=_$aTiik-g=A`$sndr$|H^%h|4lOKBKRkc$(u!bwt|O2uTz3LEV>Xlm(kMsjbFK z^FiOsVqA#ooe%1KlHucoFGQKBuYDQwqxz|fGCzcMX$y+^?VnFjR+%4${l?CvvoGvd zG3U>8Q%SPTm9N=GZ7#L?nr0jPMGW7Ulne1CHG=!$KqPCYoC$TzUy4WXRUs|DQ#B0B y<$-dl_@Hic+}j`6i_TSL!ThW|$+Z=w@oTng0<^YLaA4R8nd>NwQpbtH&cr_^Wa>8n diff --git a/netbox/project-static/styles/theme-light.scss b/netbox/project-static/styles/theme-light.scss index d4b9303bd..c14f7f314 100644 --- a/netbox/project-static/styles/theme-light.scss +++ b/netbox/project-static/styles/theme-light.scss @@ -7,6 +7,7 @@ $input-border-color: $gray-200; $theme-colors: map-merge( $theme-colors, ( + 'primary': #337ab7, 'red': $red-500, 'yellow': $yellow-500, 'green': $green-500, From 26e470f521b5491bd4c0d7a0d16da677a01c49c3 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 14:57:35 -0400 Subject: [PATCH 09/22] #7449: Use lighter color for top-level nav menu items --- netbox/project-static/dist/netbox-dark.css | Bin 788267 -> 788267 bytes netbox/project-static/dist/netbox-light.css | Bin 493227 -> 493227 bytes netbox/project-static/dist/netbox-print.css | Bin 1622455 -> 1622455 bytes netbox/project-static/styles/variables.scss | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index 0e870b682ca34ecaabd7a9c46372579cfd37f2a7..48745de125ca9d55e5264e8424d5c1a17c8fba0d 100644 GIT binary patch delta 70 zcmZ48XRx}@prM7ag{g(Pg{6hHg{_6Xg<}inrYY>kCdP>-2G-NhR&z>jzchujn|Zp# Z3{KJMx2rk1+iPcV0x{S2+8NyI@&Igr8I%A3 delta 67 zcmZ48XRx}@prM7ag{g(Pg{6hHg{_6Xg<}inrYX}+rg92Szh2GBzx~n_&Ti)ERns_m Xr(dq-6mGAb!3o4%+iPcVuge1fQF|H1 diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index bd6c6eeb27cb3e1cae8c439b6baf2c7fc95a2763..6ca1d7884d19cf22c2390e609cc385b786f53998 100644 GIT binary patch delta 50 zcmV-20L}lajUKCw9)N@agaU*Egaot&Ufh=%+yxbv{NDu*w}IRRW&@W~*#!}Y_}>M$ I_}>PzrU;4_5C8xG delta 54 zcmZ48E4R8=uAzmog{g(Pg=GtC+#NO}LnBio%js|Lv&wF7yu+Ht%$8=6W|@}Q4iwq` J_CDLbWdJ6}70Uns diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index 58aa363d3962c649ff273fd6ec4e79997d0b836b..a159c81ec9a89b19b6db58d0ced00165e28fdcbe 100644 GIT binary patch delta 90 zcmdnqoV>j`xuJ!zg{g(Pg{6hHg{_6Xg`j`xuJ!zg{g(Pg{6hHg{_6Xg` Date: Tue, 5 Oct 2021 15:21:49 -0400 Subject: [PATCH 10/22] #7450: Misc UI cleanup --- netbox/templates/generic/object_list.html | 4 +++- netbox/templates/inc/table_controls.html | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index db41151ee..61e799eee 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -4,6 +4,8 @@ {% load render_table from django_tables2 %} {% load static %} +{% block title %}{{ content_type.model_class|meta:"verbose_name_plural"|bettertitle }}{% endblock %} + {% block controls %}
@@ -26,7 +28,7 @@ {% block tab_items %} diff --git a/netbox/templates/inc/table_controls.html b/netbox/templates/inc/table_controls.html index a7a7ebfb5..d6bd60077 100644 --- a/netbox/templates/inc/table_controls.html +++ b/netbox/templates/inc/table_controls.html @@ -4,8 +4,8 @@
From 9089f5cf670c5a85966c844f2cf20fcbf7e68a41 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 15:37:49 -0400 Subject: [PATCH 11/22] #7450: Clean up object edit forms --- .../circuits/circuittermination_edit.html | 5 +- netbox/templates/dcim/cable_connect.html | 10 +- netbox/templates/dcim/device_edit.html | 153 +++++++++--------- netbox/templates/dcim/inc/cable_form.html | 1 - netbox/templates/dcim/interface_edit.html | 8 +- netbox/templates/dcim/rack_edit.html | 26 ++- netbox/templates/dcim/virtualchassis_add.html | 8 +- .../templates/dcim/virtualchassis_edit.html | 6 +- netbox/templates/generic/object_edit.html | 38 ++--- netbox/templates/ipam/ipaddress_bulk_add.html | 8 +- netbox/templates/ipam/ipaddress_edit.html | 14 +- netbox/templates/ipam/service_edit.html | 3 +- netbox/templates/ipam/vlan_edit.html | 11 +- .../virtualization/vminterface_edit.html | 8 +- 14 files changed, 129 insertions(+), 170 deletions(-) diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 76ef4a5d2..9ba41216d 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -5,7 +5,7 @@ {% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %} {% block form %} -
+
Circuit Termination
@@ -53,9 +53,8 @@
{% endwith %}
-
-
+
Termination Details
diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 83891bc21..03dcaa2e4 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -17,9 +17,7 @@
-
- A Side -
+
A Side
{% if termination_a.device %} {# Device component #} @@ -100,9 +98,7 @@
-
- B Side -
+
B Side
{% if tabs %}
    @@ -154,7 +150,7 @@
    -
    Cable
    +
    Cable
    {% include 'dcim/inc/cable_form.html' %}
    diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index ab754a74f..fbafa197d 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -4,111 +4,104 @@ {% block form %} {% render_errors form %} -
    -
    -
    Device
    -
    - {% render_field form.name %} - {% render_field form.device_role %} - {% render_field form.tags %} +
    +
    +
    Device
    +
    + {% render_field form.name %} + {% render_field form.device_role %} + {% render_field form.tags %}
    -
    -
    -
    -
    Hardware
    -
    - {% render_field form.manufacturer %} - {% render_field form.device_type %} - {% render_field form.serial %} - {% render_field form.asset_tag %} +
    +
    +
    Hardware
    +
    + {% render_field form.manufacturer %} + {% render_field form.device_type %} + {% render_field form.serial %} + {% render_field form.asset_tag %}
    -
    -
    -
    -
    Location
    +
    +
    +
    Location
    +
    + {% render_field form.region %} + {% render_field form.site_group %} + {% render_field form.site %} + {% render_field form.location %} + {% render_field form.rack %} + + {% if obj.device_type.is_child_device and obj.parent_bay %} +
    + +
    + +
    - {% render_field form.region %} - {% render_field form.site_group %} - {% render_field form.site %} - {% render_field form.location %} - {% render_field form.rack %} - - {% if obj.device_type.is_child_device and obj.parent_bay %} -
    - -
    - -
    +
    + +
    +
    + + +  Remove +
    -
    - -
    -
    - - -  Remove - -
    -
    - {% else %} - {% render_field form.face %} - {% render_field form.position %} - {% endif %} +
    + {% else %} + {% render_field form.face %} + {% render_field form.position %} + {% endif %}
    -
    -
    -
    -
    Management
    -
    - {% render_field form.status %} - {% render_field form.platform %} - {% if obj.pk %} - {% render_field form.primary_ip4 %} - {% render_field form.primary_ip6 %} - {% endif %} +
    +
    +
    Management
    +
    + {% render_field form.status %} + {% render_field form.platform %} + {% if obj.pk %} + {% render_field form.primary_ip4 %} + {% render_field form.primary_ip6 %} + {% endif %}
    -
    -
    -
    -
    Virtualization
    -
    - {% render_field form.cluster_group %} - {% render_field form.cluster %} +
    +
    +
    Virtualization
    +
    + {% render_field form.cluster_group %} + {% render_field form.cluster %}
    -
    -
    -
    -
    Tenancy
    -
    - {% render_field form.tenant_group %} - {% render_field form.tenant %} +
    +
    +
    Tenancy
    +
    + {% render_field form.tenant_group %} + {% render_field form.tenant %}
    -
    {% if form.custom_fields %} -
    +
    Custom Fields
    {% render_custom_fields form %}
    -
    {% endif %} -
    -
    Local Config Context Data
    - {% render_field form.local_context_data %} +
    +
    Local Config Context Data
    + {% render_field form.local_context_data %}
    -
    -
    - {% render_field form.comments label='Comments' %} +
    +
    Comments
    + {% render_field form.comments %}
    {% endblock %} diff --git a/netbox/templates/dcim/inc/cable_form.html b/netbox/templates/dcim/inc/cable_form.html index f1baeb756..05929821c 100644 --- a/netbox/templates/dcim/inc/cable_form.html +++ b/netbox/templates/dcim/inc/cable_form.html @@ -16,7 +16,6 @@
    {% render_field form.tags %} {% if form.custom_fields %} -
    Custom Fields
    diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html index 64cd8407e..38b22fe5e 100644 --- a/netbox/templates/dcim/interface_edit.html +++ b/netbox/templates/dcim/interface_edit.html @@ -2,7 +2,7 @@ {% load form_helpers %} {% block form %} -
    +
    Interface
    @@ -27,9 +27,8 @@ {% render_field form.mgmt_only %} {% render_field form.mark_connected %}
    -
    -
    +
    802.1Q Switching
    @@ -40,8 +39,7 @@
    {% if form.custom_fields %} -
    -
    +
    Custom Fields
    diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html index 64e366ea7..ca97be34d 100644 --- a/netbox/templates/dcim/rack_edit.html +++ b/netbox/templates/dcim/rack_edit.html @@ -2,7 +2,7 @@ {% load form_helpers %} {% block form %} -
    +
    Rack
    @@ -15,9 +15,8 @@ {% render_field form.role %} {% render_field form.tags %}
    -
    -
    +
    Inventory Control
    @@ -25,18 +24,16 @@ {% render_field form.serial %} {% render_field form.asset_tag %}
    -
    -
    +
    Tenancy
    {% render_field form.tenant_group %} {% render_field form.tenant %}
    -
    -
    +
    Dimensions
    @@ -45,34 +42,33 @@ {% render_field form.u_height %}
    -
    +
    {{ form.outer_width }}
    Width
    -
    +
    {{ form.outer_depth }}
    Depth
    -
    +
    {{ form.outer_unit }}
    Unit
    {% render_field form.desc_units %}
    -
    {% if form.custom_fields %} -
    +
    Custom Fields
    {% render_custom_fields form %}
    -
    {% endif %} -
    - {% render_field form.comments label='Comments' %} +
    +
    Comments
    + {% render_field form.comments %}
    {% endblock %} diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html index 1ff0cd8bd..3c0b10826 100644 --- a/netbox/templates/dcim/virtualchassis_add.html +++ b/netbox/templates/dcim/virtualchassis_add.html @@ -2,7 +2,7 @@ {% load form_helpers %} {% block form %} -
    +
    Virtual Chassis
    @@ -10,9 +10,8 @@ {% render_field form.domain %} {% render_field form.tags %}
    -
    -
    +
    Member Devices
    @@ -25,8 +24,7 @@
    {% if form.custom_fields %} -
    -
    +
    Custom Fields
    diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html index c994f05dc..a37ff102a 100644 --- a/netbox/templates/dcim/virtualchassis_edit.html +++ b/netbox/templates/dcim/virtualchassis_edit.html @@ -11,7 +11,7 @@ {% csrf_token %} {{ pk_form.pk }} {{ formset.management_form }} -
    +
    Virtual Chassis
    @@ -20,16 +20,14 @@ {% render_field vc_form.master %} {% render_field vc_form.tags %}
    -
    {% if vc_form.custom_fields %} -
    +
    Custom Fields
    {% render_custom_fields vc_form %}
    -
    {% endif %}
    diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index bd3f6059b..c7b4c8a8b 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -6,18 +6,6 @@ {% if obj.pk %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %} {% endblock title %} -{% block controls %} - {% if obj and settings.DOCS_ROOT %} -
    -
    - - Help - -
    -
    - {% endif %} -{% endblock controls %} - {% block tabs %}