NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-16 16:52:17 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'develop' into v2-develop

Browse Source
This commit is contained in:
Jeremy Stretch
2017-05-08 15:02:06 -04:00
committed by GitHub
parent 46ae1229e6 a92c8d90d0
commit bd2f12630d
34 changed files with 888 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/templates/secrets/secret_import.html
View File

@@ -20,10 +20,14 @@
<form action="." method="post" class="form">
{% csrf_token %}
{% render_form form %}
<div class="form-group">
<button type="submit" class="btn btn-primary">Submit</button>
<a href="{{ return_url }}" class="btn btn-default">Cancel</a>
</div>
<div class="form-group">
<div class="col-md-12 text-right">
<button type="submit" class="btn btn-primary">Submit</button>
{% if return_url %}
<a href="{% url return_url %}" class="btn btn-default">Cancel</a>
{% endif %}
</div>
</div>
</form>
</div>
<div class="col-md-6">