[IMP]Improved css and offset for tooltip.
bzr revid: bth@tinyerp.com-20131204115824-tbq4nys4c0d2c327
This commit is contained in:
parent
dfd38f311a
commit
5d874a4acb
|
@ -159,6 +159,7 @@
|
|||
.css({ top: 0, left: 0, display: 'block' })
|
||||
.addClass(placement)
|
||||
|
||||
$tip.openerpClass('oe_tooltip')
|
||||
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
|
||||
|
||||
var pos = this.getPosition()
|
||||
|
@ -300,7 +301,7 @@
|
|||
}
|
||||
|
||||
Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
|
||||
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
|
||||
return placement == 'bottom' ? { top: pos.top + pos.height, left: (pos.left + pos.width / 2 - actualWidth / 2) + actualWidth/3} :
|
||||
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
|
||||
placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
|
||||
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
|
||||
|
|
|
@ -601,6 +601,7 @@
|
|||
}
|
||||
.openerp.oe_tooltip {
|
||||
font-size: 12px;
|
||||
background-color: transparent;
|
||||
}
|
||||
.openerp.oe_tooltip .oe_tooltip_string {
|
||||
color: #ffdd55;
|
||||
|
@ -633,6 +634,12 @@
|
|||
.openerp.oe_tooltip .oe_tooltip_message {
|
||||
max-width: 310px;
|
||||
}
|
||||
.tooltip-inner {
|
||||
text-align: left !important;
|
||||
}
|
||||
.tooltip.bottom .tooltip-arrow {
|
||||
left: 12% !important;
|
||||
}
|
||||
.openerp .oe_notebook {
|
||||
margin: 8px 0;
|
||||
padding: 0 16px;
|
||||
|
|
|
@ -1851,9 +1851,6 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
|
|||
widget = widget || this;
|
||||
trigger = trigger || this.$el;
|
||||
options = _.extend({
|
||||
//delayIn: 500,
|
||||
//delayOut: 0,
|
||||
//fade: true,
|
||||
title: function() {
|
||||
var template = widget.template + '.tooltip';
|
||||
if (!QWeb.has_template(template)) {
|
||||
|
@ -1864,11 +1861,10 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
|
|||
widget: widget
|
||||
});
|
||||
},
|
||||
//gravity: $.fn.tooltip.autoBounds(50, 'nw'),
|
||||
placement: 'right',
|
||||
container: 'body',
|
||||
placement: 'bottom',
|
||||
html: true,
|
||||
//opacity: 0.85,
|
||||
//trigger: 'hover'
|
||||
opacity: 0.85,
|
||||
}, options || {});
|
||||
$(trigger).attr('data-toggle', 'tooltip');
|
||||
$(trigger).tooltip(options);
|
||||
|
|
|
@ -586,7 +586,11 @@ instance.web.ViewManager = instance.web.Widget.extend({
|
|||
this.$el.find('.oe_view_manager_switch a').attr('data-toggle', 'tooltip');
|
||||
this.$el.find('.oe_view_manager_switch a').click(function() {
|
||||
self.switch_mode($(this).data('view-type'));
|
||||
}).tooltip({'placement': 'bottom'});
|
||||
}).tooltip({
|
||||
container: 'body',
|
||||
html: true,
|
||||
opacity: 0.85
|
||||
});
|
||||
var views_ids = {};
|
||||
_.each(this.views_src, function(view) {
|
||||
self.views[view.view_type] = $.extend({}, view, {
|
||||
|
|
Loading…
Reference in New Issue