X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/38747104cc8581d642f3c5a0d78c17565cc9988c..ab093330473e6cee879256b9902ce90bd1832c35:/project/templates/explorer/editor.html

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 0c3e3a66..3a64e8d3 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -1,17 +1,23 @@
 {% extends "base.html" %}
 
 {% block extrahead %}
+	<link rel="stylesheet" href="{{STATIC_URL}}css/jquery.modal.css" type="text/css" media="screen" title="no title" charset="utf-8">
+	<link rel="stylesheet" href="{{STATIC_URL}}css/html.css" type="text/css" media="screen" title="no title" charset="utf-8">
+	
 	<script type="text/javascript" charset="utf-8">
 		var fileId = '{{ fileid }}';
 	</script>
-    <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
 	
+	{# Libraries #}
+    <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
+	<script src="{{STATIC_URL}}js/lib/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
 	{# Scriptlets #}
 	<script src="http://localhost:8000/api/toolbar/scriptlets" type="text/javascript" charset="utf-8"></script>
 	
 	{# App and views #}
 	<script src="{{STATIC_URL}}js/app.js" type="text/javascript" charset="utf-8"></script>
 	<script src="{{STATIC_URL}}js/views/view.js" type="text/javascript" charset="utf-8"></script>
+	<script src="{{STATIC_URL}}js/views/editor.js" type="text/javascript" charset="utf-8"></script>
 	<script src="{{STATIC_URL}}js/views/button_toolbar.js" type="text/javascript" charset="utf-8"></script>
 	<script src="{{STATIC_URL}}js/views/split.js" type="text/javascript" charset="utf-8"></script>
 	<script src="{{STATIC_URL}}js/views/xml.js" type="text/javascript" charset="utf-8"></script>
@@ -42,7 +48,7 @@
 		</div>
 	</script>
 	
-	<script type="text/javascript" charset="utf-8" id="button-toolbar-view-template">
+	<script type="text/html" charset="utf-8" id="button-toolbar-view-template">
 		<div class="buttontoolbarview">
 			<div class="buttontoolbarview-tabs">
 			<% for (var i=0; i < buttons.length; i++) { %>
@@ -82,6 +88,10 @@
     
 {% endblock %}
 
+{% block header-toolbar %}
+	<button id="action-merge">Merge</button> <button id="action-update">Update</button> <button id="action-commit">Commit</button> <button id="action-quick-save">Quick Save</button>
+{% endblock %}
+
 {% block maincontent %}
 	<div id="splitview">
 		<div id="left-panel-container" class='panel-container'></div>
@@ -89,35 +99,35 @@
     </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="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="button" 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>Loading dialog contents...</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 %}    
+    <div id="commit-dialog" class="jqmWindow" style="display:none">
+        <form action="{% url file_commit fileid %}" method="POST">
+            <label for="message">Commit message:</label>
+            <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="button" 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" style="display:none">
+        <div class="container-box"> </div>
+        <div class="loading-box" style="display: none;">
+            <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;">
+            <p>Server error, while loading dialog :(</p>
+            <p><button type="button" class="dialog-close-button">Close</button></p>
+        </div>
+    </div>
+{% endblock maincontent %}