Merge pull request #23 from indiana-university/LMSA-9028

LMSA-9028 remove spinner for unavailable courses
indiana-university · Dec 1, 2023 · 58475e7 · 58475e7
2 parents 3e9a75a + 5988c86
commit 58475e7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/src/main/resources/static/css/crosslisting.css b/src/main/resources/static/css/crosslisting.css
@@ -43,7 +43,7 @@
     white-space: nowrap;
 }
 
-#loading, #unavailable-loading {
+#loading {
     display: none;
 }
 
@@ -86,7 +86,6 @@
 #addTerms {
     font-weight: inherit;
     font-size: inherit;
-    margin: 1.0rem 0 1.2rem;
 }
 
 /* override the rivet style */

diff --git a/src/main/resources/static/js/crosslisting.js b/src/main/resources/static/js/crosslisting.js
@@ -304,8 +304,6 @@ function loadUnavailableSections() {
 
     loadDiv.empty();
 
-    $("#unavailable-loading").show();
-
     var displayedTerms = [];
 
     var activeTerm = $('#active-term');
@@ -329,8 +327,6 @@ function loadUnavailableSections() {
             if (xhr.status == 403) {
                 window.location.replace("error");
             }
-
-            $("#unavailable-loading").hide();
         });
 }
 

diff --git a/src/main/resources/templates/fragments/termData.html b/src/main/resources/templates/fragments/termData.html
@@ -40,7 +40,7 @@
 <body>
 <div th:fragment="termData">
     <h3 id="active-term" th:data-active-term-id = "${activeTerm.id}" th:text="${activeTerm.name}">(Active Term Name)</h3>
-    <div class="rvt-p-left-md rvt-prose">
+    <div class="rvt-p-left-md rvt-prose rvt-m-bottom-sm">
         <p th:if="${#lists.isEmpty(activeCourseSections)}">None available</p>
         <ul th:unless="${#lists.isEmpty(activeCourseSections)}" class="sectionsList rvt-list-plain">
             <li th:id="'row_' + ${section.sectionId}" th:each="section : ${activeCourseSections}" th:class="${section.getAppropriateCssClass()}"
@@ -88,7 +88,7 @@ <h3 id="active-term" th:data-active-term-id = "${activeTerm.id}" th:text="${acti
 </div>
 <div th:fragment="termDataUnavailable">
     <div th:if="${impersonationModel.includeSisSectionsInParentWithCrosslistSections && hasAlienBlocked != null && hasAlienBlocked}">
-        <h2 class="rvt-ts-26">Unavailable Sections</h2>
+        <h2 class="rvt-ts-26 rvt-m-top-md">Unavailable Sections</h2>
         <p id="unavailableSections">The section(s) below cannot be cross-listed until the cross-listed sections in their parent course(s) have been removed.</p>
         <div id="dataDiv2">
             <div th:unless="${sectionsMap.isEmpty()}" th:each="mapInstance : ${sectionsMap}">

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -86,7 +86,7 @@ <h2 class="rvt-ts-26">Cross-listed Sections</h2>
                             </div>
                             <div class="rvt-cols-8-md bp_checkboxes">
                                 <h2 class="rvt-ts-26">Available Sections</h2>
-                                <div th:if="${impersonationModel == null || impersonationModel.username == null}" class="rvt-flex rvt-m-bottom-md">
+                                <div th:if="${impersonationModel == null || impersonationModel.username == null}" class="rvt-flex rvt-m-bottom-sm">
                                     <span class="rvt-m-right-sm" id="include-crosslisted">
                                         Show already cross-listed sections
                                     </span>
@@ -104,12 +104,9 @@ <h2 class="rvt-ts-26">Available Sections</h2>
                                 </div>
                                 <div id="unavailable-sections-load" th:attr="data-urlbase=@{|/app/${courseId}/loadUnavailableSections/|}">
                                 </div>
-                                <div id="unavailable-loading">
-                                    <div class="rvt-loader rvt-loader--sm" aria-label="Content loading"></div>
-                                </div>
-                                <div th:if="${multiTermEnabled}">
+                                <div th:if="${multiTermEnabled}" class="rvt-m-top-md">
                                     <h2 class="rvt-sr-only">View additional terms</h2>
-                                    <label for="addTerm" id="addTerms" class="rvt-label">Add a term to choose additional sections:</label>
+                                    <label for="addTerm" id="addTerms" class="rvt-label rvt-m-bottom-xs">Add a term to choose additional sections:</label>
                                     <select id="addTerm" class="rvt-select rvt-width-sm" th:attr="data-urlbase=@{|/app/${courseId}/loadTerm/|}">
                                         <option>- Select a Term -</option>
                                         <option th:each="term : ${selectableTerms}" th:value="${term.id}" th:text="${term.name}">TERMNAME ####</option>