odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

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

bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi
This commit is contained in:
Fabien Pinckaers 2014-05-11 17:40:58 +02:00
parent cebce64b00
commit 106abb6496
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/website/controllers/main.py
View File

@ -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') 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] first_menu = main_menu.child_id and main_menu.child_id[0]
if first_menu: 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) return request.redirect(first_menu.url)
if first_menu.startswith('/page/'): if first_menu.url.startswith('/page/'):
page = first_menu[6:] page = first_menu[6:]
except: except:
pass pass

2
addons/website/static/src/xml/website.menu.xml
View File

@ -3,7 +3,7 @@
<li t-att-data-menu-id="submenu.id"> <li t-att-data-menu-id="submenu.id">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon fa fa-bars"/> <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"> <span class="js_menu_label">
<t t-esc="submenu.name"/> <t t-esc="submenu.name"/>
</span> </span>