mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

Browse Source 
# Conflicts:
#	netbox/dcim/tables/template_code.py
#	netbox/netbox/forms.py
#	netbox/templates/dcim/cable_connect.html
#	netbox/templates/dcim/consoleport.html
#	netbox/templates/dcim/consoleserverport.html
#	netbox/templates/dcim/device.html
#	netbox/templates/dcim/device/base.html
#	netbox/templates/dcim/device_edit.html
#	netbox/templates/dcim/interface.html
#	netbox/templates/dcim/rack.html
#	netbox/templates/dcim/rack_edit.html
#	netbox/templates/dcim/site.html
#	netbox/templates/extras/configcontext.html
#	netbox/templates/extras/objectchange.html
#	netbox/templates/generic/object.html
#	netbox/templates/inc/nav_menu.html
#	netbox/templates/ipam/ipaddress_edit.html
#	netbox/templates/ipam/vrf.html
#	netbox/utilities/templates/buttons/export.html
This commit is contained in:
checktheroads
2021-03-17 22:02:43 -07:00
parent 05c0a9256d 9a68a61ad3
commit 7a3af8de83
197 changed files with 6374 additions and 2288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/templates/extras/configcontext_edit.html
View File

@@ -15,6 +15,7 @@
<h5 class="card-header">Assignment</h5>
<div class="card-body">
{% render_field form.regions %}
{% render_field form.site_groups %}
{% render_field form.sites %}
{% render_field form.roles %}
{% render_field form.platforms %}

32
netbox/templates/extras/object_journal.html Normal file
View File

@@ -0,0 +1,32 @@
{% extends base_template %}
{% load form_helpers %}
{% block title %}{{ block.super }} - Journal{% endblock %}
{% block content %}
{% if perms.extras.add_journalentry %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>New Journal Entry</strong>
</div>
<form action="{% url 'extras:journalentry_add' %}" method="post" enctype="multipart/form-data" class="form form-horizontal">
{% csrf_token %}
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}
<div class="row panel-body">
<div class="col-md-10">
{% render_field form.kind %}
{% render_field form.comments %}
</div>
<div class="col-md-9 col-md-offset-3">
<button type="submit" class="btn btn-primary">Save</button>
<a href="{{ object.get_absolute_url }}" class="btn btn-default">Cancel</a>
</div>
</div>
</form>
</div>
{% endif %}
{% include 'panel_table.html' %}
{% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
{% endblock %}

36
netbox/templates/extras/objectchange.html
View File

@@ -86,8 +86,8 @@
</div>
</div>
<div class="card">
<h5 class="card-header">
Difference
<div class="card-header">
<h5>Difference</h5>
<div class="btn-group btn-group-xs pull-right noprint">
<a {% if prev_change %}href="{% url 'extras:objectchange' pk=prev_change.pk %}"{% else %}disabled{% endif %} class="btn btn-default">
<span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous
@@ -96,7 +96,7 @@
Next <span class="mdi mdi-chevron-right" aria-hidden="true"></span>
</a>
</div>
</h5>
</div>
<div class="card-body">
{% if diff_added == diff_removed %}
<span class="text-muted" style="margin-left: 10px;">
@@ -115,17 +115,41 @@
</div>
</div>
</div>
<div class="col-md-7">
<div class="col-md-6">
<div class="card">
<h5 class="card-header">
Object Data
Pre-Change Data
</h5>
<div class="card-body">
<pre>{{ object.object_data|render_json }}</pre>
{% if object.prechange_data %}
<pre>{% for k, v in object.prechange_data.items %}{% spaceless %}
<span{% if k in diff_removed %} style="background-color: #ffdce0"{% endif %}>{{ k }}: {{ v|render_json }}</span>
{% endspaceless %}{% endfor %}
</pre>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="card">
<h5 class="card-header">
Post-Change Data
</h5>
<div class="card-body">
{% if object.postchange_data %}
<pre>{% for k, v in object.postchange_data.items %}{% spaceless %}
<span{% if k in diff_added %} style="background-color: #cdffd8"{% endif %}>{{ k }}: {{ v|render_json }}</span>
{% endspaceless %}{% endfor %}
</pre>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
{% include 'panel_table.html' with table=related_changes_table heading='Related Changes' panel_class='default' %}