From a109098cb782aa8d44d4091035e6707b4161a70d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 12:01:27 +0200
Subject: [PATCH] [FIX] Proper editor sizing

bzr revid: ddm@openerp.com-20130910100127-98zjbitry2xhqld2
---
 addons/website/static/src/css/editor.css       | 3 ++-
 addons/website/static/src/css/editor.sass      | 3 ++-
 addons/website/static/src/js/website.ace.js    | 7 ++++---
 addons/website/static/src/js/website.editor.js | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index dd1b33aad5f..79682021261 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -337,6 +337,7 @@ table.editorbar-panel td.selected {
   right: 0;
   bottom: 0;
   left: 0;
+  width: 720px;
 }
 
 .oe_ace_closed {
@@ -345,6 +346,6 @@ table.editorbar-panel td.selected {
 }
 
 .oe_ace_open {
-  width: 50%;
+  width: 720px;
   transition: width 0.4s ease-in;
 }
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 8d250d00370..93566cf16c0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -302,11 +302,12 @@ $remove_color: $icon_close
         right: 0
         bottom: 0
         left: 0
+        width: 720px
 
 .oe_ace_closed
     width: 0
     transition: width 0.4s ease-in
 
 .oe_ace_open
-    width: 50%
+    width: 720px
     transition: width 0.4s ease-in
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 6aec5e8f182..145a9dd256a 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -14,7 +14,9 @@
             if (!editor) {
                 editor = new website.ace.ViewEditor();
                 editor.appendTo($(document.body));
-                setTimeout(editor.show, 100);
+                setTimeout(function () {
+                    editor.show.call(editor);
+                }, 100);
             } else {
                 editor.show();
             }
@@ -55,8 +57,6 @@
                     editor.setTheme("ace/theme/monokai");
                     editor.getSession().setMode("ace/mode/xml");
                     self.aceEditor = editor;
-                    self.displayView();
-                    self.show();
                 });
         },
         displayView: function () {
@@ -92,6 +92,7 @@
         show: function () {
             this.$el.removeClass('oe_ace_closed');
             this.$el.addClass('oe_ace_open');
+            this.displayView();
         },
         destroy: function () {
             editor = null;
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index c3f590c98d0..993038347bf 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -148,7 +148,7 @@
                         });
                         // Adding Static Menus
                         menu.append('<li class="divider"></li><li><a href="/page/website.themes">Change Theme</a></li>');
-                        menu.append('<li class="divider"></li><li><a data-action="ace" href="#">Ace</a></li>');
+                        menu.append('<li class="divider"></li><li><a data-action="ace" href="#">Advanced view editor</a></li>');
                     }
                 );
             });