From 7c45e5976e6caf3d7b9eb508f728062704232261 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 9 Sep 2013 23:46:26 +0200
Subject: CMS basic view editing

bzr revid: ddm@openerp.com-20130909214626-51zfydwbw624heqz
---
 addons/website/static/src/xml/website.ace.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.ace.xml

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
new file mode 100644
index 00000000000..77cb1243b25
--- /dev/null
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="website.ace_view_editor">
+        <div class="oe_ace_view_editor">
+            <div class="oe_ace_view_editor_title">
+                <button type="button" class="btn btn-default btn-small">Close</button>
+                <button data-action="save-view" type="button" class="btn btn-default btn-small">Save</button>
+                <select id="ace-view-list">
+                    <!-- filled in JS -->
+                </select>
+            </div>
+            <div id="ace-view-editor"/>
+        </div>
+    </t>
+    <t t-name="website.ace_view_option">
+        <option t-att-value="widget.view_id"><t t-esc="widget.view_name"/></option>
+    </t>
+</templates>
\ No newline at end of file
-- 
cgit v1.2.3


From d37594fab32e7df0e210a890250d29468969d42a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 08:39:38 +0200
Subject: [FIX] View save now working

bzr revid: ddm@openerp.com-20130910063938-yh6tje9h5y9i0ld6
---
 addons/website/static/src/xml/website.ace.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 77cb1243b25..bdb27a10b3e 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -2,12 +2,12 @@
 <templates id="template" xml:space="preserve">
     <t t-name="website.ace_view_editor">
         <div class="oe_ace_view_editor">
-            <div class="oe_ace_view_editor_title">
-                <button type="button" class="btn btn-default btn-small">Close</button>
-                <button data-action="save-view" type="button" class="btn btn-default btn-small">Save</button>
-                <select id="ace-view-list">
+            <div class="form-inline oe_ace_view_editor_title">
+                <select id="ace-view-list" class="form-control oe_view_list">
                     <!-- filled in JS -->
                 </select>
+                <button data-action="save" type="submit" class="btn btn-success">Save</button>
+                <button data-action="close" type="button" class="btn btn-info pull-right">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From b230cc89af561795afee6563229a7fedd329ad4d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 08:51:13 +0200
Subject: [FIX] Floating button

bzr revid: ddm@openerp.com-20130910065113-uqiltvbays6xpm34
---
 addons/website/static/src/xml/website.ace.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index bdb27a10b3e..5ead2c849b5 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -7,7 +7,7 @@
                     <!-- filled in JS -->
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
-                <button data-action="close" type="button" class="btn btn-info pull-right">Close</button>
+                <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From 9b1b1f3de014e70964b729c09424c136a8485e15 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 09:07:18 +0200
Subject: [FIX] Slide in

bzr revid: ddm@openerp.com-20130910070718-0x541xioj1udwxnt
---
 addons/website/static/src/xml/website.ace.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 5ead2c849b5..0343ebc3e3c 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="website.ace_view_editor">
-        <div class="oe_ace_view_editor">
+        <div class="oe_ace_view_editor oe_ace_closed">
             <div class="form-inline oe_ace_view_editor_title">
                 <select id="ace-view-list" class="form-control oe_view_list">
                     <!-- filled in JS -->
-- 
cgit v1.2.3


From 95a9983f666a1f8e8da4cb57ec82db6acddd7e3e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 17:12:49 +0200
Subject: [IMP] XML autoformat

bzr revid: ddm@openerp.com-20130910151249-vxn5vm0dewytngzn
---
 addons/website/static/src/xml/website.ace.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 0343ebc3e3c..b546d41a7ec 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -7,6 +7,7 @@
                     <!-- filled in JS -->
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
+                <button data-action="format" type="button" class="btn btn-warning">Format</button>
                 <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
             <div id="ace-view-editor"/>
-- 
cgit v1.2.3


From 134c0899541f036d38885c76771c4a55650a4a5d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 11 Sep 2013 15:26:18 +0200
Subject: [FIX] Proper template filtering + various

bzr revid: ddm@openerp.com-20130911132618-9n599qmiyj3k934p
---
 addons/website/static/src/xml/website.ace.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index b546d41a7ec..cda74164a28 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -8,7 +8,7 @@
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
                 <button data-action="format" type="button" class="btn btn-warning">Format</button>
-                <button data-action="close" type="button" class="btn btn-info">Close</button>
+                <button data-action="close" type="button" class="btn btn-info pull-right" style="display:none">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From 1bcae6b62fed65ea5b2797533e3a8bac41760dcb Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 11 Sep 2013 17:45:02 +0200
Subject: [IMP] CSS transparency support

bzr revid: ddm@openerp.com-20130911154502-r2493m71f2x8vvdl
---
 addons/website/static/src/xml/website.ace.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index cda74164a28..b546d41a7ec 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -8,7 +8,7 @@
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
                 <button data-action="format" type="button" class="btn btn-warning">Format</button>
-                <button data-action="close" type="button" class="btn btn-info pull-right" style="display:none">Close</button>
+                <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From e0662b11d094514711ef6ae4e7420f15d0cbb03d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 18 Sep 2013 16:50:28 +0200
Subject: [FIX] wrap the wrapper in order to allow RTE on all of the page
 (except the toolbar)

CKEditor does not work directly on body, and it's a bad idea anyway
(editing the edition toolbar won't end well).

A big wrapper around all of the page's content can be used as RTE hook
to give access to the body as well as the header and footers.

bzr revid: xmo@openerp.com-20130918145028-6ppi9sro2un0quh5
---
 addons/website/static/src/xml/website.ace.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.ace.xml')

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index b546d41a7ec..6ed823ed10c 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -16,4 +16,4 @@
     <t t-name="website.ace_view_option">
         <option t-att-value="widget.view_id"><t t-esc="widget.view_name"/></option>
     </t>
-</templates>
\ No newline at end of file
+</templates>
-- 
cgit v1.2.3