From ea6e9d23f3ad92113645fcda17417bd08a85a773 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 27 Nov 2022 12:18:38 +0900 Subject: [PATCH 1/5] =?UTF-8?q?Photos=E3=82=BB=E3=82=AF=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E5=8D=98=E4=B8=80=E8=A8=98=E4=BA=8B=E3=83=86?= =?UTF-8?q?=E3=83=B3=E3=83=97=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/photos/single.html | 78 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 layouts/photos/single.html diff --git a/layouts/photos/single.html b/layouts/photos/single.html new file mode 100644 index 0000000..bfa46bb --- /dev/null +++ b/layouts/photos/single.html @@ -0,0 +1,78 @@ +{{- define "title" }}{{ .Title }} - {{ .Site.Title }}{{ end -}} + +{{- define "content" -}} + {{- $params := .Scratch.Get "params" -}} + + {{- $toc := $params.toc -}} + {{- if eq $toc true -}} + {{- $toc = .Site.Params.page.toc | default dict -}} + {{- else if eq $toc false -}} + {{- $toc = dict "enable" false -}} + {{- end -}} + + {{- /* Auto TOC */ -}} + {{- if ne $toc.enable false -}} +
+

{{ T "contents" }}

+
+
+ {{- end -}} + +
+ {{- /* Title */ -}} +

{{ .Title }}

+ + {{- /* Subtitle */ -}} + {{- with $params.subtitle -}} +

{{ . }}

+ {{- end -}} + + {{- /* Meta */ -}} +
+
+ {{- $author := $params.author | default .Site.Author.name | default (T "author") -}} + {{- $authorLink := $params.authorlink | default .Site.Author.link | default .Site.Home.RelPermalink -}} + + {{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "fas fa-user-circle fa-fw") "Content" $author -}} + {{- partial "plugin/link.html" $options -}} + +
+
+ {{- with .Site.Params.dateformat | default "2006-01-02" | .PublishDate.Format -}} +     + {{- end -}} + {{- with $params.camera -}} +  {{ . }}  + {{- end -}} + {{- with $params.lens -}} +  ({{ . }})   + {{- end -}} + {{- with $params.location -}} +  {{ . }}   + {{- end -}} +
+
+ + {{- /* Featured image */ -}} + {{- $image := $params.featuredimage -}} + {{- with .Resources.GetMatch "featured-image" -}} + {{- $image = .RelPermalink -}} + {{- end -}} + {{- with $image -}} +
+ {{- dict "Src" . "Title" $.Description "Resources" $.Resources | partial "plugin/image.html" -}} +
+ {{- end -}} + + {{- /* Content */ -}} +
+ {{- dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" | safeHTML -}} +
+ + {{- /* Footer */ -}} + {{- partial "single/footer.html" . -}} + + {{- /* Comment */ -}} + {{- partial "comment.html" . -}} +
+{{- end -}} From fe976a5691fb081c715412d458d7a9a2ba44b699 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 27 Nov 2022 12:20:06 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=82=BB=E3=82=AF=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E3=83=96=E3=83=AD=E3=82=B0=E3=83=88=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=95=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/_default/config.toml | 15 +++++++++++++-- config/staging/config.toml | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/config/_default/config.toml b/config/_default/config.toml index 9817e9c..74e6796 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -221,6 +221,17 @@ theme = "LoveIt" # title will be shown when you hover on this menu link title = "" weight = 1 + [[menu.main]] + identifier = "photos" + # you can add extra information before the name (HTML format is supported), such as icons + pre = "" + # you can add extra information after the name (HTML format is supported), such as icons + post = "" + name = "Photos" + url = "/photos/" + # title will be shown when you hover on this menu link + title = "" + weight = 2 [[menu.main]] identifier = "tags" pre = "" @@ -228,7 +239,7 @@ theme = "LoveIt" name = "Tags" url = "/tags/" title = "" - weight = 2 + weight = 3 [[menu.main]] identifier = "categories" pre = "" @@ -236,7 +247,7 @@ theme = "LoveIt" name = "Categories" url = "/categories/" title = "" - weight = 3 + weight = 4 [markup] # Syntax Highlighting (https://gohugo.io/content-management/syntax-highlighting) diff --git a/config/staging/config.toml b/config/staging/config.toml index 3cb4365..87bbcd5 100644 --- a/config/staging/config.toml +++ b/config/staging/config.toml @@ -221,6 +221,17 @@ theme = "LoveIt" # title will be shown when you hover on this menu link title = "" weight = 1 + [[menu.main]] + identifier = "photos" + # you can add extra information before the name (HTML format is supported), such as icons + pre = "" + # you can add extra information after the name (HTML format is supported), such as icons + post = "" + name = "Photos" + url = "/photos/" + # title will be shown when you hover on this menu link + title = "" + weight = 2 [[menu.main]] identifier = "tags" pre = "" @@ -228,7 +239,7 @@ theme = "LoveIt" name = "Tags" url = "/tags/" title = "" - weight = 2 + weight = 3 [[menu.main]] identifier = "categories" pre = "" @@ -236,7 +247,7 @@ theme = "LoveIt" name = "Categories" url = "/categories/" title = "" - weight = 3 + weight = 4 [markup] # Syntax Highlighting (https://gohugo.io/content-management/syntax-highlighting) From 64a07d589943e51aceba8c6a2aeeb196c598251a Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 27 Nov 2022 12:18:15 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A8=98=E4=BA=8B=E3=82=92Photos=E3=82=AB?= =?UTF-8?q?=E3=83=86=E3=82=B4=E3=83=AA=E3=83=BC=E3=81=AB=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/photos/2022/2022-11-20-ueno-park.md | 15 +++++++++++++++ content/posts/2022/2022-11-20-ueno-park.md | 20 -------------------- 2 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 content/photos/2022/2022-11-20-ueno-park.md delete mode 100644 content/posts/2022/2022-11-20-ueno-park.md diff --git a/content/photos/2022/2022-11-20-ueno-park.md b/content/photos/2022/2022-11-20-ueno-park.md new file mode 100644 index 0000000..7b9f6c5 --- /dev/null +++ b/content/photos/2022/2022-11-20-ueno-park.md @@ -0,0 +1,15 @@ ++++ +title = "秋の上野公園" +date = 2022-11-19T17:21:00+09:00 +lastmod = 2022-11-20T18:21:00+09:00 +description = "秋の上野公園を訪ねてきました" +tags = ["上野"] +author = "kazu634" +camera = "Sony a6400" +lens = "E 35mm F1.8 OSS" +location = "上野公園" +images = ["https://live.staticflickr.com/65535/52510534640_3ba9395a29_b.jpg"] ++++ + +DSC00726.JPG + diff --git a/content/posts/2022/2022-11-20-ueno-park.md b/content/posts/2022/2022-11-20-ueno-park.md deleted file mode 100644 index efd59dd..0000000 --- a/content/posts/2022/2022-11-20-ueno-park.md +++ /dev/null @@ -1,20 +0,0 @@ -+++ -title = "秋の上野公園" -date = 2022-11-19T17:21:00+09:00 -lastmod = 2022-11-20T18:21:00+09:00 -description = "秋の上野公園を訪ねてきました" -tags = ["上野"] -categories = ["写真"] -author = "kazu634" -images = ["https://live.staticflickr.com/65535/52510534640_3ba9395a29_b.jpg"] -+++ - -秋の上野公園を訪ねてきました。 - -DSC00717.JPG - -DSC00719.JPG - -DSC00726.JPG - -DSC00738.JPG From e16422b8c48664c550c55980471116ed8a2bcce0 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 27 Nov 2022 12:20:39 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E3=81=97=E3=81=84=E8=A8=98?= =?UTF-8?q?=E4=BA=8B=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photos/2022/2022-11-23-kamata-barbon-road.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 content/photos/2022/2022-11-23-kamata-barbon-road.md diff --git a/content/photos/2022/2022-11-23-kamata-barbon-road.md b/content/photos/2022/2022-11-23-kamata-barbon-road.md new file mode 100644 index 0000000..89e41b2 --- /dev/null +++ b/content/photos/2022/2022-11-23-kamata-barbon-road.md @@ -0,0 +1,14 @@ ++++ +title = "ウィスキー" +date = 2022-11-23T21:21:00+09:00 +lastmod = 2022-11-23T21:21:00+09:00 +description = "竹鶴だよ" +tags = ["蒲田"] +author = "kazu634" +camera = "Sony a6400" +lens = "E 35mm F1.8 OSS" +location = "蒲田 バーボンロード" +images = ["ogp/2022-11-23-kamata-barbon-road.webp"] ++++ + +DSC00826.JPG From ce3f8ea61f5847940ca50eb5c161f1c8ccb1bab2 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 27 Nov 2022 12:25:42 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E3=81=97=E3=81=84=E8=A8=98?= =?UTF-8?q?=E4=BA=8B=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/photos/2022/2022-11-27-temizuya.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 content/photos/2022/2022-11-27-temizuya.md diff --git a/content/photos/2022/2022-11-27-temizuya.md b/content/photos/2022/2022-11-27-temizuya.md new file mode 100644 index 0000000..eabf934 --- /dev/null +++ b/content/photos/2022/2022-11-27-temizuya.md @@ -0,0 +1,14 @@ ++++ +title = "手水舎" +date = 2022-11-26T21:21:00+09:00 +lastmod = 2022-11-26T21:21:00+09:00 +description = "神社の手を洗うところを「手水舎」と呼びます" +tags = ["武蔵新田"] +author = "kazu634" +camera = "Sony a6400" +lens = "E 35mm F1.8 OSS" +location = "新田神社" +images = ["ogp/2022-11-27-temizuya.webp"] ++++ + +DSC00852.JPG