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 535950e..dfb4ab5 100644 (file)
--- 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 495bdc7..22e4be5 100644 (file)
--- 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);