From 84132f4ec69d46ec216d1fe1d5adc5e5ee8a4798 Mon Sep 17 00:00:00 2001
From: zuber <marek@stepniowski.com>
Date: Sun, 27 Sep 2009 22:27:00 +0200
Subject: [PATCH] =?utf8?q?Dodanie=20js/views/editor.js=20-=20widoku=20dla?=
 =?utf8?q?=20ca=C5=82ego=20edytora.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 project/static/js/models.js            |  1 +
 project/static/js/views/editor.js      | 12 ++++++++++++
 project/templates/explorer/editor.html |  7 ++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 project/static/js/views/editor.js

diff --git a/project/static/js/models.js b/project/static/js/models.js
index 96cab868..b2c7440c 100644
--- a/project/static/js/models.js
+++ b/project/static/js/models.js
@@ -143,6 +143,7 @@ var leftPanelView, rightPanelContainer, doc;
 
 $(function() {
   doc = new Editor.DocumentModel();
+  var editor = new EditorView('body', doc);
   var splitView = new SplitView('#splitview', doc);
   leftPanelView = new PanelContainerView('#left-panel-container', doc);
   rightPanelContainer = new PanelContainerView('#right-panel-container', doc);
diff --git a/project/static/js/views/editor.js b/project/static/js/views/editor.js
new file mode 100644
index 00000000..b3c9563b
--- /dev/null
+++ b/project/static/js/views/editor.js
@@ -0,0 +1,12 @@
+/*global View render_template panels */
+var EditorView = View.extend({
+  _className: 'EditorView',
+  element: null,
+  model: null,
+  template: null,
+  
+  init: function(element, model, template) {
+    this._super(element, model, template);
+    this.model.load();
+  }
+});
diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 89ff2f37..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>
@@ -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 %}
-- 
2.20.1