From ce6c01c3e17a4fbc866221e76241081f852b9a90 Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 6 Mar 2018 07:48:19 +0900 Subject: Create index and article template. --- layouts/_default/single.html | 4 ++++ layouts/index.html | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e69de29..32dc28d 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -0,0 +1,4 @@ +

{{ .Title }}

+
+{{ .Content }} +
diff --git a/layouts/index.html b/layouts/index.html index e69de29..b02cab2 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -0,0 +1,6 @@ +

{{ .Site.Title }}

+ -- cgit v1.2.3 From e198a2454ddd00a4a2a32bb821a4a58e6207260a Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 00:35:04 +0900 Subject: Create html header/footer. --- layouts/partials/footer.html | 7 +++++++ layouts/partials/header.html | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index e69de29..b20272c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index e69de29..8ac4d12 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -0,0 +1,14 @@ + + + + + + + + + + + + {{ .Site.Title }} + + -- cgit v1.2.3 From 34ded75359f796856731a4671d4cc78c48e92821 Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 00:41:41 +0900 Subject: Layout: List of articles. --- layouts/_default/list.html | 6 ++++++ layouts/_default/single.html | 2 ++ 2 files changed, 8 insertions(+) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e69de29..15c35a1 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -0,0 +1,6 @@ +{{ partial "header.html" . }} +

{{ .Title }}

+
+{{ .Content }} +
+{{ partial "footer.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 32dc28d..15c35a1 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,4 +1,6 @@ +{{ partial "header.html" . }}

{{ .Title }}

{{ .Content }}
+{{ partial "footer.html" . }} -- cgit v1.2.3 From 3fc134d8ed5f50906bf1d984334d8c4f50b2dc4c Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 01:00:05 +0900 Subject: Merge index layout to list layout. --- layouts/_default/list.html | 11 +++++++++-- layouts/index.html | 6 ------ 2 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 layouts/index.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 15c35a1..2db6cc6 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,6 +1,13 @@ {{ partial "header.html" . }} -

{{ .Title }}

+

{{ .Site.Title }}

-{{ .Content }} + {{ .Content }} +
+
+
{{ partial "footer.html" . }} diff --git a/layouts/index.html b/layouts/index.html deleted file mode 100644 index b02cab2..0000000 --- a/layouts/index.html +++ /dev/null @@ -1,6 +0,0 @@ -

{{ .Site.Title }}

- -- cgit v1.2.3 From bfeb6d862c2ffd4eec36ad126e83a4cdd528631f Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 04:22:10 +0900 Subject: Create navbar and i18n selector. --- i18n/en.toml | 2 ++ i18n/ja.toml | 2 ++ layouts/partials/footer.html | 14 +++++++++++++ layouts/partials/header.html | 49 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 i18n/en.toml create mode 100644 i18n/ja.toml diff --git a/i18n/en.toml b/i18n/en.toml new file mode 100644 index 0000000..2c5abc9 --- /dev/null +++ b/i18n/en.toml @@ -0,0 +1,2 @@ +[showTranslations] +other = "show translations" diff --git a/i18n/ja.toml b/i18n/ja.toml new file mode 100644 index 0000000..1ba6cae --- /dev/null +++ b/i18n/ja.toml @@ -0,0 +1,2 @@ +[showTranslations] +other = "翻訳を表示" diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index b20272c..3282f14 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,3 +1,17 @@ + +
+
+ +
+
+ +
+
+ + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8ac4d12..db96324 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,14 +1,57 @@ - + - - {{ .Site.Title }} +
+
    + {{ if .Site.GetPage "page" "about.md" }} +
  • + about +
    • + {{ end }} +
+
+ +
+
+
+
+
+ -- cgit v1.2.3 From 0b65c7854f48214ecc3177f2b399352d22c10220 Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 06:42:31 +0900 Subject: Setup SNS share links and OG. --- layouts/partials/header.html | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index db96324..16b2afd 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -7,7 +7,25 @@ + + {{ if .Page.IsHome }} {{ .Site.Title }} + + + {{ else }} + {{ .Site.Title }} :: {{ .Title }} + + + {{ end }} + + + {{ range $ext := ( slice "png" "jpg" "jpeg" ) }} + {{ $ogImagePath := ( delimit ( slice "static/" $.File.Dir $.File.TranslationBaseName "/og" $ext ) "" "." ) }} + {{ if ( fileExists $ogImagePath ) }} + + {{ end }} + {{ end }} +
@@ -42,8 +60,20 @@ -- cgit v1.2.3 From 4e2d6e97af69ba726894abd17032afad6fbab6b8 Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 19:50:35 +0900 Subject: Adjust header and footer: width, copyright. --- layouts/partials/footer.html | 20 ++++++++++---------- layouts/partials/header.html | 6 +----- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 3282f14..d6dc0a8 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,21 +1,21 @@ -
-
-
-
-
-
-
+
+
+
- footer + © {{ .Site.Title }} +  ·  + + Powered by Hugo
-
+
- + + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 16b2afd..b9858e6 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -79,9 +79,5 @@ -
+
-
-
-
- -- cgit v1.2.3 From 1149715fb00e094afa49c601271176580950cc64 Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 19:51:16 +0900 Subject: Adjust article layout. --- layouts/_default/list.html | 14 +++++++++----- layouts/_default/single.html | 5 ++--- layouts/partials/article.html | 7 +++++++ 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 layouts/partials/article.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 2db6cc6..091bb4c 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,12 +1,16 @@ {{ partial "header.html" . }} -

{{ .Site.Title }}

-
- {{ .Content }} +
-
+
+ {{ $paginator := .Paginate ( .Data.Pages ) }} + {{ range $paginator.Pages }} + {{ partial "article.html" . }} + {{ end }} +
+
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 15c35a1..6a91d7b 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,6 +1,5 @@ {{ partial "header.html" . }} -

{{ .Title }}

-
-{{ .Content }} +
+ {{ partial "article.html" . }}
{{ partial "footer.html" . }} diff --git a/layouts/partials/article.html b/layouts/partials/article.html new file mode 100644 index 0000000..6e21a5e --- /dev/null +++ b/layouts/partials/article.html @@ -0,0 +1,7 @@ +
+

{{ .Title }}

+

{{ .Date.Format "2006.01.02" }}

+
+ {{ .Content }} +
+
-- cgit v1.2.3 From 11a24d53d726dae84c829ce3250b7417291e568f Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Tue, 20 Mar 2018 21:38:00 +0900 Subject: Use badge for translated link. --- layouts/_default/list.html | 29 ++++++++++++++++------------- layouts/_default/single.html | 6 ++++-- layouts/partials/article.html | 5 +++-- layouts/partials/footer.html | 1 - layouts/partials/header.html | 11 +++++++++-- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 091bb4c..515d262 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,17 +1,20 @@ {{ partial "header.html" . }} -
-
-
- {{ $paginator := .Paginate ( .Data.Pages ) }} - {{ range $paginator.Pages }} - {{ partial "article.html" . }} - {{ end }} -
-
-
    - {{ range .Data.Pages }} -
  • {{ .Title }}
    • +
    +
    + {{ $paginator := .Paginate ( .Data.Pages ) }} + {{ range $idx, $page := $paginator.Pages }} + {{ partial "article.html" $page }} + {{ if lt (add $idx 1) (len $paginator.Pages) }} +
    + {{ end }} {{ end }} -
+
+
+ +
{{ partial "footer.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6a91d7b..161948d 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,5 +1,7 @@ {{ partial "header.html" . }} -
- {{ partial "article.html" . }} +
+
+ {{ partial "article.html" . }} +
{{ partial "footer.html" . }} diff --git a/layouts/partials/article.html b/layouts/partials/article.html index 6e21a5e..19e273c 100644 --- a/layouts/partials/article.html +++ b/layouts/partials/article.html @@ -1,6 +1,7 @@
-

{{ .Title }}

-

{{ .Date.Format "2006.01.02" }}

+
+

{{ .Title }}

+
{{ .Content }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index d6dc0a8..33dc620 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,4 +1,3 @@ -
-
-- cgit v1.2.3 From 98af584c3fc4ac8a9d39911b0477b00cf1cd30b2 Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Wed, 21 Mar 2018 02:59:55 +0900 Subject: Fix article layout. --- layouts/_default/list.html | 7 ++++++- layouts/_default/single.html | 9 ++++++--- layouts/partials/article.html | 8 -------- 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 layouts/partials/article.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 515d262..2426508 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -3,7 +3,12 @@
{{ $paginator := .Paginate ( .Data.Pages ) }} {{ range $idx, $page := $paginator.Pages }} - {{ partial "article.html" $page }} + {{ if lt (add $idx 1) (len $paginator.Pages) }}
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 161948d..11eb599 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,7 +1,10 @@ {{ partial "header.html" . }}
-
- {{ partial "article.html" . }} -
+
+
+

{{ .Title }}

+
+ {{ .Content }} +
{{ partial "footer.html" . }} diff --git a/layouts/partials/article.html b/layouts/partials/article.html deleted file mode 100644 index 19e273c..0000000 --- a/layouts/partials/article.html +++ /dev/null @@ -1,8 +0,0 @@ - -- cgit v1.2.3 From f66c2ff01b62bafb2fdcc99ce6740c13f94cfbbf Mon Sep 17 00:00:00 2001 From: Hidenori MATSUKI Date: Wed, 21 Mar 2018 03:06:02 +0900 Subject: Fix layout: sm -> lg --- layouts/_default/list.html | 6 +++--- layouts/_default/single.html | 2 +- layouts/partials/footer.html | 2 +- layouts/partials/header.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 2426508..325c335 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,11 +1,11 @@ {{ partial "header.html" . }}
-
+
{{ $paginator := .Paginate ( .Data.Pages ) }} {{ range $idx, $page := $paginator.Pages }} @@ -14,7 +14,7 @@ {{ end }} {{ end }}
-
+
    {{ range .Data.Pages }}
  • {{ .Title }}
    • diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 11eb599..d3c8ad0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,6 +1,6 @@ {{ partial "header.html" . }}
    -
    +

    {{ .Title }}

    diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 33dc620..e918fb9 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,5 +1,5 @@
    -
    +
    © {{ .Site.Title }}  ·  diff --git a/layouts/partials/header.html b/layouts/partials/header.html index ade4005..12cab66 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -87,4 +87,4 @@
    -
    +
    -- cgit v1.2.3