odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Style toolbar 

bzr revid: fp@tinyerp.com-20130809131352-l9z5316abe1mlit2
This commit is contained in:
Fabien Pinckaers 2013-08-09 15:13:52 +02:00
parent ee936f85c2
commit f5c06fc363
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/website/static/src/js/website.js
View File

@ -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

5
addons/website_mail/static/description/index.html
View File

@ -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">