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

Merge branch 'develop' into issue_16009

Browse Source
This commit is contained in:
Jeremy Stretch
2024-10-15 12:55:48 -04:00
parent 3c36549ff1 111a1ad888
commit ba4b5fed0b
250 changed files with 4441 additions and 3614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,6 +325,7 @@
<td>
{% if object.total_weight %}
{{ object.total_weight|floatformat }} {% trans "Kilograms" %}
({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %})
{% else %}
{{ ''|placeholder }}
{% endif %}

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

@@ -103,8 +103,12 @@
<tr>
<th scope="row">{% trans "Total Weight" %}</th>
<td>
{{ object.total_weight|floatformat }} {% trans "Kilograms" %}
({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %})
{% if object.total_weight %}
{{ object.total_weight|floatformat }} {% trans "Kilograms" %}
({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %})
{% else %}
{{ ''|placeholder }}
{% endif %}
</td>
</tr>
</table>

2
netbox/templates/extras/script_list.html
View File

@@ -50,7 +50,7 @@
</thead>
<tbody>
{% for script in module.scripts.all %}
{% with last_job=script.get_latest_jobs|get_key:script.name %}
{% with last_job=script.get_latest_jobs|first %}
<tr>
<td>
{% if script.is_executable %}

2
netbox/templates/generic/_base.html
View File

@@ -10,7 +10,7 @@
{# Title #}
<div>
<h1 class="page-title mt-1 mb-2">{% block title %}{% endblock title %}</h1>
<h1 class="page-title">{% block title %}{% endblock title %}</h1>
{% block subtitle %}{% endblock %}
</div>

6
netbox/templates/login.html
View File

@@ -11,8 +11,8 @@
{# NetBox logo #}
<div class="text-center mb-4">
<img src="{% static 'logo_netbox_dark_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-dark">
<img src="{% static 'logo_netbox_bright_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-light">
<img src="{% static 'logo_netbox_dark_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-dark logo">
<img src="{% static 'logo_netbox_bright_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-light logo">
<div class="netbox-edition fw-semibold">{{ settings.RELEASE.edition }}</div>
</div>
@@ -81,7 +81,7 @@
<div class="col">
<a href="{{ backend.url }}" class="btn w-100">
{% if backend.icon_name %}<i class="mdi mdi-{{ backend.icon_name }}"></i>
{% elif backend.icon_img %}<img src="{{ backend.icon_img }}" height="24" {% if backend.display_name %}class="me-2" {% endif %}/>{% endif %}
{% elif backend.icon_img %}<img src="{{ backend.icon_img }}" height="24"{% if backend.display_name %}class="me-2 sso-icon" {% endif %}/>{% endif %}
{{ backend.display_name }}
</a>
</div>

2
netbox/templates/virtualization/cluster.html
View File

@@ -69,7 +69,7 @@
<th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}</th>
<td>
{% if disk_sum %}
{{ disk_sum }} {% trans "GB" context "Abbreviation for gigabyte" %}
{{ disk_sum|humanize_megabytes }}
{% else %}
{{ ''|placeholder }}
{% endif %}