X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7aa07c7bcc96b144ed562f58dde3dce717524985..97059a831f2e7ac44ccfacde3950cc2561c539ee:/project/templates/explorer/editor.html?ds=sidebyside

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index e892053e..3c775d4e 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -13,12 +13,15 @@
 	{# 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>
+        <script src="{{STATIC_URL}}js/lib/jquery.json.js" type="text/javascript" charset="utf-8"></script>
 	{# Scriptlets #}
-	<script src="http://localhost:8000/api/toolbar/scriptlets" type="text/javascript" charset="utf-8"></script>
+	<script src="{{STATIC_URL}}js/button_scripts.js" 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/messages.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/flash.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>
@@ -33,10 +36,11 @@
 	<script type="text/html" charset="utf-8" id="panel-container-view-template">
 		<div class="panel-main-toolbar">
                 <p><select>
+                        <option value="empty" selected="selected"> ---- </option>
 			<% for (panel in panels) { %>
 			<option value="<%= panel %>"><%= panel %></option>
 			<% }; %>
-		</select></p>
+		</select> <button class="refresh">Odśwież panel</button></p>
                 </div>
 		<div class="content-view"></div>
 	</script>
@@ -49,11 +53,23 @@
 	</script>
 	
 	<script type="text/html" charset="utf-8" id="html-view-template">
+                <div class="htmlview-toolbar">
+                    <a class="html-print-link" href="print" ui:baseref="{% url file_print fileid %}" target="_new">Wersja do druku</a>
+                </div>
+                
 		<div class="htmlview">
 		</div>
-	</script>
+	</script>	
 
-        <script type="text/html" charset="utf-8" id="image-gallery-view-template">
+	<script type="text/html" charset="utf-8" id="flash-view-template">
+		<div class="flashview">
+		<% if (shownMessage) { %>
+			<p style="margin: 0; padding: 0.2em 0.5em; line-height: 1.8em" class="<%= shownMessage.type %>"><%= shownMessage.text %></p>
+		<% } %>
+		</div>
+	</script>
+	
+    <script type="text/html" charset="utf-8" id="image-gallery-view-template">
 	<div class="image-gallery-view-template">
 
         <div class="image-gallery-header">
@@ -99,7 +115,7 @@
 		<div class="buttontoolbarview panel-toolbar">
 			<div class="buttontoolbarview-tabs toolbar-tabs-container toolbar-buttons-container">
 			<% for (var i=0; i < buttons.length; i++) { %>
-				<a href="#" class="buttontoolbarview-tab" ui:groupindex="<%= i %>"><%= buttons[i].name %></a>
+				<button type="button" class="buttontoolbarview-tab" ui:groupindex="<%= i %>"><%= buttons[i].name %></button>
 			<% }; %>
 			</div>
 			<div class="buttontoolbarview-groups ">
@@ -107,9 +123,13 @@
 				<div class="buttontoolbarview-group toolbar-buttons-container" ui:groupIndex="<%= i %>" style="display: none">
 					<% for (var j=0; j < buttons[i].buttons.length; j++) { %>
 						<% if (buttons[i].buttons[j].scriptlet_id) { %>
-						<a href="#" class="buttontoolbarview-button" ui:groupindex="<%= i %>" ui:buttonindex="<%= j %>">
+						<button type="button" class="buttontoolbarview-button"
+                                                    title="<%= buttons[i].buttons[j].tooltip %>"
+                                                    hotkey="<%= buttons[i].buttons[j].key %>"
+                                                    ui:hotkey_mod="<%= buttons[i].buttons[j].key_mod %>"
+                                                    ui:groupindex="<%= i %>" ui:buttonindex="<%= j %>">
 							<%= buttons[i].buttons[j].label %>
-						</a>
+						</button>
 						<% } %>
 					<% } %>
 				</div>
@@ -122,23 +142,28 @@
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid }}{% endblock breadcrumbs %}
 
 {% 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>
+    <a href="http://stigma.nowoczesnapolska.org.pl/platforma-hg/ksiazki/log/tip/{{ fileid }}.xml" target="_new" >Historia</a>
+	<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>
-	    <div id="right-panel-container" class='panel-container'></div>
-    </div>
+    <p style="display: none;" id="api-base-url">{% url document_list_view %}</p>
+    <p style="display: none;" id="api-toolbar-url">{% url toolbar_buttons %}</p>
 
+    <div id="splitview">
+        <div id="left-panel-container" class='panel-container'></div>
+	<div id="right-panel-container" class='panel-container'></div>
+    </div>
 
     <div id="commit-dialog" class="jqmWindow" style="display:none">
-        <form action="{% url file_commit fileid %}" method="POST">
+        <form action="" 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}}">
+            <fieldset id="commit-dialog-related-issues" ui:ajax-src="{{REDMINE_URL}}/publications/issues/{{fileid}}">
                 <legend>Related issues</legend>
                 <div class="loading-box" style="display: none;">
                     <p>Loading related issues...</p>
@@ -164,3 +189,7 @@
         </div>
     </div>
 {% endblock maincontent %}
+
+{% block extrabody %}
+	<div style="position: absolute; left: 35%; right: 35%; top: 0; height: 20px; z-index: 0" id="flashview"></div>
+{% endblock %}
\ No newline at end of file