From f5c06fc3636ae10215ffde34033814cbda9eb9c9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 9 Aug 2013 15:13:52 +0200
Subject: [PATCH] [IMP] Style toolbar

bzr revid: fp@tinyerp.com-20130809131352-l9z5316abe1mlit2
---
 addons/website/static/src/js/website.js       | 20 +++++++++++++------
 .../static/description/index.html             |  5 ++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index ba662288aae..1d84cb94a34 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -205,14 +205,22 @@ instance.website.RTE = instance.web.Widget.extend({
             // Place toolbar in controlled location
             sharedSpaces: { top: 'oe_rte_toolbar' },
             toolbar: [
-                {name: 'items', items: [
+                {name: 'basicstyles', items: [
                     "Bold", "Italic", "Underline", "Strike", "Subscript",
-                    "Superscript", "TextColor", "BGColor", "RemoveFormat",
+                    "Superscript", "TextColor", "BGColor", "RemoveFormat"
+                ],
+                name: 'span', items: [
                     "Link", "Unlink", "Blockquote", "BulletedList",
-                    "NumberedList", "Image", "Indent", "Outdent",
-                    "JustifyLeft", "JustifyCenter", "JustifyRight",
-                    "JustifyBlock", "Table", "Font", "FontSize", "Format",
-                    "Styles"
+                    "NumberedList", "Indent", "Outdent",
+                ],
+                name: 'justify', items: [
+                    "JustifyLeft", "JustifyCenter", "JustifyRight", "JustifyBlock"
+                ],
+                name: 'special', items: [
+                    "Image", "Table"
+                ],
+                name: 'styles', items: [
+                    "Format", "Styles"
                 ]}
             ],
             // styles dropdown in toolbar
diff --git a/addons/website_mail/static/description/index.html b/addons/website_mail/static/description/index.html
index 21834b41b50..a900da51e24 100644
--- a/addons/website_mail/static/description/index.html
+++ b/addons/website_mail/static/description/index.html
@@ -193,7 +193,6 @@
               Others access rights related to business objects (products, people,
               events, etc) directly follows OpenERP's standard access right allowing
               you to not have to configure them twice.
-
           </p>
         </div>
     </div>
@@ -201,7 +200,7 @@
 
 <section class="oe_container oe_dark">
     <div class="oe_row">
-        <h2 class="oe_slogan">Built-in comments</h2>
+        <h2 class="oe_slogan">Built-in Comments</h2>
         <h3 class="oe_slogan">Engage with your readers</h3>
         <div class="oe_span6">
             <p class='oe_mt32'>
@@ -221,7 +220,7 @@
 
 <section class="oe_container">
     <div class="oe_row">
-        <h2 class="oe_slogan">Fully Integrated With Others Apps</h2>
+        <h2 class="oe_slogan">Integrated With Others OpenERP Apps</h2>
         <h3 class="oe_slogan">Get hundreds of open source apps for free</h3>
         <div class="oe_span4">
             <a href="/apps/website">