From da12b0c8023c9856821d6c7863b74866eec86e57 Mon Sep 17 00:00:00 2001 From: Wagner Date: Wed, 29 Nov 2023 09:12:19 -0700 Subject: [PATCH 1/2] LMSA-9028 remove spinner for unavailable courses --- src/main/resources/static/css/crosslisting.css | 2 +- src/main/resources/static/js/crosslisting.js | 4 ---- src/main/resources/templates/index.html | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/resources/static/css/crosslisting.css b/src/main/resources/static/css/crosslisting.css index 114ca77..a3f5ed7 100644 --- 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; } diff --git a/src/main/resources/static/js/crosslisting.js b/src/main/resources/static/js/crosslisting.js index 84c48ff..eeb42c3 100644 --- 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/index.html b/src/main/resources/templates/index.html index a941804..cfddc97 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -104,9 +104,6 @@

Available Sections

-
-
-

View additional terms

From 5988c8617b295db7280377bdbb611b0f7d1e4f47 Mon Sep 17 00:00:00 2001 From: Wagner Date: Fri, 1 Dec 2023 08:41:16 -0700 Subject: [PATCH 2/2] LMSA-9028 spacing tweaks --- src/main/resources/static/css/crosslisting.css | 1 - src/main/resources/templates/fragments/termData.html | 4 ++-- src/main/resources/templates/index.html | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/resources/static/css/crosslisting.css b/src/main/resources/static/css/crosslisting.css index a3f5ed7..b1d04a6 100644 --- a/src/main/resources/static/css/crosslisting.css +++ b/src/main/resources/static/css/crosslisting.css @@ -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/templates/fragments/termData.html b/src/main/resources/templates/fragments/termData.html index 37df2e6..ca7d1ff 100644 --- a/src/main/resources/templates/fragments/termData.html +++ b/src/main/resources/templates/fragments/termData.html @@ -40,7 +40,7 @@

(Active Term Name)

-
+

None available

  • -

    Unavailable Sections

    +

    Unavailable Sections

    The section(s) below cannot be cross-listed until the cross-listed sections in their parent course(s) have been removed.

    diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index cfddc97..e7355fd 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -86,7 +86,7 @@

    Cross-listed Sections

    Available Sections

    -
    +
    Show already cross-listed sections @@ -104,9 +104,9 @@

    Available Sections

    -
    +

    View additional terms

    - +