diff options
| author | Niko <nwi@openerp.com> | 2012-12-20 11:03:14 +0100 |
|---|---|---|
| committer | Niko <nwi@openerp.com> | 2012-12-20 11:03:14 +0100 |
| commit | fb07bf7234eeafffd6a7e9c85d48c6ed0ebf1887 (patch) | |
| tree | ab720b42e26fd1aad6223433c6ed888f43f79f88 /addons/web/static/src/xml/base.xml | |
| parent | 988b89a02ce7cdd129a5e7ee05e2be18dd6347c9 (diff) | |
| parent | 2315050bab19cd1ec7e087a6751c3ca96d6c34e6 (diff) | |
[MERGE] merge with trunk
bzr revid: nwi@openerp.com-20121220100314-98ka2wahul3lbu57
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index dc31a24dc31..877a2c183ee 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -36,7 +36,7 @@ <t t-name="CrashManager.warning"> <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning"> <tr> - <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe_dialog_icon"/></td> + <td class="oe_dialog_icon"><img t-att-src='_s + "/web/static/src/img/warning.png"'/></td> <td> <p> <t t-js="d"> @@ -348,16 +348,14 @@ <li t-foreach="widget.data.data.children" t-as="menu"> <t t-call="Menu.link"/> </li> + <li class="oe_menu_more_container" style="display: none;"> + <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow"> + More + <ul class="oe_menu_more oe_dropdown_menu"/> + </span> + </li> </ul> </t> -<t t-name="Menu.more"> - <li class="oe_menu_more_container"> - <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow"> - More - <ul class="oe_menu_more oe_dropdown_menu"/> - </span> - </li> -</t> <t t-name="Menu.secondary"> <div t-foreach="widget.data.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id"> <t t-foreach="menu.children" t-as="menu"> @@ -414,7 +412,7 @@ <div class="oe_about"> <a class="oe_activate_debug_mode oe_right" href="?debug" style="background-color: white; padding:2px 6px; border-radius: 10px;">Activate the developer mode</a> <img class="oe_logo" src="/web/static/src/img/logo2.png"/> - <h3>Version <t t-esc="version_info.version"/></h3> + <h3>Version <t t-esc="version_info.server_version"/></h3> <div class="oe_bottom"> <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br /> @@ -439,7 +437,10 @@ <tr> <td class="oe_leftbar" valign="top"> <t t-set="debug" t-value="__debug__ ? '&debug' : ''"/> - <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><img t-att-src='widget.session.url("/web/binary/company_logo")'/></a> + <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"> + <span class="oe_logo_edit">Edit Company data</span> + <img t-att-src='widget.session.url("/web/binary/company_logo")'/> + </a> <div class="oe_secondary_menus_container"/> <div class="oe_footer"> Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a> |