Merge lp:~openerp-dev/openerp-web/trunk-web-bootstrap3-psa1 into lp:~openerp-dev/openerp-web/trunk-web-bootstrap3

[Paramjit Singh Sahota(OpenERP)]

Hello Sir,

Fixed the following issues:
  1./ The issue of leftbar in database manager.
  2./ The issue of login page footer.
  3./ The issue in database manager in menu drop database and backup database.
  4./ Used the bootstrap navbar instead topbar and done changes accordingly and fixed the changes were necessary.
  5./ Fixed the issue of hiding of caret. Which hides when the cursor hovers it.
  6./ Fixed the issue of topbar in login page.
  7./ Fixed the position of timezone alert icon.
  8./ Fixed the issue of size of navbar with anonymous user
  9./ Fix the Day Week Month tabs position and the body part in week and month to specific height.

Thankz...

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-11-14 11:23:43 +0000
+++ addons/web/static/src/css/base.css	2013-11-14 12:15:39 +0000
@@ -997,7 +997,7 @@
 }
 .openerp .oe_login .oe_login_footer a {
   color: #eeeeee;
-  margin: 0 8px;
+  margin: 0 6px;
 }
 .openerp .oe_login .oe_login_footer a:hover {
   text-decoration: underline;
@@ -1043,19 +1043,7 @@
 .openerp .oe_content_full_screen .oe_topbar, .openerp .oe_content_full_screen .oe_leftbar {
   display: none;
 }
-.openerp .oe_topbar {
-  width: 100%;
-  height: 32px;
-  background-color: #414141;
-  background-color: #454343;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
-  background-image: -webkit-linear-gradient(top, #646060, #262626);
-  background-image: -moz-linear-gradient(top, #646060, #262626);
-  background-image: -ms-linear-gradient(top, #646060, #262626);
-  background-image: -o-linear-gradient(top, #646060, #262626);
-  background-image: linear-gradient(to bottom, #646060, #262626);
-}
-.openerp .oe_topbar .oe_topbar_anonymous_login {
+.openerp .navbar .oe_topbar_anonymous_login {
   background-color: #dc5f59;
   color: #eeeeee;
   background-color: #be4343;
@@ -1066,11 +1054,11 @@
   background-image: -o-linear-gradient(top, #fc8787, maroon);
   background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
-.openerp .oe_topbar .oe_topbar_anonymous_login a {
+.openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
-  height: 20px;
+  height: 30px;
   text-decoration: none;
   color: white;
   background: transparent;
@@ -1080,7 +1068,7 @@
   -o-transition: all 0.2s ease-out;
   transition: all 0.2s ease-out;
 }
-.openerp .oe_topbar .oe_topbar_anonymous_login a:hover {
+.openerp .navbar .oe_topbar_anonymous_login a:hover {
   background: rgba(0, 0, 0, 0.1);
   color: white;
   text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2);
@@ -1088,9 +1076,9 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
 }
-.openerp .oe_topbar .oe_topbar_item {
+.openerp .navbar .oe_topbar_item {
   display: block;
-  padding: 5px 10px 7px;
+  padding: 5px 10px 26px;
   line-height: 20px;
   height: 20px;
   text-decoration: none;
@@ -1103,7 +1091,7 @@
   -o-transition: all 0.2s ease-out;
   transition: all 0.2s ease-out;
 }
-.openerp .oe_topbar .oe_topbar_item:hover {
+.openerp .navbar .oe_topbar_item:hover {
   background: rgba(0, 0, 0, 0.2);
   text-shadow: black 0px 0px 3px;
   color: white;
@@ -1111,7 +1099,7 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
 }
-.openerp .oe_topbar .oe_topbar_avatar {
+.openerp .navbar .oe_topbar_avatar {
   width: 24px;
   height: 24px;
   margin: -2px 2px 0 0;
@@ -1119,13 +1107,13 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-.openerp .oe_topbar .oe_topbar_avatar {
+.openerp .navbar .oe_topbar_avatar {
   vertical-align: top;
 }
-.openerp .oe_topbar .oe_dropdown_arrow:after {
+.openerp .navbar .oe_dropdown_arrow:after {
   border-top: 4px solid white;
 }
-.openerp .oe_topbar .oe_dropdown_menu {
+.openerp .navbar .dropdown_menu {
   top: 32px;
   background: #333333;
   background: rgba(37, 37, 37, 0.9);
@@ -1140,14 +1128,14 @@
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.openerp .oe_topbar .oe_dropdown_menu li {
+.openerp .navbar .dropdown_menu li {
   float: none;
   padding: 3px 12px;
 }
-.openerp .oe_topbar .oe_dropdown_menu li a {
+.openerp .navbar .dropdown_menu li a {
   color: #eeeeee;
 }
-.openerp .oe_topbar .oe_dropdown_menu li:hover {
+.openerp .navbar .dropdown_menu li:hover {
   background-color: #212121;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
   background-image: -webkit-linear-gradient(top, #292929, #191919);
@@ -1159,21 +1147,20 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.openerp .oe_topbar .oe_topbar_name {
+.openerp .navbar .oe_topbar_name {
   max-width: 150px;
-  overflow: hidden;
   display: inline-block;
   max-height: 100%;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.openerp .oe_menu {
+.openerp .navbar-nav {
   float: left;
   padding: 0;
   margin: 0;
   font-size: 13px;
 }
-.openerp .oe_menu > li {
+.openerp .navbar-nav > li {
   list-style-type: none;
   padding: 0;
   margin: 0;
@@ -1181,13 +1168,13 @@
   display: block;
   color: #eeeeee;
 }
-.openerp .oe_menu > li > a {
+.openerp .navbar-nav > li > a {
   display: block;
-  padding: 5px 10px 7px;
+  padding: 5px 10px 26px !important;
   line-height: 20px;
   height: 20px;
   text-decoration: none;
-  color: #eeeeee;
+  color: #eeeeee !important;
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-transition: all 0.2s ease-out;
@@ -1196,7 +1183,7 @@
   -o-transition: all 0.2s ease-out;
   transition: all 0.2s ease-out;
 }
-.openerp .oe_menu > li > a:hover {
+.openerp .navbar-nav > li > a:hover {
   background: rgba(0, 0, 0, 0.2);
   text-shadow: black 0px 0px 3px;
   color: white;
@@ -1204,7 +1191,7 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
 }
-.openerp .oe_menu > li > .oe_active {
+.openerp .navbar-nav > li > .active {
   background: rgba(0, 0, 0, 0.3);
   text-shadow: black 0px 0px 3px;
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
@@ -2298,7 +2285,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -3443,7 +3430,6 @@
     overflow: hidden !important;
   }
 }
-
 .nav li > a {
   padding: 3px 4px 2px 18px;
   color: #4c4c4c;
@@ -3476,7 +3462,12 @@
   line-height: normal;
 }
 
-h1, h2, h3 {
+h1, h2 {
+  font-weight: bold;
+}
+
+h3 {
+  font-size: 1.17em;
   font-weight: bold;
 }
 
@@ -3502,6 +3493,69 @@
   margin-top: 0px;
 }
 
+.navbar {
+  min-height: 32px;
+  margin-bottom: 0px;
+  border: none;
+  background-color: #414141;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+}
+
+.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus {
+  background: rgba(0, 0, 0, 0.3);
+}
+.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus {
+  background: rgba(0, 0, 0, 0.3) !important;
+}
+.navbar-default .navbar-nav .dropdown > a .caret {
+  border-top-color: #777777 !important;
+  border-bottom-color: #777777 !important;
+}
+
+.navbar-nav li a {
+  padding: 4px 32px 4px 12px;
+}
+
+.dropdown-menu {
+  font-size: 13px;
+  padding: 4px 0;
+  background: #333333 !important;
+  background: rgba(37, 37, 37, 0.9) !important;
+  border-color: #999999;
+  border-color: rgba(0, 0, 0, 0.2);
+  background-color: #414141;
+  text-shadow: none;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
+.dropdown-menu li a, .dropdown-menu li a:hover, .dropdown-menu li a:focus {
+  color: #eeeeee;
+}
+
+.ui-icon {
+  width: 18px;
+  height: 18px;
+}
+
+input[type="radio"], input[type="checkbox"] {
+  margin-right: 4px;
+  margin-left: 4px;
+}
+
 .blockUI.blockOverlay {
   background-color: black;
   opacity: 0.6;
 
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-11-14 11:23:43 +0000
+++ addons/web/static/src/css/base.sass	2013-11-14 12:15:39 +0000
@@ -831,7 +831,7 @@
             text-align: center
             a
                 color: #eee
-                margin: 0 8px
+                margin: 0 6px
                 &:hover
                     text-decoration: underline
             span
@@ -874,11 +874,7 @@
     // }}}
     // Top Menu {{{
 
-    .oe_topbar
-        width: 100%
-        height: 32px
-        background-color: #414141
-        @include vertical-gradient(#646060, #262626)
+    .navbar
         .oe_topbar_anonymous_login
             background-color: #dc5f59
             color: #eeeeee
@@ -887,7 +883,7 @@
                 display: block
                 padding: 5px 10px 7px
                 line-height: 20px
-                height: 20px
+                height: 30px
                 text-decoration: none
                 color: white
                 background: transparent
@@ -899,7 +895,7 @@
                 @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
         .oe_topbar_item
             display: block
-            padding: 5px 10px 7px
+            padding: 5px 10px 26px
             line-height: 20px
             height: 20px
             text-decoration: none
@@ -922,7 +918,7 @@
             vertical-align: top
         .oe_dropdown_arrow:after
             border-top: 4px solid white
-        .oe_dropdown_menu
+        .dropdown_menu
             top: 32px
             background: #333
             background: rgba(37,37,37,0.9)
@@ -942,7 +938,6 @@
                     @include box-shadow(none)
         .oe_topbar_name
             max-width: 150px
-            overflow: hidden
             display: inline-block
             max-height: 100%
             text-overflow: ellipsis
@@ -952,7 +947,7 @@
     // So why aren't the buttons oe_topbar_items ? This sad state of affairs
     // is a leftover from an uncomplete refactoring when the left and top menu
     // were merged. You are welcome to refactor and clean this up
-    .oe_menu
+    .navbar-nav
         float: left
         padding: 0
         margin: 0
@@ -966,11 +961,11 @@
             color: #eeeeee
             > a
                 display: block
-                padding: 5px 10px 7px
+                padding: 5px 10px 26px !important
                 line-height: 20px
                 height: 20px
                 text-decoration: none
-                color: #eee
+                color: #eee !important
                 vertical-align: top
                 text-shadow: 0 1px 1px rgba(0,0,0,0.2)
                 @include transition(all 0.2s ease-out)
@@ -979,7 +974,7 @@
                     text-shadow: black 0px 0px 3px
                     color: white
                     @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
-            > .oe_active
+            > .active
                 background: rgba(0,0,0,0.30)
                 text-shadow: black 0px 0px 3px
                 @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
@@ -2764,7 +2759,10 @@
 // Customize for global tags
 button, body
     line-height: normal
-h1,h2,h3
+h1,h2
+    font-weight: bold
+h3
+    font-size: 1.17em
     font-weight: bold
 // End of customize
 
@@ -2789,6 +2787,53 @@
     margin-top: 0px
 // End of customize
 
+// navbar hack {{{
+.navbar
+    min-height: 32px
+    margin-bottom: 0px
+    border: none
+    background-color: #414141
+    @include vertical-gradient(#646060, #262626)
+.navbar-default
+    .navbar-nav
+        li
+            a:hover,a:focus
+                background: rgba(0, 0, 0, 0.3)
+        .open > a,a:hover,a:focus
+            background: rgba(0, 0, 0, 0.3) !important
+        .dropdown > a .caret
+            border-top-color: #777 !important
+            border-bottom-color: #777 !important
+.navbar-nav
+    li
+        a
+            padding: 4px 32px 4px 12px
+.dropdown-menu
+    font-size: 13px
+    padding: 4px 0
+    background: #333333 !important
+    background: rgba(37, 37, 37, 0.9) !important
+    border-color: #999999
+    border-color: rgba(0, 0, 0, 0.2)
+    background-color: #414141
+    text-shadow: none
+    @include vertical-gradient(#646060, #262626)
+    @include radius(3px)
+    li
+        a,a:hover,a:focus
+            color: #eeeeee
+// End hack }}}
+
+// Hack for ui icon {{{
+.ui-icon
+    width: 18px
+    height: 18px
+// End hack}}}
+
+input[type="radio"], input[type="checkbox"]
+    margin-right: 4px
+    margin-left: 4px
+
 .blockUI.blockOverlay
     background-color: black
     opacity: 0.6000000238418579
 
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2013-11-07 12:10:25 +0000
+++ addons/web/static/src/js/chrome.js	2013-11-14 12:15:39 +0000
@@ -982,8 +982,8 @@
     reflow: function() {
         var self = this;
         this.$el.height('auto').show();
-        var $more_container = this.$('.oe_menu_more_container').hide();
-        var $more = this.$('.oe_menu_more');
+        var $more_container = this.$('#menu_more_container').hide();
+        var $more = this.$('#menu_more');
         $more.children('li').insertBefore($more_container);
         var $toplevel_items = this.$el.children('li').not($more_container).hide();
         $toplevel_items.each(function() {
@@ -1143,7 +1143,7 @@
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-        this.$el.on('click', '.oe_dropdown_menu li a[data-menu]', function(ev) {
+        this.$el.on('click', '.dropdown-menu li a[data-menu]', function(ev) {
             ev.preventDefault();
             var f = self['on_menu_' + $(this).data('menu')];
             if (f) {
@@ -1284,7 +1284,7 @@
         self.action_manager.appendTo(self.$('.oe_application'));
     },
     toggle_bars: function(value) {
-        this.$('tr:has(td.oe_topbar),.oe_leftbar').toggle(value);
+        this.$('tr:has(td.navbar),.oe_leftbar').toggle(value);
     },
     has_uncommitted_changes: function() {
         return false;
 
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-11-07 12:10:25 +0000
+++ addons/web/static/src/xml/base.xml	2013-11-14 12:15:39 +0000
@@ -320,7 +320,7 @@
 </t>
 <t t-name="DatabaseManager.menu">
     <div class="oe_secondary_menu_section">Database Management</div>
-    <ul class="oe_secondary_submenu">
+    <ul class="oe_secondary_submenu nav nav-pills nav-stacked">
         <li><a href="#db_create">Create</a></li>
         <li><a href="#db_duplicate">Duplicate</a></li>
         <li><a href="#db_drop">Drop</a></li>
@@ -362,15 +362,13 @@
 </t>
 
 <t t-name="Menu">
-    <ul class="oe_menu" t-if="widget.data">
+    <ul class="nav navbar-nav navbar-left" t-if="widget.data">
         <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 id="menu_more_container" class="dropdown" style="display: none;">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
+            <ul id="menu_more" class="dropdown-menu"></ul>
         </li>
     </ul>
 </t>
@@ -417,17 +415,21 @@
 </t>
 
 <t t-name="UserMenu">
-    <span class="oe_user_menu oe_topbar_item oe_dropdown_toggle oe_dropdown_arrow">
-        <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
-        <span class="oe_topbar_name"/>
-        <ul class="oe_dropdown_menu">
-            <li><a href="#" data-menu="settings">Preferences</a></li>
-            <li><a href="#" data-menu="account">My OpenERP.com account</a></li>
-            <li><a href="#" data-menu="about">About OpenERP</a></li>
-            <li><a href="#" data-menu="help">Help</a></li>
-            <li><a href="#" data-menu="logout">Log out</a></li>
-        </ul>
-    </span>
+    <ul class="nav navbar-nav navbar-right">
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
+                <span class="oe_topbar_name"/> <b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a href="#" data-menu="settings">Preferences</a></li>
+                <li><a href="#" data-menu="account">My OpenERP.com account</a></li>
+                <li><a href="#" data-menu="about">About OpenERP</a></li>
+                <li><a href="#" data-menu="help">Help</a></li>
+                <li><a href="#" data-menu="logout">Log out</a></li>
+            </ul>
+        </li>
+    </ul>
 </t>
 <t t-name="UserMenu.about">
 
@@ -450,7 +452,7 @@
     <div class="openerp openerp_webclient_container">
     <table class="oe_webclient">
         <tr>
-            <td colspan="2" class="oe_topbar">
+            <td colspan="2" class="navbar navbar-default navbar-static-top" role="navigation">
                 <div class="oe_menu_placeholder"/>
                 <div class="oe_user_menu_placeholder"/>
                 <div class="oe_systray"/>
 
=== modified file 'addons/web_calendar/static/src/css/web_calendar.css'
--- addons/web_calendar/static/src/css/web_calendar.css	2013-01-23 10:03:22 +0000
+++ addons/web_calendar/static/src/css/web_calendar.css	2013-11-14 12:15:39 +0000
@@ -24,3 +24,24 @@
 .openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body {
   padding-right: 5px;
 }
+
+.dhx_cal_tab {
+  height: 18px;
+}
+
+.dhx_cal_tab.active {
+  height: 20px;
+}
+
+.dhx_cal_today_button {
+  height: 20px;
+}
+
+.dhx_cal_event .dhx_body {
+  width: auto !important;
+  height: 28px !important;
+}
+
+.dhx_scale_hour {
+  height: 42px !important;
+}
 
=== modified file 'addons/web_calendar/static/src/css/web_calendar.sass'
--- addons/web_calendar/static/src/css/web_calendar.sass	2013-01-23 10:03:22 +0000
+++ addons/web_calendar/static/src/css/web_calendar.sass	2013-11-14 12:15:39 +0000
@@ -31,5 +31,19 @@
             table tr td:last-child div.dhx_month_body
                 padding-right: 5px
 
+// Hack for calender {{{
+.dhx_cal_tab
+    height: 18px
+.dhx_cal_tab.active
+    height: 20px
+.dhx_cal_today_button
+    height: 20px
+.dhx_cal_event .dhx_body
+    width: auto !important
+    height: 28px !important
+.dhx_scale_hour
+    height: 42px !important
+// End hack }}}
+
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: