Merge branch 'master' into quiz-spellcheck

.env-prod

@@ -2,7 +2,10 @@ APP_ENV=prod
 APP_SECRET=ba16d9b24f329be32408d0a9dc24a534 #Nothing. We're an open book and have no secrets
 #Message of the Day
 #If blank, no MOTD will be displayed on pages.
+#MOTDLEVEL sets the color of the motd display, according to Bootstrap 5.3 settings.
+#MOTD Level Options: info (default, light-blue), warning (yellow), danger(red), success (green)
 MOTD=""
+MOTDLEVEL=""
 #Ticket Database file URIs.
 RP_DATABASE_URL=sqlite:///%kernel.project_dir%/RPCopy/CRParchive.db
 SP_DATABASE_URL=sqlite:///%kernel.project_dir%/RPCopy/CSParchive.db

config/SafetyQuiz.yaml

@@ -56,8 +56,8 @@ Questions:
     Text: "Fall protection systems should prevent workers from falling more than:"
     Choices:
       - {Label: "2 Feet", Value: False}
-      - {Label: "4 Feet", Value: False}
-      - {Label: "6 Feet", Value: True}
+      - {Label: "4 Feet", Value: True}
+      - {Label: "6 Feet", Value: False}
       - {Label: "8 Feet", Value: False}
   Q9:
     Text: "Common fall protection systems are:"

config/packages/twig.yaml

@@ -2,6 +2,7 @@ twig:
     default_path: '%kernel.project_dir%/templates'
     globals:
         motd: '%env(MOTD)%'
+        motdLevel: '%env(MOTDLEVEL)%'
 
 when@test:
     twig:

templates/Training/Safety/Topics/fall.html.twig

@@ -79,7 +79,7 @@
 <li>Fall arrest systems should match the work situation</li>
 <li>Fall arrest systems should:</li>
 	<ul class='list'>
-	<li>prevent a worker from falling more than 6 feet</li>
+	<li>prevent a worker from falling more than 4 feet</li>
 	<li>prevent a worker from contacting any lower level during arrest of a fall</li>
 </ul>
 </ul>
@@ -90,7 +90,7 @@
 <li>bring a worker to a complete stop</li>
 <li>limit the deceleration distance a worker travels to 3 1/2 feet</li>
 <li>have sufficient strength to withstand twice the potential energy impact of a worker </li>
-falling a distance of 6 feet - or- have sufficient strength to withstand the free-fall distance permitted by the system, whichever is less</li>
+falling a distance of 4 feet - or- have sufficient strength to withstand the free-fall distance permitted by the system, whichever is less</li>
 </ul>
 
 <h4>Personal fall protection: </h4>

templates/_navbar.html.twig

@@ -40,7 +40,12 @@
 	</div>
     {# Display MOTD, if one is set #}
     {% if motd is defined and motd is not empty %}
-    <div class="alert alert-info alert-dismissible fade show" role="alert">
+    {% if motdLevel is defined and motdLevel is not empty %}
+    
+    {% else %}
+    {% set motdLevel = "info" %}
+    {% endif %}
+    <div class="alert alert-primary alert-{{ motdLevel }} alert-dismissible fade show" role="alert" style="margin-bottom:0;">
     <div class="row justify-content-end">
 			<div class="col-12 justify-content-center">
                 <p class="text-center">{{ motd }}</p>