X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3e25eb8de00f8d172b3ed2cfbb236e1e672426a0..25400813a0ea9828e39975bf166672b97d3c16b7:/project/templates/explorer/editor.html?ds=sidebyside

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index f7e827fe..a6bcc41a 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -4,26 +4,23 @@
 	<script type="text/javascript" charset="utf-8">
 		var fileId = '{{ fileid }}';
 	</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/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>
+	
+	{# 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>
 	<script src="{{STATIC_URL}}js/views/html.js" type="text/javascript" charset="utf-8"></script>
 	<script src="{{STATIC_URL}}js/views/panel_container.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>
-
+	<script src="{{STATIC_URL}}js/models.js" type="text/javascript" charset="utf-8"></script>
+	
 	{# JavaScript templates #}
 	<script type="text/html" charset="utf-8" id="panel-container-view-template">
 		<select>
@@ -35,12 +32,38 @@
 	</script>
 	
 	<script type="text/html" charset="utf-8" id="xml-view-template">
+		<div class="xmlview-toolbar"></div>
 		<div class="xmlview">
+			
 		</div>
 	</script>
 	
 	<script type="text/html" charset="utf-8" id="html-view-template">
-		<p>Hej! Jestem widokiem HTML!</p>
+		<div class="htmlview">
+		</div>
+	</script>
+	
+	<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++) { %>
+				<a href="#" class="buttontoolbarview-tab" ui:groupindex="<%= i %>"><%= buttons[i].name %></a>
+			<% }; %>
+			</div>
+			<div class="buttontoolbarview-groups">
+			<% for (var i=0; i < buttons.length; i++) { %>
+				<div class="buttontoolbarview-group" 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 %>">
+							<%= buttons[i].buttons[j].label %>
+						</a>
+						<% } %>
+					<% } %>
+				</div>
+			<% }; %>
+			</div>
+		</div>
 	</script>
 {% endblock extrahead %}
 
@@ -60,6 +83,10 @@
     
 {% endblock %}
 
+{% block header-toolbar %}
+	<button>Merge</button> <button>Update</button>
+{% endblock %}
+
 {% block maincontent %}
 	<div id="splitview">
 		<div id="left-panel-container" class='panel-container'></div>
@@ -67,35 +94,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"> #}
+    {#     <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 %}