[FIX] css edit menu alignment and fix of / handling

bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 9583588..4180ecf 100644 (file)
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -39,9 +39,9 @@ class Website(openerp.addons.web.controllers.main.Home):
             main_menu = request.registry['ir.model.data'].get_object(request.cr, request.uid, 'website', 'main_menu')
             first_menu = main_menu.child_id and main_menu.child_id[0]
             if first_menu:
-                if not (first_menu.startswith(('/page/', '/?', '/#')) or (first_menu=='/')):
+                if not (first_menu.url.startswith(('/page/', '/?', '/#')) or (first_menu.url=='/')):
                     return request.redirect(first_menu.url)
-                if first_menu.startswith('/page/'):
+                if first_menu.url.startswith('/page/'):
                     page = first_menu[6:]
         except:
             pass

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 5afc927..0dc68f3 100644 (file)
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -3,7 +3,7 @@
     <li t-att-data-menu-id="submenu.id">
         <div class="input-group">
             <span class="input-group-addon fa fa-bars"/>
-            <span class="form-control" style="padding-top: 0; padding-bottom: 0;">
+            <span class="form-control">
                 <span class="js_menu_label">
                     <t t-esc="submenu.name"/>
                 </span>