From 81e1b7490eb3dc4fe92999d28e4fde9529132cac Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 29 Jul 2021 13:48:06 -0400 Subject: [PATCH 1/3] #6834: Add title, favicon to GraphiQL view --- netbox/netbox/graphql/views.py | 2 + netbox/project-static/img/graphql.ico | Bin 0 -> 1235 bytes netbox/templates/graphiql.html | 59 ++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 netbox/project-static/img/graphql.ico create mode 100644 netbox/templates/graphiql.html diff --git a/netbox/netbox/graphql/views.py b/netbox/netbox/graphql/views.py index 18ed3843d..c2c0269fa 100644 --- a/netbox/netbox/graphql/views.py +++ b/netbox/netbox/graphql/views.py @@ -12,6 +12,8 @@ class GraphQLView(GraphQLView_): """ Extends graphene_django's GraphQLView to support DRF's token-based authentication. """ + graphiql_template = 'graphiql.html' + def dispatch(self, request, *args, **kwargs): # Enforce GRAPHQL_ENABLED diff --git a/netbox/project-static/img/graphql.ico b/netbox/project-static/img/graphql.ico new file mode 100644 index 0000000000000000000000000000000000000000..4940291a2ef32ce404e25132b143d04d73e815ad GIT binary patch literal 1235 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G|oWRD45dJguM!v-tY$DUh!@P+6=(yLU`z6LcLCBs@Y8vBJ&@uo z@Q5r1(g|SvA=~LZ0|WC_PZ!6KjC*fyMt6j!im-pU@3VM?MVr(wC6~P&Wixf;TjZEE zb-6O-*tJe@?Dh|F3Dm!;GBfa6GwbI?SG`3f*wPXOQ*AjWwSJxOq(o6|>!#NgmbNw7 z#>;Jg&zZUR`5c+Ve;*E>iF*Be{nl^)^s?6HPsYJGSM-4Mq%9xk^Oxcv2X#LoS zeQu&IpIbru#diGyuKZ&bqMP<@Sb22L)^wu}ODn9Kelj!9=(cwHRy6mmw&LxEn-v24 zTXW3yGTj^I?y#PBWqyUejP8NY7LAv0w5b}V+qHe<7Q0@k%XhQjMu+9?rpGP?dIy$P z*w@G%iPd^{wY?|yxO<_>zkA)GJ1u8BUynau(eB$|sn>b6dYb0}X4bt6TTsL_bD{N*h^L-zrWCTD$4_|JyI_DiGGb|+b-m59o&8L#l~63=X?k~Tow~&`h(|m)0M z{^4P+gXupc)_c3&y(;=xO8ll!mD<1ehn@$mEvn=GG5tY#P3D#(=loV~(^+`C&~VdI7-*MvJfwaZPpCukGcM3goOmXFe=#J-GUh>-L$AfQKhxaOr z=ibM&z3(6RR3Wu{Npi8j_Q~QK!ggh?=buhi-NWeoFM9TxoMa~L;(cuewV|8j=9p|V zl3C$p!I-1-q1L#G zK489c$zglE7W2358VBTFzR0;!btkxWOYp0gPxkw=FWp-x6x~xMxhkQqAf=}HhvoCn zypuDy${$#*w0nPi(S-E}+)F*zhX3=6lrPRcxK*j7yP*EZo-(6@{wh1;7SG*QyQ7Hd zbJ!!{#j<^yPHva^yyQ`~i`GQ;rEX#Czj*GDHE+u?$Z<cK(V*d8bqgR&>6bZT2IZd(*q +{% load static %} + + + + + + + + + + + + GraphiQL | NetBox + + +
+ {% csrf_token %} + + + + From 689f67b1a80f9f031c7f697f1e20b37707d38e67 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 29 Jul 2021 15:02:52 -0400 Subject: [PATCH 2/3] #6834: Add favicon to REST API web UI --- netbox/project-static/img/rest-api.ico | Bin 0 -> 878 bytes netbox/templates/base/layout.html | 2 +- netbox/templates/rest_framework/api.html | 10 ++++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 netbox/project-static/img/rest-api.ico diff --git a/netbox/project-static/img/rest-api.ico b/netbox/project-static/img/rest-api.ico new file mode 100644 index 0000000000000000000000000000000000000000..8a9341ccbcf8a8c90375107bd9485a7331ee73fa GIT binary patch literal 878 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G|oWRD45dJguM!v-tY$DUh!@P+6=(yLU`z6LcLCBs@Y8vBJ&@uo z@Q5r1(g|SvA=~LZ0|Qfmr;B4q#=W;Q&S#4liX69>jsB3ZeT8^^h?wR--g&Mc*{^Qf zw(g(sBK5DgvKMM}nLAF2+q30HGsoU(a@FfIxbxQ9`yC474}D#6Vo6I*nOWuL&Cv$( z6{q>0sNSEx=cG5A(nJrHPxhCuAKdq=vHJk)1DycYJ_gMXyg!)MFnAv@+Hm>x1JmXM zC2B@rx12w~yx>yy$H|R{a({Ehylwr!eBd(Eq1hTH<$Dhv&?7QeOZ{Birhy7nJa zo^8<-ayWXi%q--ON|yMC+M6}5-hay*OB3X#in4z`68_P9b{<>8ZTAONs~P68^Tlod z)6T+pLvzQ=m*(B2UF(?kGarrL#{L21vPW)6yTx;$_u8f$eSIWOR zYwyf0X6QZ8Xdb9P$5VGh|CDE5c3r>sOih1(qE2OVdXV53#k+34*(wLz9PVZMMV{w% zl)ruL^M(cdLJxY66wco;m7#k@vAaeY*B8laU17OxEsSf_R@|vpEU?p;xpGu>;r;Bt z&s84op15Svt_fkEzDG=-XZYtm(X7cc(q>Q|O4h;S(3v%Xw+#?MJukj#@L? zF#mhQd@${t`BLBA=U*S5d0C^ts`}jx^Vw#99AtIF0(YNPdUa2z(?x0G3Az6a4ZlAg zW;n>f0ZfFdC9V-ADTyViR>?)FK#IZ0z{pV7z+BhJGQ`lr%GA=z&`{gJz{ - + {# API docs #} diff --git a/netbox/templates/rest_framework/api.html b/netbox/templates/rest_framework/api.html index 76f43629b..e18d38ad3 100644 --- a/netbox/templates/rest_framework/api.html +++ b/netbox/templates/rest_framework/api.html @@ -1,5 +1,11 @@ {% extends 'rest_framework/base.html' %} +{% load static %} + +{% block head %} + {{ block.super }} + +{% endblock head %} {% block branding %} - NetBox -{% endblock %} + NetBox +{% endblock branding %} From d08244285174c5514ef16ae62dcbd4d1a3c5da92 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 29 Jul 2021 15:06:09 -0400 Subject: [PATCH 3/3] Update REST API web UI title --- netbox/templates/rest_framework/api.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/rest_framework/api.html b/netbox/templates/rest_framework/api.html index e18d38ad3..36bf7a554 100644 --- a/netbox/templates/rest_framework/api.html +++ b/netbox/templates/rest_framework/api.html @@ -6,6 +6,8 @@ {% endblock head %} +{% block title %}{% if name %}{{ name }} | {% endif %}NetBox REST API{% endblock %} + {% block branding %} NetBox {% endblock branding %}