X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/fc7a60feb9496c250cd1e8ca3db8c74267790047..970685936cdd7b70e3efa2f2506f66198049b16d:/project/templates/explorer/editor.html

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 891366b7..2263f02e 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -2,15 +2,17 @@
 
 {% block extrahead %}
     <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.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.hpanel.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/editor.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/editor.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/editor.ui.js" type="text/javascript" charset="utf-8"></script>
 {% endblock extrahead %}
 
 {% block extrabody %}
@@ -30,10 +32,8 @@
 
 {% block header-toolbar %}
 
-<form action="{% url file_commit fileid %}" method="POST" style="display: inline;" id="toolbar-commit-form">
-    <input type="text" size="40" id="toolbar-commit-message" name="message" />
-    <button type="submit" class="toolbar-button" id="toolbar-button-commit">Merge</button>
-</form>
+
+<button type="button" class="toolbar-button" id="toolbar-button-commit">Merge</button>
 <button type="button" class="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>
@@ -79,4 +79,27 @@
             </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>
+                <p>
+                   <input type="submit" value="Save" id="commit-dialog-save-button" />
+                   <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
+                </p>
+            </form>
+        </div>
+
+        <div id="split-dialog" class="jqmWindow">
+            <div class="container-box"> </div>
+            <div class="loading-box" style="display: none;">
+                <p>Wczytuję zawartość okna...</p>
+                <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
+            </div>
+            <div class="fatal-error-box" style="display: none;">
+                <p>Server error, while loading dialog :(</p>
+                <p><button type="button" class="dialog-close-button">Close</button></p>
+            </div>
+        </div>
 {% endblock maincontent %}