diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-09-15 15:09:32 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-09-15 15:09:32 +0200 |
| commit | 45cc064d590eae30357b6055f7609508a47b78fc (patch) | |
| tree | db41ced74b478c9e6629f4aa40396b00ed78cc65 /addons/web/static/src/xml/base.xml | |
| parent | 3fb4ad20cdae70019656c8fce32ab0bb8fadf090 (diff) | |
| parent | 780dd9891f5783fd07a075a445314df912d0a88c (diff) | |
[MERGE] forward port of branch 8.0 up to 780dd98
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index eb02390ad17..911736c7262 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -365,13 +365,13 @@ <t t-name="UserMenu.about"> <div class="oe_about"> - <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a> - - - <div class="container"> - <div class=""> - <div class="col-sm-6 col-md-6 user-details"> + <div class="container-fluid"> + <div class="row"> + <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a> + </div> + <div class="row"> + <div class="col-sm-offset-2 col-md-offset-2 col-sm-8 col-md-8 user-details"> <div class="user-image"> <img src="/web/static/src/img/logo2.png" alt="Odoo (Formerly OpenERP)" title="Odoo (Formerly OpenERP)" class="img-circle"/> </div> @@ -381,7 +381,7 @@ <h3>Version <t t-esc="version_info.server_version"/></h3> </div> - <ul class="navigation"> + <ul class="list-inline text-center navigation"> <li class="active"> <a data-toggle="tab" href="#settings"> <span class="glyphicon glyphicon-cog"></span> @@ -439,7 +439,6 @@ </div> </div> </div> - </t> <t t-name="WebClient.timezone_notification"> @@ -1298,10 +1297,10 @@ <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> <b>Uploading ...</b> </div> + <t t-call="HiddenInputFile"> + <t t-set="fileupload_id" t-value="widget.fileupload_id"/> + </t> </div> - <t t-call="HiddenInputFile"> - <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - </t> </t> </span> </t> |