diff --git a/src/Controller/SafetyController.php b/src/Controller/SafetyController.php index d8b838c..1f0a305 100644 --- a/src/Controller/SafetyController.php +++ b/src/Controller/SafetyController.php @@ -95,10 +95,13 @@ class SafetyController extends AbstractController } $topic = strtolower($topic); + //Render the page header $header = $this->renderView('_header.html.twig') . $this->renderView ('_navbar.html.twig'); + //prepare navButton data $navButtonData = ['previous'=> $previousTopic, 'next' => $nextTopic]; - $contents = $this->renderView('Training/Safety/Topics/'.$topic.".html.twig", $navButtonData); - $navButtons = $this->renderView('Training/Safety/navButtons.html.twig',$navButtonData); - return new Response($header . $contents . $navButtons); + $contents = $this->renderView('Training/Safety/Topics/'.$topic.".html.twig"); //render main page contents + $navButtons = $this->renderView('Training/Safety/navButtons.html.twig',$navButtonData); //render nav buttons + + return new Response($header . $navButtons . $contents . $navButtons); } } diff --git a/templates/Training/Safety/Topics/actionplan.html.twig b/templates/Training/Safety/Topics/actionplan.html.twig index d40f0af..8855264 100644 --- a/templates/Training/Safety/Topics/actionplan.html.twig +++ b/templates/Training/Safety/Topics/actionplan.html.twig @@ -1,9 +1,5 @@ - -{{ 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 d1b3019..6e9083d 100644 --- a/templates/Training/Safety/Topics/bloodborne.html.twig +++ b/templates/Training/Safety/Topics/bloodborne.html.twig @@ -1,9 +1,5 @@ - -{{ 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 5aa12f6..1755429 100644 --- a/templates/Training/Safety/Topics/crane.html.twig +++ b/templates/Training/Safety/Topics/crane.html.twig @@ -1,9 +1,5 @@ - -{{ 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 9f3472f..194bad0 100644 --- a/templates/Training/Safety/Topics/electrical.html.twig +++ b/templates/Training/Safety/Topics/electrical.html.twig @@ -1,9 +1,5 @@ - -{{ 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 6f90654..23cbd3f 100644 --- a/templates/Training/Safety/Topics/extinguisher.html.twig +++ b/templates/Training/Safety/Topics/extinguisher.html.twig @@ -1,9 +1,5 @@ - -{{ 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 a2b5909..33b34f6 100644 --- a/templates/Training/Safety/Topics/fireprevention.html.twig +++ b/templates/Training/Safety/Topics/fireprevention.html.twig @@ -1,9 +1,5 @@ - -{{ 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 9c83c88..1d7bb95 100644 --- a/templates/Training/Safety/Topics/general.html.twig +++ b/templates/Training/Safety/Topics/general.html.twig @@ -1,9 +1,5 @@ - -{{ include('_header.html.twig') }} -{{ include('_navbar.html.twig')}} -{{ include('Training/Safety/navButtons.html.twig') }}
diff --git a/templates/Training/Safety/Topics/guarding.html.twig b/templates/Training/Safety/Topics/guarding.html.twig index ac342e5..326b95d 100644 --- a/templates/Training/Safety/Topics/guarding.html.twig +++ b/templates/Training/Safety/Topics/guarding.html.twig @@ -1,9 +1,5 @@ - -{{ 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 5cd90d5..6ebaab2 100644 --- a/templates/Training/Safety/Topics/hazardcommunication.html.twig +++ b/templates/Training/Safety/Topics/hazardcommunication.html.twig @@ -1,9 +1,5 @@ - -{{ 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 558714d..8b9376e 100644 --- a/templates/Training/Safety/Topics/hearing.html.twig +++ b/templates/Training/Safety/Topics/hearing.html.twig @@ -1,9 +1,5 @@ - -{{ 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 13a5883..f49147f 100644 --- a/templates/Training/Safety/Topics/powertools.html.twig +++ b/templates/Training/Safety/Topics/powertools.html.twig @@ -1,9 +1,5 @@ - -{{ 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 b23e27d..86d2a3b 100644 --- a/templates/Training/Safety/Topics/ppe.html.twig +++ b/templates/Training/Safety/Topics/ppe.html.twig @@ -1,9 +1,5 @@ - -{{ 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 04c0508..d271a27 100644 --- a/templates/Training/Safety/Topics/safelifting.html.twig +++ b/templates/Training/Safety/Topics/safelifting.html.twig @@ -1,9 +1,5 @@ - -{{ 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 0d2b8bf..9a42b26 100644 --- a/templates/Training/Safety/Topics/tagout.html.twig +++ b/templates/Training/Safety/Topics/tagout.html.twig @@ -1,9 +1,5 @@ - -{{ 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 523299a..7c74491 100644 --- a/templates/Training/Safety/Topics/welding.html.twig +++ b/templates/Training/Safety/Topics/welding.html.twig @@ -1,9 +1,5 @@ - -{{ include('_header.html.twig') }} -{{ include('_navbar.html.twig')}} -{{ include('Training/Safety/navButtons.html.twig') }}

Welding Safety