Merge branch 'master' into view-refactor

[redakcja.git] / project / templates / explorer / panels / xmleditor.html

diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index 76018ca..74a6877 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -1,26 +1,27 @@
 {% load toolbar_tags %}
+{% toolbar toolbar_groups toolbar_extra_group %}
 
-<div class="iframe-container" style="position: absolute; top: 41pt; 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>
 
-{% toolbar %}
-
 <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_URL}}js/codemirror/",
+            path: "{{STATIC_URL}}js/lib/codemirror/",
+            width: 'auto',
             stylesheet: "{{STATIC_URL}}css/xmlcolors.css",
             parserConfig: {useHTMLKludges: false},
+            textWrapping: false,
+            lineNumbers: true,
             onChange: function() {
                self.fireEvent('contentChanged');
             },
@@ -31,11 +32,15 @@ panel_hooks = {
                 texteditor.grabKeys(
                     $.fbind(self, self.hotkeyPressed),
                     $.fbind(self, self.isHotkey) );
+                
             }
         })
 
-        $(texteditor.frame).css({width: '100%', height: '100%'});    
+        $('.CodeMirror-content-wrapper').css({
+            width: '100%', height: '100%' });
+                    
         this.texteditor = texteditor;
+        self._endload();       
     },
 
        unload: function() { 
@@ -47,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>