summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <KangOl@users.noreply.github.com>2015-01-23 11:53:36 +0100
committerChristophe Simonis <KangOl@users.noreply.github.com>2015-01-23 11:53:36 +0100
commita3bcadd5f16bd8d0005eaba65f353cc2ac7d738e (patch)
treee8cc08719b7f549eafe8543bc876ee41a4fa99c4 /addons/web/static/src
parent373539425e268f41d7d74e3f4e6f9d622863dcd4 (diff)
parent3cae676619a1ed20ffe264ab06b8fc9e4b1b51ce (diff)
Merge pull request #4860 from odoo-dev/8.0-deb-packaging-aab
8.0 - Various fixes for Debian Packaging
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/entypo-webfont.eotbin29428 -> 29428 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/entypo-webfont.ttfbin29264 -> 29264 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/entypo-webfont.woffbin18772 -> 18772 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/mnmliconsv21-webfont.eotbin24173 -> 24173 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/mnmliconsv21-webfont.ttfbin39912 -> 39912 bytes
-rw-r--r--[-rwxr-xr-x]addons/web/static/src/font/mnmliconsv21-webfont.woffbin26348 -> 26348 bytes
-rw-r--r--addons/web/static/src/img/k-waiting1.gifbin0 -> 29257 bytes
-rw-r--r--addons/web/static/src/img/k-waiting2.gifbin0 -> 276059 bytes
-rw-r--r--addons/web/static/src/js/chrome.js2
9 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/font/entypo-webfont.eot b/addons/web/static/src/font/entypo-webfont.eot
index 2c09f336d57..2c09f336d57 100755..100644
--- a/addons/web/static/src/font/entypo-webfont.eot
+++ b/addons/web/static/src/font/entypo-webfont.eot
Binary files differ
diff --git a/addons/web/static/src/font/entypo-webfont.ttf b/addons/web/static/src/font/entypo-webfont.ttf
index 89b7a194cc7..89b7a194cc7 100755..100644
--- a/addons/web/static/src/font/entypo-webfont.ttf
+++ b/addons/web/static/src/font/entypo-webfont.ttf
Binary files differ
diff --git a/addons/web/static/src/font/entypo-webfont.woff b/addons/web/static/src/font/entypo-webfont.woff
index 3879f5b811e..3879f5b811e 100755..100644
--- a/addons/web/static/src/font/entypo-webfont.woff
+++ b/addons/web/static/src/font/entypo-webfont.woff
Binary files differ
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.eot b/addons/web/static/src/font/mnmliconsv21-webfont.eot
index 433ebb82e4b..433ebb82e4b 100755..100644
--- a/addons/web/static/src/font/mnmliconsv21-webfont.eot
+++ b/addons/web/static/src/font/mnmliconsv21-webfont.eot
Binary files differ
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.ttf b/addons/web/static/src/font/mnmliconsv21-webfont.ttf
index c38e59cf138..c38e59cf138 100755..100644
--- a/addons/web/static/src/font/mnmliconsv21-webfont.ttf
+++ b/addons/web/static/src/font/mnmliconsv21-webfont.ttf
Binary files differ
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.woff b/addons/web/static/src/font/mnmliconsv21-webfont.woff
index 3ddf14fb814..3ddf14fb814 100755..100644
--- a/addons/web/static/src/font/mnmliconsv21-webfont.woff
+++ b/addons/web/static/src/font/mnmliconsv21-webfont.woff
Binary files differ
diff --git a/addons/web/static/src/img/k-waiting1.gif b/addons/web/static/src/img/k-waiting1.gif
new file mode 100644
index 00000000000..b76cdfaac23
--- /dev/null
+++ b/addons/web/static/src/img/k-waiting1.gif
Binary files differ
diff --git a/addons/web/static/src/img/k-waiting2.gif b/addons/web/static/src/img/k-waiting2.gif
new file mode 100644
index 00000000000..b0b79e80830
--- /dev/null
+++ b/addons/web/static/src/img/k-waiting2.gif
Binary files differ
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0557dad2670..b18debb1d96 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1221,7 +1221,7 @@ instance.web.WebClient = instance.web.Client.extend({
$("body").css("background-image", "url(" + instance.session.origin + "/web/static/src/img/back-enable.jpg" + ")");
if ($.blockUI) {
var imgkit = Math.floor(Math.random() * 2 + 1);
- $.blockUI.defaults.message = '<img src="http://www.amigrave.com/loading-kitten/' + imgkit + '.gif" class="loading-kitten">';
+ $.blockUI.defaults.message = '<img src="/web/static/src/img/k-waiting' + imgkit + '.gif" class="loading-kitten">';
}
},
/**