diff options
| author | Antony Lesuisse <al@openerp.com> | 2013-07-31 09:48:29 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2013-07-31 09:48:29 +0200 |
| commit | d616e2d5fe06a9317f15afd1ffecb60f6056b2af (patch) | |
| tree | 2e8598b0a6e578e1b2ba0493e5db33e62ff2cb5e /addons | |
| parent | 90787f3e419a13baa50d8ca2a82a12378baf13df (diff) | |
m
bzr revid: al@openerp.com-20130731074829-koml85g6ofa9r1c0
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 1 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.js | 2 | ||||
| -rw-r--r-- | addons/website_mail/views/website_mail.xml | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index e431b3db571..eca9a2edc22 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,3 +1,4 @@ +@charset "utf-8"; .oe_website_editorbar { position: fixed; top: 0; diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index e7a42877dcc..21fd393aab2 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -45,7 +45,7 @@ instance.website.EditorBar = instance.web.Widget.extend({ var $editables = $('[data-oe-model]') .not('link, script').prop('contentEditable', true) .addClass('oe_editable'); - var $rte_ables = $editables.filter('div, p, li').not('[data-oe-type]'); + var $rte_ables = $editables.filter('div, p, li, section').not('[data-oe-type]'); var $raw_editables = $editables.not($rte_ables); this.rte.start_edition($rte_ables); diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index 9ab1aa58abe..feba7637c22 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -73,8 +73,8 @@ <i class="icon-ok-circle css_publish"></i> <i class="icon-remove-sign css_unpublish"></i> </a> - <h3><t t-esc="blog_id.subject"/></h3> - <p><t t-raw="blog_id.body"/></p> + <h3><t t-record="blog_id" t-field="subject"/></h3> + <p><t t-record="blog_id" t-field="body"/></p> <small class="pull-right muted text-right"> <div><t t-esc="blog_id.read(['author_id'])[0]['author_id'][1]"/></div> <div><t t-esc="blog_id.date"/></div> @@ -115,9 +115,9 @@ <i class="icon-ok-circle css_publish"></i> <i class="icon-remove-sign css_unpublish"></i> </a> - <a t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><h4 class="media-heading"><t t-esc="blog.subject"/></h4></a> + <a t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><h4 class="media-heading"><t t-record="blog" t-field="subject"/></h4></a> <div class="media"> - <t t-raw="blog.body"/> + <t t-record="blog" t-field="body"/> <small class="pull-right muted text-right"> <a t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)">Read more </a> <div><t t-esc="blog.read(['author_id'])[0]['author_id'][1]"/></div> |