summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml/base.xml
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2016-02-26 16:32:09 +0100
committerGéry Debongnie <ged@odoo.com>2016-03-09 13:01:34 +0100
commitf970906c9e89da364feaf2654b1a0d242e1bb789 (patch)
tree786ea3e4410f13ce2e65a6853a91376a29ede4d7 /addons/web/static/src/xml/base.xml
parent3cc96b2a8effac4250c7325dffd6da52042a2316 (diff)
[IMP] base,openerp,web: add debug mode === 'assets' and don't split assets by default
This is a rather large change for developers: from this commit on, we need to use debug=assets instead of just debug to split assets. The About menu has been slightly improved as well (the link does not appear when we are already in debug mode), and an option has been added in the debugging menu to activate the assets debugging mode.
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
-rw-r--r--addons/web/static/src/xml/base.xml16
1 files changed, 10 insertions, 6 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 6030c1bce2b..71a87464f15 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -93,9 +93,6 @@
<div t-name="UserMenu.about" class="oe_about">
<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"/>
@@ -114,9 +111,9 @@
<div class="tab-content">
<div id="settings" class="tab-pane active">
<h4>Copyright © 2004-2015 Odoo S.A.</h4>
- <p>Odoo is a trademark of <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo S.A.</a></p>
- <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/lgpl.html" style="text-decoration: underline;">GNU Lesser General Public License</a></p>
- <p>For more information visit <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo.com</a></p>
+ <p>Odoo is a trademark of <a target="_blank" href="https://www.odoo.com">Odoo S.A.</a></p>
+ <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a></p>
+ <p>For more information visit <a target="_blank" href="https://www.odoo.com">Odoo.com</a></p>
<p>
<a href="https://www.odoo.com/web/about/facebook"><i class="fa fa-facebook-square fa-3x social-fb"></i></a>
<a href="https://www.odoo.com/web/about/twitter"><i class="fa fa-twitter-square fa-3x social-tw"></i></a>
@@ -129,6 +126,11 @@
</div>
</div>
</div>
+ <div class="row" t-if="!debug">
+ <div class="col-sm-12 col-md-12">
+ <a class="pull-right oe_activate_debug_mode" href="?debug" >Activate the developer mode</a>
+ </div>
+ </div>
</div>
</div>
@@ -220,6 +222,8 @@
<li class="oe_edit_workflow"><a href="#" data-action="edit_workflow">Edit Workflow</a></li>
<li class="oe_print_workflow"><a href="#" data-action="print_workflow">Print Workflow</a></li>
<li class="divider"/>
+ <li class="oe_split_assets"><a href="#" data-action="split_assets">Activate Assets Debugging</a></li>
+ <li class="divider"/>
<li class="oe_leave"><a href="#" data-action="leave_debug">Leave Debug Mode</a></li>
</t>
</t>