some cleanup

author: Jerry Kiely <jerry@cowboysmall.com> 2019-11-27 15:33:45 +0300
committer: Jerry Kiely <jerry@cowboysmall.com> 2019-11-27 15:33:45 +0300
commit: 61e18d554d09a5adc0cbddd899bdf9f425539fbd (patch)
tree: f0cd78e7d0e89335acb375406c59639564f98c63
parent: f4fa410f7222b69d045657f56c130d27682f7089 (diff)
10 files changed, 126 insertions, 138 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 56284a1..b04105b 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -79,10 +79,8 @@ googleAnalytics = "UA-XXXXXXX-Y"
 
         [[params.projects.sections]]
         # title = "Section 1"
-
         [[params.projects.sections.rows]]
         # title = "Section 1, Row 1"
-
         [[params.projects.sections.rows.items]]
         title = "Card title 1"
         description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus."
@@ -98,10 +96,8 @@ googleAnalytics = "UA-XXXXXXX-Y"
         description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque."
         url = "#"
         image = "300x200.png"
-
         [[params.projects.sections.rows]]
         # title = "Section 1, Row 2"
-
         [[params.projects.sections.rows.items]]
         title = "Card title 4"
         description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus."
@@ -116,10 +112,8 @@ googleAnalytics = "UA-XXXXXXX-Y"
 
         [[params.projects.sections]]
         # title = "Section 2"
-
         [[params.projects.sections.rows]]
         # title = "Section 2, Row 1"
-
         [[params.projects.sections.rows.items]]
         title = "Card title 1"
         description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus."
@@ -135,10 +129,8 @@ googleAnalytics = "UA-XXXXXXX-Y"
         description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque."
         url = "#"
         image = "300x200.png"
-
         [[params.projects.sections.rows]]
         # title = "Section 2, Row 2"
-
         [[params.projects.sections.rows.items]]
         title = "Card title 4"
         description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus."
diff --git a/layouts/index.html b/layouts/index.html
index 102f4e9..5fdf387 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,32 +1,32 @@
 <!DOCTYPE html>
 
-{{ partial "lang.html" . }}
+<html lang="{{ .Site.LanguageCode }}">
 
-<head>
+  <head>
 
-  {{ partial "head.html" . }}
+    {{ partial "head.html" . }}
 
-</head>
+  </head>
 
-<body>
+  <body>
 
-  {{ partial "navbar.html" . }}
+    {{ partial "navbar.html" . }}
 
-  {{ partial "header.html" . }}
+    {{ partial "header.html" . }}
 
-  <!-- Page Content -->
-  <div class="container">
+    <!-- Page Content -->
+    <div class="container">
 
-    {{ partial "summary.html" . }}
+      {{ partial "summary.html" . }}
 
-    {{ partial "projects.html" . }}
+      {{ partial "projects.html" . }}
 
-  </div><!-- /.container -->
+    </div><!-- /.container -->
 
-  {{ partial "footer.html" . }}
+    {{ partial "footer.html" . }}
 
-  {{ partial "scripts.html" . }}
+    {{ partial "scripts.html" . }}
 
-</body>
+  </body>
 
 </html>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index db5e6e7..d8d21cc 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,8 +1,8 @@
 
-  <!-- Footer -->
-  <footer class="py-5 bg-dark">
-    <div class="container">
-      <p class="m-0 text-center text-white">Ported to Hugo by <a class="text-white" href="https://github.com/cowboysmall" target="_blank">CowboySmall</a></p>
-      <p class="m-0 text-center text-white">Copyright &copy; {{ .Site.Params.footer.copyright }} {{ now.Year }}</p>
-    </div><!-- /.container -->
-  </footer>
+    <!-- Footer -->
+    <footer class="py-5 bg-dark">
+      <div class="container">
+        <p class="m-0 text-center text-white">Ported to Hugo by <a class="text-white" href="https://github.com/cowboysmall" target="_blank">CowboySmall</a></p>
+        <p class="m-0 text-center text-white">Copyright &copy; {{ .Site.Params.footer.copyright }} {{ now.Year }}</p>
+      </div><!-- /.container -->
+    </footer>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index a98bf3d..d2fafbd 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,14 +1,14 @@
 
-  <title>{{ .Site.Title }}</title>
+    <title>{{ .Site.Title }}</title>
 
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <meta name="description" content="{{ .Site.Params.description }}">
-  <meta name="author" content="{{ .Site.Params.author }}">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="{{ .Site.Params.description }}">
+    <meta name="author" content="{{ .Site.Params.author }}">
 
-  <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="favicon.ico">
 
-  <!-- Bootstrap core CSS -->
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/vendor/bootstrap/css/bootstrap.min.css">
-  <!-- Custom styles for this template -->
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/business-frontpage.css">
+    <!-- Bootstrap core CSS -->
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/vendor/bootstrap/css/bootstrap.min.css">
+    <!-- Custom styles for this template -->
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}assets/css/business-frontpage.css">
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 77fa68d..76d7506 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,12 +1,14 @@
 
-  <!-- Header -->
-  <header class="bg-primary py-5 mb-5">
-    <div class="container h-100">
-      <div class="row h-100 align-items-center">
-        <div class="col-lg-12">
-          <h1 class="display-4 text-white mt-5 mb-2">{{ .Site.Params.header.name }}</h1>
-          <p class="lead mb-5 text-white-50">{{ .Site.Params.header.tagline }}</p>
+    <!-- Header -->
+    <header class="bg-primary py-5 mb-5">
+      <div class="container h-100">
+        <div class="row h-100 align-items-center">
+          <div class="col-lg-12">
+            {{ with .Site.Params.header }}
+            <h1 class="display-4 text-white mt-5 mb-2">{{ .name }}</h1>
+            <p class="lead mb-5 text-white-50">{{ .tagline }}</p>
+            {{ end }}
+          </div>
         </div>
       </div>
-    </div>
-  </header>
+    </header>
diff --git a/layouts/partials/lang.html b/layouts/partials/lang.html
deleted file mode 100644
index 5da485c..0000000
--- a/layouts/partials/lang.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<html lang="{{ .Site.LanguageCode }}">
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index cfc7255..90afcc0 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,23 +1,23 @@
 
-  <!-- Navigation -->
-  <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-    <div class="container">
+    <!-- Navigation -->
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+      <div class="container">
+        {{ with .Site.Params.navbar }}
+        <a class="navbar-brand" href="{{ .url }}">{{ .name }}</a>
+        {{ end }}
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
 
-      <a class="navbar-brand" href="{{ .Site.Params.navbar.url }}">{{ .Site.Params.navbar.name }}</a>
+        <div class="collapse navbar-collapse" id="navbarResponsive">
+          <ul class="navbar-nav ml-auto">
+            {{ range .Site.Params.navbar.nav }}
+            <li class="nav-item{{ if .current }} active{{ end }}">
+              <a class="nav-link" href="{{ .url }}">{{ .name }}{{ if .current }}<span class="sr-only">(current)</span>{{ end }}</a>
+            </li>
+            {{ end }}
+          </ul>
+        </div>
 
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse" id="navbarResponsive">
-        <ul class="navbar-nav ml-auto">
-          {{ range .Site.Params.navbar.nav }}
-          <li class="nav-item{{ if .current }} active{{ end }}">
-            <a class="nav-link" href="{{ .url }}">{{ .name }}{{ if .current }}<span class="sr-only">(current)</span>{{ end }}</a>
-          </li>
-          {{ end }}
-        </ul>
       </div>
-
-    </div>
-  </nav>
+    </nav>
diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html
index 0ceb2e5..5f0c0b7 100644
--- a/layouts/partials/projects.html
+++ b/layouts/partials/projects.html
@@ -1,41 +1,35 @@
 
-  {{ range .Site.Params.projects.sections }}
-
-    {{ if .title }}
-    <div class="row">
-      <div class="col-md-12 mb-5">
-        <h2>{{ .title }}</h2>
-        <hr>
-      </div>
-    </div><!-- /.row -->
-    {{ end }}
-
-    {{ range .rows }}
-    <div class="row">
-
-      {{ if .title }}
-      <div class="col-md-12 mb-5">
-        <h2>{{ .title }}</h2>
-        <hr>
-      </div>
-      {{ end }}
-
-      {{ range .items }}
-      <div class="col-md-4 mb-5">
-        <div class="card h-100">
-          <img class="card-img-top" src="{{ .Site.BaseURL }}assets/images/{{ .image }}" alt="">
-          <div class="card-body">
-            <h4 class="card-title">{{ .title }}</h4>
-            <p class="card-text">{{ .description }}</p>
+      {{ range .Site.Params.projects.sections }}
+        {{ if .title }}
+        <div class="row">
+          <div class="col-md-12 mb-5">
+            <h2>{{ .title }}</h2>
+            <hr>
+          </div>
+        </div><!-- /.row -->
+        {{ end }}
+        {{ range .rows }}
+        <div class="row">
+          {{ if .title }}
+          <div class="col-md-12 mb-5">
+            <h2>{{ .title }}</h2>
+            <hr>
           </div>
-          <div class="card-footer">
-            <a href="{{ .url }}" class="btn btn-primary">{{ i18n "link" }}</a>
+          {{ end }}
+          {{ range .items }}
+          <div class="col-md-4 mb-5">
+            <div class="card h-100">
+              <img class="card-img-top" src="{{ .Site.BaseURL }}assets/images/{{ .image }}" alt="">
+              <div class="card-body">
+                <h4 class="card-title">{{ .title }}</h4>
+                <p class="card-text">{{ .description }}</p>
+              </div>
+              <div class="card-footer">
+                <a href="{{ .url }}" class="btn btn-primary">{{ i18n "link" }}</a>
+              </div>
+            </div>
           </div>
-        </div>
-      </div>
+          {{ end }}
+        </div><!-- /.row -->
+        {{ end }}
       {{ end }}
-
-    </div><!-- /.row -->
-    {{ end }}
-
-  {{ end }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 02a8ca9..de1de64 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,6 +1,6 @@
 
-  <!-- Bootstrap core JavaScript -->
-  <script src="{{ .Site.BaseURL }}assets/vendor/jquery/jquery.min.js"></script>
-  <script src="{{ .Site.BaseURL }}assets/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <!-- Bootstrap core JavaScript -->
+    <script src="{{ .Site.BaseURL }}assets/vendor/jquery/jquery.min.js"></script>
+    <script src="{{ .Site.BaseURL }}assets/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
 
-  {{ template "_internal/google_analytics_async.html" . }}
+    {{ template "_internal/google_analytics_async.html" . }}
diff --git a/layouts/partials/summary.html b/layouts/partials/summary.html
index adaebad..a110de1 100644
--- a/layouts/partials/summary.html
+++ b/layouts/partials/summary.html
@@ -1,31 +1,33 @@
 
-    <div class="row">
+      <div class="row">
 
-      <div class="col-md-8 mb-5">
-        <h2>{{ i18n "about" }}</h2>
-        <hr>
-        {{ range .Site.Params.summary.description.items }}
-        <p>{{ .description }}</p>
-        {{ end }}
-        <a class="btn btn-primary btn-lg" href="{{ .Site.Params.summary.url }}">{{ i18n "more" }} &raquo;</a>
-      </div>
+        <div class="col-md-8 mb-5">
+          <h2>{{ i18n "about" }}</h2>
+          <hr>
+          {{ range .Site.Params.summary.description.items }}
+          <p>{{ .description }}</p>
+          {{ end }}
+          <a class="btn btn-primary btn-lg" href="{{ .Site.Params.summary.url }}">{{ i18n "more" }} &raquo;</a>
+        </div>
 
-      <div class="col-md-4 mb-5">
-        <h2>{{ i18n "contact" }}</h2>
-        <hr>
-        <address>
-          <strong>{{ .Site.Params.summary.contact.name }}</strong>
-          <br>{{ .Site.Params.summary.contact.address1 }}
-          <br>{{ .Site.Params.summary.contact.address2 }}
-          <br>
-        </address>
-        <address>
-          <abbr title="Phone">P:</abbr>
-          {{ .Site.Params.summary.contact.phone }}
-          <br>
-          <abbr title="Email">E:</abbr>
-          <a href="mailto:{{ .Site.Params.summary.contact.email }}">{{ .Site.Params.summary.contact.email }}</a>
-        </address>
-      </div>
+        <div class="col-md-4 mb-5">
+          <h2>{{ i18n "contact" }}</h2>
+          <hr>
+          {{ with .Site.Params.summary.contact }}
+          <address>
+            <strong>{{ .name }}</strong>
+            <br>{{ .address1 }}
+            <br>{{ .address2 }}
+            <br>
+          </address>
+          <address>
+            <abbr title="Phone">P:</abbr>
+            {{ .phone }}
+            <br>
+            <abbr title="Email">E:</abbr>
+            <a href="mailto:{{ .email }}">{{ .email }}</a>
+          </address>
+          {{ end }}
+        </div>
 
-    </div><!-- /.row -->
+      </div><!-- /.row -->
author	Jerry Kiely <jerry@cowboysmall.com>	2019-11-27 15:33:45 +0300
committer	Jerry Kiely <jerry@cowboysmall.com>	2019-11-27 15:33:45 +0300
commit	61e18d554d09a5adc0cbddd899bdf9f425539fbd (patch)
tree	f0cd78e7d0e89335acb375406c59639564f98c63
parent	f4fa410f7222b69d045657f56c130d27682f7089 (diff)