NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-01 21:36:25 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Improve prefixes description visibility

Browse Source 
CIDR notation is not that human readable so when you have a lot
of prefixes and children prefixes, descriptions are really helpful
to understand your network infrastructure.

Current displays kind of hide descriptions instead of highlighting it.
This patch tries to fix that.

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
This commit is contained in:
Sylvain Rabot 2017-05-22 12:06:14 +02:00
parent 3fa63b774e
commit 98e60502b2
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/ipam/tables.py
View File

@ -48,13 +48,23 @@ PREFIX_LINK = """
{% else %} {% else %}
<span style="padding-left: {{ record.depth }}9px"> <span style="padding-left: {{ record.depth }}9px">
{% endif %} {% endif %}
<a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a> <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% endif %}">
{% if record.description %}
{{ record.prefix }}</a> - {{ record.description }}
{% else %}
{{ record.prefix }}</a>
{% endif %}
</span> </span>
""" """
PREFIX_LINK_BRIEF = """ PREFIX_LINK_BRIEF = """
<span style="padding-left: {{ record.depth }}0px"> <span style="padding-left: {{ record.depth }}0px">
<a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a> <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% endif %}">
{% if record.description %}
{{ record.prefix }}</a> - {{ record.description }}
{% else %}
{{ record.prefix }}</a>
{% endif %}
</span> </span>
""" """
@ -247,7 +257,7 @@ class PrefixTable(BaseTable):
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = Prefix model = Prefix
fields = ('pk', 'prefix', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'description') fields = ('pk', 'prefix', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role')
row_attrs = { row_attrs = {
'class': lambda record: 'success' if not record.pk else '', 'class': lambda record: 'success' if not record.pk else '',
} }

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

@ -41,7 +41,11 @@
</a> </a>
{% endif %} {% endif %}
</div> </div>
{% if prefix.description %}
<h1>{{ prefix }} - {{ prefix.description }}</h1>
{% else %}
<h1>{{ prefix }}</h1> <h1>{{ prefix }}</h1>
{% endif %}
{% include 'inc/created_updated.html' with obj=prefix %} {% include 'inc/created_updated.html' with obj=prefix %}
<ul class="nav nav-tabs" style="margin-bottom: 20px"> <ul class="nav nav-tabs" style="margin-bottom: 20px">
<li role="presentation"{% if active_tab == 'prefix' %} class="active"{% endif %}><a href="{% url 'ipam:prefix' pk=prefix.pk %}">Prefix</a></li> <li role="presentation"{% if active_tab == 'prefix' %} class="active"{% endif %}><a href="{% url 'ipam:prefix' pk=prefix.pk %}">Prefix</a></li>

2
netbox/templates/ipam/prefix_edit.html
View File

@ -6,12 +6,12 @@
<div class="panel-heading"><strong>Prefix</strong></div> <div class="panel-heading"><strong>Prefix</strong></div>
<div class="panel-body"> <div class="panel-body">
{% render_field form.prefix %} {% render_field form.prefix %}
{% render_field form.description %}
{% render_field form.status %} {% render_field form.status %}
{% render_field form.vrf %} {% render_field form.vrf %}
{% render_field form.site %} {% render_field form.site %}
{% render_field form.vlan %} {% render_field form.vlan %}
{% render_field form.role %} {% render_field form.role %}
{% render_field form.description %}
{% render_field form.is_pool %} {% render_field form.is_pool %}
</div> </div>
</div> </div>