diff --git a/addons/hr_attendance/static/src/css/attendance.css b/addons/hr_attendance/static/src/css/attendance.css new file mode 100644 index 00000000000..2346e2b3a2d --- /dev/null +++ b/addons/hr_attendance/static/src/css/attendance.css @@ -0,0 +1,3 @@ +.oe_systray #oe_attendance_sign_in_out_icon { + font-color: white; +} \ No newline at end of file diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css deleted file mode 100644 index 849cd33a894..00000000000 --- a/addons/hr_attendance/static/src/css/slider.css +++ /dev/null @@ -1,33 +0,0 @@ - -.openerp .oe_attendance_status { - height: 32px; - width: 32px; - display: inline-block; -} -.openerp .oe_attendance_signin { - float: right; - height: 32px; - width: 32px; - background: url(/hr_attendance/static/src/img/emp-out32.png); - cursor: pointer; -} -.openerp .oe_attendance_signin:hover { - background: url(/hr_attendance/static/src/img/emp-out-disable32.png); -} -.openerp .oe_attendance_status.oe_attendance_signed .oe_attendance_signin { - display: none; -} - -.openerp .oe_attendance_signout { - float:right; - height: 32px; - width: 32px; - background: url(/hr_attendance/static/src/img/emp-in32.png); - cursor: pointer; -} -.openerp .oe_attendance_signout:hover { - background: url(/hr_attendance/static/src/img/emp-in-disable32.png); -} -.openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout { - display: none; -} diff --git a/addons/hr_attendance/static/src/img/emp-in-disable32.png b/addons/hr_attendance/static/src/img/emp-in-disable32.png deleted file mode 100644 index 1968e0de464..00000000000 Binary files a/addons/hr_attendance/static/src/img/emp-in-disable32.png and /dev/null differ diff --git a/addons/hr_attendance/static/src/img/emp-in32.png b/addons/hr_attendance/static/src/img/emp-in32.png deleted file mode 100644 index 26e3c01556b..00000000000 Binary files a/addons/hr_attendance/static/src/img/emp-in32.png and /dev/null differ diff --git a/addons/hr_attendance/static/src/img/emp-out-disable32.png b/addons/hr_attendance/static/src/img/emp-out-disable32.png deleted file mode 100644 index b7099e44529..00000000000 Binary files a/addons/hr_attendance/static/src/img/emp-out-disable32.png and /dev/null differ diff --git a/addons/hr_attendance/static/src/img/emp-out32.png b/addons/hr_attendance/static/src/img/emp-out32.png deleted file mode 100644 index d2a6cbb5013..00000000000 Binary files a/addons/hr_attendance/static/src/img/emp-out32.png and /dev/null differ diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js index 143e3dd163d..692fdc33f50 100644 --- a/addons/hr_attendance/static/src/js/attendance.js +++ b/addons/hr_attendance/static/src/js/attendance.js @@ -14,15 +14,14 @@ openerp.hr_attendance = function (instance) { start: function() { var self = this; var tmp = function() { - this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in")); - this.$el.toggleClass("oe_attendance_signed", this.get("signed_in")); + var $sign_in_out_icon = this.$('#oe_attendance_sign_in_out_icon'); + $sign_in_out_icon.toggleClass("fa-sign-in", ! this.get("signed_in")); + $sign_in_out_icon.toggleClass("fa-sign-out", this.get("signed_in")); }; this.on("change:signed_in", this, tmp); _.bind(tmp, this)(); - this.$(".oe_attendance_signin").click(function() { - self.do_update_attendance(); - }); - this.$(".oe_attendance_signout").click(function() { + this.$(".oe_attendance_sign_in_out").click(function(ev) { + ev.preventDefault(); self.do_update_attendance(); }); this.$el.tooltip({ diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml index 2e71e1195aa..bed10677d2c 100644 --- a/addons/hr_attendance/static/src/xml/attendance.xml +++ b/addons/hr_attendance/static/src/xml/attendance.xml @@ -1,13 +1,9 @@ - - - - - diff --git a/addons/hr_attendance/views/hr_attendance.xml b/addons/hr_attendance/views/hr_attendance.xml index f481ec29053..9f229b92abb 100644 --- a/addons/hr_attendance/views/hr_attendance.xml +++ b/addons/hr_attendance/views/hr_attendance.xml @@ -5,8 +5,8 @@ diff --git a/addons/im/static/src/css/im.css b/addons/im/static/src/css/im.css index b869bdddb44..b17b4dfaa70 100644 --- a/addons/im/static/src/css/im.css +++ b/addons/im/static/src/css/im.css @@ -11,11 +11,9 @@ visibility: hidden; } } - /* button */ - -.openerp .oe_topbar_imbutton { - cursor: pointer; +.oe_systray #oe_topbar_im_icon { + color: white; } .openerp .oe_topbar_item.oe_topbar_imbutton .oe_e { position: relative; diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js index 95f29bc5c49..3731c8e80d7 100644 --- a/addons/im/static/src/js/im.js +++ b/addons/im/static/src/js/im.js @@ -25,7 +25,7 @@ im.appendTo(instance.client.$el); var button = new instance.im.ImTopButton(this); button.on("clicked", im, im.switch_display); - button.appendTo(instance.webclient.$el.find('.oe_systray')); + button.appendTo(window.$('.oe_systray')); }); return this._super.apply(this, arguments); }, @@ -36,7 +36,8 @@ events: { "click": "clicked", }, - clicked: function() { + clicked: function(ev) { + ev.preventDefault(); this.trigger("clicked"); }, }); @@ -80,7 +81,7 @@ }); }, calc_box: function() { - var $topbar = instance.client.$(".navbar"); // .oe_topbar is replaced with .navbar of bootstrap3 + var $topbar = window.$('#oe_main_menu_navbar'); // .oe_topbar is replaced with .navbar of bootstrap3 var top = $topbar.offset().top + $topbar.height(); top = Math.max(top - $(window).scrollTop(), 0); this.$el.css("top", top); diff --git a/addons/im/static/src/xml/im.xml b/addons/im/static/src/xml/im.xml index 1acb538db4f..0c5e61824e2 100644 --- a/addons/im/static/src/xml/im.xml +++ b/addons/im/static/src/xml/im.xml @@ -14,9 +14,11 @@ -
- + -
+
  • + + + +
    • diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 0abd8ab1b4e..ff446310d77 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -1,29 +1,7 @@ /* ------------ TOPBAR MAIL BUTTON --------------- */ - -/* FIXME this css is not very pretty because it uses a - * 'button' element wich comes with a lot of inappropriate - * styling. Entypo is also a headache to center properly - * */ - -.openerp .oe_topbar_item.oe_topbar_compose_full_email{ - padding: 0px; - width: 32px; - height: 32px; -} -.openerp .oe_topbar_item.oe_topbar_compose_full_email button{ - position: relative; - top: -3px; /* centering entypo ... urgh */ - box-sizing: border-box; - border: none; - box-shadow: none; +.oe_systray #oe_topbar_compose_full_email_icon { color: white; - background: none; - text-shadow: 0px 1px 2px black; - width: 32px; - height: 32px; - padding: 0px; - margin: 0px; - border-radius: 0px; + margin-right: 15px; } /* ---- GENERIC FOR MAIL-RELATED STUFF ---- */ diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index 0dd438d13af..95d4dc6e1ff 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -12,7 +12,9 @@ openerp_announcement = function(instance) { } var self = this; var config_parameter = new instance.web.Model('ir.config_parameter'); - var $bar = this.$el.find('.announcement_bar'); + $(openerp.qweb.render('WebClient.announcement_bar')).prependTo($('body')); + var $bar = $('#announcement_bar_table'); + return config_parameter.call('get_param', ['database.uuid', false]).then(function(dbuuid) { if (!dbuuid) { return; diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 04e99f5de0e..dbe7d54aade 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -1996,11 +1996,12 @@ openerp.mail = function (session) { template:'mail.ComposeMessageTopButton', start: function () { - this.$('button').on('click', this.on_compose_message ); + this.$el.on('click', this.on_compose_message); this._super(); }, on_compose_message: function (event) { + event.preventDefault(); event.stopPropagation(); var action = { type: 'ir.actions.act_window', @@ -2021,7 +2022,8 @@ openerp.mail = function (session) { this._super.apply(this, arguments); this.update_promise.then(function() { var mail_button = new session.web.ComposeMessageTopButton(); - mail_button.appendTo(session.webclient.$el.find('.oe_systray')); + mail_button.appendTo(session.webclient.$el.parents().find('.oe_systray')); + openerp.web.bus.trigger('resize'); // Re-trigger the reflow logic }); }, }); diff --git a/addons/mail/static/src/xml/announcement.xml b/addons/mail/static/src/xml/announcement.xml index 84dfa426796..46397861992 100644 --- a/addons/mail/static/src/xml/announcement.xml +++ b/addons/mail/static/src/xml/announcement.xml @@ -1,12 +1,18 @@ - - - - - - - + +
    + + + + +
    + + + + + +
    +
    -     diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 62ecdcd89d6..c79b95224b1 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -340,9 +340,11 @@ render of the button on the user bar for open wizard compose message --> -
    - -
    +
  • + + + +
    • -
    - - - -     - -
      -
    • - - - -
      • -
    -     - - - - - - - -