From e92cb7456525650c2c95f27a90ec15b91f64da1e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Aug 2013 15:32:10 +0200
Subject: [PATCH 1/6] [IMP] website_crm_partner_assign: some change in view

bzr revid: chm@openerp.com-20130829133210-o7tp2zj01x8i7fej
---
 addons/website_contract/views/website_contract.xml              | 2 +-
 .../views/website_crm_partner_assign.xml                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 051752fe86c..278486bb522 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -56,7 +56,7 @@
                             </a>
                             <div class="media-body">
                                 <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
-                                <a class="media-heading" t-attf-href="/references/#{ partner.id }/"><small t-field="partner.parent_id"/> <small t-field="partner.name"/></a>
+                                <a class="media-heading" t-attf-href="/references/#{ partner.id }/"><span t-field="partner.parent_id"/> <span t-field="partner.name"/></a>
                                 <div t-field="partner.website_short_description"/>
                             </div>
                         </div>
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 68662bb908f..becb60875b5 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -65,7 +65,7 @@
                             </a>
                             <div class="media-body">
                                 <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
-                                <a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><small t-field="partner.parent_id"/> <small t-field="partner.name"/></a>
+                                <a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><span t-field="partner.parent_id"/> <span t-field="partner.name"/></a> - <span t-field="partner.grade_id"/>
                                 <div t-field="partner.website_short_description"/>
                             </div>
                         </div>

From e6da64b39e1d11336663e9f2319f4ffe904b109c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Aug 2013 17:00:58 +0200
Subject: [PATCH 2/6] [IMP] website_crm_partner_assign: imp views

bzr revid: chm@openerp.com-20130829150058-bmcedth32o4nrdvh
---
 .../views/website_contract.xml                |  8 +++--
 .../controllers/main.py                       |  3 +-
 .../views/website_crm_partner_assign.xml      | 35 +++++++++++--------
 .../website_crm_partner_assign.py             |  7 ++++
 addons/website_event/views/website_event.xml  |  2 +-
 addons/website_sale/views/website_sale.xml    |  4 +--
 6 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 278486bb522..4efc1ef5024 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -27,10 +27,12 @@
     <template id="index" name="References">
         <t t-call="website_contract.layout">
             <t t-set="ref_content">
-                <h1 class="span12 text-center">Trusted by millions worldwide</h1>
-                <h2 class="span12 text-center">Our public references</h2>
+                <h1 class="span12 text-center">
+                    Trusted by millions worldwide<br/>
+                    <small>Our public references</small>
+                </h1>
                 <div class="span12" id="ref_content">
-                    <div class='navbar navbar-inverse'>
+                    <div class='navbar'>
                         <div class='navbar-inner'>
                             <t t-call="website.pager" >
                                 <t t-set="classname">pull-left</t>
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index fb9fe9f9f0d..cc4af24d527 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -51,7 +51,8 @@ class website_crm_partner_assign(http.Controller):
 
         step = 20
         pager = website.pager(url="/partners/", total=len(partner_ids), page=page, step=step, scope=7, url_args=post)
-        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], limit=step, offset=pager['offset'])
+        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], 
+            limit=step, offset=pager['offset'], order="grade_id ASC,partner_weight DESC")
 
 
         values = website.get_rendering_context({
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index becb60875b5..8fee7dcf8f4 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -27,14 +27,13 @@
     <template id="index" name="Partners">
         <t t-call="website_crm_partner_assign.layout">
             <t t-set="ref_content">
-                <h1 class="span12 text-center">Want services on OpenERP?</h1>
-                <h2 class="span12 text-center">Contact a local partner</h2>
+                <h1 class="span12 text-center">
+                    Want services on OpenERP?<br/>
+                    <small>Contact a local partner</small>
+                </h1>
                 <div class="span12" id="ref_content">
-                    <div class='navbar navbar-inverse'>
+                    <div class='navbar'>
                         <div class='navbar-inner'>
-                            <t t-call="website.pager" >
-                                <t t-set="classname">pull-left</t>
-                            </t>
                             <form action="/partners/" method="get" class="navbar-search pull-right pagination">
                                 <input type="text" name="search" class="search-query span2 mt4" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
                                 <select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
@@ -59,16 +58,22 @@
                         </div>
                     </div>
                     <div>
-                        <div t-foreach="partner_ids" t-as="partner" class="media thumbnail">
-                            <a class="pull-left" t-attf-href="/partners/#{ partner.id }/">
-                                <img class="media-object" t-att-src="partner.img('image_small')"/>
-                            </a>
-                            <div class="media-body">
-                                <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
-                                <a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><span t-field="partner.parent_id"/> <span t-field="partner.name"/></a> - <span t-field="partner.grade_id"/>
-                                <div t-field="partner.website_short_description"/>
+                        <t t-foreach="partner_ids" t-as="partner">
+                            <t t-if="grade_id != partner.grade_id.id">
+                                <t t-set="grade_id" t-value="partner.grade_id.id"/>
+                                <h3 class="text-center well"><span t-field="partner.grade_id"/> Partners</h3>
+                            </t>
+                            <div class="media thumbnail">
+                                <a class="pull-left" t-attf-href="/partners/#{ partner.id }/">
+                                    <img class="media-object" t-att-src="partner.img('image_small')"/>
+                                </a>
+                                <div class="media-body">
+                                    <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
+                                    <a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><span t-field="partner.parent_id"/> <span t-field="partner.name"/></a> - <span t-field="partner.grade_id"/>
+                                    <div t-field="partner.website_short_description"/>
+                                </div>
                             </div>
-                        </div>
+                        </t>
                     </div>
                 </div>
             </t>
diff --git a/addons/website_crm_partner_assign/website_crm_partner_assign.py b/addons/website_crm_partner_assign/website_crm_partner_assign.py
index 1d89a2bdf4e..828df9bbff5 100644
--- a/addons/website_crm_partner_assign/website_crm_partner_assign.py
+++ b/addons/website_crm_partner_assign/website_crm_partner_assign.py
@@ -11,3 +11,10 @@ class res_partner(osv.osv):
 
     def img(self, cr, uid, ids, field='image_small', context=None):
         return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])
+
+
+class res_partner_grade(osv.osv):
+    _inherit = 'res.partner.grade'
+    _columns = {
+        'website_description': fields.html('Description for the website'),
+    }
\ No newline at end of file
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 3d099c538fe..47b0a233d2e 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -40,7 +40,7 @@
                             </t>
                         </ul>
                     </div>
-                    <div class='span8 navbar navbar-inverse'>
+                    <div class='span8 navbar'>
                         <div class='navbar-inner'>
                             <t t-call="website.pager" >
                                 <t t-set="classname">pull-left</t>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index b7a40a5fb8c..6eb80aa7689 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -97,7 +97,7 @@
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
-                <div class='navbar navbar-inverse'>
+                <div class='navbar'>
                     <div class='navbar-inner'>
                         <t t-call="website.pager" >
                             <t t-set="classname">pull-left</t>
@@ -142,7 +142,7 @@
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
-                <div class='navbar navbar-inverse'>
+                <div class='navbar'>
                     <div class='navbar-inner'>
                         <form t-attf-action="/shop/#{ category_id and ('category/%s/' % category_id) or ''}" method="get" class="navbar-search pull-right pagination">
                             <input type="text" name="search" class="search-query span2" placeholder="Search" t-att-value="search or '' or ''"/>

From 0d64c9037dcf27d8a32515e5150e96e16ef8a75e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Aug 2013 17:34:41 +0200
Subject: [PATCH 3/6] [IMP] Implement custom bootstrap dialog for links.

Dialog doesn't work right as it's a bootstrap 3-ish dialog, not 2, so
none of the classes works correctly.

Also moved editor templates outside of main website template file.

bzr revid: xmo@openerp.com-20130829153441-w51n3hxxikyti0xj
---
 .../website/static/src/js/website.editor.js   | 210 +++++++++++++++++-
 addons/website/static/src/js/website.js       |   2 +-
 .../website/static/src/xml/website.editor.xml |  56 +++++
 addons/website/static/src/xml/website.xml     |  10 -
 4 files changed, 256 insertions(+), 22 deletions(-)
 create mode 100644 addons/website/static/src/xml/website.editor.xml

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 047a5b17557..fa8dc60c251 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -3,7 +3,53 @@
 
     var website = openerp.website;
 
+    website.templates.push('/website/static/src/xml/website.editor.xml');
+    website.dom_ready.done(function () {
+        // $.fn.data automatically parses value, '0'|'1' -> 0|1
+        website.is_editable = $(document.documentElement).data('editable');
+        var is_smartphone = $(document.body)[0].clientWidth < 767;
+
+        if (website.is_editable && !is_smartphone) {
+            website.ready().then(website.init_editor);
+        }
+    });
+
+    function link_dialog(editor) {
+        return new website.editor.LinkDialog(editor).appendTo(document.body);
+    }
+
     website.init_editor = function () {
+        CKEDITOR.plugins.add('customdialogs', {
+            requires: 'link,image',
+            init: function (editor) {
+                editor.on('doubleclick', function (evt) {
+                    if (evt.data.dialog === 'link' || evt.data.dialog === 'image') {
+                        delete evt.data.dialog;
+                        link_dialog(editor);
+                    }
+                    // priority should be smaller than dialog (999) but bigger
+                    // than link or image (default=10)
+                }, null, null, 500);
+
+                editor.addCommand('link', {
+                    exec: function (editor, data) {
+                        link_dialog(editor);
+                        return true;
+                    },
+                    canUndo: false,
+                    editorFocus: true,
+                });
+                editor.addCommand('image', {
+                    exec: function (editor, data) {
+                        console.log('image', editor, data);
+                        return true;
+                    },
+                    canUndo: false,
+                    editorFocus: true,
+                });
+
+            }
+        });
         var editor = new website.EditorBar();
         var $body = $(document.body);
         editor.prependTo($body);
@@ -215,7 +261,7 @@
                 autoParagraph: false,
                 filebrowserImageUploadUrl: "/website/attach",
                 // Support for sharedSpaces in 4.x
-                extraPlugins: 'sharedspace',
+                extraPlugins: 'sharedspace,customdialogs',
                 // Place toolbar in controlled location
                 sharedSpaces: { top: 'oe_rte_toolbar' },
                 toolbar: [
@@ -251,6 +297,158 @@
         },
     });
 
+    website.editor = { };
+    website.editor.Dialog = openerp.Widget.extend({
+        events: {
+            'hidden': 'destroy',
+        },
+        init: function (editor) {
+            this._super();
+            this.editor = editor;
+        },
+        start: function () {
+            var sup = this._super();
+            this.$el.modal();
+            return sup;
+        },
+    });
+
+    website.editor.LinkDialog = website.editor.Dialog.extend({
+        template: 'website.editor.dialog.link',
+        events: _.extend({}, website.editor.Dialog.prototype.events, {
+            'click button.btn-primary': 'save',
+            'change .url-source': function (e) { this.changed($(e.target)); },
+        }),
+        init: function (editor) {
+            this._super(editor);
+            this.pages = Object.create(null);
+        },
+        start: function () {
+            var element;
+            if ((element = this.get_selected_link()) && element.hasAttribute('href')) {
+                this.editor.getSelection().selectElement(element);
+            }
+            this.element = element;
+
+            return $.when(
+                this.fetch_pages().done(this.proxy('fill_pages')),
+                this._super()
+            ).done(this.proxy('bind_data'));
+        },
+        /**
+         * Greatly simplified version of CKEDITOR's
+         * plugins.link.dialogs.link.onOk.
+         *
+         * @param {String} url
+         * @param {Boolean} [new_window=false]
+         * @param {String} [label=null]
+         */
+        make_link: function (url, new_window, label) {
+            var attributes = {href: url, 'data-cke-saved-href': url};
+            var to_remove = [];
+            if (new_window) {
+                attributes['target'] = '_blank';
+            } else {
+                to_remove.push('target');
+            }
+
+            if (this.element) {
+                this.element.setAttributes(attributes);
+                this.element.removeAttributes(to_remove);
+            } else {
+                var selection = this.editor.getSelection();
+                var range = selection.getRanges(true)[0];
+
+                if (range.collapsed) {
+                    var text = new CKEDITOR.dom.text(label || url);
+                    range.insertNode(text);
+                    range.selectNodeContents(text);
+                }
+
+                new CKEDITOR.style({
+                    type: CKEDITOR.STYLE_INLINE,
+                    element: 'a',
+                    attributes: attributes,
+                }).applyToRange(range);
+                // blows up the call stack, not sure why as original version
+                // seems to work OK
+                // range.select();
+            }
+        },
+        save: function () {
+            var $e = this.$('.url-source').filter(function () { return !!this.value; });
+
+            var val = $e.val();
+            if ($e.hasClass('email-address')) {
+                this.make_link('mailto:' + val, false, val);
+            } else if ($e.hasClass('pages')) {
+                this.make_link(val, false, $e.find('option:selected').text());
+            } else {
+                this.make_link(val, this.$('input.window-new').prop('checked'));
+            }
+            this.$el.modal('hide');
+        },
+        bind_data: function () {
+            var href = this.element && (this.element.data( 'cke-saved-href')
+                                    ||  this.element.getAttribute('href'));
+            if (!href) { return; }
+
+            var match, $control;
+            if (match = /(mailto):(.+)/.exec(href)) {
+                $control = this.$('input.email-address').val(match[2]);
+            } else if(href in this.pages) {
+                $control = this.$('select.pages').val(href);
+            }
+            if (!$control) {
+                $control = this.$('input.url').val(href);
+            }
+
+            this.changed($control);
+
+            this.$('input.window-new').prop(
+                'checked', this.element.getAttribute('target') === '_blank');
+        },
+        changed: function ($e) {
+            $e.closest('li.list-group-item').addClass('active')
+              .siblings().removeClass('active');
+            this.$('.url-source').not($e).val('');
+        },
+        /**
+         * CKEDITOR.plugins.link.getSelectedLink ignores the editor's root,
+         * if the editor is set directly on a link it will thus not work.
+         */
+        get_selected_link: function () {
+            var sel = this.editor.getSelection(),
+                el = sel.getSelectedElement();
+            if (el && el.is('a')) { return el; }
+
+            var range = sel.getRanges(true)[0];
+            if (!range) { return null; }
+
+            range.shrink(CKEDITOR.SHRINK_TEXT);
+            return this.editor.elementPath(range.getCommonAncestor())
+                              .contains('a');
+
+        },
+        fetch_pages: function () {
+            return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
+                model: 'website',
+                method: 'list_pages',
+                args: [],
+                kwargs: {}
+            });
+        },
+        fill_pages: function (results) {
+            var self = this;
+            var $select = this.$('select');
+            $select.append(new Option());
+            _(results).each(function (result) {
+                self.pages[result.url] = true;
+                $select.append(new Option(result.name, result.url));
+            });
+        },
+    });
+
 
     var Observer = window.MutationObserver || window.WebkitMutationObserver || window.JsMutationObserver;
     var observer = new Observer(function (mutations) {
@@ -279,14 +477,4 @@
             .uniq()
             .each(function (node) { $(node).trigger('content_changed'); })
     });
-
-    website.dom_ready.done(function () {
-        // $.fn.data automatically parses value, '0'|'1' -> 0|1
-        website.is_editable = $(document.documentElement).data('editable');
-        var is_smartphone = $(document.body)[0].clientWidth < 767;
-
-        if (website.is_editable && !is_smartphone) {
-            website.ready().then(website.init_editor);
-        }
-    });
 })();
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index f55ebc34bf2..8a7f396895f 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -5,7 +5,7 @@
     // The following line can be removed in 2017
     openerp.website = website;
 
-    var templates = [
+    var templates = website.templates = [
         '/website/static/src/xml/website.xml'
     ];
 
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
new file mode 100644
index 00000000000..6fbc7345b17
--- /dev/null
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -0,0 +1,56 @@
+<templates id="template" xml:space="preserve">
+    <t t-extend="website.editorbar">
+        <t t-jquery="#website-top-view" t-operation="after">
+            <div class="navbar-inner" id="website-top-edit">
+                <form class="navbar-form pull-left">
+                    <button data-action="save" class="btn btn-primary">Save</button>
+                    <button data-action="cancel" class="btn">Cancel</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                </ul>
+            </div>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.link">
+        <div class="modal hide" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3>Link to:</h3>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <ul class="list-group">
+                        <li class="list-group-item active">
+                            <h3 class="list-group-item-heading">Page on Your Website</h3>
+                            <select class="form-control pages url-source"/>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading pull-left">Website URL</h3>
+                            <div class="pull-right">
+                                <label>
+                                    <input type="checkbox" class="window-new"/>
+                                    Open in new window
+                                </label>
+                            </div>
+                            <div class="clearfix"></div>
+                            <div class="input-group">
+                                <input type="text" class="form-control url url-source"
+                                       placeholder="http://openerp.com"/>
+                            </div>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading">Email Address</h3>
+                            <input type="email" class="form-control email-address url-source"
+                                   placeholder="you@yourwebsite.com"/>
+                        </li>
+                    </ul>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+                <button type="button" class="btn btn-primary">Save changes</button>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 17ec64bc6bb..a03868d392b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -27,16 +27,6 @@
                     </li>
                 </ul>
             </div>
-
-            <div class="navbar-inner" id="website-top-edit">
-                <form class="navbar-form pull-left">
-                    <button data-action="save" class="btn btn-primary">Save</button>
-                    <button data-action="cancel" class="btn">Cancel</button>
-                </form>
-                <ul class="nav pull-right">
-                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
-                </ul>
-            </div>
         </div>
     </t>
 

From 69327029a7ba7d93baf17692059e9031924d678b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Aug 2013 17:37:48 +0200
Subject: [PATCH 4/6] [IMP] website_event: demo data

bzr revid: chm@openerp.com-20130829153748-gtbocio487ym5drj
---
 addons/event_sale/event_demo.xml             | 22 ++++++++++++++++++++
 addons/event_sale/event_sale.py              |  2 +-
 addons/website_event/views/website_event.xml | 10 ++++-----
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
index bb023a40ff0..d4b8e225130 100644
--- a/addons/event_sale/event_demo.xml
+++ b/addons/event_sale/event_demo.xml
@@ -14,6 +14,9 @@
         <field name="event_ok">True</field>
         <field name="event_type_id" ref="event.event_type_4"/>
         <field name="categ_id" ref="product.product_category_1"/>
+        <field name="address_id" ref="base.res_partner_2"/>
+        <field name="organizer_id" ref="base.res_partner_address_4"/>
+        <!--field name="event_ticket_ids" eval="[(6, 0, [ref('idea.idea_cat_0'), ref('idea.idea_cat_1')])]"/-->
         <field name="type">service</field>
         <field name="list_price">2500.0</field>
         <field name="standard_price">1000.0</field>
@@ -21,5 +24,24 @@
         <field name="uom_po_id" ref="product.product_uom_unit"/>
         <field name="image">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</field>
     </record>
+
+    <record id="event_ticket_1" model="event.event.ticket">
+        <field name="name">Standard</field>
+        <field name="event_id" ref="event_technical_training"/>
+        <field name="product_id" ref="event_product"/>
+        <field name="deadline" eval="(DateTime.today() + timedelta(90)).strftime('%Y-%m-%d')"/>
+        <field name="price">1000.0</field>
+        <field name="register_max">20</field>
+    </record>
+
+    <record id="event_ticket_2" model="event.event.ticket">
+        <field name="name">VIP</field>
+        <field name="event_id" ref="event_technical_training"/>
+        <field name="product_id" ref="event_product"/>
+        <field name="deadline" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d')"/>
+        <field name="price">5000.0</field>
+        <field name="register_max">5</field>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index a8f73a3055f..21682d18373 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -127,7 +127,7 @@ class event_event(osv.osv):
             string='Maximum Registrations',
             help="The maximum registration level is equal to the sum of the maximum registration of event ticket." +
             "If you have too much registrations you are not able to confirm your event. (0 to ignore this rule )",
-            type='integer', store=True)
+            type='integer')
     }
 
     def check_registration_limits(self, cr, uid, ids, context=None):
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 47b0a233d2e..cf545a63ff9 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -67,8 +67,8 @@
                                     <t t-call="website.publish"><t t-set="object" t-value="event"/></t>
                                     <div>
                                         <span t-field="event.type">: </span>
-                                        <t t-if="event.user_id">
-                                            Organized by: <span t-field="event.user_id"> </span>
+                                        <t t-if="event.organizer_id">
+                                            Organized by: <span t-field="event.organizer_id"> </span>
                                         </t>
                                     </div>
                                     <div>
@@ -132,7 +132,7 @@
                             <pre t-field="event_id.address_id"/>
                             <i class="icon-time"></i> <span t-field="event_id.date_begin"> </span><br/>
                             <i class="icon-time"></i> <span t-field="event_id.date_end"> </span>
-                            <t t-if="event_id.user_id">
+                            <t t-if="event_id.organizer_id">
                                 <h6>Organized by:</h6>
                                 <pre><t t-field="event_id.organizer_id"/><br/><span>&amp;#x2706;</span> <span t-field="event_id.phone"></span><br/><i class="icon-envelope"></i> <span t-field="event_id.email"></span></pre>
                             </t>
@@ -164,7 +164,7 @@
                                 <table class="table">
                                     <thead>
                                         <tr>
-                                            <th>Ticket type</th>
+                                            <th>Ticket</th>
                                             <th>Sales End</th>
                                             <th>Price</th>
                                             <th>Seats</th>
@@ -173,7 +173,7 @@
                                     </thead>
                                     <tbody>
                                         <tr t-foreach="event_id.event_ticket_ids" t-as="ticket">
-                                            <td t-field="ticket.product_id"/>
+                                            <td t-field="ticket.name"/>
                                             <td t-field="ticket.deadline"/>
                                             <td t-field="ticket.price"/>
                                             <td><span t-if="ticket.register_max"><t t-esc="ticket.register_current"/>/<t t-field="ticket.register_max"/></span></td>

From f54949bcb694d11eddfb1db940d713f0c0d76e3f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Aug 2013 18:03:26 +0200
Subject: [PATCH 5/6] [IMP] website_event: demo data

bzr revid: chm@openerp.com-20130829160326-pr3lyy9vrksh5ruk
---
 addons/event_sale/event_demo.xml    | 1 -
 addons/website_event/__openerp__.py | 1 +
 addons/website_event/event.py       | 8 ++++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
index d4b8e225130..cd6139b82e0 100644
--- a/addons/event_sale/event_demo.xml
+++ b/addons/event_sale/event_demo.xml
@@ -16,7 +16,6 @@
         <field name="categ_id" ref="product.product_category_1"/>
         <field name="address_id" ref="base.res_partner_2"/>
         <field name="organizer_id" ref="base.res_partner_address_4"/>
-        <!--field name="event_ticket_ids" eval="[(6, 0, [ref('idea.idea_cat_0'), ref('idea.idea_cat_1')])]"/-->
         <field name="type">service</field>
         <field name="list_price">2500.0</field>
         <field name="standard_price">1000.0</field>
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index c00067fbe26..1e66a74f540 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -17,5 +17,6 @@ OpenERP Blog
         'security/website_event.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
+    'demo': ['event_demo.xml'],
     'installable': True,
 }
diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index 3a880503bc9..e3cc2aeb885 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -11,6 +11,14 @@ class product(osv.osv):
     }
 
 
+class event(osv.osv):
+    _inherit = 'event.event'
+    _columns = {
+        'website_published': fields.boolean('Available in the website'),
+        'description_website': fields.html('Description for the website'),
+    }
+
+
 class event_event(osv.osv):
     _inherit = "event.event"
 

From bc5c8a082894b824d3d9a83010b082031b07690a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 29 Aug 2013 18:39:52 +0200
Subject: [PATCH 6/6] SEO screen based on mockup (partial)

bzr revid: ddm@openerp.com-20130829163952-v41gi10q7ths1elt
---
 addons/website/static/src/css/editor.css    | 26 +++++------
 addons/website/static/src/css/editor.sass   | 24 +++++-----
 addons/website/static/src/js/website.seo.js | 43 +++++++++++++----
 addons/website/static/src/xml/website.xml   | 52 +++++++++++++--------
 4 files changed, 91 insertions(+), 54 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 410f4849d06..6ebb6dfea8f 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -289,18 +289,17 @@
 }
 
 /* ---- SEO TOOLS ---- */
-.oe_seo_configuration {
-  min-width: 42em;
+.oe_seo_configuration.modal {
+  width: 100%;
+  left: 0;
+  margin-left: 0;
+  top: 0 !important;
+  margin-top: 0 !important;
+  height: 100%;
 }
 .oe_seo_configuration .modal-body {
-  max-height: inherit;
-  min-height: 27em;
-}
-.oe_seo_configuration input {
-  width: 90%;
-}
-.oe_seo_configuration textarea {
-  width: 90%;
+  max-height: 100%;
+  height: 100%;
 }
 .oe_seo_configuration ul {
   list-style: none;
@@ -309,11 +308,10 @@
   color: #e00101;
 }
 
-.oe_seo_keywords_list {
-  width: 100%;
+.oe_seo_keywords_list.container {
   margin: 0.1em;
 }
-.oe_seo_keywords_list li {
+.oe_seo_keywords_list .oe_seo_keyword {
   float: left;
-  width: 19em;
+  padding-right: 0.5em;
 }
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 74885a380ee..c32fcbc1c44 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -259,22 +259,24 @@ $icon_close: #E00101
 
 $remove_color: $icon_close
 .oe_seo_configuration
-    min-width: 42em
+    &.modal
+        width: 100%
+        left: 0
+        margin-left: 0
+        top: 0!important
+        margin-top: 0!important
+        height: 100%
     .modal-body
-        max-height: inherit
-        min-height: 27em
-    input
-        width: 90%
-    textarea
-        width: 90%
+        max-height: 100%
+        height: 100%
     ul
         list-style: none
     .oe_remove
         color: $remove_color
 
 .oe_seo_keywords_list
-    width: 100%
-    margin: 0.1em
-    li
+    &.container
+        margin: 0.1em
+    .oe_seo_keyword
         float: left
-        width: 19em
+        padding-right: 0.5em
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index af3e30d7fcf..5564e8eac98 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -11,7 +11,25 @@
         },
     });
 
+    function cleanupKeyword (word) {
+        return word ? word.replace(/[,;.:]+/g, " ").replace(/ +/g, " ").trim() : "";
+    }
+
     website.seo = {};
+
+    website.seo.Tip = openerp.Widget.extend({
+        template: 'website.seo_tip',
+        events: {
+            'click button[data-action=close]': 'destroy',
+        },
+        init: function (parent, options) {
+            this._super(parent);
+            this.message = options.message;
+            // info, error or success
+            this.type = options.type;
+        },
+    });
+
     website.seo.Keyword = openerp.Widget.extend({
         template: 'website.seo_keyword',
         events: {
@@ -29,9 +47,7 @@
             this._super();
         },
     });
-    website.seo.cleanupKeyword = function (word) {
-        return word ? word.replace(/[,;.:]+/g, " ").replace(/ +/g, " ").trim() : "";
-    };
+
     website.seo.PageParser = openerp.Class.extend({
         init: function () {
             this._url = this._currentURL();
@@ -62,7 +78,7 @@
         keywordSuggestions: function () {
             var headers = this.headers();
             return _.map(_.uniq(headers.h1.concat(headers.h2)),
-                         website.seo.cleanupKeyword);
+                         cleanupKeyword);
         },
     });
     website.seo.Configurator = openerp.Widget.extend({
@@ -85,17 +101,26 @@
             this.$el.find('.js_seo_page_url').text(pageParser.url());
             this.$el.find('input[name=seo_page_title]').val(pageParser.title());
             this.$el.find('input[name=seo_page_keywords]').typeahead({
+                items: 4,
                 source: function () {
                     var suggestions = pageParser.keywordSuggestions();
                     var alreadyChosen = currentKeywords();
                     return _.difference(suggestions, alreadyChosen);
                 },
-                items: 4
             });
-
+            this.checkBestPractices(pageParser);
             $(document.body).addClass('oe_stop_scrolling');
             this.$el.modal();
         },
+        checkBestPractices: function (parser) {
+            var pageParser = parser || new website.seo.PageParser();
+            if (pageParser.headers()['h1'].length > 1) {
+                new website.seo.Tip(this, {
+                   message: "You have more than one &lt;h1&gt; tag on the page.",
+                   type: 'error'
+                }).appendTo(this.$el.find('.js_seo_tips'));
+            }
+        },
         currentPage: function () {
             var url = window.location.href;
             var hashIndex = url.indexOf('#');
@@ -104,7 +129,7 @@
         keywords: function () {
             return _.uniq($('.js_seo_keyword').map(function () {
                 return $(this).text();
-            }).get());
+            }));
         },
         isExistingKeyword: function (word) {
             return _.contains(this.keywords(), word);
@@ -122,7 +147,7 @@
             var $modal = this.$el;
             function enableNewKeywords () {
                 $modal.find('input[name=seo_page_keywords]')
-                    .removeAttr('readonly').attr('placeholder', "New keyword");
+                    .removeAttr('readonly').attr('placeholder', "");
                 $modal.find('button[data-action=add]')
                     .prop('disabled', false).removeClass('disabled');
             }
@@ -134,7 +159,7 @@
                     .prop('disabled', true).addClass('disabled');
             }
             var candidate = this.$el.find('input[name=seo_page_keywords]').val();
-            var word = website.seo.cleanupKeyword(candidate);
+            var word = cleanupKeyword(candidate);
             if (word && !this.isKeywordListFull() && !this.isExistingKeyword(word)) {
                 new website.seo.Keyword(this, {
                     keyword: word,
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index a03868d392b..61f9e8011ca 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -48,44 +48,56 @@
         <div class="modal hide fade oe_seo_configuration" tabindex="-1" role="dialog" aria-labelledby="js_seo_page_url" aria-hidden="true">
             <div class="modal-header">
                 <button title="Close" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3>Promote your page on the Web</h3>
-                <br/>
-                <span class="js_seo_page_url"></span>
+                <h2>Promote <small class="js_seo_page_url"></small></h2>
+                <h4>Get your page efficiently referenced in Google to attract more visitors with relevant content.</h4>
             </div>
             <div class="modal-body">
-                <div class="control-group">
+                <div class="js_seo_tips" />
+
+                <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                <div class="control-group form-horizontal oe_seo_keywords_area">
+                    <label class="control-label" for="seo_page_keywords">Keyword</label>
+                    <div class="controls">
+                        <div class="input-append">
+                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder=""/>
+                            <button data-action="add" class="btn" type="button">Add</button>
+                        </div>
+                        <div class="container oe_seo_keywords_list js_seo_keywords_list">
+
+                                <!-- filled in JS -->
+
+                        </div>
+                    </div>
+                </div>
+
+                <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
+                <div class="control-group form-horizontal">
                     <label class="control-label" for="seo_page_title">Title</label>
                     <div class="controls">
                         <input type="text" name="seo_page_title" maxlength="70" size="70"/>
                     </div>
                 </div>
-                <div class="control-group">
+                <div class="control-group form-horizontal">
                     <label class="control-label" for="seo_page_description">Description</label>
                     <div class="controls">
                         <textarea name="seo_page_description" rows="3" cols="70" size="160"/>
                     </div>
                 </div>
-                <div class="control-group oe_seo_keywords_area">
-                    <label class="control-label" for="seo_page_keywords">Keywords</label>
-                    <div class="controls">
-                        <div class="input-append">
-                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder="New keyword"/>
-                            <button data-action="add" class="btn" type="button">Add</button>
-                        </div>
-                        <ul class="oe_seo_keywords_list js_seo_keywords_list">
-                            <!-- filled in JS -->
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
+                <hr/>
                 <a data-action="update" href="#" class="btn btn-primary">Update page</a>
             </div>
         </div>
     </t>
 
+    <t t-name="website.seo_tip">
+        <div t-attf-class="alert alert-#{widget.type}">
+              <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
+              <t t-raw="widget.message"/>
+        </div>
+    </t>
+
     <t t-name="website.seo_keyword">
-        <li><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></li>
+        <div class="oe_seo_keyword"><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></div>
     </t>
 
     <t t-name="website.carousel">