diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-10-04 11:44:29 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-10-04 11:44:29 +0200 |
| commit | 28a8768a63a8a8d5ac0c8f4a905a9ef4df3975c4 (patch) | |
| tree | 25d6eccb7e5dac6c961e3866ef2c47e76e7e98ef /addons/web/static/src/xml | |
| parent | 192acbb383868c2883866ace3ebd6e984b1d22c7 (diff) | |
| parent | 29a53e19546570b97932d163a0c2d0a2acf4a7ff (diff) | |
[MERGE] from trunk
bzr revid: fva@openerp.com-20121004094429-hq4lcntvkycytnj6
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ab4f81a1688..bf55db8d7c2 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -2,12 +2,6 @@ <!-- vim:fdl=1: --> <templates id="template" xml:space="preserve"> -<t t-name="ui.Header"> - <header> - <t t-raw="__content__"/> - </header> -</t> - <t t-name="EmptyComponent"> <div></div> </t> @@ -413,7 +407,7 @@ <a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a> <div class="oe_secondary_menus_container"/> <div class="oe_footer"> - Powered by <a href="http://www.openerp.com" target="_blank"><span>Open</span>ERP</a> + Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a> </div> </td> <td class="oe_application"> @@ -1128,7 +1122,7 @@ <td> <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - <t t-set="fileupload_style">width: 83px;</t> + <t t-set="fileupload_style" t-translation="off">width: 83px;</t> <button class="oe_button oe_field_button" type="button"> <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/> <span>Select</span> |