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 3a1baf1..74a6877 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -1,13 +1,11 @@
 {% load toolbar_tags %}
 {% load toolbar_tags %}

+{% toolbar toolbar_groups toolbar_extra_group %}

 
 <div class="iframe-container" style="position: absolute; top: 40px; left:0px; right:0px; bottom: 0px;">
        <textarea name="text">{{ text }}</textarea>
 </div>
 
 
 <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">
 <script type="text/javascript" charset="utf-8">

-

 panel_hooks = {
        load: function () {
                var self = this;
 panel_hooks = {
        load: function () {
                var self = this;


@@ -16,11 +14,14 @@ panel_hooks = {
         var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
        $('textarea', panel).attr('id', textareaId);
 
         var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
        $('textarea', panel).attr('id', textareaId);
 

-       var texteditor = CodeMirror.fromTextArea(textareaId, {
+       var texteditor = CodeMirror.fromTextArea(textareaId, {            

             parserfile: 'parsexml.js',
             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},
             stylesheet: "{{STATIC_URL}}css/xmlcolors.css",
             parserConfig: {useHTMLKludges: false},

+            textWrapping: false,
+            lineNumbers: true,

             onChange: function() {
                self.fireEvent('contentChanged');
             },
             onChange: function() {
                self.fireEvent('contentChanged');
             },


@@ -35,8 +36,11 @@ panel_hooks = {
             }
         })
 
             }
         })
 

-        $(texteditor.frame).css({width: '100%', height: '100%'});    
+        $('.CodeMirror-content-wrapper').css({
+            width: '100%', height: '100%' });
+                    

         this.texteditor = texteditor;
         this.texteditor = texteditor;

+        self._endload();       

     },
 
        unload: function() { 
     },
 
        unload: function() { 


@@ -48,7 +52,7 @@ panel_hooks = {
 
        saveInfo: function(saveInfo) {
                var myInfo = {
 
        saveInfo: function(saveInfo) {
                var myInfo = {

-                       url: "{% url file_xml fpath %}", 
+                       url: "{% url file_xml fileid %}",

                        postData: {
                                content: this.texteditor.getCode()
                        } 
                        postData: {
                                content: this.texteditor.getCode()
                        } 


@@ -57,8 +61,8 @@ panel_hooks = {
        },
 
         toolbarResized: function() {
        },
 
         toolbarResized: function() {

-            $('.iframe-container', self.contentDiv).css('top',
-                    $('.toolbar', self.contentDiv).outerHeight() );
+            $('.iframe-container', this.contentDiv).css('top',
+                    $('.toolbar', this.contentDiv).outerHeight() );

         }
 };
 
         }
 };