NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-24 16:26:09 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

8424 fix merge

Browse Source
This commit is contained in:
Arthur 2022-09-30 16:48:00 -07:00
parent 86d637be4e
commit 2e0c5a7745
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/dcim/views.py
View File

@ -1616,6 +1616,7 @@ class DeviceView(generic.ObjectView):
return { return {
'services': services, 'services': services,
'vc_members': vc_members, 'vc_members': vc_members,
'svg_extra': f'highlight=id:{instance.pk}'
} }

8
netbox/templates/dcim/device.html
View File

@ -7,7 +7,11 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<<<<<<< HEAD
<div class="col col-md-6"> <div class="col col-md-6">
=======
<div class="col col-12 col-xl-6">
>>>>>>> a504b17fd (8424 highlight device)
<div class="card"> <div class="card">
<h5 class="card-header"> <h5 class="card-header">
Device Device
@ -153,7 +157,11 @@
{% include 'inc/panels/comments.html' %} {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %} {% plugin_left_page object %}
</div> </div>
<<<<<<< HEAD
<div class="col col-md-6"> <div class="col col-md-6">
=======
<div class="col col-12 col-xl-6">
>>>>>>> a504b17fd (8424 highlight device)
<div class="card"> <div class="card">
<h5 class="card-header">Management</h5> <h5 class="card-header">Management</h5>
<div class="card-body"> <div class="card-body">