From db9dcf6055c2f98a4873ef2768ed4bf0a11bb374 Mon Sep 17 00:00:00 2001
From: Stephan Kulla <git.mail@kulla.me>
Date: Tue, 4 Oct 2016 02:14:37 +0200
Subject: [PATCH] widgets: Direct inclusion of widgets (#45)

Replace the long if-else block in index.html with a direct inclusion of
the widgets.

Signed-off-by: Stephan Kulla <git.mail@kulla.me>
---
 exampleSite/content/home/publications.md      |  2 +-
 .../content/home/publications_selected.md     |  2 +-
 layouts/index.html                            | 18 +++---------------
 layouts/partials/widgets/about.html           | 19 +++++++++++--------
 layouts/partials/widgets/contact.html         | 17 ++++++++++-------
 layouts/partials/widgets/custom.html          |  2 +-
 6 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/exampleSite/content/home/publications.md b/exampleSite/content/home/publications.md
index ecfc21b2..ed445a61 100644
--- a/exampleSite/content/home/publications.md
+++ b/exampleSite/content/home/publications.md
@@ -7,7 +7,7 @@ draft = false
 
 title = "Recent Publications"
 subtitle = ""
-widget = "pubs"
+widget = "publications"
 
 # Order that this section will appear in.
 weight = 20
diff --git a/exampleSite/content/home/publications_selected.md b/exampleSite/content/home/publications_selected.md
index c7771a20..217ae2b0 100644
--- a/exampleSite/content/home/publications_selected.md
+++ b/exampleSite/content/home/publications_selected.md
@@ -8,7 +8,7 @@ draft = false
 
 title = "Selected Publications"
 subtitle = ""
-widget = "pubs_selected"
+widget = "publications_selected"
 
 # Order that this section will appear in.
 weight = 10
diff --git a/layouts/index.html b/layouts/index.html
index 9fdf18c9..88c0d496 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -7,21 +7,9 @@
 <!-- Widgets -->
 {{ $pubs_selected_len := len (where (where .Data.Pages "Type" "publication") ".Params.selected" true) }}
 {{ range $index, $page := where .Data.Pages "Type" "home" }}
-  {{ if eq $page.Params.widget "about" }}
-    {{ partial "widgets/about" $page }}
-  {{ else if eq $page.Params.widget "pubs_selected" }}
-    {{ partial "widgets/publications_selected" (dict "root" $ "page" $page "pubs_selected_len" $pubs_selected_len) }}
-  {{ else if eq $page.Params.widget "pubs" }}
-    {{ partial "widgets/publications" (dict "root" $ "page" $page "pubs_selected_len" $pubs_selected_len) }}
-  {{ else if eq $page.Params.widget "posts" }}
-    {{ partial "widgets/posts" (dict "root" $ "page" $page) }}
-  {{ else if eq $page.Params.widget "projects" }}
-    {{ partial "widgets/projects" (dict "root" $ "page" $page) }}
-  {{ else if eq $page.Params.widget "contact" }}
-    {{ partial "widgets/contact.html" $page }}
-  {{ else }}
-    {{ partial "widgets/custom.html" $page }}
-  {{ end }}
+  {{ $params := dict "root" $ "page" $page "pubs_selected_len" $pubs_selected_len }}
+  {{ $widget := printf "widgets/%s.html" ( or $page.Params.widget "custom" ) }}
+  {{ partial $widget $params }}
 {{ end }}
 
 <!-- Page Footer -->
diff --git a/layouts/partials/widgets/about.html b/layouts/partials/widgets/about.html
index a61f7dbf..b29d827b 100644
--- a/layouts/partials/widgets/about.html
+++ b/layouts/partials/widgets/about.html
@@ -1,3 +1,6 @@
+{{ $ := .root }}
+{{ $page := .page }}
+
 <!-- About/Biography widget -->
 <section id="bio" class="home-section">
   <div class="container">
@@ -7,17 +10,17 @@
         <div id="profile">
 
           <div class="portrait" itemprop="image"
-               style="background-image: url('{{ .Site.BaseURL }}img/{{ .Site.Params.avatar }}');">
+               style="background-image: url('{{ $.Site.BaseURL }}img/{{ $.Site.Params.avatar }}');">
           </div>
 
           <div class="portrait-title">
-            <h2 itemprop="name">{{ .Site.Params.name }}</h2>
-            <h3 itemprop="jobTitle">{{ .Site.Params.role }}</h3>
-            {{ with .Site.Params.organization }}<h3 itemprop="worksFor">{{ . }}</h3>{{ end }}
+            <h2 itemprop="name">{{ $.Site.Params.name }}</h2>
+            <h3 itemprop="jobTitle">{{ $.Site.Params.role }}</h3>
+            {{ with $.Site.Params.organization }}<h3 itemprop="worksFor">{{ . }}</h3>{{ end }}
           </div>
 
           <ul class="social-icon" aria-hidden="true">
-            {{ range .Site.Params.social }}
+            {{ range $.Site.Params.social }}
             <li>
               <a href="{{ .link }}">
                 <i class="{{ .icon_pack | default "fa" }} {{ .icon_pack | default "fa" }}-{{ .icon }} big-icon"></i>
@@ -33,11 +36,11 @@
 
       <div class="col-xs-12 col-md-8" itemprop="description">
 
-        {{ .Content }}
+        {{ $page.Content }}
 
         <div class="row">
 
-          {{ with .Params.interests }}
+          {{ with $page.Params.interests }}
           <div class="col-sm-5">
             <h3>{{ .title | default "Interests" | markdownify }}</h3>
             <ul class="ul-interests">
@@ -48,7 +51,7 @@
           </div>
           {{ end }}
 
-          {{ with .Params.education }}
+          {{ with $page.Params.education }}
           <div class="col-sm-7">
             <h3>{{ .title | default "Education" | markdownify }}</h3>
             <ul class="ul-edu fa-ul">
diff --git a/layouts/partials/widgets/contact.html b/layouts/partials/widgets/contact.html
index 6e6ec540..b50220fe 100644
--- a/layouts/partials/widgets/contact.html
+++ b/layouts/partials/widgets/contact.html
@@ -1,18 +1,21 @@
+{{ $ := .root }}
+{{ $page := .page }}
+
 <!-- Contact widget -->
 <section id="contact" class="home-section">
   <div class="container">
 
     <div class="row">
       <div class="col-xs-12 col-md-4 section-heading">
-        <h1>{{ with .Title }}{{ . | markdownify }}{{ end }}</h1>
-        {{ with .Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
+        <h1>{{ with $page.Title }}{{ . | markdownify }}{{ end }}</h1>
+        {{ with $page.Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
       </div>
       <div class="col-xs-12 col-md-8">
-        {{ with .Content }}<p>{{ . | markdownify }}</p>{{ end }}
+        {{ with $page.Content }}<p>{{ . | markdownify }}</p>{{ end }}
 
         <ul class="list-unstyled">
 
-          {{ with .Site.Params.email }}
+          {{ with $.Site.Params.email }}
           <li>
             <i class="fa fa-envelope fa-fw big-icon" aria-hidden="true"></i>
             {{ if and (isset $.Params "autolink") (eq $.Params.autolink false) }}
@@ -23,7 +26,7 @@
           </li>
           {{ end }}
 
-          {{ with .Site.Params.keybase }}
+          {{ with $.Site.Params.keybase }}
           <li>
             <i class="fa fa-lock fa-fw big-icon" aria-hidden="true"></i>
             <span>
@@ -32,7 +35,7 @@
           </li>
           {{ end }}
 
-          {{ with .Site.Params.phone }}
+          {{ with $.Site.Params.phone }}
           <li>
             <i class="fa fa-phone fa-fw big-icon" aria-hidden="true"></i>
             {{ if and (isset $.Params "autolink") (eq $.Params.autolink false) }}
@@ -43,7 +46,7 @@
           </li>
           {{ end }}
 
-          {{ with .Site.Params.address }}
+          {{ with $.Site.Params.address }}
           <li>
             <i class="fa fa-map-marker fa-fw big-icon" aria-hidden="true"></i>
             <span>{{ . }}</span>
diff --git a/layouts/partials/widgets/custom.html b/layouts/partials/widgets/custom.html
index d809f395..98273669 100644
--- a/layouts/partials/widgets/custom.html
+++ b/layouts/partials/widgets/custom.html
@@ -1,4 +1,4 @@
-{{ $page := . }}
+{{ $page := .page }}
 {{ $title_words := split $page.Title " " }}
 
 <!-- Custom widget -->