X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/889882b4d84fb826afc834040b203dff2fb4a224..ac2e9ceea7cf6a59810081d52b64d9c22861c62d:/project/templates/explorer/editor.html?ds=sidebyside

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 4b08914b..22a60f60 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -6,13 +6,12 @@
 	</script>
     <link rel="stylesheet" href="{{STATIC_URL}}css/toolbar.css" type="text/css" />
     <link rel="stylesheet" href="{{STATIC_URL}}css/jquery.modal.css" type="text/css" />
-    <script src="{{STATIC_URL}}js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
-    <!--<script src="{{STATIC_URL}}js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>-->
-    <script src="{{STATIC_URL}}js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/jquery.json.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/lib/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/lib/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/lib/jquery.json.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/lib/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/lib/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
 
     <script src="{{STATIC_URL}}js/editor.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/editor.ui.js" type="text/javascript" charset="utf-8"></script>
@@ -31,17 +30,16 @@
     </script>
 {% endblock extrabody %}
 
- {% load explorer_tags %}
+{% load explorer_tags %}
 
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid|bookname }}{% endblock breadcrumbs %}
 
 {% block header-toolbar %}
-
-
-<button type="button" class="toolbar-button" id="toolbar-button-commit">Merge</button>
-<button type="button" class="toolbar-button" id="toolbar-button-update"
+<button type="button" class="requires-save toolbar-button" id="toolbar-button-commit">Merge</button>
+<button type="button" class="requires-save toolbar-button" id="toolbar-button-update"
         ui:ajax-action="{% url file_update fileid %}">Update</button>
-<button type="button" class="toolbar-button" id="toolbar-button-save" disabled="disabled">Save</button>
+<button type="button" class="provides-save toolbar-button" id="toolbar-button-save" disabled="disabled">Commit</button>
+<button type="button" class="provides-save toolbar-button" id="toolbar-button-quick-save" disabled="disabled">Quick Save</button>
 {% endblock %}
 
 {% block message-box %}
@@ -70,8 +68,10 @@
                         {% endfor %}
                     </select>
                     </label>
-                    <span class="toolbar-button-groups-container">
-                    <span class="panel-toolbar-extra" > </span>
+
+                    <span
+                    <span class="toolbar-buttons-container panel-toolbar-extra">
+                        </span>
                     </span>
                     <!-- rethink the refresh button - it doesn't work very well -->
                     <!-- <button type="button" class="refresh-button">Odśwież</button> -->
@@ -84,13 +84,22 @@
             </div>
             {% endfor %}
         </div>
+
         <div id="commit-dialog" class="jqmWindow">
             <form action="{% url file_commit fileid %}" method="POST">
                 <label for="message">Commit message:</label>
-                <textarea cols="60" rows="15" name="message" id="commit-dialog-message"></textarea>
-                <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>
+                <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
+                <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>                
+                <fieldset id="commit-dialog-related-issues" 
+                          ui:ajax-src="http://localhost:3000/publications/issues/{{fileid}}">
+                    <legend>Related issues</legend>
+                    <div class="loading-box" style="display: none;">
+                        <p>Loading related issues...</p>
+                    </div>
+                    <div class="container-box">No related issues.</div>
+                </fieldset>
                 <p>
-                   <input type="submit" value="Save" id="commit-dialog-save-button" />
+                   <input type="button" value="Save" id="commit-dialog-save-button" />
                    <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
                 </p>
             </form>
@@ -99,7 +108,7 @@
         <div id="split-dialog" class="jqmWindow">
             <div class="container-box"> </div>
             <div class="loading-box" style="display: none;">
-                <p>Wczytuję zawartość okna...</p>
+                <p>Loading dialog contents...</p>
                 <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
             </div>
             <div class="fatal-error-box" style="display: none;">