Merge pull request 'Implement Article navbutton fix' (#2) from navbar-fix into master

Reviewed-on: #2

config/safetyLinks.yaml

@@ -15,24 +15,21 @@ Cards:
   #   - { title: 'Item Title', url: 'URL goes here'}
 
   General Safety:
-    - { title: 'General Safety', url: '/Training/Safety/Topics/general'}
+    - { title: 'General Safety', url: 'general'}
-    - { title: 'Bloodborne Pathogens', url: '/Training/Safety/Topics/bloodborne'}
+    - { title: 'Bloodborne Pathogens', url: 'bloodborne'}
-    - { title: 'Safe Lifting (Video)', url: '/Training/Safety/Topics/safelifting'}
+    - { title: 'Safe Lifting (Video)', url: 'safelifting'}
-    - { title: 'Hazard Communication (Video)', url: '/Training/Safety/Topics/hazardcommunication'}
+    - { title: 'Hazard Communication (Video)', url: 'hazardcommunication'}
-    - { title: 'Electrical Safety', url: '/Training/Safety/Topics/electrical'}
+    - { title: 'Electrical Safety', url: 'electrical'}
-    - { title: 'Hearing Protection (Video)', url: '/Training/Safety/Topics/hearing'}
+    - { title: 'Hearing Protection (Video)', url: 'hearing'}
-    - { title: 'Fall Protection', url: '/Training/Safety/Topics/fall'}
+    - { title: 'Fall Protection', url: 'fall'}
   Workplace Hazards:
-    - {title: 'Hand & Power Tools', url: '/Training/Safety/Topics/powertools'}
+    - {title: 'Hand & Power Tools', url: 'powertools'}
-    - {title: 'Welding safety (Video)', url: '/Training/Safety/Topics/welding'}
+    - {title: 'Welding safety (Video)', url: 'welding'}
-    - {title: 'Personal Protective Equipment (PPE)', url: '/Training/Safety/Topics/ppe'}
+    - {title: 'Personal Protective Equipment (PPE)', url: 'ppe'}
-    - {title: 'Lockout Tagout (Video)', url: '/Training/Safety/Topics/tagout'}
+    - {title: 'Lockout Tagout (Video)', url: 'tagout'}
-    - {title: 'Machine Guarding', url: '/Training/Safety/Topics/guarding'}
+    - {title: 'Machine Guarding', url: 'guarding'}
-    - {title: 'Crane/Hoist (Video)', url: '/Training/Safety/Topics/crane'}
+    - {title: 'Crane/Hoist (Video)', url: 'crane'}
   Planning:
-    - {title: 'Emergency Action Plan', url: '/Training/Safety/Topics/actionplan'}
+    - {title: 'Emergency Action Plan', url: 'actionplan'}
-    - {title: 'Fire Prevention', url: '/Training/Safety/Topics/fireprevention'}
+    - {title: 'Fire Prevention', url: 'fireprevention'}
-    - {title: 'Fire Extinguisher Training', url: '/Training/Safety/Topics/extinguisher'}
+    - {title: 'Fire Extinguisher Training', url: 'extinguisher'}
-  Forklift:
-    - {title: 'Account Creation', url: 'https://sunbeltrentals.csod.com/login/render.aspx?id=defaultclp'}
-    - {title: 'Training', url: 'https://www.sunbeltrentals.com/training/safety/'}

templates/Training/Safety/safetyHome.html.twig

@@ -30,7 +30,7 @@
                         <div class="card-text">
                             <ul class="list-group list-group-flush">
                             {% for link in links %}
-                                <a class="list-group-item list-group-item-action list-item {{ (link.disabled|default(false))? 'disabled' : ''}}" href="{{link.url}}">{{link.title}}</a>
+                                <a class="list-group-item list-group-item-action list-item {{ (link.disabled|default(false))? 'disabled' : ''}}" href="/Training/Safety/Topics/{{link.url}}">{{link.title}}</a>
                             {% endfor %}
                             </ul>
                         </div>
@@ -38,10 +38,23 @@
                 </div>
         {% endfor %}
 	</div>
-		
+		{# Forklift Training #}
+	<div class="card-group">
+		<div class="card text-center service-card">
+                    <div class="card-body">
+                        <div class="card-header">
+                            <h5 class="card-title">Forklift Training</h5>
+                        </div>
+                        <div class="card-text">
+                            <ul class="list-group list-group-flush">
+                                <a class="list-group-item list-group-item-action list-item" href="https://sunbeltrentals.csod.com/login/render.aspx?id=defaultclp">Account Creation</a>
+								<a class="list-group-item list-group-item-action list-item" href="https://www.sunbeltrentals.com/training/safety/">Training</a>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+			</div>
 		</div>
-
-
 </body>
 
 </html>