From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 25 Jul 2014 14:25:09 +0000 (+0200)
Subject: loading messages
X-Git-Tag: myslice-1.0~42
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c8d5c8180ee140b573188ca78b0df1995f20e908

loading messages
---

diff --git a/plugins/apply/static/js/apply.js b/plugins/apply/static/js/apply.js
index b94fcd6e..236deaf1 100644
--- a/plugins/apply/static/js/apply.js
+++ b/plugins/apply/static/js/apply.js
@@ -120,7 +120,6 @@
 
             var username = this.options.username;
 
-            this.spin();
             console.log("do_update in progress");
 
             manifold.raise_event(this.options.query_uuid, RUN_UPDATE);
@@ -215,13 +214,11 @@
 
         on_query_in_progress: function()
         {
-            this.spin();
         },
 
         on_query_done: function()
         {
             this.populate_table();
-            this.unspin();
         },
 
         // D : Data present
@@ -233,12 +230,13 @@
 
         on_clear_records: function()
         {
+        	 $('#applyloading').hide();
             this.clear();
         },
 
         on_query_done: function()
         {
-            this.unspin();
+            $('#applyloading').hide();
         },
 
         // PC : Pending changes
diff --git a/plugins/apply/templates/apply.html b/plugins/apply/templates/apply.html
index 31a22eee..1a9e8058 100644
--- a/plugins/apply/templates/apply.html
+++ b/plugins/apply/templates/apply.html
@@ -5,7 +5,14 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="{{domid}}__apply__label">Applying pending changes...</h4>
+            <h4 class="modal-title" id="{{domid}}__apply__label">
+            	Applying pending changes...
+            	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            	<img id="applyloading" src="/static/img/loading.gif" />
+            </h4>
+            <div>
+            	Please be patient, this operation can take a minute or two.
+            </div>
         </div>
         <div class="modal-body">
 <div class='resources-selected-spacer'>
diff --git a/portal/homeview.py b/portal/homeview.py
index b0249ce8..a910f74f 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -99,7 +99,6 @@ class HomeView (FreeAccessView, ThemeView):
         env = self.default_env()
         acc_auth_cred={}
         if request.user.is_authenticated():
-            acc_auth_cred='N/A'
             ## check user is pi or not
             platform_query  = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled')
             account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
diff --git a/portal/templates/base.html b/portal/templates/base.html
index 96aa08e9..1b83737f 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -93,13 +93,9 @@ $(document).ready(function() {
 	{% endblock %}
 {% endblock container %}
 <div class="loading">
-	<div class="row">
-		<div class="col-xs-11">Loading...</div>
-		<div class="col-xs-1"><img src="{{ STATIC_URL }}/img/loading.gif" /></div>
-	</div>
-	<div class="row">
-		<div class="col-xs-12 message"></div>
-	</div>
+	<div><img src="{{ STATIC_URL }}/img/loading.gif" /> Loading...</div>
+	<div>&nbsp;</div>
+	<div class="message"></div>
 </div>
 </body>
 </html>