diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-04-05 13:09:00 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-04-05 13:09:00 +0200 |
| commit | 6bdd041c61d7c77d6f3f556cec63cd280fe63ac8 (patch) | |
| tree | 88ba732339f0ce43609ce920afa54792c8598681 /addons/web/static/src | |
| parent | 825d3445a8993fc5a720d4ad2cecb2a4dde41bca (diff) | |
| parent | c0ec4d92d0cf69cdfb4d84d72accbcce967f3e14 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130405110900-wkj2vnkdbyjoqol4
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 8 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 7 |
4 files changed, 13 insertions, 8 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1b5ce950b60..043f867a1b7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3179,6 +3179,14 @@ .kitten-mode-activated > * { opacity: 0.7; } +.loading-kitten { + -moz-border-radius: 15px; + -webkit-border-radius: 15px; + border-radius: 15px; + -moz-box-shadow: 0 0 5px 5px #999999; + -webkit-box-shadow: 0 0 5px 5px #999999; + box-shadow: 0 0 5px 5px #999999; +} div.ui-widget-overlay { background: black; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4be6aa9e150..b79580d8225 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2504,6 +2504,9 @@ $sheet-padding: 16px background-attachment: fixed >* opacity: 0.70 +.loading-kitten + @include radius(15px) + @include box-shadow(0 0 5px 5px #999) // }}} // jQueryUI top level {{{ diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 696f25109a9..3870a7999b4 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1257,7 +1257,8 @@ instance.web.WebClient = instance.web.Client.extend({ $("body").addClass("kitten-mode-activated"); $("body").css("background-image", "url(" + instance.session.origin + "/web/static/src/img/back-enable.jpg" + ")"); if ($.blockUI) { - $.blockUI.defaults.message = '<img src="http://www.amigrave.com/kitten.gif">'; + var imgkit = Math.floor(Math.random() * 2 + 1); + $.blockUI.defaults.message = '<img src="http://www.amigrave.com/loading-kitten/' + imgkit + '.gif" class="loading-kitten">'; } } if (!self.session.session_is_valid()) { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 757519c0f2f..1143bdfc2af 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -662,13 +662,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ }, add_breadcrumb: function(options) { var options = options || {}; - // 7.0 backward compatibility - if (typeof options == 'function') { - options = { - on_reverse_breadcrumb: options - }; - } - // end of 7.0 backward compatibility var self = this; var views = [this.active_view || this.views_src[0].view_type]; this.on('switch_mode', self, function(mode) { |