add custom variables to config and template files

5 files changed, 20 insertions, 25 deletions

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 4b400f4..c265df6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -22,16 +22,8 @@
     {{ partial "footer.html" . }}
   </div>
   <script src="{{ .Site.BaseUrl }}/js/slim.js"></script>
-  <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  {{ with .Site.Params.AnalyticsID }}{{ partial "analytics.html" . }}{{ end }}
 
-  ga('create', 'UA-58516870-1', 'auto');
-  ga('send', 'pageview');
-
-</script>
 </body>
 
 </html>
diff --git a/layouts/index.html b/layouts/index.html
index 1e59e69..4a74f8f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -10,7 +10,6 @@
     {{ partial "header.html" . }}
     <div class="content">
       <div class="posts">
-
         {{ range .Data.Pages }}
         <div class="post">
           <h2 class="post-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
@@ -22,16 +21,8 @@
     {{ partial "footer.html" . }}
   </div>
   <script src="{{ .Site.BaseUrl }}/js/slim.js"></script>
-  <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-58516870-1', 'auto');
-  ga('send', 'pageview');
+  {{ with .Site.Params.AnalyticsID }}{{ partial "analytics.html" . }}{{ end }}
 
-</script>
 </body>
 
 </html>
diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
new file mode 100644
index 0000000..c2434f2
--- /dev/null
+++ b/layouts/partials/analytics.html
@@ -0,0 +1,10 @@
+<script>
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', '{{.}}', 'auto');
+ga('send', 'pageview');
+
+</script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e198f0a..eecb26f 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,14 +1,17 @@
 <div class="header">
-  <h1 class="site-title"><a href="{{ .Site.BaseUrl }}">Zhe Zhang</a></h1>
-  <p class="site-tagline">A personal site made in Shanghai.</p>
+  <h1 class="site-title"><a href="{{ .Site.BaseUrl }}">{{ .Site.Title }}</a></h1>
+  <p class="site-tagline">{{ .Site.Params.Subtitle  }}</p>
   <div class="nav">
     <a class="nav-btn" href="#">
       <span class="ci ci-burger"></span>
     </a>
     <ul class="nav-list">
-      <li><a href="https://github.com/zhe">Github</a></li>
-      <li><a href="https://twitter.com/neomana">Twitter</a></li>
-      <li><a href="http://linkedin.com/in/zhangzhe">LinkedIn</a></li>
+      {{ with .Site.Params.GithubID }}
+      <li><a href="https://github.com/{{.}}">Github</a></li>{{ end }}
+      {{ with .Site.Params.TwitterID }}
+      <li><a href="https://twitter.com/{{.}}">Twitter</a></li>{{ end }}
+      {{ with .Site.Params.LinkedInID }}
+      <li><a href="http://linkedin.com/in/{{.}}">LinkedIn</a></li>{{ end }}
     </ul>
   </div>
 </div>
diff --git a/theme.toml b/theme.toml
index b23b10c..d3f7930 100644
--- a/theme.toml
+++ b/theme.toml
@@ -1,5 +1,4 @@
 name = "Slim"
-author = "Zhe Zhang"
 description = "A slim minimal theme for Hugo."
 license = "MIT"
 source_repo = "https://github.com/zhe/hugo-theme-slim"