X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/38747104cc8581d642f3c5a0d78c17565cc9988c..9bec1deeed00ac693e6031c69f0778d3bb0dfbd9:/project/templates/explorer/editor.html?ds=inline

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 0c3e3a66..a6bcc41a 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -12,6 +12,7 @@
 	{# 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 +43,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 +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>
@@ -120,4 +125,4 @@
     {#         <p><button type="button" class="dialog-close-button">Close</button></p> #}
     {#     </div> #}
     {# </div> #}
-{% endblock maincontent %}    
+{% endblock maincontent %}