X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b993aa15c106eadf473fd64edbb9f3d9ddb7754a..9479037111e9b243268189874be167e6c445455f:/project/templates/explorer/panels/xmleditor.html?ds=inline

diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index 2253609c..74a68776 100644
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -1,96 +1,46 @@
 {% load toolbar_tags %}
+{% toolbar toolbar_groups toolbar_extra_group %}
 
-{% toolbar %}
-<div class="change-font-size" style="">
-    <div class="decrease-font-size">A<sup>-</sup></div>
-    <div class="increase-font-size">A<sup>+</sup></div>
-</div>
-<div class="iframe-container" style="position: absolute; top: 48px; left:0px; right:0px; bottom: 0px;">
+<div class="iframe-container" style="position: absolute; top: 40px; left:0px; right:0px; bottom: 0px;">
 	<textarea name="text">{{ text }}</textarea>
 </div>
 
 <script type="text/javascript" charset="utf-8">
-
 panel_hooks = {
 	load: function () {
 		var self = this;
 		var panel = self.contentDiv;
 
         var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
-	        $('textarea', panel).attr('id', textareaId);
+	$('textarea', panel).attr('id', textareaId);
 
-		var texteditor = CodeMirror.fromTextArea(textareaId, {
+	var texteditor = CodeMirror.fromTextArea(textareaId, {            
             parserfile: 'parsexml.js',
-            path: "/static/js/codemirror/",
-            stylesheet: "/static/css/xmlcolors.css",
+            path: "{{STATIC_URL}}js/lib/codemirror/",
+            width: 'auto',
+            stylesheet: "{{STATIC_URL}}css/xmlcolors.css",
             parserConfig: {useHTMLKludges: false},
+            textWrapping: false,
+            lineNumbers: true,
             onChange: function() {
-				panel.trigger('panel:contentChanged', self);
+		self.fireEvent('contentChanged');
             },
             initCallback: function(editor) {
-                // Toolbar
-                $('.toolbar-tabs li', panel).click(function() {
-                    var id = $(this).attr('p:button-list');
-                    $('.toolbar-tabs li', panel).removeClass('active');
-                    $(this).addClass('active');
-                    if (!$('.' + id, panel).is(':visible')) {
-                        $('.toolbar-buttons ol', panel).not('#' + id).hide();
-                        $('.' + id, panel).show();
-                    }
-                })
+                // Editor is loaded
+                // Buttons are connected
+                // register callbacks for actions
+                texteditor.grabKeys(
+                    $.fbind(self, self.hotkeyPressed),
+                    $.fbind(self, self.isHotkey) );
                 
-                var keys = {};
-                $('.toolbar-buttons li', panel).each(function() {
-                    var tag = $(this).attr('p:tag');
-                    var handler = function() {
-                        var text = texteditor.selection();
-                        editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
-                        if (text.length == 0) {
-                            var pos = texteditor.cursorPosition();
-                            texteditor.selectLines(pos.line, pos.character + tag.length + 2);
-                        }
-                        $(document).trigger('panel:contentChanged', self);
-                    }
-                    if ($(this).attr('p:key')) {
-                        keys[$(this).attr('p:key')] = handler;
-                    }
-                    $(this).click(handler)
-                });
-
-                texteditor.grabKeys(function(event) { 
-                    if (keys[event.keyCode]) {
-                        keys[event.keyCode]();
-                    }
-                }, function(event) { return event.altKey && keys[event.keyCode]; });
             }
         })
-        
-        $(texteditor.frame).css({width: '100%', height: '100%'});
-        
-        $('#toolbar-buttons li').wTooltip({
-            delay: 1000, 
-            style: {
-                border: "1px solid #7F7D67",
-                opacity: 0.9, 
-                background: "#FBFBC6", 
-                padding: "1px",
-                fontSize: "12px",
-            }
-        });
 
-        $('.decrease-font-size', panel).click(function() {
-            var frameBody = $('body', $(texteditor.frame).contents());
-            console.log(frameBody.css('font-size'));
-            frameBody.css('font-size', parseInt(frameBody.css('font-size')) - 2);
-        });
-        
-        $('.increase-font-size', panel).click(function() {
-            var frameBody = $('body', $(texteditor.frame).contents());
-            console.log(frameBody.css('font-size'));
-            frameBody.css('font-size', parseInt(frameBody.css('font-size')) + 2);
-        });
-        
-		this.texteditor = texteditor;
+        $('.CodeMirror-content-wrapper').css({
+            width: '100%', height: '100%' });
+                    
+        this.texteditor = texteditor;
+        self._endload();       
     },
 
 	unload: function() { 
@@ -102,13 +52,18 @@ panel_hooks = {
 
 	saveInfo: function(saveInfo) {
 		var myInfo = {
-			url: "{% url file_xml fpath %}", 
+			url: "{% url file_xml fileid %}",
 			postData: {
 				content: this.texteditor.getCode()
 			} 
 		};
 		$.extend(saveInfo, myInfo);
-	}		
+	},
+
+        toolbarResized: function() {
+            $('.iframe-container', this.contentDiv).css('top',
+                    $('.toolbar', this.contentDiv).outerHeight() );
+        }
 };
 
 </script>