Merge branch 'master' into dev

src/documents/templates/admin/documents/document/change_form.html

@@ -12,6 +12,10 @@
 {% block content %}
 
 {{ block.super }}
+<div class="side-preview">
+  <h2>Preview</h2>
+  <object data="/fetch/preview/{{object_id}}"></object>
+</div>
 
 {% if file_type in "pdf jpg png" %}
 
@@ -47,6 +51,37 @@
 
 {% endblock content %}
 
+{% block extrastyle %}
+{{ block.super }}
+<style>
+.side-preview {
+    width: 100%;
+    height: 800px;
+    clear: both;
+}
+
+.side-preview object {
+    height: 100%;
+    width: 100%;
+}
+
+@media screen and (min-width: 1500px) {
+    #content-main {
+        width: 50%;
+    }
+    #footer {
+        padding: 0;
+    }
+    .side-preview {
+        float: right;
+        width: 40%;
+        height: 80vh;
+        clear: none;
+    }
+}
+</style>
+{% endblock %}
+
 {% block footer %}
 
 	{{ block.super }}