[IMP] Move website settings to 'Configration' wizard

bzr revid: ddm@openerp.com-20140123150317-9vxccax7vn2xls9x

3 files changed, 56 insertions, 42 deletions

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index fe7d21c5267..2d4bf290f2b 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -125,6 +125,10 @@ class website(osv.osv):
             })
     }
 
+    # cf. Wizard hack in website_views.xml
+    def noop(self, *args, **kwargs):
+        pass
+
     def write(self, cr, uid, ids, vals, context=None):
         self._get_languages.clear_cache(self)
         return super(website, self).write(cr, uid, ids, vals, context)
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 6433330e50e..514969fc4c2 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -261,8 +261,9 @@
                 self.reloadPage.call(self);
             }).fail(function (source, error) {
                 var message = _.isString(error) ? error
-                    : (error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
-                    : error.message;
+                    : (error && error.data && error.data.arguments && error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
+                    : (error && error.message) ? error.message
+                    : "Unexpected error";
                 self.displayError.call(self, message);
             });
         },
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 86427e7c314..4d7c9f59ac3 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -10,14 +10,46 @@
     </data>
 
     <data>
-        <record id="action_website_form" model="ir.actions.act_window">
-            <field name="name">Websites</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">website</field>
-            <field name="view_type">form</field>
-            <field name="help">Create and manage the companies websites.</field>
+
+        <record id="view_website_form" model="ir.ui.view">
+            <field name="name">website.form</field>
+            <field name="model">website</field>
+            <field name="arch" type="xml">
+                <form string="Website" version="7.0">
+                     <header>
+                        <button string="Apply" type="object" name="noop" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" type="object" name="noop" class="oe_link"/>
+                    </header>
+                    <div name="domain">
+                        <separator string="Domain"/>
+                        <group name="domain">
+                            <field name="name" class="oe_inline"/>
+                            <field name="google_analytics_key" placeholder="UA-XXXXXXXX-Y"/>
+                        </group>
+                    </div>
+                    <div name="social_media">
+                        <separator string="Social Media"/>
+                        <group name="social_media">
+                            <field name="social_twitter" placeholder="https://twitter.com/openerp"/>
+                            <field name="social_facebook" placeholder="https://facebook.com/openerp"/>
+                            <field name="social_googleplus" placeholder="https://plus.google.com/+openerp"/>
+                            <field name="social_linkedin" placeholder="http://www.linkedin.com/company/openerp"/>
+                            <field name="social_youtube" placeholder="http://www.youtube.com/channel/HCU842OHPPNrQ"/>
+                            <field name="social_github" placeholder="https://youraccount.github.io"/>
+                        </group>
+                    </div>
+                    <div name="other">
+                        <separator string="Other Info"/>
+                        <group name="other">
+                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="language_ids" widget="many2many_checkboxes"/>
+                            <field name="default_lang_id" widget="selection"/>
+                        </group>
+                    </div>
+                </form>
+            </field>
         </record>
-        <menuitem action="action_website_form" id="menu_action_website_form" parent="base.menu_res_company_global"/>
 
         <record id="view_website_tree" model="ir.ui.view">
             <field name="name">website.tree</field>
@@ -31,40 +63,17 @@
             </field>
         </record>
 
-        <record id="view_website_form" model="ir.ui.view">
-            <field name="name">website.form</field>
-            <field name="model">website</field>
-            <field name="arch" type="xml">
-                <form string="Website" version="7.0">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only"/>
-                            <h1>
-                                <field name="name" class="oe_inline"/>
-                            </h1>
-                        </div>
-                        <group>
-                            <group string="Social Icons">
-                                <field name="social_twitter" placeholder="https://twitter.com/openerp"/>
-                                <field name="social_facebook" placeholder="https://facebook.com/openerp"/>
-                                <field name="social_googleplus" placeholder="https://plus.google.com/+openerp"/>
-                                <field name="social_linkedin" placeholder="http://www.linkedin.com/company/openerp"/>
-                                <field name="social_youtube" placeholder="http://www.youtube.com/channel/HCU842OHPPNrQ"/>
-                                <field name="social_github" placeholder="https://youraccount.github.io"/>
-                            </group>
-                            <group string="Other Info">
-                                <field name="company_id" groups="base.group_multi_company"/>
-                                <field name="language_ids" widget="many2many_checkboxes"/>
-                                <field name="default_lang_id" widget="selection"/>
-                            </group>
-                            <group string="Website Management">
-                                <field name="google_analytics_key" placeholder="UA-XXXXXXXX-X"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
+        <record id="action_website_form" model="ir.actions.act_window">
+            <field name="name">Website</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">website</field>
+            <field name="res_id">1</field>
+            <field name="view_mode">form</field>
+            <field name="help">Create and manage the companies websites.</field>
+            <field name="target">inline</field>
         </record>
+        <menuitem action="action_website_form" id="menu_action_website_form" parent="base.menu_config"/>
+
         <record id="view_base_language_install" model="ir.ui.view">
             <field name="name">view_base_language_install.inherit</field>
             <field name="model">base.language.install</field>