summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorbth-openerp <bth@tinyerp.com>2013-12-04 17:28:24 +0530
committerbth-openerp <bth@tinyerp.com>2013-12-04 17:28:24 +0530
commit5d874a4acb1e2e60069d879bef4d49226492b4cd (patch)
tree9d8c28bca3342c486536f9dc0f8103e22dd3ac9a /addons/web/static/src
parentdfd38f311a34dd49bc55673a301ccdac9ae3c4fa (diff)
[IMP]Improved css and offset for tooltip.
bzr revid: bth@tinyerp.com-20131204115824-tbq4nys4c0d2c327
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css7
-rw-r--r--addons/web/static/src/js/view_form.js10
-rw-r--r--addons/web/static/src/js/views.js6
3 files changed, 15 insertions, 8 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 010585ee4a0..96fbcf9f805 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -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;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 748f9bde4f8..ed6d66e5c68 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -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);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 01b469d39d1..f9e8018b183 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -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, {