Merge pull request #1484 from NYPL/MLN-1304

Changed Signin message place
NYPL · Jan 3, 2025 · c5ea36e · c5ea36e
2 parents 7ada945 + 9213243
commit c5ea36e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/app/admin/dashboard.rb b/app/admin/dashboard.rb
@@ -164,7 +164,7 @@
 
     columns do
       column do
-        h2 "Pending"
+        h2 "Pending Account Verification"
         if Hold.pending.count == 0
           div 'No Pending - Trouble holds'
         else
@@ -214,7 +214,7 @@
 
     columns do
       column do
-        h2 "Pending - In Transit Aux"
+        h2 "Priority Orders"
         if Hold.transit.count == 0
           div 'No Pending - In Transit Aux holds'
         else
@@ -264,7 +264,7 @@
 
     columns do
       column do
-        h2 "Pending - Trouble"
+        h2 "Pending Outreach"
         if Hold.trouble.count == 0
           div 'No Pending - Trouble holds'
         else
@@ -314,7 +314,7 @@
 
     columns do
       column do
-        h2 "Pending - Unavailable"
+        h2 "Pending Unavailable"
         if Hold.unavailable.count == 0
           div 'No Pending - Unavailable holds'
         else

diff --git a/app/javascript/components/Faqs/Faqs.jsx b/app/javascript/components/Faqs/Faqs.jsx
@@ -58,8 +58,8 @@ export default function Faqs(props) {
       breakout={<AppBreadcrumbs />}
       contentTop={
         <>
-          {renderInactiveSchoolMessage(isSchoolActive)}
           {<SignedInMsg signInDetails={props} />} 
+          {renderInactiveSchoolMessage(isSchoolActive)}
         </>}
       contentPrimary={
         <>

diff --git a/app/javascript/components/ParticipatingSchools/ParticipatingSchools.jsx b/app/javascript/components/ParticipatingSchools/ParticipatingSchools.jsx
@@ -202,8 +202,8 @@ export default function ParticipatingSchools(props) {
     <TemplateAppContainer
       breakout={<AppBreadcrumbs />}
       contentTop={ <>
-          {renderInactiveSchoolMessage(isSchoolActive)}
           {<SignedInMsg signInDetails={props} />}
+          {renderInactiveSchoolMessage(isSchoolActive)}
         </>
       }
       contentPrimary={

diff --git a/app/javascript/components/SearchTeacherSets/SearchTeacherSets.jsx b/app/javascript/components/SearchTeacherSets/SearchTeacherSets.jsx
@@ -1269,13 +1269,14 @@ export default function SearchTeacherSets(props) {
       contentTop={
         <>
           {<SignedInMsg signInDetails={props} />}
-          {renderInactiveSchoolMessage(isSchoolActive)}
           {<SignUpMsg signUpDetails={props} />}
+          {renderInactiveSchoolMessage(isSchoolActive)}
           <Heading
             id="search-and-find-teacher-sets-header"
             size="heading3"
             level="h2"
             text="Search and find Teacher Sets"
+            marginTop="l"
           />
           <HorizontalRule
             id="ts-horizontal-rule"

diff --git a/app/javascript/components/SignedInMsg.jsx b/app/javascript/components/SignedInMsg.jsx
@@ -16,7 +16,7 @@ export default function SignedInMsg(props) {
           content="You have signed in successfully!"
           type="informative"
           mb="l"
-          marginBottom="s"
+          marginBottom="xs"
         />
       );
     } else {