diff --git a/.env-prod b/.env-prod index 8d0e98f..b4a5546 100644 --- a/.env-prod +++ b/.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 diff --git a/config/SafetyQuiz.yaml b/config/SafetyQuiz.yaml index 5bd1a62..e308e1f 100644 --- a/config/SafetyQuiz.yaml +++ b/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:" diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index ad88610..3b94021 100644 --- a/config/packages/twig.yaml +++ b/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: diff --git a/templates/Training/Safety/Topics/fall.html.twig b/templates/Training/Safety/Topics/fall.html.twig index f0dd2ea..2cf600d 100644 --- a/templates/Training/Safety/Topics/fall.html.twig +++ b/templates/Training/Safety/Topics/fall.html.twig @@ -79,7 +79,7 @@
  • Fall arrest systems should match the work situation
  • Fall arrest systems should:
  • @@ -90,7 +90,7 @@
  • bring a worker to a complete stop
  • limit the deceleration distance a worker travels to 3 1/2 feet
  • have sufficient strength to withstand twice the potential energy impact of a worker
  • -falling a distance of 6 feet - or- have sufficient strength to withstand the free-fall distance permitted by the system, whichever is less +falling a distance of 4 feet - or- have sufficient strength to withstand the free-fall distance permitted by the system, whichever is less

    Personal fall protection:

    diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig index ad52c3d..a8d89fe 100644 --- a/templates/_navbar.html.twig +++ b/templates/_navbar.html.twig @@ -40,7 +40,12 @@ {# Display MOTD, if one is set #} {% if motd is defined and motd is not empty %} -