5 files changed, 18 insertions, 47 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1b8851f7b69..da478d105f9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -704,9 +704,7 @@
   color: #a24689;
 }
 .openerp .oe_about .user-details {
-  position: relative;
   padding: 0;
-  margin-bottom: 275px;
 }
 .openerp .oe_about .user-details .user-image {
   width: 100%;
@@ -714,32 +712,15 @@
 }
 .openerp .oe_about .user-details .user-info-block {
   width: 100%;
-  position: absolute;
-  top: 55px;
-  padding-top: 35px;
+  margin-top: -25px;
 }
 .openerp .oe_about .user-details .user-info-block .user-heading {
   text-align: center;
   margin: 10px 0 0;
 }
-.openerp .oe_about .user-details .user-info-block .navigation li a {
-  padding: 10px 20px;
-}
-.openerp .oe_about .user-details .user-info-block .navigation li.active a {
-  background: #a24689;
-  color: #fff;
-}
 .openerp .oe_about .user-details .user-info-block .user-body {
   text-align: center;
 }
-.openerp .oe_about .user-details .user-info-block .user-body .tab-content > div {
-  float: left;
-  width: 100%;
-}
-.openerp .oe_about a.oe_activate_debug_mode {
-  color: white !important;
-  font-size: 100%;
-}
 .openerp .oe_about #social i {
   margin: 10px;
 }
@@ -2039,7 +2020,7 @@
   padding-left: 14px;
 }
 .openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active {
-  background-color: #5382b9;
+  background-color: #5382ba;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
   background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
   background-image: -moz-linear-gradient(top, #729fcf, #3465a4);
@@ -2086,7 +2067,7 @@
   color: #7C7BAD;
 }
 .openerp ul.oe_form_status_clickable li.oe_active:hover {
-  background-color: #3a699f;
+  background-color: #3a69a0;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
   background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
   background-image: -moz-linear-gradient(top, #4c85c2, #284d7d);
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 814f0a5865a..1c2f61a9fea 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -689,35 +689,18 @@ $sheet-padding: 16px
             color: $link-color-odoo
 
         .user-details
-            position: relative
             padding: 0
-            margin-bottom: 275px
             .user-image
                 width: 100%
                 text-align: center
             .user-info-block
                 width: 100%
-                position: absolute
-                top: 55px
-                padding-top: 35px
+                margin-top: -25px
                 .user-heading
                     text-align: center
                     margin: 10px 0 0
-                .navigation
-                    li
-                        a
-                            padding: 10px 20px
-                        &.active a
-                            background: $link-color-odoo
-                            color: #fff
                 .user-body
                     text-align: center
-                    .tab-content > div
-                        float: left
-                        width: 100%
-        a.oe_activate_debug_mode
-            color: white !important
-            font-size: 100%
         #social
             i
                 margin: 10px
diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js
index 36a3a205632..74a534ec40e 100644
--- a/addons/web/static/src/js/widgets/debug_manager.js
+++ b/addons/web/static/src/js/widgets/debug_manager.js
@@ -201,6 +201,9 @@ if (core.debug) {
                 this.do_warn("Warning", "No record selected.");
             }
         },
+        split_assets: function() {
+            window.location = $.param.querystring(window.location.href, 'debug=assets');
+        },
         leave_debug: function() {
             window.location.search="?";
         },
diff --git a/addons/web/static/src/js/widgets/user_menu.js b/addons/web/static/src/js/widgets/user_menu.js
index cc682861c12..31728dfa813 100644
--- a/addons/web/static/src/js/widgets/user_menu.js
+++ b/addons/web/static/src/js/widgets/user_menu.js
@@ -68,7 +68,7 @@ var UserMenu = Widget.extend({
         }
 
         function menu_help_about(db_info) {
-            var $help = $(QWeb.render("UserMenu.about", {db_info: db_info}));
+            var $help = $(QWeb.render("UserMenu.about", {db_info: db_info, debug: core.debug}));
             $help.find('a.oe_activate_debug_mode').click(function (e) {
                 e.preventDefault();
                 window.location = $.param.querystring(window.location.href, 'debug');
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>