diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index a016cbc150b..75de4387083 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
/* THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
*
* css for editor buttons, openerp widget included in the website and other
@@ -97,12 +96,12 @@
}
/* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
-html, body {
+html, body, #wrapwrap {
box-sizing: border-box;
height: 100%;
}
-body {
+#wrapwrap {
display: table;
width: 100%;
}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index a4b07b2969c..86cfad27fc6 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -64,11 +64,11 @@
/* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
-html,body
+html,body, #wrapwrap
box-sizing: border-box
height: 100%
-body
+#wrapwrap
display: table
width: 100%
@@ -110,9 +110,8 @@ footer
.nav-hierarchy
padding-left: 16px
-div#wrap
- .carousel
- top: -20px
+div#wrap .carousel
+ top: -20px
/* -- Hack for removing double scrollbar from mobile preview -- */
div#mobile-preview.modal
@@ -122,9 +121,8 @@ div#mobile-preview.modal
ul.nav-stacked > li > a
padding: 2px 15px
-#customize-menu
- .dropdown-header
- text-transform: uppercase
+#customize-menu .dropdown-header
+ text-transform: uppercase
/* ---- PUBLISH ---- */
a[data-publish]
@@ -157,4 +155,4 @@ a[data-publish]
top: -10px
display: none
/*&:hover > [data-publish]*/
- /* display: block*/
\ No newline at end of file
+ /* display: block*/
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 84e2d1fa017..512c374e8d4 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -310,8 +310,7 @@
start_edition: function ($elements) {
var self = this;
// create a single editor for the whole page
- // FIXME: is not the whole page, ckeditor can't handle body
- var root = document.getElementById('wrap');
+ var root = document.getElementById('wrapwrap');
root.setAttribute('data-cke-editable', 'true');
this.editor = CKEDITOR.inline(root, self._config());
this.editor.on('instanceReady', function () {
diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index b546d41a7ec..6ed823ed10c 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -16,4 +16,4 @@
-
\ No newline at end of file
+
diff --git a/addons/website/view.py b/addons/website/view.py
index d3b715159c1..8d5fef42b23 100644
--- a/addons/website/view.py
+++ b/addons/website/view.py
@@ -55,34 +55,42 @@ class view(osv.osv):
def extract_embedded_fields(self, cr, uid, arch, context=None):
return arch.xpath('//*[@data-oe-model != "ir.ui.view"]')
- def convert_embedded_field(self, cr, uid, el, column, context=None):
+ def convert_embedded_field(self, cr, uid, el, column,
+ type_override=None, context=None):
""" Converts the content of an embedded field to a value acceptable
for writing in the column
:param etree._Element el: embedded field being saved
:param fields._column column: column object corresponding to the field
+ :param type type_override: column type to dispatch on instead of the
+ column's actual type (for proxy column types
+ e.g. relateds)
:return: converted value
"""
- if isinstance(column, fields.html):
+ column_type = type_override or type(column)
+
+ if issubclass(column_type, fields.html):
# FIXME: multiple children?
return html.tostring(el[0])
- elif isinstance(column, fields.integer):
+ elif issubclass(column_type, fields.integer):
return int(el.text_content())
- elif isinstance(column, fields.float):
+ elif issubclass(column_type, fields.float):
return float(el.text_content())
- elif isinstance(column, (fields.char, fields.text,
- fields.date, fields.datetime)):
+ elif issubclass(column_type, (fields.char, fields.text,
+ fields.date, fields.datetime)):
return el.text_content()
# TODO: fields.selection
# TODO: fields.many2one
- elif isinstance(column, fields.function):
+ elif issubclass(column_type, fields.function):
# FIXME: special-case selection as in get_pg_type?
return self.convert_embedded_field(
- cr, uid, el, getattr(fields, column._type), context=context)
+ cr, uid, el, column,
+ type_override=getattr(fields, column._type),
+ context=context)
# TODO?: fields.many2many, fields.one2many
# TODO?: fields.reference
else:
- raise TypeError("Un-convertable column type %s" % column)
+ raise TypeError("Un-convertable column type %s" % column_type)
def save_embedded_field(self, cr, uid, el, context=None):
Model = self.pool[el.get('data-oe-model')]
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 9a04f9816ad..6b71eadf832 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -57,99 +57,101 @@
-
-
+
+
+
-
-
-
-
Main Layout
-
+
-