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

This commit is contained in:
Matthew Smith
2019-10-05 21:16:58 +01:00
2 changed files with 11 additions and 5 deletions

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">

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>