From f42cd781e10712be72ff53e8e5a7ccf485d7e730 Mon Sep 17 00:00:00 2001
From: Alexander Feller <alxschwrz@gmail.comalexfinn@ubimo.com>
Date: Mon, 12 Nov 2018 11:37:10 +0300
Subject: fixes

---
 layouts/_default/indexes.html   | 22 ++++++++++++++--------
 layouts/_default/list.html      |  1 +
 layouts/_default/single.html    | 12 ++++++------
 layouts/_default/tag.html       | 16 ++++++++++++++++
 layouts/chrome/about.html       |  5 -----
 layouts/chrome/analytics.html   | 15 ---------------
 layouts/chrome/disqus.html      | 13 -------------
 layouts/chrome/footer.html      | 13 -------------
 layouts/chrome/header.html      | 25 -------------------------
 layouts/chrome/includes.html    |  5 -----
 layouts/chrome/menu.html        |  7 -------
 layouts/chrome/meta.html        | 12 ------------
 layouts/index.html              | 24 ++++++++++++------------
 layouts/indexes/indexes.html    | 14 --------------
 layouts/indexes/tag.html        | 16 ----------------
 layouts/partials/about.html     |  5 +++++
 layouts/partials/analytics.html | 15 +++++++++++++++
 layouts/partials/disqus.html    | 13 +++++++++++++
 layouts/partials/footer.html    | 13 +++++++++++++
 layouts/partials/header.html    | 25 +++++++++++++++++++++++++
 layouts/partials/includes.html  |  5 +++++
 layouts/partials/menu.html      |  7 +++++++
 layouts/partials/meta.html      | 12 ++++++++++++
 theme.toml                      |  2 +-
 24 files changed, 145 insertions(+), 152 deletions(-)
 create mode 100644 layouts/_default/list.html
 create mode 100644 layouts/_default/tag.html
 delete mode 100644 layouts/chrome/about.html
 delete mode 100644 layouts/chrome/analytics.html
 delete mode 100644 layouts/chrome/disqus.html
 delete mode 100644 layouts/chrome/footer.html
 delete mode 100644 layouts/chrome/header.html
 delete mode 100644 layouts/chrome/includes.html
 delete mode 100644 layouts/chrome/menu.html
 delete mode 100644 layouts/chrome/meta.html
 delete mode 100644 layouts/indexes/indexes.html
 delete mode 100644 layouts/indexes/tag.html
 create mode 100644 layouts/partials/about.html
 create mode 100644 layouts/partials/analytics.html
 create mode 100644 layouts/partials/disqus.html
 create mode 100644 layouts/partials/footer.html
 create mode 100644 layouts/partials/header.html
 create mode 100644 layouts/partials/includes.html
 create mode 100644 layouts/partials/menu.html
 create mode 100644 layouts/partials/meta.html

diff --git a/layouts/_default/indexes.html b/layouts/_default/indexes.html
index de38d4d..c760b84 100644
--- a/layouts/_default/indexes.html
+++ b/layouts/_default/indexes.html
@@ -1,8 +1,14 @@
-<section id="main">
-  <div>
-   <h1 id="title">{{ .Title }}</h1>
-   <ul>
-   
-   </ul>
-  </div>
-</section>
\ No newline at end of file
+{{ $baseurl := .Site.BaseURL }}
+{{ template "partials/header.html" . }}
+
+    <section id="main">
+      <div>
+       <h1 id="title">{{ .Title }}</h1>
+       <ul>
+       {{ $data := .Data }}
+        {{ range $key,$value := .Data.Index.ByCount }}
+        <li><a href="{{ $baseurl }}/tags/{{ $value.Name | urlize }}"> {{ $value.Name }} </a> {{ $value.Count }} </li>
+        {{ end }}
+       </ul>
+      </div>
+    </section>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/layouts/_default/list.html
@@ -0,0 +1 @@
+
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index fc84e46..5380e60 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,5 @@
 	{{ $baseurl := .Site.BaseURL }}
-	{{ template "theme/chrome/header.html" . }}
+	{{ template "partials/header.html" . }}
 	    <!-- CONTENT -->
 	  <div class="post">
 	    <header class="post-header">
@@ -9,7 +9,7 @@
 	    <div class="post-after">
 	        <div class="tags">
 	            {{ range .Params.tags }}
-	                <a href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }}</a>              
+	                <a href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }}</a>
 	            {{ end }}
 	        </div>
 	    </div>
@@ -18,9 +18,9 @@
 	        {{ .Content }}
 	    </div>
 	    <!-- END CONTENT -->
-	{{ template "theme/chrome/about.html" . }}
+	{{ template "partials/about.html" . }}
 		<nav id="pagination">
-			{{if .Prev}}<a class="prev" href="{{.Prev.Permalink}}">Prev</a>{{end}}
-			{{if .Next}}<a class="next" href="{{.Next.Permalink}}">Next</a>{{end}}
+			{{if .NextPage}}<a class="prev" href="{{.NextPage.Permalink}}">Prev</a>{{end}}
+			{{if .PrevPage}}<a class="next" href="{{.PrevPage.Permalink}}">Next</a>{{end}}
 		</nav>
-	{{ template "theme/chrome/footer.html" . }}
+	{{ template "partials/footer.html" . }}
diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
new file mode 100644
index 0000000..f7d8f8f
--- /dev/null
+++ b/layouts/_default/tag.html
@@ -0,0 +1,16 @@
+{{ template "partials/header.html" . }}
+    <!-- CONTENT -->
+  <div class="tag-list">
+      <p id="tag-name">
+        <h1>Tag: {{ .Title }}</h1>
+      </p>
+        {{ range .Data.Pages }}
+        <div class="one-post">
+          <h3><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
+          <div class="post-time">{{ .Date.Format "January 2 2006" }}</div>
+        </div>
+        <hr>
+        {{ end }}
+  </div>
+
+{{ template "partials/footer.html" . }}
diff --git a/layouts/chrome/about.html b/layouts/chrome/about.html
deleted file mode 100644
index 16950dc..0000000
--- a/layouts/chrome/about.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="about">
-	<p> 
-     
-    </p>
-</div>
\ No newline at end of file
diff --git a/layouts/chrome/analytics.html b/layouts/chrome/analytics.html
deleted file mode 100644
index 69ad7fe..0000000
--- a/layouts/chrome/analytics.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + ":change-me";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', 4]);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
-    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><p><img src="http://change-me" style="border:0;" alt="" /></p></noscript>
-<!-- End Piwik Code -->
diff --git a/layouts/chrome/disqus.html b/layouts/chrome/disqus.html
deleted file mode 100644
index 06d42af..0000000
--- a/layouts/chrome/disqus.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="row">
-      <div class="small-offset-1 small-10 columns">
-        <div id="disqus_thread"></div>
-        <script type="text/javascript">                        
-        var disqus_shortname = 'hey-its-alex'; 
-        var disqus_developer = 1;
-        </script>
-
-        <script type="text/javascript" src="http://disqus.com/forums/antzucaro/embed.js"></script>
-        <noscript><a href="http://antzucaro.disqus.com/?url=ref">View the discussion thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
-      </div>
-    </div>
-    <!-- END DISQUS -->
\ No newline at end of file
diff --git a/layouts/chrome/footer.html b/layouts/chrome/footer.html
deleted file mode 100644
index a306358..0000000
--- a/layouts/chrome/footer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-		        <footer>
-		        	Built with <a href="https://github.com/spf13/hugo">Hugo</a> 
-		        	<p>© Alexander Ivanov 2014</p>
-		        </footer>
-		    </div>
-		  </div>    
-		</div>
-      </div>
-    </div>
-</body>
-{{ template "theme/chrome/analytics.html" }}
-</html>
diff --git a/layouts/chrome/header.html b/layouts/chrome/header.html
deleted file mode 100644
index 8fd8141..0000000
--- a/layouts/chrome/header.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>    
-    <title>ALEXFINN - {{ .Title }}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-
-    {{ template "theme/chrome/includes.html" . }}
-    <link rel="shortcut icon" href="/images/alexfinn.ico"> 
-    <link rel="apple-touch-icon" href="">
-    <link rel="canonical" href="{{ .Permalink }}">
-
-    <!-- atom & rss feed -->
-    <link href="/rss.xml" type="application/atom+xml" rel="alternate" title="{{ .Site.Title }}">    
-
-  </head>
-  <body>    
-    {{ template "theme/chrome/menu.html" }}
-
-<div class="container">
-  <div class="content">
-    <div class="row-fluid">
-      <div class="span12">
-        <div class="posts">
-      
diff --git a/layouts/chrome/includes.html b/layouts/chrome/includes.html
deleted file mode 100644
index 63c9724..0000000
--- a/layouts/chrome/includes.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-    <link href="/css/milk.min.css" rel="stylesheet">
-    <link href="/css/milk-responsive.min.css" rel="stylesheet">     
-    <link href="/css/style.css" rel="stylesheet" type="text/css" media="all">
-    <link href="/css/fonts.css" rel="stylesheet" type="text/css" media="all">
\ No newline at end of file
diff --git a/layouts/chrome/menu.html b/layouts/chrome/menu.html
deleted file mode 100644
index ed9a3a0..0000000
--- a/layouts/chrome/menu.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="navbar navbar-fixed-top">        
-  <div id="navbar-inner">
-          <div id="logo">
-            <a href="{{ .Site.BaseURL }}"><img src="/images/letter-a.png" width="100px"></img></a>
-          </div>
-  </div>
-</div>
diff --git a/layouts/chrome/meta.html b/layouts/chrome/meta.html
deleted file mode 100644
index e9b62cf..0000000
--- a/layouts/chrome/meta.html
+++ /dev/null
@@ -1,12 +0,0 @@
-    <meta charset="utf-8">
-    <title>ALEXFINN</title>
-    
-    <meta name="author" content="Alexander 'alexfinn' Ivanov">
-
-    <!-- Enable responsive viewport -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
diff --git a/layouts/index.html b/layouts/index.html
index fbb6439..cbf1fc2 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    {{ template "theme/chrome/meta.html" . }}  
-    {{ template "theme/chrome/includes.html" . }}
-    <link rel="shortcut icon" href="/images/alexfinn.ico"> 
+    {{ template "partials/meta.html" . }}
+    {{ template "partials/includes.html" . }}
+    <link rel="shortcut icon" href="/images/alexfinn.ico">
     <link rel="apple-touch-icon" href="">
     <link rel="canonical" href="{{ .Permalink }}">
     <!-- atom & rss feed -->
-    <link href="/rss.xml" type="application/atom+xml" rel="alternate" title="{{ .Site.Title }}">    
+    <link href="/rss.xml" type="application/atom+xml" rel="alternate" title="{{ .Site.Title }}">
   </head>
 
-  <body>    
-    {{ template "theme/chrome/menu.html" }}
+  <body>
+    {{ template "partials/menu.html" }}
 
 {{ $baseurl := .Site.BaseURL }}
 
@@ -22,9 +22,9 @@
     <div class="span12">
 
       <div class="posts">
-        {{ range .Data.Pages }}        
+        {{ range .Data.Pages }}
             <article class="post">
-            
+
               <header class="post-header">
                 <h1><a href="{{.RelPermalink }}">{{ .Title }}</a></h1>
                 <div class="post-time">{{ .Date.Format "January 2 2006" }}, {{ .FuzzyWordCount }} Words</div>
@@ -33,15 +33,15 @@
               <div class="post-after">
                   <div class="tags">
                     {{ range .Params.tags }}
-                        <a href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }}</a>              
+                        <a href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }}</a>
                     {{ end }}
                   </div>
               </div>
             </article>
         {{ end }}
       </div>
-           
-    </div>  
+
+    </div>
   </div>
 
-{{ template "theme/chrome/footer.html" }}
+{{ template "partials/footer.html" }}
diff --git a/layouts/indexes/indexes.html b/layouts/indexes/indexes.html
deleted file mode 100644
index 2168b06..0000000
--- a/layouts/indexes/indexes.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ $baseurl := .Site.BaseURL }}
-{{ template "theme/chrome/header.html" . }}
-
-	<section id="main">
-	  <div>
-	   <h1 id="title">{{ .Title }}</h1>
-	   <ul>
-	   {{ $data := .Data }}
-	    {{ range $key,$value := .Data.Index.ByCount }}
-	    <li><a href="{{ $baseurl }}/tags/{{ $value.Name | urlize }}"> {{ $value.Name }} </a> {{ $value.Count }} </li>
-	    {{ end }}
-	   </ul>
-	  </div>
-	</section>
diff --git a/layouts/indexes/tag.html b/layouts/indexes/tag.html
deleted file mode 100644
index 42beea2..0000000
--- a/layouts/indexes/tag.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{{ template "theme/chrome/header.html" . }}
-    <!-- CONTENT -->
-  <div class="tag-list">
-      <p id="tag-name">
-      	<h1>Tag: {{ .Title }}</h1>
-      </p>
-        {{ range .Data.Pages }}
-        <div class="one-post">      
-          <h3><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
-          <div class="post-time">{{ .Date.Format "January 2 2006" }}</div>
-        </div>
-        <hr>
-        {{ end }}
-  </div>      
-
-{{ template "theme/chrome/footer.html" . }}
diff --git a/layouts/partials/about.html b/layouts/partials/about.html
new file mode 100644
index 0000000..16950dc
--- /dev/null
+++ b/layouts/partials/about.html
@@ -0,0 +1,5 @@
+<div class="about">
+	<p> 
+     
+    </p>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
new file mode 100644
index 0000000..69ad7fe
--- /dev/null
+++ b/layouts/partials/analytics.html
@@ -0,0 +1,15 @@
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + ":change-me";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', 4]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="http://change-me" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html
new file mode 100644
index 0000000..06d42af
--- /dev/null
+++ b/layouts/partials/disqus.html
@@ -0,0 +1,13 @@
+<div class="row">
+      <div class="small-offset-1 small-10 columns">
+        <div id="disqus_thread"></div>
+        <script type="text/javascript">                        
+        var disqus_shortname = 'hey-its-alex'; 
+        var disqus_developer = 1;
+        </script>
+
+        <script type="text/javascript" src="http://disqus.com/forums/antzucaro/embed.js"></script>
+        <noscript><a href="http://antzucaro.disqus.com/?url=ref">View the discussion thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+      </div>
+    </div>
+    <!-- END DISQUS -->
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
new file mode 100644
index 0000000..ff3c180
--- /dev/null
+++ b/layouts/partials/footer.html
@@ -0,0 +1,13 @@
+
+		        <footer>
+		        	Built with <a href="https://github.com/spf13/hugo">Hugo</a>
+		        	<p>© Alexander Feller 2018</p>
+		        </footer>
+		    </div>
+		  </div>
+		</div>
+      </div>
+    </div>
+</body>
+{{ template "partials/analytics.html" }}
+</html>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
new file mode 100644
index 0000000..883310b
--- /dev/null
+++ b/layouts/partials/header.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <title>ALEXFINN - {{ .Title }}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+
+    {{ template "partials/includes.html" . }}
+    <link rel="shortcut icon" href="/images/alexfinn.ico">
+    <link rel="apple-touch-icon" href="">
+    <link rel="canonical" href="{{ .Permalink }}">
+
+    <!-- atom & rss feed -->
+    <link href="/rss.xml" type="application/atom+xml" rel="alternate" title="{{ .Site.Title }}">
+
+  </head>
+  <body>
+    {{ template "partials/menu.html" }}
+
+<div class="container">
+  <div class="content">
+    <div class="row-fluid">
+      <div class="span12">
+        <div class="posts">
+
diff --git a/layouts/partials/includes.html b/layouts/partials/includes.html
new file mode 100644
index 0000000..63c9724
--- /dev/null
+++ b/layouts/partials/includes.html
@@ -0,0 +1,5 @@
+
+    <link href="/css/milk.min.css" rel="stylesheet">
+    <link href="/css/milk-responsive.min.css" rel="stylesheet">     
+    <link href="/css/style.css" rel="stylesheet" type="text/css" media="all">
+    <link href="/css/fonts.css" rel="stylesheet" type="text/css" media="all">
\ No newline at end of file
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
new file mode 100644
index 0000000..9bc158b
--- /dev/null
+++ b/layouts/partials/menu.html
@@ -0,0 +1,7 @@
+<div class="navbar navbar-fixed-top">
+  <div id="navbar-inner">
+          <div id="logo">
+            <a href="{{ .Site.Home }}"><img src="/images/letter-a.png" width="100px"></img></a>
+          </div>
+  </div>
+</div>
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
new file mode 100644
index 0000000..3b1bb33
--- /dev/null
+++ b/layouts/partials/meta.html
@@ -0,0 +1,12 @@
+    <meta charset="utf-8">
+    <title>ALEXFINN</title>
+
+    <meta name="author" content="Alexander Feller">
+
+    <!-- Enable responsive viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
diff --git a/theme.toml b/theme.toml
index 0d29ad7..3b23440 100644
--- a/theme.toml
+++ b/theme.toml
@@ -9,5 +9,5 @@ features = ["blog", ]
 
 [author]
     name = "AlexFinn"
-    homepage = "http://ru.alexfinn.eu/"
+    homepage = "http://ru.alxschwarz.com/"
     source_repo = "https://github.com/AlexFinn/simple-a"
-- 
cgit v1.2.3