Merge lp:~openerp-dev/openerp-web/7.0-sanitize-template-tde into lp:openerp-web/7.0

[Thibault Delavallée (OpenERP)]

[IMP] html_sanitize upgraded, allowing styling in html.

Web branch: cleditor does not uses custom fonts anymore.

[lp:~openerp-dev/openerp-web/7.0-sanitize-template-tde]

3663. By Thibault Delavallée (OpenERP) on 2012-12-27

[MERGE] Sync with 7.0.

=== modified file 'addons/web/static/lib/cleditor/jquery.cleditor.js'
--- addons/web/static/lib/cleditor/jquery.cleditor.js	2012-10-29 14:35:27 +0000
+++ addons/web/static/lib/cleditor/jquery.cleditor.js	2012-12-27 09:04:22 +0000
@@ -52,7 +52,7 @@
       docCSSFile:   // CSS file used to style the document contained within the editor
                     "", 
       bodyStyle:    // style to assign to document body contained within the editor
-                    "margin:4px; font:10pt Arial,Verdana; cursor:text"
+                    "margin:4px; color:#4c4c4c; font-size:13px; font-family:\"Lucida Grande\",Helvetica,Verdana,Arial,sans-serif; cursor:text"
     },
 
     // Define all usable toolbar buttons - the init string property is 
 
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2012-12-21 14:02:36 +0000
+++ addons/web/static/src/js/view_form.js	2012-12-27 09:04:22 +0000
@@ -2632,7 +2632,7 @@
                             "| removeformat | bullets numbering | outdent " +
                             "indent | link unlink | source",
                 bodyStyle:  // style to assign to document body contained within the editor
-                            "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
+                            "margin:4px; color:#4c4c4c; font-size:13px; font-family:\"Lucida Grande\",Helvetica,Verdana,Arial,sans-serif; cursor:text"
             });
             this.$cleditor = this.$textarea.cleditor()[0];
             this.$cleditor.change(function() {