Spinner included globally in base.html - used in validate requests

diff --git a/portal/templates/base.html b/portal/templates/base.html
index 9c6eb1b..82fa444 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -23,6 +23,11 @@
 <!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
 <script src="{{ STATIC_URL }}js/myslice-ui.js"></script>
 <!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
 <script src="{{ STATIC_URL }}js/myslice-ui.js"></script>

+
+<script type="text/javascript" src="{{STATIC_URL}}/js/spin-presets.js"></script>
+<script type="text/javascript" src="{{STATIC_URL}}/js/spin.min.js"></script>
+<script type="text/javascript" src="{{STATIC_URL}}/js/jquery.spin.js"></script>
+

 <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
 {{ header_prelude }}
 {% block head %} {% endblock head %}
 <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
 {{ header_prelude }}
 {% block head %} {% endblock head %}

diff --git a/portal/templates/fed4fire/fed4fire_institution.html b/portal/templates/fed4fire/fed4fire_institution.html
index 7e9c176..e523c81 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_institution.html
+++ b/portal/templates/fed4fire/fed4fire_institution.html
@@ -125,13 +125,15 @@
           </div>
        </div>
        <div class="tab-pane row" id="requests">
           </div>
        </div>
        <div class="tab-pane row" id="requests">

+        <div id="spinner" style="padding-top:40px; padding-left:40px;"/>

        </div>
 </div>
 <script>
 $(document).ready(function() {
     {% if person %}
     {% if user_details.parent_authority %}
        </div>
 </div>
 <script>
 $(document).ready(function() {
     {% if person %}
     {% if user_details.parent_authority %}

-
+        $('#spinner').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 = [];
             var table_slices = [];
         $.post("/rest/myslice:slice/",{'fields':['slice_hrn','users','url','slice_date_created'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_slices = [];
             var table_slices = [];

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index db4ace2..0b9b8f8 100644 (file)
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -1,3 +1,4 @@
+

 <script type="text/javascript">
        $(document).ready(function() {
                $("li#nav-request").addClass("active");
 <script type="text/javascript">
        $(document).ready(function() {
                $("li#nav-request").addClass("active");