From c9d41679fbeebf244a75964f8875f9b6c6c9f4e1 Mon Sep 17 00:00:00 2001
From: Mathias Neef <mn@copado.de>
Date: Fri, 14 Aug 2015 16:57:53 +0200
Subject: [PATCH] [FIX] website*: `active` class in menu

In the top menu bar, the `active` class is set when the
menu url matches the page url (the url in the browser url bar)

A while ago, we made so all urls
`/page/website.***'
were automatically redirected to
`/page/****`

Therefore, if the menu url still contains this `website.` prefix,
the active class wasn't set on it, while it should.

Fixes #3059
Closes #3070
---
 addons/website/controllers/main.py           | 2 +-
 addons/website/data/data.xml                 | 4 ++--
 addons/website_crm/data/website_crm_data.xml | 2 +-
 addons/website_hr/data/website_hr_data.xml   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 1dce8d28488..cd9f7e0d601 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -176,7 +176,7 @@ class Website(openerp.addons.web.controllers.main.Home):
             model, id  = request.registry["ir.model.data"].get_object_reference(request.cr, request.uid, 'website', 'main_menu')
             request.registry['website.menu'].create(request.cr, request.uid, {
                     'name': path,
-                    'url': "/page/" + xml_id,
+                    'url': "/page/" + xml_id[8:],
                     'parent_id': id,
                 }, context=request.context)
         # Reverse action in order to allow shortcut for /page/<website_xml_id>
diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml
index c5254d65c0f..95e1c1873ec 100644
--- a/addons/website/data/data.xml
+++ b/addons/website/data/data.xml
@@ -22,7 +22,7 @@
 
         <record id="menu_contactus" model="website.menu">
             <field name="name">Contact us</field>
-            <field name="url">/page/website.contactus</field>
+            <field name="url">/page/contactus</field>
             <field name="parent_id" ref="website.main_menu"/>
             <field name="sequence" type="int">60</field>
         </record>
@@ -64,7 +64,7 @@
         </record>
         <record id="action_website_homepage" model="ir.actions.act_url">
             <field name="name">Website Homepage</field>
-            <field name="url">/page/website.homepage</field>
+            <field name="url">/page/homepage</field>
             <field name="target">self</field>
         </record>
 
diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml
index ba131d22f34..7a831dc7adb 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/website_crm_data.xml
@@ -5,7 +5,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Contact Form</field>
             <field name="target">self</field>
-            <field name="url">/page/website.contactus</field>
+            <field name="url">/page/contactus</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_hr/data/website_hr_data.xml b/addons/website_hr/data/website_hr_data.xml
index 161b875556a..5afe68add8f 100644
--- a/addons/website_hr/data/website_hr_data.xml
+++ b/addons/website_hr/data/website_hr_data.xml
@@ -5,7 +5,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website About</field>
             <field name="target">self</field>
-            <field name="url">/page/website.aboutus</field>
+            <field name="url">/page/aboutus</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>