diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-09-04 15:17:45 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-09-04 15:17:45 +0200 |
| commit | b56cd5e2bec421ee34bcb561ede46cc5832a4cbb (patch) | |
| tree | 17446e42c4589c203d035cd2789ba8ddfadddf2d | |
| parent | 4932521377aa38891617c3bd4add15473b996a0c (diff) | |
[IMP] merge Format and Styles dropdowns
bzr revid: xmo@openerp.com-20130904131745-ro5c0c7myvyv98xw
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 42e35ea0d65..0ac26fe91db 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -291,11 +291,20 @@ "Image", "Table" ]},{ name: 'styles', items: [ - "Format", "Styles" + "Styles" ]} ], // styles dropdown in toolbar stylesSet: [ + {name: "Normal", element: 'p'}, + {name: "Heading 1", element: 'h1'}, + {name: "Heading 2", element: 'h2'}, + {name: "Heading 3", element: 'h3'}, + {name: "Heading 4", element: 'h4'}, + {name: "Heading 5", element: 'h5'}, + {name: "Heading 6", element: 'h6'}, + {name: "Formatted", element: 'pre'}, + {name: "Address", element: 'address'}, // emphasis {name: "Muted", element: 'span', attributes: {'class': 'text-muted'}}, {name: "Primary", element: 'span', attributes: {'class': 'text-primary'}}, |