Merge branch 'ui-improvements' into dev

This commit is contained in:
Jonas Winkler
2018-07-16 16:09:41 +02:00
3 changed files with 78 additions and 5 deletions

View File

@@ -5,9 +5,10 @@
{{ block.super }}
{% if file_type in "pdf jpg png" %}
<div id="twocolumn_parent" style="display: flex;">
<div id="form_parent" style="flex:50%; margin-right: 10px;"></div>
<div id="viewer_parent" style="flex:50%; margin-left: 10px; text-align: center;">
<div id="change_form_twocolumn_parent">
<div id="change_form_form_parent"></div>
<div id="change_form_viewer_parent">
{% if file_type == "pdf" %}
{% include "admin/documents/document/viewers/viewer_pdf.html" %}
{% endif %}
@@ -18,8 +19,20 @@
</div>
<script>
django.jQuery("#form_parent").append(django.jQuery("#document_form"));
django.jQuery("#change_form_form_parent").append(django.jQuery("#document_form"));
django.jQuery("#content-main").append(django.jQuery("#change_form_twocolumn_parent"));
</script>
{% if next_object %}
<script type="text/javascript">//<![CDATA[
(function($){
$('<input type="submit" value="Save and edit next" name="_saveandeditnext" />')
.prependTo('div.submit-row');
$('<input type="hidden" value="{{next_object}}" name="_next_object" />')
.prependTo('div.submit-row');
})(django.jQuery);
//]]></script>
{% endif %}
{% endif %}
{% endblock content %}