NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-26 23:27:46 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merged v2.5.13

Browse Source
This commit is contained in:
Jeremy Stretch
2019-05-31 21:37:41 -04:00
parent ab07f721cf f9dba8a75c
commit 3bb3b85fa2
40 changed files with 801 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@
</h4>
<p><span class="label label-{% if cable.status %}success{% else %}info{% endif %}">{{ cable.get_status_display }}</span></p>
<p>{{ cable.get_type_display|default:"" }}</p>
{% if cable.length %}- {{ cable.length }}{{ cable.get_length_unit_display }}{% endif %}
{% if cable.length %}{{ cable.length }} {{ cable.get_length_unit_display }}{% endif %}
<span class="label color-block center-block" style="background-color: #{{ cable.color }}">&nbsp;</span>
{% else %}
<h4 class="text-muted">No Cable</h4>

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

@@ -12,7 +12,7 @@
<h1>{% block title %}Sites{% endblock %}</h1>
<div class="row">
<div class="col-md-9">
{% include 'utilities/obj_table.html' with bulk_edit_url='dcim:site_bulk_edit' %}
{% include 'utilities/obj_table.html' with bulk_edit_url='dcim:site_bulk_edit' bulk_delete_url='dcim:site_bulk_delete' %}
</div>
<div class="col-md-3 noprint">
{% include 'inc/search_panel.html' %}

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

@@ -435,7 +435,12 @@
</ul>
</li>
{% else %}
<li><a href="{% url 'login' %}?next={{ request.path }}"><i class="fa fa-sign-in"></i> Log in</a></li>
{% url 'login' as login_url %}
{% if request.path == login_url %}
<li><a href="{{ request.get_full_path }}"><i class="fa fa-sign-in"></i> Log in</a></li>
{% else %}
<li><a href="{{ login_url }}?next={{ request.get_full_path | urlencode }}"><i class="fa fa-sign-in"></i> Log in</a></li>
{% endif %}
{% endif %}
</ul>
<form action="{% url 'search' %}" method="get" class="navbar-form navbar-right" id="navbar_search" role="search">

1
netbox/templates/login.html
View File

@@ -25,6 +25,7 @@
<div class="panel-body">
{% csrf_token %}
{% if 'next' in request.GET %}<input type="hidden" name="next" value="{{ request.GET.next }}" />{% endif %}
{% if 'next' in request.POST %}<input type="hidden" name="next" value="{{ request.POST.next }}" />{% endif %}
{% render_form form %}
</div>
<div class="panel-footer text-right">