diff --git a/src/Controller/SafetyController.php b/src/Controller/SafetyController.php index b2f2f00..a9ad58f 100644 --- a/src/Controller/SafetyController.php +++ b/src/Controller/SafetyController.php @@ -97,7 +97,7 @@ class SafetyController extends AbstractController $topic = strtolower($topic); //TODO: Insert back button $navButtonData = ['previous'=> $previousTopic, 'next' => $nextTopic]; - $contents = $this->render('Training/Safety/Topics/'.$topic.".html.twig"); + $contents = $this->render('Training/Safety/Topics/'.$topic.".html.twig", $navButtonData); $navButtons = $this->render('Training/Safety/navButtons.html.twig',$navButtonData); return new Response($contents . $navButtons); } diff --git a/templates/Training/Safety/Topics/actionplan.html.twig b/templates/Training/Safety/Topics/actionplan.html.twig index c33cdbe..d40f0af 100644 --- a/templates/Training/Safety/Topics/actionplan.html.twig +++ b/templates/Training/Safety/Topics/actionplan.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

Emergency Action Plan

diff --git a/templates/Training/Safety/Topics/bloodborne.html.twig b/templates/Training/Safety/Topics/bloodborne.html.twig index 2584b2b..d1b3019 100644 --- a/templates/Training/Safety/Topics/bloodborne.html.twig +++ b/templates/Training/Safety/Topics/bloodborne.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}
diff --git a/templates/Training/Safety/Topics/crane.html.twig b/templates/Training/Safety/Topics/crane.html.twig index ed724fb..5aa12f6 100644 --- a/templates/Training/Safety/Topics/crane.html.twig +++ b/templates/Training/Safety/Topics/crane.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

Crane / Hoist Safety

diff --git a/templates/Training/Safety/Topics/electrical.html.twig b/templates/Training/Safety/Topics/electrical.html.twig index 72e246d..9f3472f 100644 --- a/templates/Training/Safety/Topics/electrical.html.twig +++ b/templates/Training/Safety/Topics/electrical.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

Electrical Safety

diff --git a/templates/Training/Safety/Topics/extinguisher.html.twig b/templates/Training/Safety/Topics/extinguisher.html.twig index 848391f..6f90654 100644 --- a/templates/Training/Safety/Topics/extinguisher.html.twig +++ b/templates/Training/Safety/Topics/extinguisher.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

Fire Extinguisher Operation

diff --git a/templates/Training/Safety/Topics/fireprevention.html.twig b/templates/Training/Safety/Topics/fireprevention.html.twig index 4d0eff7..a2b5909 100644 --- a/templates/Training/Safety/Topics/fireprevention.html.twig +++ b/templates/Training/Safety/Topics/fireprevention.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

Fire Prevention

diff --git a/templates/Training/Safety/Topics/general.html.twig b/templates/Training/Safety/Topics/general.html.twig index 926c496..9c83c88 100644 --- a/templates/Training/Safety/Topics/general.html.twig +++ b/templates/Training/Safety/Topics/general.html.twig @@ -2,9 +2,10 @@ {{ include('_header.html.twig') }} - +{{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }} - {{ include('_navbar.html.twig')}} +

General Rules at J.V. Manufacturing, Inc.

    diff --git a/templates/Training/Safety/Topics/guarding.html.twig b/templates/Training/Safety/Topics/guarding.html.twig index 5d9917f..ac342e5 100644 --- a/templates/Training/Safety/Topics/guarding.html.twig +++ b/templates/Training/Safety/Topics/guarding.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Machine Guarding

    diff --git a/templates/Training/Safety/Topics/hazardcommunication.html.twig b/templates/Training/Safety/Topics/hazardcommunication.html.twig index 12c204f..5cd90d5 100644 --- a/templates/Training/Safety/Topics/hazardcommunication.html.twig +++ b/templates/Training/Safety/Topics/hazardcommunication.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Hazard Communication

    diff --git a/templates/Training/Safety/Topics/hearing.html.twig b/templates/Training/Safety/Topics/hearing.html.twig index 4b4686f..558714d 100644 --- a/templates/Training/Safety/Topics/hearing.html.twig +++ b/templates/Training/Safety/Topics/hearing.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Hearing Protection

    diff --git a/templates/Training/Safety/Topics/powertools.html.twig b/templates/Training/Safety/Topics/powertools.html.twig index a8f2bd3..13a5883 100644 --- a/templates/Training/Safety/Topics/powertools.html.twig +++ b/templates/Training/Safety/Topics/powertools.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Hand & Power Tools

    diff --git a/templates/Training/Safety/Topics/ppe.html.twig b/templates/Training/Safety/Topics/ppe.html.twig index 97b84d3..b23e27d 100644 --- a/templates/Training/Safety/Topics/ppe.html.twig +++ b/templates/Training/Safety/Topics/ppe.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Personal Protective Equipment (Eyes, Face, Hands, & Feet)

    diff --git a/templates/Training/Safety/Topics/safelifting.html.twig b/templates/Training/Safety/Topics/safelifting.html.twig index d2f059d..04c0508 100644 --- a/templates/Training/Safety/Topics/safelifting.html.twig +++ b/templates/Training/Safety/Topics/safelifting.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Safe Lifting

    diff --git a/templates/Training/Safety/Topics/tagout.html.twig b/templates/Training/Safety/Topics/tagout.html.twig index 9f13895..0d2b8bf 100644 --- a/templates/Training/Safety/Topics/tagout.html.twig +++ b/templates/Training/Safety/Topics/tagout.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Lockout Tagout

    diff --git a/templates/Training/Safety/Topics/welding.html.twig b/templates/Training/Safety/Topics/welding.html.twig index b11542f..523299a 100644 --- a/templates/Training/Safety/Topics/welding.html.twig +++ b/templates/Training/Safety/Topics/welding.html.twig @@ -3,6 +3,7 @@ {{ include('_header.html.twig') }} {{ include('_navbar.html.twig')}} +{{ include('Training/Safety/navButtons.html.twig') }}

    Welding Safety