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 v2.11.8 changes

Browse Source
This commit is contained in:
jeremystretch
2021-07-06 12:10:29 -04:00
parent 57fc6efd4c c585175214
commit 88e382e7a1
40 changed files with 264 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@
<th scope="row"><i class="mdi mdi-chip"></i> Memory</th>
<td>
{% if object.memory %}
{{ object.memory }} MB
{{ object.memory|humanize_megabytes }} MB
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}

28
netbox/templates/virtualization/virtualmachine_component_add.html
View File

@@ -1,28 +0,0 @@
{% extends 'base/layout.html' %}
{% load helpers %}
{% load form_helpers %}
{% block title %}Create {{ component_type }}{% endblock %}
{% block content %}
<form action="" method="post" class="form form-horizontal">
{% csrf_token %}
<div class="row mb-3">
<div class="col col-md-6">
<div class="field-group">
<h4>{{ component_type|bettertitle }}</h4>
{% render_form form %}
</div>
</div>
</div>
<div class="row mb-3">
<div class="col col-md-6">
<div class="float-end">
<a href="{{ return_url }}" class="btn btn-outline-danger">Cancel</a>
<button type="submit" name="_addanother" class="btn btn-outline-primary">Create & Add More</button>
<button type="submit" name="_create" class="btn btn-primary">Create</button>
</div>
</div>
</div>
</form>
{% endblock %}