From 8f1acfff3b497d127a6b53c34dcc176bbb220eae Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 7 Aug 2013 14:17:46 +0200 Subject: [PATCH] [ADD] basic stylesSet conf bzr revid: xmo@openerp.com-20130807121746-10gjzibadyr1kdml --- addons/website/static/src/js/website.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index af30b6a640a..ba662288aae 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -191,8 +191,6 @@ instance.website.RTE = instance.web.Widget.extend({ 'magicline' ]; return { - // Don't load ckeditor's style rules - stylesSet: [], removePlugins: removed_plugins.join(','), uiColor: '', // Ensure no config file is loaded @@ -216,7 +214,17 @@ instance.website.RTE = instance.web.Widget.extend({ "JustifyBlock", "Table", "Font", "FontSize", "Format", "Styles" ]} - ] + ], + // styles dropdown in toolbar + stylesSet: [ + // emphasis + {name: "Muted", element: 'span', attributes: {'class': 'text-muted'}}, + {name: "Primary", element: 'span', attributes: {'class': 'text-primary'}}, + {name: "Warning", element: 'span', attributes: {'class': 'text-warning'}}, + {name: "Danger", element: 'span', attributes: {'class': 'text-danger'}}, + {name: "Success", element: 'span', attributes: {'class': 'text-success'}}, + {name: "Info", element: 'span', attributes: {'class': 'text-info'}} + ], }; }, // TODO clean