arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-27 02:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'asset-assetforms' of https://github.com/nottinghamtec/PyRIGS into asset-assetforms

Browse Source
This commit is contained in:
Matthew Smith
2019-10-05 21:16:58 +01:00
parent d5f08a8bff 366d9c4130
commit 1c06bf3ba4
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/templates/asset_create.html
View File

@@ -143,8 +143,11 @@
Collection Details Collection Details
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% include 'partials/asset_picker.html' %} <div class="form-group">
</div <label for="selectpicker">Set Parent:</label>
{% include 'partials/asset_picker.html' %}
</div>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@@ -158,4 +161,4 @@
{% include 'partials/confirm_delete.html' with object=object %} {% include 'partials/confirm_delete.html' with object=object %}
{% endblock %} {% endblock %}

7
assets/templates/asset_update.html
View File

@@ -191,7 +191,10 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% if edit or duplicate %} {% if edit or duplicate %}
{% include 'partials/asset_picker.html' %} <div class="form-group">
<label for="selectpicker">Set Parent:</label>
{% include 'partials/asset_picker.html' %}
</div>
{% else%} {% else%}
<dl> <dl>
<dt>Parent</dt> <dt>Parent</dt>
@@ -234,4 +237,4 @@
{% include 'partials/confirm_delete.html' with object=object %} {% include 'partials/confirm_delete.html' with object=object %}
{% endblock %} {% endblock %}