summaryrefslogtreecommitdiffstats
path: root/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'layouts')
-rw-r--r--layouts/_default/archives.html11
-rw-r--r--layouts/_default/baseof.html1
-rw-r--r--layouts/_default/list.html12
-rw-r--r--layouts/_default/single.html3
-rw-r--r--layouts/_default/tag.html13
-rw-r--r--layouts/partials/head.html18
-rw-r--r--layouts/partials/header.html3
-rw-r--r--layouts/partials/post-exlink.html4
-rw-r--r--layouts/partials/post-meta.html24
-rw-r--r--layouts/partials/scripts.html87
-rw-r--r--layouts/partials/sidebar.html5
11 files changed, 85 insertions, 96 deletions
diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html
index e3ee3e5..348e6ac 100644
--- a/layouts/_default/archives.html
+++ b/layouts/_default/archives.html
@@ -1,8 +1,9 @@
{{ define "main" }}
-<div id="page-tag">
+<!-- page info section e.g. current tag & total archive pages -->
+<div id="page-info">
<span>{{ i18n "archivesTotalPages" }}{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span>
</div>
-<!-- archives range in posts -->
+<!-- archives range in all posts -->
{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }}
{{ range $paginator.Pages }}
<div id="post-archive">
@@ -14,7 +15,8 @@
</div>
</div>
{{ end }}
-<!-- custom smart pagination -->
+
+<!-- START custom smart pagination -->
{{ $offsetLinks := 2 }}
{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
{{ $lowerLimit := (add $offsetLinks 1) }}
@@ -31,7 +33,6 @@
<a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
</li>
{{ end }}
-
{{ range $paginator.Pagers }}
{{ $.Scratch.Set "pageNumFlag" false }}
{{ if gt $paginator.TotalPages $maxLinks }}
@@ -57,7 +58,6 @@
</li>
{{ end }}
{{ end }}
-
{{ if $paginator.HasNext }}
<li class="pag-next">
<a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
@@ -70,5 +70,6 @@
{{ end }}
</ul>
{{ end }}
+<!-- END custom smart pagination -->
{{ end }} \ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6df6ad6..71ba5a5 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -15,6 +15,7 @@
<div class="col-md-3 col-12 float-left" id="sidebar">
{{ partial "sidebar.html" . }}
</div>
+ <!-- global APlayer -->
{{ if .Site.Params.playerURL }}
<div id="aplayer"></div>
{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e2a0eb7..7f387f6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,5 @@
{{ define "main" }}
-<!-- homepage range in posts -->
+<!-- homepage range in all posts -->
{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
{{ range $paginator.Pages }}
<div id="post">
@@ -17,7 +17,8 @@
</div>
</div>
{{ end }}
-<!-- custom smart pagination -->
+
+<!-- START custom smart pagination -->
{{ $offsetLinks := 2 }}
{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
{{ $lowerLimit := (add $offsetLinks 1) }}
@@ -26,15 +27,14 @@
<ul id="pagination">
{{ if ne $paginator.PageNumber 1 }}
<li class="pag-first">
- <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></i></a>
+ <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></a>
</li>
{{ end }}
{{ if $paginator.HasPrev }}
<li class="pag-previous">
- <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></i></a>
+ <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
</li>
{{ end }}
-
{{ range $paginator.Pagers }}
{{ $.Scratch.Set "pageNumFlag" false }}
{{ if gt $paginator.TotalPages $maxLinks }}
@@ -60,7 +60,6 @@
</li>
{{ end }}
{{ end }}
-
{{ if $paginator.HasNext }}
<li class="pag-next">
<a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
@@ -73,5 +72,6 @@
{{ end }}
</ul>
{{ end }}
+<!-- END custom smart pagination -->
{{ end }} \ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6056021..7ee7d25 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,6 @@
{{ define "main" }}
<article>
+ <!-- post meta -->
<h4 id="post-title">
<a href="{{ .Permalink }}">{{ .Title }}</a>
</h4>
@@ -9,10 +10,12 @@
{{ with .Params.playerURL }}
<div id="post-aplayer"></div>
{{ end }}
+ <!-- post main content -->
<div class="markdown-body" id="post-content">
{{ .Content }}
</div>
</article>
+<!-- post license -->
{{ if ne .Params.noLicense true }}
<div class="markdown-body" id="license">
<blockquote>
diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
index 6a0d4d2..b2860b2 100644
--- a/layouts/_default/tag.html
+++ b/layouts/_default/tag.html
@@ -1,8 +1,9 @@
{{ define "main" }}
-<div id="page-tag">
+<!-- page info section e.g. current tag & total archive pages -->
+<div id="page-info">
<span>{{ i18n "tagsCurrentTag" . }}</span>
</div>
-<!-- tags page range in posts -->
+<!-- tags page range in posts with current tag -->
{{ $paginator := .Paginator }}
{{ range $paginator.Pages }}
<div id="post">
@@ -16,11 +17,12 @@
{{ .Summary }}
</div>
<div id="post-exlink">
- <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a>
+ {{ partial "post-exlink.html" . }}
</div>
</div>
{{ end }}
-<!-- custom smart pagination -->
+
+<!-- START custom smart pagination -->
{{ $offsetLinks := 2 }}
{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
{{ $lowerLimit := (add $offsetLinks 1) }}
@@ -37,7 +39,6 @@
<a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
</li>
{{ end }}
-
{{ range $paginator.Pagers }}
{{ $.Scratch.Set "pageNumFlag" false }}
{{ if gt $paginator.TotalPages $maxLinks }}
@@ -63,7 +64,6 @@
</li>
{{ end }}
{{ end }}
-
{{ if $paginator.HasNext }}
<li class="pag-next">
<a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
@@ -76,5 +76,6 @@
{{ end }}
</ul>
{{ end }}
+<!-- END custom smart pagination -->
{{ end }} \ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2b12e1d..a458be1 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,3 +1,4 @@
+<!-- basic meta -->
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="HandheldFriendly" content="True" />
@@ -6,8 +7,10 @@
<meta http-equiv="Cache-Control" content="no-siteapp" />
{{ hugo.Generator }}
+<!-- favicon -->
{{ partial "favicon.html" . }}
+<!-- seo metadata -->
{{ if and (.IsHome) (.Site.Params.subTitle) }}
<title>{{ .Site.Title }} - {{ .Site.Params.subTitle }}</title>
{{ else if .IsHome }}
@@ -20,18 +23,17 @@
{{ if .Params.tags }}
<meta name="keywords" content="{{ delimit .Params.tags ", " }}" />
{{ end }}
-
{{ template "_internal/opengraph.html" . }}
{{ template "_internal/twitter_cards.html" . }}
{{ template "_internal/google_analytics_async.html" . }}
-<!-- global css -->
+<!-- global main css -->
{{ $options := (dict "targetPath" "css/main.min.css" "outputStyle" "compressed") }}
{{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options }}
<link rel="stylesheet" href="{{ $style.Permalink }}" />
+<!-- global dependency (CDN) -->
{{ if .Site.Params.useCDN }}
-<!-- global dependency -->
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.0/dist/jquery.min.js" integrity="sha256-xNzN2a4ltkB44Mc/Jz3pT4iU1cmeR0FkXs4pru/JxaQ=" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.0/lazysizes.min.js" integrity="sha256-h2tMEmhemR2IN4wbbdNjj9LaDIjzwk2hralQwfJmBOE=" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/css/all.min.css" integrity="sha256-h20CPZ0QyXlBuAw7A+KluUYx/3pK+c7lYEpqLTlxjYQ=" crossorigin="anonymous" />
@@ -39,13 +41,13 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" integrity="sha256-uqQQGnDcmRKvhKwc5Vm4XT1GQ2oV6t1U0NR2N9tV+BQ=" crossorigin="anonymous" />
<script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js" integrity="sha256-6Y7CJDaltoeNgk+ZftgCD9jLgmGv4xKUo8nQ0HgAwVo=" crossorigin="anonymous"></script>
{{ end }}
+<!-- global dependency (LOCAL) -->
{{ else }}
-<!-- global dependency -->
{{ $jquery := resources.Get "js/jquery.min.js" }}
<script src="{{ $jquery.Permalink }}"></script>
{{ $lazysizes := resources.Get "js/lazysizes.min.js" }}
<script src="{{ $lazysizes.Permalink }}"></script>
-{{ $fontawesome := resources.Get "css/all.min.css" }}
+{{ $fontawesome := resources.Get "css/fontawsome.min.css" }}
<link rel="stylesheet" href="{{ $fontawesome.Permalink }}" />
{{ if or (.Site.Params.playerURL) (.Params.playerURL) }}
{{ $aplayerCSS := resources.Get "css/APlayer.min.css" }}
@@ -60,10 +62,4 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css" integrity="sha384-zB1R0rpPzHqg7Kpt0Aljp8JPLqbXI3bhnPWROx27a9N0Ll6ZP/+DiW/UqRcLbRjq" crossorigin="anonymous" />
<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js" integrity="sha384-y23I5Q6l+B6vatafAwxRu/0oK/79VlbSz7Q9aiSZUvyWYIYsd+qj+o24G5ZU2zJz" crossorigin="anonymous"></script>
<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script>
-{{ end }}
-
-<!-- dev use -->
-{{ if .Site.Params.webpChecker }}
-{{ $webp := resources.Get "js/modernizr-webp.min.js" }}
-<script src="{{ $webp.Permalink }}"></script>
{{ end }} \ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index ca01fa6..e4fcaae 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,9 +1,8 @@
<header>
- <!-- fake navbar header-->
<div class="container-lg clearfix">
<div class="col-12 p-3">
<a id="main-title" href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
- <span id="sub-title">{{ .Site.Params.subTitle }}</span>
+ {{ with .Site.Params.subTitle }}<span id="sub-title">{{ . }}</span>{{ end }}
</div>
</div>
</header> \ No newline at end of file
diff --git a/layouts/partials/post-exlink.html b/layouts/partials/post-exlink.html
index 5691ede..da81614 100644
--- a/layouts/partials/post-exlink.html
+++ b/layouts/partials/post-exlink.html
@@ -1,3 +1 @@
-<span>
- <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a>
-</span> \ No newline at end of file
+<a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a> \ No newline at end of file
diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html
index 4864808..f208210 100644
--- a/layouts/partials/post-meta.html
+++ b/layouts/partials/post-meta.html
@@ -1,15 +1,9 @@
-<span>
- <time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }}</time> |
-</span>
-<span>
- <span>{{ .WordCount }}{{ i18n "postMetaWordCount" }}</span> |
-</span>
-<span>
- {{ if .Params.tags }}
- {{ range .Params.tags }}
- <a href="/tags/{{ . | urlize }}/">{{ . }}</a>
- {{ end }}
- {{ else }}
- <span>{{ i18n "postMetaNoTag" }}</span>
- {{ end }}
-</span> \ No newline at end of file
+<time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }}</time> |
+<span>{{ .WordCount }}{{ i18n "postMetaWordCount" }}</span> |
+{{ if .Params.tags }}
+{{ range .Params.tags }}
+<a href="/tags/{{ . | urlize }}/">{{ . }}</a>
+{{ end }}
+{{ else }}
+<span>{{ i18n "postMetaNoTag" }}</span>
+{{ end }} \ No newline at end of file
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 85346f2..894d5c3 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,5 +1,5 @@
+<!-- utterances comment loading indicator -->
{{ if and (.IsPage) (.Site.Params.utterancesRepo) }}
-<!-- comment loading indicator -->
<script>
$(function () {
var commentStatus;
@@ -8,13 +8,13 @@
function checkUtterances() {
commentStatus = $('#post-comment .utterances').attr('style');
- if (commentStatus === undefined) {
+ if (commentStatus == undefined) {
commentLoadingTime += 1;
if (commentLoadingTime > 20) {
clearInterval(commentCheckInterval);
$('#post-comment').hide();
$('#post-loading p').text('{{ i18n "postCommentLoadingFailed" }}');
- $('#post-loading i').attr("class", "far fa-times-circle");
+ $('#post-loading i').attr('class', 'far fa-times-circle');
}
return;
} else {
@@ -25,71 +25,62 @@
});
</script>
{{ end }}
+
+<!-- toc smooth scroll & APlayer cjk html anchor fix -->
+{{ if in .Site.Params.mainSections .Type }}
+<script>
+ $('#widget-toc a').click(function () {
+ $('html, body').animate({
+ scrollTop: $($(this).attr('href')).offset().top
+ });
+ });
+</script>
+{{ end }}
+{{ if .Site.Params.scrollTop }}
+<!-- scroll to top button -->
+<script>
+ $('#scroll-top').click(function () {
+ $('html, body').animate({
+ scrollTop: 0
+ });
+ });
+</script>
+{{ end }}
+
+<!-- in-post APlayer -->
{{ with .Params.playerURL }}
<script>
$(function () {
const postAPlayer = new APlayer({
- container: document.getElementById("post-aplayer"),
- theme: "#8F82BC",
+ container: document.getElementById('post-aplayer'),
+ theme: '#8F82BC',
volume: 0.1,
audio: [{
- name: "{{ $.Params.playerName }}",
- artist: "{{ $.Params.playerArtist }}",
- url: "{{ . }}",
- cover: "{{ $.Params.playerCover }}"
+ name: '{{ $.Params.playerName }}',
+ artist: '{{ $.Params.playerArtist }}',
+ url: '{{ . }}',
+ cover: '{{ $.Params.playerCover }}'
}]
});
});
</script>
{{ end }}
+<!-- site global APlayer -->
{{ with .Site.Params.playerURL }}
<script>
$(function () {
const siteAPlayer = new APlayer({
- container: document.getElementById("aplayer"),
+ container: document.getElementById('aplayer'),
fixed: true,
- theme: "#8F82BC",
+ theme: '#8F82BC',
volume: 0.1,
audio: [{
- name: "{{ $.Site.Params.playerName }}",
- artist: "{{ $.Site.Params.playerArtist }}",
- url: "{{ . }}",
- cover: "{{ $.Site.Params.playerCover }}"
+ name: '{{ $.Site.Params.playerName }}',
+ artist: '{{ $.Site.Params.playerArtist }}',
+ url: '{{ . }}',
+ cover: '{{ $.Site.Params.playerCover }}'
}]
});
});
</script>
-{{ end }}
-{{ if in .Site.Params.mainSections .Type }}
-<!-- toc smooth scroll & aplayer cjk html anchor fix -->
-<script>
- $("#widget-toc a").click(function () {
- $("html, body").animate({
- scrollTop: $($(this).attr("href")).offset().top
- });
- return false;
- });
-</script>
-{{ end }}
-{{ if .Site.Params.scrollTop }}
-<!-- scroll to top button -->
-<script>
- $("#scroll-top").click(function () {
- $("html, body").animate({
- scrollTop: 0
- });
- });
-</script>
-{{ end }}
-{{ if .Site.Params.webpChecker }}
-<!-- webp checker -->
-<script>
- $(function () {
- Modernizr.on("webp", function (result) {
- if (!result) {
- $('<blockquote><p>{{ i18n "webpCheckerFront" }}<a href="https://caniuse.com/#feat=webp" target="_blank">WebP</a>{{ i18n "webpCheckerEnd" }}</p></blockquote>').replaceAll("#content img");
- }
- });
- });
-</script>
{{ end }} \ No newline at end of file
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index a39eb3f..1f6ce45 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,9 +1,11 @@
+<!-- in-post toc -->
{{ if in .Site.Params.mainSections .Type }}
<div id="widget-toc">
<h5>{{ i18n "sidebarToc" }}</h5>
{{.TableOfContents}}
</div>
{{ end }}
+<!-- pages -->
<div id="widget-pages">
<h5>{{ i18n "sidebarPages" }}</h5>
<ul>
@@ -15,6 +17,7 @@
{{ end }}
</ul>
</div>
+<!-- tags -->
<div id="widget-tags">
<h5>{{ i18n "sidebarTags" }}</h5>
<div>
@@ -25,6 +28,7 @@
{{ end }}
</div>
</div>
+<!-- links -->
<div id="widget-links">
<h5>{{ i18n "sidebarLinks" }}</h5>
<ul>
@@ -35,6 +39,7 @@
{{ end }}
</ul>
</div>
+<!-- bgm.tv image chart -->
{{ with .Site.Params.bgmImageChart }}
<div id="widget-bgm">
<h5>{{ i18n "sidebarBangumiChart" }}</h5>
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 21:52:00 +0000