From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 29 Jul 2014 14:17:47 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~35^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e15aa1aaa4cd8749f432e19abf10a5469be43185;hp=f2119c1c9f52fe5c4adf923b4d843517ec527ea0;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/manifoldapi/static/css/manifold.css b/manifoldapi/static/css/manifold.css
index 535950e3..dfb4ab5c 100644
--- a/manifoldapi/static/css/manifold.css
+++ b/manifoldapi/static/css/manifold.css
@@ -17,3 +17,7 @@
     display:none;
     z-index:100;
 }
+.loading img {
+    vertical-align:middle;
+    margin-right:15px;
+}
diff --git a/manifoldapi/static/js/plugin.js b/manifoldapi/static/js/plugin.js
index 495bdc7d..22e4be52 100644
--- a/manifoldapi/static/js/plugin.js
+++ b/manifoldapi/static/js/plugin.js
@@ -318,7 +318,7 @@ var Plugin = Class.extend({
     // you can also call spin_presets() yourself and tweak what you need to, like topmenuvalidation does
     spin: function (message) {
     	if (!message) {
-    		message = 'Please be patient, this can take a minute or two.';
+    		message = 'Please be patient, this operation can take a minute or two.';
     	}
     	$('div.loading').fadeIn('fast');
     	$('div.loading').find('.message').text(message);