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 feature

Browse Source
This commit is contained in:
Jeremy Stretch
2024-10-11 11:29:36 -04:00
parent 65687851fe 7ac6dff96d
commit 256b5dc676
232 changed files with 3956 additions and 3334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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>

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 %}