Version 2 - now better configuration

10 files changed, 81 insertions, 121 deletions

diff --git a/layouts/_default/index.xml b/layouts/_default/index.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layouts/_default/index.xml
diff --git a/layouts/_default/sitemap.xml b/layouts/_default/sitemap.xml
new file mode 100644
index 0000000..a48ab5d
--- /dev/null
+++ b/layouts/_default/sitemap.xml
@@ -0,0 +1,22 @@
+{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" | safeHTML }}
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  {{ with .Site.GetPage }}
+  <url>
+    <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
+    <lastmod>{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
+    <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
+    <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ if .IsTranslated }}{{ range .Translations }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+  </url>
+  {{ end }}
+</urlset>
diff --git a/layouts/index.html b/layouts/index.html
index 8f80d35..2929ba3 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,15 +1,4 @@
 {{- define "main" -}}
-    {{- $.Scratch.Set "about" "about" -}}
-    {{- $.Scratch.Set "download" "download" -}}
-    {{- $.Scratch.Set "contact" "contact" -}}
-    {{- range $pagesect := (slice "about" "download" "contact") -}}
-        {{- if isset $.Params $pagesect -}}
-          {{- $param_pagesect := index $.Params $pagesect -}}
-          {{- if isset $param_pagesect "rename" -}}
-              {{- $.Scratch.Set $pagesect (index $param_pagesect "rename") -}}
-          {{- end -}}
-        {{- end -}}
-    {{- end -}}
     <!-- Navigation -->
     <nav class="navbar navbar-expand-lg navbar-light fixed-top" id="mainNav">
       <div class="container">
@@ -20,13 +9,14 @@
         </button>
         <div class="collapse navbar-collapse" id="navbarResponsive">
           <ul class="navbar-nav ml-auto">
-            {{- range $pagesect := ( slice "about" "download" "contact" ) -}}
-              {{- if isset $.Params $pagesect -}}
-                <li class="nav-item">
-                  <a class="nav-link js-scroll-trigger improve-contrast-box" href="#{{ $.Scratch.Get $pagesect }}">{{- $.Scratch.Get $pagesect -}}</a>
-                </li>
-              {{- end -}}
+            {{- range $ind, $elem := .Pages.ByWeight }}
+                {{ if ne $ind 0 }}
+                    <li class="nav-item">
+                      <a class="nav-link js-scroll-trigger improve-contrast-box" href="#sec-ind-{{ $ind }}">{{- $elem.Params.title -}}</a>
+                    </li>
+                {{ end }}
             {{- end -}}
+
             {{- if isset $.Params "menu" -}}
               {{- range $menuitem := $.Params.menu -}}
                 <li class="nav-item">
@@ -38,113 +28,35 @@
         </div>
       </div>
     </nav>
-    
-    <!-- Intro Header -->
-    {{- if isset $.Params "intro" -}}
-    <header class="masthead">
-      <div class="intro-body">
-        <div class="container">
-          <div class="row">
-            <div class="col-lg-8 mx-auto">
-              <div class="improve-contrast-box">
-                <h1 class="brand-heading">{{ default "" $.Params.intro.header | safeHTML }}</h1>
-                <p class="intro-text">{{- default "" $.Params.intro.text | safeHTML -}}</p>
-              </div>
-              <a href="#{{ .Scratch.Get "about" }}" class="btn btn-circle js-scroll-trigger">
-                <i class="fa fa-angle-double-down animated"></i>
-              </a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </header>
-    {{ end }}
 
-    <!-- About Section -->
-    {{- if isset $.Params "about" -}}
-    <section id="{{ .Scratch.Get "about" }}" class="content-section text-center">
-      <div class="container">
-        <div class="row">
-          <div class="col-lg-8 mx-auto">
-            <h2>{{- default "" $.Params.about.header | safeHTML -}}</h2>
-            <p>{{- default "" $.Params.about.text | safeHTML -}}</p>
-          </div>
-        </div>
-      </div>
-    </section>
-    {{- end -}}
+    {{ range $ind, $elem := .Pages.ByWeight }}
+        {{ if eq $ind 0 -}}
+            <header><div id="intro-body">
+        {{- else -}}
+            <section id="sec-ind-{{ $ind }}" class="section-{{ $ind }} content-section text-center">
+        {{- end -}}
 
-    <!-- Download Section -->
-    {{- if isset $.Params "download" -}}
-    <section id="{{ .Scratch.Get "download" }}" class="download-section content-section text-center">
-      <div class="container">
-        <div class="col-lg-8 mx-auto">
-            <div class="improve-contrast-box">
-              <h2>{{- default "" $.Params.download.header | safeHTML -}}</h2>
-              <p>{{- default "" $.Params.download.text | safeHTML -}}</p>
-            </div>
-        </div>
-      </div>
-    </section>
-    {{- end -}}
+        <div class="container"><div class="row"><div class="col-lg-8 mx-auto">
+            {{- if $elem.Params.improvecontrast -}}
+                <div class="improve-contrast-box">
+            {{- end -}}
+            {{- default "" $elem.Content -}}
+            {{- if $elem.Params.improvecontrast -}}
+                </div>
+            {{- end -}}
 
-    <!-- Contact Section -->
-    {{- if isset $.Params "contact" -}}
-    <section id="{{ .Scratch.Get "contact" }}" class="content-section text-center">
-      <div class="container">
-        <div class="row">
-          <div class="col-lg-8 mx-auto">
-            <h2>{{- default "" $.Params.contact.header | safeHTML -}}</h2>
-            <p>{{- default "" $.Params.contact.text | safeHTML -}}</p>
-            {{- if isset $.Params "socialhandles" -}}
-            <ul class="list-inline banner-social-buttons">
-              {{- if isset $.Params.socialhandles "twitter" -}}
-              <li class="list-inline-item">
-                <a href="https://twitter.com/{{ $.Params.socialhandles.twitter }}" class="btn btn-default btn-lg">
-                  <i class="fa fa-twitter fa-fw"></i>
-                  <span class="network-name">Twitter</span>
-                </a>
-              </li>
-              {{- end -}}
-              {{- if isset $.Params.socialhandles "github" -}}
-              <li class="list-inline-item">
-                <a href="https://github.com/{{ $.Params.socialhandles.github }}" class="btn btn-default btn-lg">
-                  <i class="fa fa-github fa-fw"></i>
-                  <span class="network-name">Github</span>
-                </a>
-              </li>
-              {{- end -}}
-              {{- if isset $.Params.socialhandles "googplus" -}}
-              <li class="list-inline-item">
-                <a href="https://plus.google.com/+{{ $.Params.socialhandles.googplus }}/posts" class="btn btn-default btn-lg">
-                  <i class="fa fa-google-plus fa-fw"></i>
-                  <span class="network-name">Google+</span>
-                </a>
-              </li>
-              {{- end -}}
-              {{- if isset $.Params.socialhandles "facebook" -}}
-              <li class="list-inline-item">
-                <a href="https://facebook.com/{{ $.Params.socialhandles.facebook}}" class="btn btn-default btn-lg">
-                  <i class="fa fa-facebook-square fa-fw"></i>
-                  <span class="network-name">Facebook</span>
-                </a>
-              </li>
-              {{- end -}}
-              {{- if isset $.Params.socialhandles "instagram" -}}
-              <li class="list-inline-item">
-                <a href="https://instagram.com/{{ $.Params.socialhandles.instagram }}" class="btn btn-default btn-lg">
-                  <i class="fa fa-instagram fa-fw"></i>
-                  <span class="network-name">Instagram</span>
-                </a>
-              </li>
-              {{- end -}}
-            </ul>
+            {{- if eq $ind 0 -}}
+                <a href="#sec-ind-1" class="btn btn-circle js-scroll-trigger" aria-label="Scroll to Next Section"><i class="fa fa-angle-double-down animated"></i></a>
             {{- end -}}
-          </div>
-        </div>
-      </div>
-    </section>
-    {{- end -}}
+
+        </div></div></div>
+
+        {{- if eq $ind 0 -}}
+            </div></header>
+        {{- else -}}
+            </section>
+        {{- end }}
+    {{ end }}
 
     {{- if isset $.Params "mapsapikey" -}}
     <!-- Map Section -->
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 848dfe5..31bf7b9 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -24,6 +24,6 @@
     <link href='https://fonts.googleapis.com/css?family=Cabin:700' rel='stylesheet' type='text/css'>
 
     <!-- Custom styles for this template -->
-    <link href="{{ "css/grayscale.min.css" | relURL }}" rel="stylesheet">
+    <link href="{{ "css/grayscale.css" | relURL }}" rel="stylesheet">
 
     {{ template "_internal/google_analytics_async.html" . }}
diff --git a/layouts/shortcodes/big-button.html b/layouts/shortcodes/big-button.html
new file mode 100644
index 0000000..a0b222e
--- /dev/null
+++ b/layouts/shortcodes/big-button.html
@@ -0,0 +1 @@
+<a href="{{ .Get "href" }}" class="btn btn-default btn-lg">{{ .Get "text" }}</a>
diff --git a/layouts/shortcodes/facebook.html b/layouts/shortcodes/facebook.html
new file mode 100644
index 0000000..5605867
--- /dev/null
+++ b/layouts/shortcodes/facebook.html
@@ -0,0 +1,6 @@
+<li class="list-inline-item">
+<a href="https://facebook.com/{{ .Get "user" }}" class="btn btn-default btn-lg">
+<i class="fa fa-facebook-square fa-fw"></i>
+<span class="network-name">Facebook</span>
+</a>
+</li>
diff --git a/layouts/shortcodes/github.html b/layouts/shortcodes/github.html
new file mode 100644
index 0000000..6686fde
--- /dev/null
+++ b/layouts/shortcodes/github.html
@@ -0,0 +1,6 @@
+<li class="list-inline-item">
+<a href="https://github.com/{{ .Get "user" }}" class="btn btn-default btn-lg">
+<i class="fa fa-github fa-fw"></i>
+<span class="network-name">Github</span>
+</a>
+</li>
diff --git a/layouts/shortcodes/instagram.html b/layouts/shortcodes/instagram.html
new file mode 100644
index 0000000..36eda0e
--- /dev/null
+++ b/layouts/shortcodes/instagram.html
@@ -0,0 +1,6 @@
+<li class="list-inline-item">
+<a href="https://instagram.com/{{ .Get "user" }}" class="btn btn-default btn-lg">
+<i class="fa fa-instagram fa-fw"></i>
+<span class="network-name">Instagram</span>
+</a>
+</li>
diff --git a/layouts/shortcodes/socialhandles.html b/layouts/shortcodes/socialhandles.html
new file mode 100644
index 0000000..df2d3a7
--- /dev/null
+++ b/layouts/shortcodes/socialhandles.html
@@ -0,0 +1 @@
+<ul class="list-inline banner-social-buttons">{{- .Inner -}}</ul>
diff --git a/layouts/shortcodes/twitter.html b/layouts/shortcodes/twitter.html
new file mode 100644
index 0000000..321a768
--- /dev/null
+++ b/layouts/shortcodes/twitter.html
@@ -0,0 +1,6 @@
+<li class="list-inline-item">
+<a href="https://twitter.com/{{ .Get "user" }}" class="btn btn-default btn-lg">
+<i class="fa fa-twitter fa-fw"></i>
+<span class="network-name">Twitter</span>
+</a>
+</li>