post sort

4 files changed, 29 insertions, 57 deletions

diff --git a/assets/css/_ublogger.scss b/assets/css/_ublogger.scss
index e89fc45..196170a 100644
--- a/assets/css/_ublogger.scss
+++ b/assets/css/_ublogger.scss
@@ -1209,5 +1209,18 @@ code[class*="language-"], pre[class*="language-"] {
   }
 }
 
+.post-sort {
+  text-align: right;
+  margin-bottom: 5px;
+
+  ol {
+    li {
+      margin-left: 7px;
+      list-style: none;
+      display: inline-block;
+    }
+  }
+}
+
 @import "_partial/share-icon";
 @import "ublogger_media";
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index e27bf33..e78e7f2 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -52,11 +52,18 @@
             <div class="post-pinned">
             {{- .Render "summary" -}}
             </div>
-
+            <hr/>
             {{end}}
             {{end}}
             {{end}}
-
+            <div class="post-sort">
+                <ol>
+                    <li><a href="/posts/">Все посты</a> </li>
+                    <li><a href="/">Основные посты</a></li>
+                    <li><a href="/views">Лучшее</a></li>
+                    <li><a href="/feed">Фид</a></li>
+                </ol>
+            </div>
             {{- range $pages.Pages -}}
                 {{- .Render "summary" -}}
             {{- end -}}
diff --git a/layouts/post/posts-by-lastmod.html b/layouts/post/posts-by-lastmod.html
index 0237f6c..0753c99 100644
--- a/layouts/post/posts-by-lastmod.html
+++ b/layouts/post/posts-by-lastmod.html
@@ -22,38 +22,14 @@
     {{- if ne $posts.enable false | and .Site.RegularPages -}}
     {{- /* Paginate */ -}}
     {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections -}}
-    {{- if .Site.Params.page.hiddenFromHomePage -}}
-    {{- $pages = where $pages "Params.hiddenfromhomepage" false -}}
-    {{- else -}}
-    {{- $pages = where $pages "Params.hiddenfromhomepage" "!=" true -}}
-    {{- end -}}
-
-    {{ $pinnedPostRelPermalinks := split .Site.Params.pinnedPost "," }}
-    {{ $pinnedPosts := where $pages "RelPermalink" "in" $pinnedPostRelPermalinks }}
-    {{ $pages := where $pages "RelPermalink" "not in" $pinnedPostRelPermalinks }}
 
     {{- with $posts.paginate | default .Site.Params.paginate -}}
-    {{- $pages = $.Paginate $pages . -}}
+    {{- $pages = $.Paginate ($pages.ByLastmod) . -}}
     {{- else -}}
-    {{- $pages = .Paginate $pages -}}
+    {{- $pages = .Paginate ($pages.ByLastmod) -}}
     {{- end -}}
 
-    {{ if .Site.Params.pinnedPost }}
-    {{ if (and .Site.Params.pinOnlyToFirstPage (ne $pages.PageNumber 1)) }}
-    {{/* Do nothing if the pinOnlyToFirstPage flag is set and we're not on page 1. */}}
-    {{else}}
-
-    {{ range $pinnedPosts }}
-    <div class="post-pinned">
-        {{- .Render "summary" -}}
-    </div>
-
-    {{end}}
-    {{end}}
-    {{end}}
-
-
-    {{- range $pages.Pages.ByLastmod -}}
+    {{- range $pages.Pages -}}
     {{- .Render "summary" -}}
     {{- end -}}
     {{- partial "paginator.html" . -}}
diff --git a/layouts/post/posts-by-views.html b/layouts/post/posts-by-views.html
index 68858f5..ee3ab93 100644
--- a/layouts/post/posts-by-views.html
+++ b/layouts/post/posts-by-views.html
@@ -21,39 +21,15 @@
     {{- /* Posts */ -}}
     {{- if ne $posts.enable false | and .Site.RegularPages -}}
     {{- /* Paginate */ -}}
-    {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections -}}
-    {{- if .Site.Params.page.hiddenFromHomePage -}}
-    {{- $pages = where $pages "Params.hiddenfromhomepage" false -}}
-    {{- else -}}
-    {{- $pages = where $pages "Params.hiddenfromhomepage" "!=" true -}}
-    {{- end -}}
-
-    {{ $pinnedPostRelPermalinks := split .Site.Params.pinnedPost "," }}
-    {{ $pinnedPosts := where $pages "RelPermalink" "in" $pinnedPostRelPermalinks }}
-    {{ $pages := where $pages "RelPermalink" "not in" $pinnedPostRelPermalinks }}
+    {{- $pages :=  where (where site.RegularPages "Type" "in" site.Params.mainSections) "Params.views" "ne" nil -}}
 
     {{- with $posts.paginate | default .Site.Params.paginate -}}
-    {{- $pages = $.Paginate $pages . -}}
+    {{- $pages = $.Paginate ($pages.ByParam "views").Reverse . -}}
     {{- else -}}
-    {{- $pages = .Paginate $pages -}}
+    {{- $pages = .Paginate ($pages.ByParam "views").Reverse -}}
     {{- end -}}
 
-    {{ if .Site.Params.pinnedPost }}
-    {{ if (and .Site.Params.pinOnlyToFirstPage (ne $pages.PageNumber 1)) }}
-    {{/* Do nothing if the pinOnlyToFirstPage flag is set and we're not on page 1. */}}
-    {{else}}
-
-    {{ range $pinnedPosts }}
-    <div class="post-pinned">
-        {{- .Render "summary" -}}
-    </div>
-
-    {{end}}
-    {{end}}
-    {{end}}
-
-
-    {{- range ($pages.Pages.ByParam "views").Reverse -}}
+    {{- range $pages.Pages -}}
     {{- .Render "summary" -}}
     {{- end -}}
     {{- partial "paginator.html" . -}}