fixed dates issues

fboehm · Oct 8, 2021 · 686d087 · 686d087
1 parent ef63dcb
commit 686d087
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/layouts/partials/work.html b/layouts/partials/work.html
@@ -28,14 +28,20 @@
 
 {{ else if eq .type "service" }}
 <i class="fa-li fas fa-hand-point-right fa-fw"></i>
-<strong>{{ .description }}</strong>, {{ .source }}
-(
-{{if isset . "date" }}{{ dateFormat "January 2006" .date }}{{ end }}
-{{if isset . "start_date" }}{{ dateFormat "January 2006" .start_date }} to {{ dateFormat "January 2006" .end_date }} {{ end }}
-)
+<strong>{{ .description }}</strong>{{if isset . "source"}}, {{ .source }}{{end}}
+{{if isset . "date" }} ({{ dateFormat "January 2006" .date }}) {{ end }}
+{{if isset . "start_date" }}
+  {{if isset . "end_date" }}
+     ({{ dateFormat "January 2006" .start_date }} to {{ dateFormat "January 2006" .end_date }}) 
+  {{ end }}
+  {{if not (isset . "end_date")}}
+    ({{ dateFormat "January 2006" .start_date }} to present)
+  {{end}}
+
+{{end}}
+{{end}}
 {{ if isset . "exurl" }}&nbsp;<a href="{{ .exurl }}" class="is-smaller"><i class="fas fa-link fa-fw"></i></a>{{ end }}
 
-{{ end }}
 
 {{if isset . "long_description" }}
   &nbsp;<a data-kube="toggle" data-target="#desc-{{ .name }}" class="is-hidden-print"><i class="fas fa-angle-down fa-fw"></i></a>