Spinner in Management page

diff --git a/portal/static/js/institution.js b/portal/static/js/institution.js
index da0cacf..1545263 100644 (file)
--- a/portal/static/js/institution.js
+++ b/portal/static/js/institution.js
@@ -1,3 +1,17 @@
+function unspin_all(){
+    $('input:checkbox').each(function (index) {
+        if(this.checked){
+            this.nextElementSibling.style.display = "none";
+        }
+    });
+}
+function spin_all(){
+    $('input:checkbox').each(function (index) {
+        if(this.checked){
+            this.nextElementSibling.style.display = "inline";
+        }
+    });
+}
 $(document).ready(function() {
        loadedTabs = [];
        
@@ -17,6 +31,7 @@ $(document).ready(function() {
        });
 
     $('button#deleteusers').click(function() {
+        spin_all();
         $('input:checkbox.user').each(function (index) {
             if(this.checked){
                 var record_id = this.id;
@@ -40,6 +55,7 @@ $(document).ready(function() {
                         mysliceAlert('Rest Error for: '+data.error,'warning', true);
                         //alert("Rest Error for "+record_id+": "+data.error);
                     }   
+                    unspin_all();
                 });
             } 
         });
@@ -47,10 +63,12 @@ $(document).ready(function() {
 
     /* TODO: factorize into functions */
     $('button#deleteslices').click(function() {
+        spin_all();
         var flag = false;
         $('input:checkbox.slice').each(function (index) {
             if(this.checked){
                 var record_id = this.id;
+                $('#'+record_id+'-loading').spin();
                 $.post("/delete/slice/",{'filters':{'slice_hrn':this.id}}, function(data) {
                     if(data.success){
                         localStorage.clear();
@@ -61,11 +79,13 @@ $(document).ready(function() {
                         mysliceAlert('Rest Error for: '+data.error,'warning', true);
                         //alert("Rest Error for "+record_id+": "+data.error);
                     }
+                    unspin_all();
                 });
             }
         });
     });
     $('button#renewslices').click(function() {
+        spin_all();
         var now = new Date();
         /* In Javascript getMonth() gives month[0] = january, month[1] = february, and so on...  */
         var month = now.getMonth()+2;
@@ -73,6 +93,7 @@ $(document).ready(function() {
         $('input:checkbox.slice').each(function (index) {
             if(this.checked){
                 var record_id = this.id;
+                $('#'+record_id+'-loading').spin();
                 $.post("/update/slice/",{'filters':{'slice_hrn':this.id},'params':{'expires':one_month_later}}, function(data) {
                     if(data.success){
                         // TODO: highlight row after success
@@ -82,6 +103,7 @@ $(document).ready(function() {
                         mysliceAlert('Rest Error for: '+data.error,'warning', true);
                         //alert("Rest Error for "+record_id+": "+data.error);
                     }
+                    unspin_all();
                 });
                 
             }
@@ -90,10 +112,12 @@ $(document).ready(function() {
         //window.location="/portal/institution#slices";
     });
     $('button#deleteprojects').click(function() {
+        spin_all();
         var flag = false;
         $('input:checkbox.project').each(function (index) {
             if(this.checked){
                 var record_id = this.id;
+                $('#'+record_id+'-loading').spin();
                 console.log(record_id);
                 $.post("/delete/myslice:authority/",{'filters':{'authority_hrn':this.id}}, function(data) {
                     if(data.success){
@@ -105,6 +129,7 @@ $(document).ready(function() {
                         mysliceAlert('Rest Error for: '+data.error,'warning', true);
                         //alert("Rest Error for "+record_id+": "+data.error);
                     }
+                    unspin_all();
                 });
             }
         });

diff --git a/portal/templates/fed4fire/fed4fire_institution.html b/portal/templates/fed4fire/fed4fire_institution.html
index 15b7525..f9a272e 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_institution.html
+++ b/portal/templates/fed4fire/fed4fire_institution.html
@@ -43,7 +43,7 @@
        
        <div class="tab-pane row" id="users" data-authority="{{user_details.parent_authority}}">
                <div class="col-md-12 el">
-                       <div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
+                       <div id="user-tab-loading" style="padding-bottom:10px;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
                                <div id="user-tab-loaded" style="display:none;">
                                <table id="user-tab" class="table">
                                        <tr>
@@ -78,7 +78,7 @@
     {% if not project %}
        <div class="tab-pane row" id="projects" data-authority="{{user_details.parent_authority}}">
                <div class="col-md-12 el">
-                       <div id="project-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Projects" /></div>
+                       <div id="project-tab-loading" style="padding-bottom:10px;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Projects" /></div>
                                <div id="project-tab-loaded" style="display:none;">
                                <table id="project-tab" class="table">
                                        <tr>
@@ -101,7 +101,7 @@
    {% endif %}
        <div class="tab-pane row" id="slices">
                <div class="col-md-12 el">
-           <div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
+           <div id="slice-tab-loading" style="padding-bottom:10px;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
            <div id="slice-tab-loaded" style="display:none;">
                <table id="slice-tab" class="table">
                    <tr>
@@ -134,7 +134,6 @@ $(document).ready(function() {
     {% if person %}
     {% if user_details.parent_authority %}
         $('#spinner').spin();
-        $('#loading').spin();
         
         $.post("/rest/myslice:slice/",{'fields':['slice_hrn','users','url','slice_date_created'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_slices = [];
@@ -147,7 +146,6 @@ $(document).ready(function() {
                 }else{
                     nodes_length=val.nodes.length;
                 }
-                //console.log(val);
                 if(val.users=="undefined" || val.users==null){
                     users_length=0;
                 }else{
@@ -161,7 +159,7 @@ $(document).ready(function() {
                 }
                 
                 slice_row = "<tr id='"+val.slice_hrn+"'>";
-                slice_row += "<td><input type='checkbox' class='slice' id='"+val.slice_hrn+"'><div id='loading' style='float: right;'></div></td>";
+                slice_row += "<td><input type='checkbox' class='slice' id='"+val.slice_hrn+"'><div id='"+val.slice_hrn+"-loading' style='display:none;padding-left:3px;'><img src='{{ STATIC_URL }}img/loading.gif'></div></td>";
 
                 // filter links to slices, only those that the user has credentials for
                 s = myslice.user.slices;
@@ -190,9 +188,8 @@ $(document).ready(function() {
            
             var table_users = [];
             $.each( data[0].pi_users, function( key, val ) {
-                //console.log(val);
                 user_row = "<tr id='"+val+"'>";
-                user_row += "<td><input type='checkbox' class='user' id='"+val+"'></td>";
+                user_row += "<td><input type='checkbox' class='user' id='"+val+"'><div id='"+val+"-loading' style='display:none;padding-left:3px;'><img src='{{ STATIC_URL }}img/loading.gif'></div></td>";
                 user_row += "<td>"+val+"</td>";
                 user_row += "</tr>";
                 table_users.push(user_row);
@@ -213,7 +210,7 @@ $(document).ready(function() {
             $.each( data, function( key, val ) {
                 list_users.push( "<li><a href=\"portal/user/"+val.user_email+"\">" + val.user_email + "</a></li>" );
                 user_row = "<tr id='"+val.user_hrn+"'>";
-                user_row += "<td><input type='checkbox' class='user' id='"+val.user_hrn+"' data-email='"+val.user_email+"'></td>";
+                user_row += "<td><input type='checkbox' class='user' id='"+val.user_hrn+"' data-email='"+val.user_email+"'><div id='"+val.user_hrn+"-loading' style='display:none;padding-left:3px;'><img src='{{ STATIC_URL }}img/loading.gif'></div></td>";
                 user_row += "<td>"+val.user_email+"</td>";
                 user_row += "<td>"+val.user_hrn+"</td>";
                 /*
@@ -232,9 +229,8 @@ $(document).ready(function() {
            
             var table_projects = [];
             $.each( data, function( key, val ) {
-                console.log(val);
                 project_row = "<tr id='"+val.authority_hrn+"'>";
-                project_row += "<td><input type='checkbox' class='project' id='"+val.authority_hrn+"'></td>";
+                project_row += "<td><input type='checkbox' class='project' id='"+val.authority_hrn+"'><div id='"+val.authority_hrn+"-loading' style='display:none;padding-left:3px;'><img src='{{ STATIC_URL }}img/loading.gif'></div></td>";
 
                 // filter links to projects, only those that the user has credentials for
                 p = myslice.projects;
@@ -277,11 +273,10 @@ $(document).ready(function() {
        } else {
                $('.nav-tabs a[href=#about]').click();
        }
-});
 
-//upgrade users to PI
-$(document).ready(function() {
+    //upgrade users to PI
     $('button#makepi').click(function() {
+        spin_all();
         var flag = false;
         var pi_users = [];
         $.post("/rest/myslice:authority/",{'filters':{'authority_hrn': '{{user_details.parent_authority}}'}}, function( data ) {
@@ -303,14 +298,14 @@ $(document).ready(function() {
                         mysliceAlert('Rest Error for: '+data.error,'warning', true);
                         //alert("Rest Error for "+record_id+": "+data.error);
                     }
+                    unspin_all();
                 });
             }
         });
     });
-});
 //downgrade to user [in projects:remove from project]
-$(document).ready(function() {
     $('button#removepi').click(function() {
+        spin_all();
         var flag = false;
         var pi_users = [];
         $.post("/rest/myslice:authority/",{'filters':{'authority_hrn': '{{user_details.parent_authority}}'}}, function( data ) {
@@ -348,9 +343,11 @@ $(document).ready(function() {
                         mysliceAlert('Rest Error for: '+data.error,'warning', true);
                         //alert("Rest Error for "+record_id+": "+data.error);
                     }
+                    unspin_all();
                 });
             }else{
                 mysliceAlert('No action: User had no rights on: {{user_details.parent_authority}}','success', true);
+                unspin_all();
             }
         });
     });