fixes

author: Alexander Feller <alxschwrz@gmail.comalexfinn@ubimo.com> 2018-11-12 11:37:10 +0300
committer: Alexander Feller <alxschwrz@gmail.comalexfinn@ubimo.com> 2018-11-12 11:37:10 +0300
commit: f42cd781e10712be72ff53e8e5a7ccf485d7e730 (patch)
tree: 0cd35e69b57adc12e48ce47789c6067e5fafdadd
parent: fb7301224206de88267cbeec0384d7e854ebcc88 (diff)
16 files changed, 59 insertions, 66 deletions
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/indexes/tag.html b/layouts/_default/tag.html
index 42beea2..f7d8f8f 100644
--- a/layouts/indexes/tag.html
+++ b/layouts/_default/tag.html
@@ -1,16 +1,16 @@
-{{ template "theme/chrome/header.html" . }}
+{{ template "partials/header.html" . }}
     <!-- CONTENT -->
   <div class="tag-list">
       <p id="tag-name">
-      	<h1>Tag: {{ .Title }}</h1>
+        <h1>Tag: {{ .Title }}</h1>
       </p>
         {{ range .Data.Pages }}
-        <div class="one-post">      
+        <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>      
+  </div>
 
-{{ template "theme/chrome/footer.html" . }}
+{{ template "partials/footer.html" . }}
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/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/chrome/about.html b/layouts/partials/about.html
index 16950dc..16950dc 100644
--- a/layouts/chrome/about.html
+++ b/layouts/partials/about.html
diff --git a/layouts/chrome/analytics.html b/layouts/partials/analytics.html
index 69ad7fe..69ad7fe 100644
--- a/layouts/chrome/analytics.html
+++ b/layouts/partials/analytics.html
diff --git a/layouts/chrome/disqus.html b/layouts/partials/disqus.html
index 06d42af..06d42af 100644
--- a/layouts/chrome/disqus.html
+++ b/layouts/partials/disqus.html
diff --git a/layouts/chrome/footer.html b/layouts/partials/footer.html
index a306358..ff3c180 100644
--- a/layouts/chrome/footer.html
+++ b/layouts/partials/footer.html
@@ -1,13 +1,13 @@
 
 		        <footer>
-		        	Built with <a href="https://github.com/spf13/hugo">Hugo</a> 
-		        	<p>© Alexander Ivanov 2014</p>
+		        	Built with <a href="https://github.com/spf13/hugo">Hugo</a>
+		        	<p>© Alexander Feller 2018</p>
 		        </footer>
 		    </div>
-		  </div>    
+		  </div>
 		</div>
       </div>
     </div>
 </body>
-{{ template "theme/chrome/analytics.html" }}
+{{ template "partials/analytics.html" }}
 </html>
diff --git a/layouts/chrome/header.html b/layouts/partials/header.html
index 8fd8141..883310b 100644
--- a/layouts/chrome/header.html
+++ b/layouts/partials/header.html
@@ -1,25 +1,25 @@
 <!doctype html>
 <html lang="en">
-  <head>    
+  <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"> 
+    {{ 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" }}
 
 <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/partials/includes.html
index 63c9724..63c9724 100644
--- a/layouts/chrome/includes.html
+++ b/layouts/partials/includes.html
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/chrome/meta.html b/layouts/partials/meta.html
index e9b62cf..3b1bb33 100644
--- a/layouts/chrome/meta.html
+++ b/layouts/partials/meta.html
@@ -1,7 +1,7 @@
     <meta charset="utf-8">
     <title>ALEXFINN</title>
-    
-    <meta name="author" content="Alexander 'alexfinn' Ivanov">
+
+    <meta name="author" content="Alexander Feller">
 
     <!-- Enable responsive viewport -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
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"
author	Alexander Feller <alxschwrz@gmail.comalexfinn@ubimo.com>	2018-11-12 11:37:10 +0300
committer	Alexander Feller <alxschwrz@gmail.comalexfinn@ubimo.com>	2018-11-12 11:37:10 +0300
commit	f42cd781e10712be72ff53e8e5a7ccf485d7e730 (patch)
tree	0cd35e69b57adc12e48ce47789c6067e5fafdadd
parent	fb7301224206de88267cbeec0384d7e854ebcc88 (diff)