mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-09 00:58:16 -06:00
Move the create/update/cancel buttons to the righthand side and make them float
This commit is contained in:
Jeremy Stretch
parent
d5488ca7da
commit
d9735c2279
@ -132,7 +132,7 @@ def secret_add(request, pk):
|
|||||||
form = forms.SecretForm(instance=secret)
|
form = forms.SecretForm(instance=secret)
|
||||||
|
|
||||||
return render(request, 'secrets/secret_edit.html', {
|
return render(request, 'secrets/secret_edit.html', {
|
||||||
'secret': secret,
|
'obj': secret,
|
||||||
'form': form,
|
'form': form,
|
||||||
'return_url': device.get_absolute_url(),
|
'return_url': device.get_absolute_url(),
|
||||||
})
|
})
|
||||||
@ -185,7 +185,7 @@ def secret_edit(request, pk):
|
|||||||
form = forms.SecretForm(instance=secret)
|
form = forms.SecretForm(instance=secret)
|
||||||
|
|
||||||
return render(request, 'secrets/secret_edit.html', {
|
return render(request, 'secrets/secret_edit.html', {
|
||||||
'secret': secret,
|
'obj': secret,
|
||||||
'form': form,
|
'form': form,
|
||||||
'return_url': reverse('secrets:secret', kwargs={'pk': secret.pk}),
|
'return_url': reverse('secrets:secret', kwargs={'pk': secret.pk}),
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,91 +1,64 @@
|
|||||||
{% extends '_base.html' %}
|
{% extends 'utilities/obj_edit.html' %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load form_helpers %}
|
{% load form_helpers %}
|
||||||
|
|
||||||
{% block content %}
|
{% block title %}Circuit {{ obj.circuit }} - {{ form.term_side.value }} Side{% endblock %}
|
||||||
<form action="." method="post" class="form form-horizontal">
|
|
||||||
{% csrf_token %}
|
{% block form %}
|
||||||
{% for field in form.hidden_fields %}
|
<div class="panel panel-default">
|
||||||
{{ field }}
|
<div class="panel-heading"><strong>Location</strong></div>
|
||||||
{% endfor %}
|
<div class="panel-body">
|
||||||
<div class="row">
|
<div class="form-group">
|
||||||
<div class="col-md-6 col-md-offset-3">
|
<label class="col-md-3 control-label">Provider</label>
|
||||||
<h3>{% block title %}Circuit {{ obj.circuit }} - {{ form.term_side.value }} Side{% endblock %}</h3>
|
<div class="col-md-9">
|
||||||
{% if form.non_field_errors %}
|
<p class="form-control-static">{{ obj.circuit.provider }}</p>
|
||||||
<div class="panel panel-danger">
|
|
||||||
<div class="panel-heading"><strong>Errors</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{{ form.non_field_errors }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading"><strong>Location</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-md-3 control-label">Provider</label>
|
|
||||||
<div class="col-md-9">
|
|
||||||
<p class="form-control-static">{{ obj.circuit.provider }}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-md-3 control-label">Circuit</label>
|
|
||||||
<div class="col-md-9">
|
|
||||||
<p class="form-control-static">{{ obj.circuit.cid }}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-md-3 control-label">Termination</label>
|
|
||||||
<div class="col-md-9">
|
|
||||||
<p class="form-control-static">{{ form.term_side.value }}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% render_field form.site %}
|
|
||||||
{% render_field form.rack %}
|
|
||||||
{% render_field form.device %}
|
|
||||||
{% render_field form.interface %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading"><strong>Termination Details</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-md-3 control-label required" for="id_port_speed">{{ form.port_speed.label }}</label>
|
|
||||||
<div class="col-md-9">
|
|
||||||
<div class="input-group">
|
|
||||||
{{ form.port_speed }}
|
|
||||||
{% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %}
|
|
||||||
</div>
|
|
||||||
<span class="help-block">{{ form.port_speed.help_text }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-md-3 control-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
|
|
||||||
<div class="col-md-9">
|
|
||||||
<div class="input-group">
|
|
||||||
{{ form.upstream_speed }}
|
|
||||||
{% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %}
|
|
||||||
</div>
|
|
||||||
<span class="help-block">{{ form.upstream_speed.help_text }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% render_field form.xconnect_id %}
|
|
||||||
{% render_field form.pp_info %}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="form-group">
|
||||||
<div class="row">
|
<label class="col-md-3 control-label">Circuit</label>
|
||||||
<div class="col-md-6 col-md-offset-3 text-right">
|
<div class="col-md-9">
|
||||||
{% if obj.pk %}
|
<p class="form-control-static">{{ obj.circuit.cid }}</p>
|
||||||
<button type="submit" name="_update" class="btn btn-primary">Update</button>
|
</div>
|
||||||
{% else %}
|
|
||||||
<button type="submit" name="_create" class="btn btn-primary">Create</button>
|
|
||||||
{% endif %}
|
|
||||||
<a href="{{ return_url }}" class="btn btn-default">Cancel</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-md-3 control-label">Termination</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<p class="form-control-static">{{ form.term_side.value }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% render_field form.site %}
|
||||||
|
{% render_field form.rack %}
|
||||||
|
{% render_field form.device %}
|
||||||
|
{% render_field form.interface %}
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</div>
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading"><strong>Termination Details</strong></div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-md-3 control-label required" for="id_port_speed">{{ form.port_speed.label }}</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<div class="input-group">
|
||||||
|
{{ form.port_speed }}
|
||||||
|
{% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %}
|
||||||
|
</div>
|
||||||
|
<span class="help-block">{{ form.port_speed.help_text }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-md-3 control-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<div class="input-group">
|
||||||
|
{{ form.upstream_speed }}
|
||||||
|
{% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %}
|
||||||
|
</div>
|
||||||
|
<span class="help-block">{{ form.upstream_speed.help_text }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% render_field form.xconnect_id %}
|
||||||
|
{% render_field form.pp_info %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block javascript %}
|
{% block javascript %}
|
||||||
|
|||||||
@ -35,17 +35,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block buttons %}
|
|
||||||
{% if obj.pk %}
|
|
||||||
<button type="submit" name="_update" class="btn btn-primary">Update</button>
|
|
||||||
<button type="submit" formaction="?return_url={% url 'dcim:interface_edit' pk=obj.pk %}" class="btn btn-primary">Update and Continue Editing</button>
|
|
||||||
{% else %}
|
|
||||||
<button type="submit" name="_create" class="btn btn-primary">Create</button>
|
|
||||||
<button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
|
|
||||||
{% endif %}
|
|
||||||
<a href="{{ return_url }}" class="btn btn-default">Cancel</a>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block javascript %}
|
{% block javascript %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|||||||
@ -1,94 +1,64 @@
|
|||||||
{% extends '_base.html' %}
|
{% extends 'utilities/obj_edit.html' %}
|
||||||
{% load static from staticfiles %}
|
{% load static from staticfiles %}
|
||||||
{% load form_helpers %}
|
{% load form_helpers %}
|
||||||
|
|
||||||
{% block content %}
|
{% block title %}{% if obj.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}
|
||||||
<form action="." method="post" class="form form-horizontal">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form.private_key }}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-6 col-md-offset-3">
|
|
||||||
<h3>{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}</h3>
|
|
||||||
{% if form.non_field_errors %}
|
|
||||||
<div class="panel panel-danger">
|
|
||||||
<div class="panel-heading"><strong>Errors</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{{ form.non_field_errors }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading"><strong>Secret Attributes</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-md-3 control-label required">Device</label>
|
|
||||||
<div class="col-md-9">
|
|
||||||
<p class="form-control-static">{{ secret.device }}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% render_field form.role %}
|
|
||||||
{% render_field form.name %}
|
|
||||||
{% render_field form.userkeys %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading"><strong>Secret Data</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{% if secret.pk %}
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="col-md-3 control-label required">Current Plaintext</label>
|
|
||||||
<div class="col-md-7">
|
|
||||||
<p class="form-control-static" id="secret_{{ secret.pk }}">********</p>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2 text-right">
|
|
||||||
<button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
|
|
||||||
<i class="fa fa-lock"></i> Unlock
|
|
||||||
</button>
|
|
||||||
<button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
|
|
||||||
<i class="fa fa-unlock-alt"></i> Lock
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% render_field form.plaintext %}
|
|
||||||
{% render_field form.plaintext2 %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% if form.custom_fields %}
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading"><strong>Custom Fields</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{% render_custom_fields form %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading"><strong>Tags</strong></div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{% render_field form.tags %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="form-group">
|
|
||||||
<div class="col-md-12 text-center">
|
|
||||||
{% if secret.pk %}
|
|
||||||
<button type="submit" name="_update" class="btn btn-primary">Update</button>
|
|
||||||
<a href="{% url 'secrets:secret' pk=secret.pk %}" class="btn btn-default">Cancel</a>
|
|
||||||
{% else %}
|
|
||||||
<button type="submit" name="_create" class="btn btn-primary">Create</button>
|
|
||||||
<button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
|
|
||||||
<a href="{{ return_url }}" class="btn btn-default">Cancel</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
{% include 'secrets/inc/private_key_modal.html' %}
|
{% block form %}
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading"><strong>Secret Attributes</strong></div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-md-3 control-label required">Device</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<p class="form-control-static">{{ obj.device }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% render_field form.role %}
|
||||||
|
{% render_field form.name %}
|
||||||
|
{% render_field form.userkeys %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading"><strong>Secret Data</strong></div>
|
||||||
|
<div class="panel-body">
|
||||||
|
{% if obj.pk %}
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-md-3 control-label required">Current Plaintext</label>
|
||||||
|
<div class="col-md-7">
|
||||||
|
<p class="form-control-static" id="secret_{{ obj.pk }}">********</p>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-2 text-right">
|
||||||
|
<button class="btn btn-xs btn-success unlock-secret" secret-id="{{ obj.pk }}">
|
||||||
|
<i class="fa fa-lock"></i> Unlock
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ obj.pk }}">
|
||||||
|
<i class="fa fa-unlock-alt"></i> Lock
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% render_field form.plaintext %}
|
||||||
|
{% render_field form.plaintext2 %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% if form.custom_fields %}
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading"><strong>Custom Fields</strong></div>
|
||||||
|
<div class="panel-body">
|
||||||
|
{% render_custom_fields form %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading"><strong>Tags</strong></div>
|
||||||
|
<div class="panel-body">
|
||||||
|
{% render_field form.tags %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block javascript %}
|
{% block javascript %}
|
||||||
|
{% include 'secrets/inc/private_key_modal.html' %}
|
||||||
<script src="{% static 'js/secrets.js' %}?v{{ settings.VERSION }}"></script>
|
<script src="{% static 'js/secrets.js' %}?v{{ settings.VERSION }}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
{% extends 'utilities/obj_edit.html' %}
|
{% extends 'utilities/obj_edit.html' %}
|
||||||
{% load static from staticfiles %}
|
|
||||||
{% load form_helpers %}
|
{% load form_helpers %}
|
||||||
|
|
||||||
{% block form %}
|
{% block form %}
|
||||||
|
|||||||
@ -10,6 +10,10 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6 col-md-offset-3">
|
<div class="col-md-6 col-md-offset-3">
|
||||||
<h3>{% block title %}{% if obj.pk %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %}{% endblock %}</h3>
|
<h3>{% block title %}{% if obj.pk %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %}{% endblock %}</h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 col-md-offset-3">
|
||||||
{% block tabs %}{% endblock %}
|
{% block tabs %}{% endblock %}
|
||||||
{% if form.non_field_errors %}
|
{% if form.non_field_errors %}
|
||||||
<div class="panel panel-danger">
|
<div class="panel panel-danger">
|
||||||
@ -28,18 +32,18 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="col-md-3">
|
||||||
<div class="row">
|
<div style="position: fixed">
|
||||||
<div class="col-md-6 col-md-offset-3 text-right">
|
{% block buttons %}
|
||||||
{% block buttons %}
|
{% if obj.pk %}
|
||||||
{% if obj.pk %}
|
<p><button type="submit" name="_save" class="btn btn-success"><i class="fa fa-save"></i> Save</button></p>
|
||||||
<button type="submit" name="_update" class="btn btn-primary">Update</button>
|
{% else %}
|
||||||
{% else %}
|
<p><button type="submit" name="_create" class="btn btn-success"><i class="fa fa-plus"></i> Create</button></p>
|
||||||
<button type="submit" name="_create" class="btn btn-primary">Create</button>
|
<p><button type="submit" name="_addanother" class="btn btn-primary"><i class="fa fa-plus"></i> Create and Add Another</button></p>
|
||||||
<button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
|
{% endif %}
|
||||||
{% endif %}
|
<p><a href="{{ return_url }}" class="btn btn-default"><i class="fa fa-ban"></i> Cancel</a></p>
|
||||||
<a href="{{ return_url }}" class="btn btn-default">Cancel</a>
|
{% endblock %}
|
||||||
{% endblock %}
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@ -26,17 +26,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block buttons %}
|
|
||||||
{% if obj.pk %}
|
|
||||||
<button type="submit" name="_update" class="btn btn-primary">Update</button>
|
|
||||||
<button type="submit" formaction="?return_url={% url 'virtualization:interface_edit' pk=obj.pk %}" class="btn btn-primary">Update and Continue Editing</button>
|
|
||||||
{% else %}
|
|
||||||
<button type="submit" name="_create" class="btn btn-primary">Create</button>
|
|
||||||
<button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
|
|
||||||
{% endif %}
|
|
||||||
<a href="{{ return_url }}" class="btn btn-default">Cancel</a>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block javascript %}
|
{% block javascript %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user