fixing some lighthouse issues

8 files changed, 31 insertions, 20 deletions

diff --git a/layouts/index.html b/layouts/index.html
index 4a6f5ea..8dcae98 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,4 +1,3 @@
-{{ define "title" }}{{ .Site.Title }}{{ end}}
 {{ define "body_classes" }}page-home{{ end }}
 
 {{ define "main" }}
@@ -7,8 +6,8 @@
     <div class="row justify-content-start">
       <div class="col-12 col-md-7 col-lg-6 order-2 order-md-1">
         {{ .Content }}
-        {{ if .Site.Params.homepage.show_call_box }}
-        {{ partial "call.html" (dict "site" .Site "context" . "show_button" "true") }}
+        {{ if .Site.Params.homepage.show_contact_box }}
+          {{ partial "call.html" (dict "site" .Site "context" . "show_button" "true") }}
         {{ end }}
       </div>
       {{ if .Params.intro_image }}
@@ -32,7 +31,7 @@
       </div>
       {{ end }}
     </div>
-    {{ if not .Site.Params.homepage.hide_view_all_services }}
+    {{ if not .Site.Params.homepage.show_services_button }}
     <div class="row justify-content-center">
       <div class="col-auto">
         <a class="button button-primary" href="{{ "services/" | relURL }}">View All Services</a>
@@ -51,7 +50,7 @@
       <div class="col-12 col-md-6 col-lg-4 mb-2">
         <div class="feature">
           {{ if .image }}
-          <div class="feature-image"><img alt="{{ .Title }} logo" src="{{ .image | relURL }}" /></div>
+          <div class="feature-image"><img width="100" height="100" alt="{{ .Title }} logo" src="{{ .image | relURL }}" /></div>
           {{ end }}
           <h2 class="feature-title">{{ .title }}</h2>
           <div class="feature-content">
diff --git a/layouts/partials/footer-menu.html b/layouts/partials/footer-menu.html
new file mode 100644
index 0000000..6ec4094
--- /dev/null
+++ b/layouts/partials/footer-menu.html
@@ -0,0 +1,15 @@
+<div id="footer-menu" class="footer-menu">
+  <ul>
+    {{ $currentPage := . }}
+    {{ range .Site.Menus.footer }}
+    {{ $active := or ($currentPage.IsMenuCurrent "footer" .) ($currentPage.HasMenuCurrent "footer" .) }}
+    {{ $active = or $active (eq .Name $currentPage.Title) }}
+    <li class="menu-item-{{ .Name | lower }} {{ if $active }}active{{ end }}">
+      <a href="{{.URL}}">
+        {{ .Pre }}
+        <span>{{ .Name }}</span>
+      </a>
+    </li>
+    {{end}}
+  </ul>
+</div>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index ac43bc1..d16a010 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -4,16 +4,8 @@
       <div class="col-12">
         <div class="footer-inner">
           <h3 class="footer-title">{{.Site.Title}}</h3>
-          <ul>
-            {{ $currentPage := . }}
-            {{ range .Site.Menus.footer }}
-            <li class="menu-item-{{ .Name | lower }}{{ if $currentPage.IsMenuCurrent "main" . }} active{{ end }}">
-              <a href="{{.URL}}">
-                {{ .Name }}
-              </a>
-            </li>
-            {{end}}
-          </ul>
+          {{ partial "footer-menu" . }}
+          
         </div>
       </div>
     </div>
diff --git a/layouts/partials/main-menu.html b/layouts/partials/main-menu.html
index 924c91b..00a7dc0 100644
--- a/layouts/partials/main-menu.html
+++ b/layouts/partials/main-menu.html
@@ -2,7 +2,9 @@
   <ul>
     {{ $currentPage := . }}
     {{ range .Site.Menus.main }}
-    <li class="menu-item-{{ .Name | lower }}{{ if $currentPage.IsMenuCurrent "main" . }} active{{ end }}">
+    {{ $active := or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }}
+    {{ $active = or $active (eq .Name $currentPage.Title) }}
+    <li class="menu-item-{{ .Name | lower }} {{ if $active }}active{{ end }}">
       <a href="{{.URL}}">
         {{ .Pre }}
         <span>{{ .Name }}</span>
@@ -10,4 +12,4 @@
     </li>
     {{end}}
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/layouts/services/list.html b/layouts/services/list.html
index 0a810c5..1e71cc1 100644
--- a/layouts/services/list.html
+++ b/layouts/services/list.html
@@ -10,6 +10,7 @@
       {{ if .Params.intro_image }}
       <div class="col-12 col-md-5 col-lg-6 order-1 order-md-2 position-relative">
         <img
+          alt={{ .Title }}
           class="intro-image{{ if .Params.intro_image_absolute }} intro-image-absolute{{ end }}{{ if .Params.intro_image_hide_on_mobile }} intro-image-hide-mobile{{ end }}"
           src="{{ .Params.intro_image | relURL }}" />
       </div>
diff --git a/layouts/team/list.html b/layouts/team/list.html
index e78ca82..be2ca31 100644
--- a/layouts/team/list.html
+++ b/layouts/team/list.html
@@ -10,6 +10,7 @@
       {{ if .Params.intro_image }}
       <div class="col-12 col-md-5 col-lg-6 order-1 order-md-2 position-relative">
         <img
+          alt="{{ .Title }}"
           class="intro-image{{ if .Params.intro_image_absolute }} intro-image-absolute{{ end }}{{ if .Params.intro_image_hide_on_mobile }} intro-image-hide-mobile{{ end }}"
           src="{{ .Params.intro_image | relURL }}" />
       </div>
diff --git a/layouts/team/summary-large.html b/layouts/team/summary-large.html
index fb5ead8..d5bee09 100755
--- a/layouts/team/summary-large.html
+++ b/layouts/team/summary-large.html
@@ -8,9 +8,9 @@
     <h2 class="team-name">{{ .Title }}</h2>
     <p class="team-description">{{ .Params.Jobtitle }}</p>
     {{ if .Params.Linkedinurl }}
-    <a target="_blank" href="{{ .Params.Linkedinurl }}">LinkedIn</a> {{ end }}
+    <a target="_blank" rel="noreferrer" href="{{ .Params.Linkedinurl }}">LinkedIn</a> {{ end }}
     {{ if .Params.Twitterhandle }}
-    <a target="_blank" href="https://twitter.com/{{ .Params.Twitterhandle }}">Twitter</a> {{ end }}
+    <a target="_blank" rel="noreferrer" href="https://twitter.com/{{ .Params.Twitterhandle }}">Twitter</a> {{ end }}
 
   </div>
   <div class="team-content">    {{ .Content | truncate (.Site.Params.team.summary_large_truncate | default 120 ) "…" }}</div>
diff --git a/layouts/team/summary.html b/layouts/team/summary.html
index e1eadbf..1dbff41 100755
--- a/layouts/team/summary.html
+++ b/layouts/team/summary.html
@@ -8,7 +8,8 @@
     <h2 class="team-name">{{ .Title }}</h2>
     <p class="team-description">{{ .Params.Jobtitle }}</p>
     {{ if .Params.Linkedinurl }}
-    <a target="_blank" href="{{ .Params.Linkedinurl }}">LinkedIn</a> {{ end }}
+      <a target="_blank" rel="noreferrer" href="{{ .Params.Linkedinurl }}">LinkedIn</a> 
+    {{ end }}
   </div>
   <div class="team-content"></div>
 </div>
\ No newline at end of file