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 'develop-2.4' into 1898-activity-logging

Browse Source
This commit is contained in:
Jeremy Stretch
2018-06-21 16:53:15 -04:00
parent e1055b7f97 b945dec41b
commit 9d419de9dc
20 changed files with 294 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/templates/dcim/site.html
View File

@@ -187,6 +187,16 @@
{% endif %}
</td>
</tr>
<tr>
<td>GPS Coordinates</td>
<td>
{% if site.latitude and site.longitude %}
{{ site.latitude }}, {{ site.longitude }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
</tr>
<tr>
<td>Contact Name</td>
<td>

2
netbox/templates/dcim/site_edit.html
View File

@@ -27,6 +27,8 @@
<div class="panel-body">
{% render_field form.physical_address %}
{% render_field form.shipping_address %}
{% render_field form.latitude %}
{% render_field form.longitude %}
{% render_field form.contact_name %}
{% render_field form.contact_phone %}
{% render_field form.contact_email %}

5
netbox/templates/inc/nav_menu.html
View File

@@ -286,6 +286,11 @@
{% endif %}
<a href="{% url 'ipam:vlangroup_list' %}">VLAN Groups</a>
</li>
<li class="divider"></li>
<li class="dropdown-header">Services</li>
<li>
<a href="{% url 'ipam:service_list' %}">Services</a>
</li>
</ul>
</li>
<li class="dropdown{% if request.path|contains:'/virtualization/' %} active{% endif %}">

4
netbox/templates/ipam/inc/service.html
View File

@@ -1,5 +1,7 @@
<tr>
<td>{{ service.name }}</td>
<td>
<a href="{{ service.get_absolute_url }}">{{ service.name }}</a>
</td>
<td>
{{ service.get_protocol_display }}/{{ service.port }}
</td>

88
netbox/templates/ipam/service.html Normal file
View File

@@ -0,0 +1,88 @@
{% extends '_base.html' %}
{% load helpers %}
{% block content %}
<div class="row">
<div class="col-sm-8 col-md-9">
<ol class="breadcrumb">
<li><a href="{% url 'ipam:service_list' %}">Services</a></li>
<li><a href="{{ service.parent.get_absolute_url }}">{{ service.parent }}</a></li>
<li>{{ service }}</li>
</ol>
</div>
<div class="col-sm-4 col-md-3">
<form action="{% url 'ipam:service_list' %}" method="get">
<div class="input-group">
<input type="text" name="q" class="form-control" placeholder="Search Services" />
<span class="input-group-btn">
<button type="submit" class="btn btn-primary">
<span class="fa fa-search" aria-hidden="true"></span>
</button>
</span>
</div>
</form>
</div>
</div>
{% if perms.dcim.change_service %}
<div class="pull-right">
<a href="{% url 'ipam:service_edit' pk=service.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this service
</a>
</div>
{% endif %}
<h1>{% block title %}{{ service }}{% endblock %}</h1>
{% include 'inc/created_updated.html' with obj=service %}
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Service</strong>
</div>
<table class="table table-hover panel-body attr-table">
<tr>
<td>Name</td>
<td>{{ service.name }}</td>
</tr>
<tr>
<td>Parent</td>
<td>
<a href="{{ service.parent.get_absolute_url }}">{{ service.parent }}</a>
</td>
</tr>
<tr>
<td>Protocol</td>
<td>{{ service.get_protocol_display }}</td>
</tr>
<tr>
<td>Port</td>
<td>{{ service.port }}</td>
</tr>
<tr>
<td>IP Addresses</td>
<td>
{% for ipaddress in service.ipaddresses.all %}
<a href="{{ ipaddress.get_absolute_url }}">{{ ipaddress }}</a><br />
{% empty %}
<span class="text-muted">None</span>
{% endfor %}
</td>
</tr>
<tr>
<td>Description</td>
<td>
{% if service.description %}
{{ service.description }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
</tr>
</table>
</div>
{% with service.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
</div>
</div>
{% endblock %}

8
netbox/templates/ipam/service_edit.html
View File

@@ -32,4 +32,12 @@
{% render_field form.description %}
</div>
</div>
{% if form.custom_fields %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Custom Fields</strong></div>
<div class="panel-body">
{% render_custom_fields form %}
</div>
</div>
{% endif %}
{% endblock %}

13
netbox/templates/ipam/service_list.html Normal file
View File

@@ -0,0 +1,13 @@
{% extends '_base.html' %}
{% block content %}
<h1>{% block title %}Services{% endblock %}</h1>
<div class="row">
<div class="col-md-9">
{% include 'utilities/obj_table.html' with bulk_edit_url='ipam:service_bulk_edit' bulk_delete_url='ipam:service_bulk_delete' %}
</div>
<div class="col-md-3">
{% include 'inc/search_panel.html' %}
</div>
</div>
{% endblock %}