From 6b76c1892b4d7374601623d33326d74a780660d6 Mon Sep 17 00:00:00 2001 From: Greenscreener Date: Sun, 14 Jul 2019 19:28:54 +0200 Subject: [PATCH] More work done, more placeholder content. Can't be bothered to make all content multilingual. Code should be compliant though. --- archetypes/authors.md | 5 ++++ archetypes/blog.md | 6 ++++ archetypes/default.md | 2 +- archetypes/projects.md | 6 ++++ content/authors/Greenscreener/_index.cs.md | 3 +- content/authors/Greenscreener/_index.en.md | 3 +- content/authors/_index.cs.md | 4 --- content/blog/urychlovac1.cs.md | 8 ++++++ content/blog/urychlovac2.cs.md | 8 ++++++ content/blog/urychlovac3.cs.md | 8 ++++++ content/projects/urychlovac/_index.cs.md | 7 +++++ themes/patek/assets/css/main.scss | 28 +++++++++++++++++++ .../patek/assets/js/patek-logo-custom-element | 2 +- themes/patek/i18n/cs.toml | 21 +++++++++++++- themes/patek/i18n/en.toml | 19 ++++++++++++- themes/patek/layouts/_default/list.html | 2 +- themes/patek/layouts/_default/single.html | 2 +- themes/patek/layouts/authors/list.html | 17 ----------- themes/patek/layouts/blog/list.html | 15 ++++++++++ themes/patek/layouts/blog/single.html | 9 ++++++ .../layouts/partials/blogPageHeader.html | 7 +++++ themes/patek/layouts/partials/list.html | 6 ++-- themes/patek/layouts/partials/pageHeader.html | 3 ++ .../layouts/partials/projectPageHeader.html | 9 ++++++ themes/patek/layouts/taxonomy/author.html | 20 +++++++++++++ themes/patek/layouts/taxonomy/project.html | 9 ++++++ 26 files changed, 194 insertions(+), 35 deletions(-) create mode 100644 archetypes/authors.md create mode 100644 archetypes/blog.md create mode 100644 archetypes/projects.md delete mode 100644 content/authors/_index.cs.md create mode 100644 content/blog/urychlovac1.cs.md create mode 100644 content/blog/urychlovac2.cs.md create mode 100644 content/blog/urychlovac3.cs.md create mode 100644 content/projects/urychlovac/_index.cs.md delete mode 100644 themes/patek/layouts/authors/list.html create mode 100644 themes/patek/layouts/blog/list.html create mode 100644 themes/patek/layouts/blog/single.html create mode 100644 themes/patek/layouts/partials/blogPageHeader.html create mode 100644 themes/patek/layouts/partials/pageHeader.html create mode 100644 themes/patek/layouts/partials/projectPageHeader.html create mode 100644 themes/patek/layouts/taxonomy/author.html create mode 100644 themes/patek/layouts/taxonomy/project.html diff --git a/archetypes/authors.md b/archetypes/authors.md new file mode 100644 index 0000000..8ac9694 --- /dev/null +++ b/archetypes/authors.md @@ -0,0 +1,5 @@ +--- +title: "unknown" +avatar: "https://example.com/images/avatar.png" +fullname: "Jan Novák" +--- \ No newline at end of file diff --git a/archetypes/blog.md b/archetypes/blog.md new file mode 100644 index 0000000..5a1b664 --- /dev/null +++ b/archetypes/blog.md @@ -0,0 +1,6 @@ +--- +title: "{{ replace .Name "-" " " | title }}" +date: {{ .Date }} +draft: false +authors: [ "unknown" ] +--- \ No newline at end of file diff --git a/archetypes/default.md b/archetypes/default.md index 48d39b4..6661186 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -2,6 +2,6 @@ title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} draft: false -authors: [ "Greenscreener" ] +authors: [ "unknown" ] --- diff --git a/archetypes/projects.md b/archetypes/projects.md new file mode 100644 index 0000000..9a000d1 --- /dev/null +++ b/archetypes/projects.md @@ -0,0 +1,6 @@ +--- +title: "{{ replace .Name "-" " " | title }}" +draft: false +authors: [ "unknown" ] +leader: [ "unknown" ] +--- diff --git a/content/authors/Greenscreener/_index.cs.md b/content/authors/Greenscreener/_index.cs.md index fa23dec..984ccd1 100644 --- a/content/authors/Greenscreener/_index.cs.md +++ b/content/authors/Greenscreener/_index.cs.md @@ -3,5 +3,4 @@ title: "Greenscreener" avatar: "https://greenscreener.tk/images/GSLOGO.svg" fullname: "Jan Černohorský" --- -# Blehgh -Lorem ipsum dolor sit amet. \ No newline at end of file +Greenscreener je velice cool týpek. \ No newline at end of file diff --git a/content/authors/Greenscreener/_index.en.md b/content/authors/Greenscreener/_index.en.md index fa23dec..34e3108 100644 --- a/content/authors/Greenscreener/_index.en.md +++ b/content/authors/Greenscreener/_index.en.md @@ -3,5 +3,4 @@ title: "Greenscreener" avatar: "https://greenscreener.tk/images/GSLOGO.svg" fullname: "Jan Černohorský" --- -# Blehgh -Lorem ipsum dolor sit amet. \ No newline at end of file +Greenscreener is a really cool guy. \ No newline at end of file diff --git a/content/authors/_index.cs.md b/content/authors/_index.cs.md deleted file mode 100644 index c5c4466..0000000 --- a/content/authors/_index.cs.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: "Autoři" -type: "_default" ---- \ No newline at end of file diff --git a/content/blog/urychlovac1.cs.md b/content/blog/urychlovac1.cs.md new file mode 100644 index 0000000..703cc47 --- /dev/null +++ b/content/blog/urychlovac1.cs.md @@ -0,0 +1,8 @@ +--- +title: "Tvorba urychlovače Kapitola I." +date: 2019-07-14T18:27:55+02:00 +draft: false +authors: [ "Greenscreener" ] +projects: [ "urychlovac" ] +--- +Bastlíme a bastlíme a bastlíme a bastľime a bastlíme a bastlíme. diff --git a/content/blog/urychlovac2.cs.md b/content/blog/urychlovac2.cs.md new file mode 100644 index 0000000..ffa6d0a --- /dev/null +++ b/content/blog/urychlovac2.cs.md @@ -0,0 +1,8 @@ +--- +title: "Tvorba urychlovače Kapitola II." +date: 2019-07-14T18:28:01+02:00 +draft: false +authors: [ "Greenscreener" ] +projects: [ "urychlovac" ] +--- +Bastlíme a bastlíme a bastlíme a bastľime a bastlíme a bastlíme. diff --git a/content/blog/urychlovac3.cs.md b/content/blog/urychlovac3.cs.md new file mode 100644 index 0000000..ca21921 --- /dev/null +++ b/content/blog/urychlovac3.cs.md @@ -0,0 +1,8 @@ +--- +title: "Tvorba urychlovače Kapitola III." +date: 2019-07-14T18:28:07+02:00 +draft: false +authors: [ "Greenscreener" ] +projects: [ "urychlovac" ] +--- +Bastlíme a bastlíme a bastlíme a bastľime a bastlíme a bastlíme. diff --git a/content/projects/urychlovac/_index.cs.md b/content/projects/urychlovac/_index.cs.md new file mode 100644 index 0000000..4b28d8b --- /dev/null +++ b/content/projects/urychlovac/_index.cs.md @@ -0,0 +1,7 @@ +--- +title: "Projekt Urychlovač" +draft: false +authors: [ "Greenscreener", "sijisu" ] +leader: [ "sijisu" ] +--- +Chtěli jsme jet na MakerFaire, ale neměli jsme co prezentovat. Tak jsme za měsíc postavili urychlovač částic. \ No newline at end of file diff --git a/themes/patek/assets/css/main.scss b/themes/patek/assets/css/main.scss index acc71ea..27f02ca 100644 --- a/themes/patek/assets/css/main.scss +++ b/themes/patek/assets/css/main.scss @@ -60,4 +60,32 @@ $primary: #0b2a37; .author-media { margin-bottom: 15px; } + +.pageTitle.title { + font-weight: 300; + font-size: 40px; + margin-bottom: 10px; +} +.column .pageTitle.title { + font-size: 30px; + +} +.pageHeader { + margin-bottom: 40px; +} +.content h1, h2, h3, h4, h5, h6, .title { + font-weight: 300; +} +h2 a { + color: $text; +} +.box h2 a { + color: $link; + &:hover { + color: $link-hover; + } +} +.separateWithCommas + .separateWithCommas:before { + content: ", "; +} // /Custom styles diff --git a/themes/patek/assets/js/patek-logo-custom-element b/themes/patek/assets/js/patek-logo-custom-element index d3ba819..e8f57b5 160000 --- a/themes/patek/assets/js/patek-logo-custom-element +++ b/themes/patek/assets/js/patek-logo-custom-element @@ -1 +1 @@ -Subproject commit d3ba819e7db1e938c9d3581aff71c9423e036228 +Subproject commit e8f57b57ed235335fa6dcd18c3ef866ec1ecbacc diff --git a/themes/patek/i18n/cs.toml b/themes/patek/i18n/cs.toml index d20206a..e5d9bb0 100644 --- a/themes/patek/i18n/cs.toml +++ b/themes/patek/i18n/cs.toml @@ -1,2 +1,21 @@ [readmore] -other = "Číst dále" \ No newline at end of file +other = "Číst dále" + +[published] +other = "Publikováno" + +[author] +other = "Autor" + +[part_of_project] +one = "Tento přízpěvek je součástí projektu" +few = "Tento přízpěvek je součástí projektů" +other = "Tento přízpěvek je součástí projektů" + +[member] +one = "Člen" +few = "Členové" +other = "Členové" + +[leader] +other = "Vedoucí" \ No newline at end of file diff --git a/themes/patek/i18n/en.toml b/themes/patek/i18n/en.toml index 56cd5eb..1b9bd8b 100644 --- a/themes/patek/i18n/en.toml +++ b/themes/patek/i18n/en.toml @@ -1,2 +1,19 @@ [readmore] -other = "Read more" \ No newline at end of file +other = "Read more" + +[published] +other = "Published" + +[author] +other = "Author" + +[part_of_project] +one = "This post is a part of this project" +other = "This post is a part of these projects" + +[member] +one = "Member" +other = "Members" + +[leader] +other = "Leader" \ No newline at end of file diff --git a/themes/patek/layouts/_default/list.html b/themes/patek/layouts/_default/list.html index 88cc96c..dc23a7a 100644 --- a/themes/patek/layouts/_default/list.html +++ b/themes/patek/layouts/_default/list.html @@ -1,4 +1,4 @@ {{ define "main" }} -

{{ .Title }}

+ {{ partial "pageHeader.html" . }} {{ partial "list.html" .}} {{ end }} \ No newline at end of file diff --git a/themes/patek/layouts/_default/single.html b/themes/patek/layouts/_default/single.html index d623702..40970ba 100644 --- a/themes/patek/layouts/_default/single.html +++ b/themes/patek/layouts/_default/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -

{{ .Title }}

+ {{ partial "pageHeader.html" . }}
{{ .Content }}
diff --git a/themes/patek/layouts/authors/list.html b/themes/patek/layouts/authors/list.html deleted file mode 100644 index edc0a5b..0000000 --- a/themes/patek/layouts/authors/list.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ define "main" }} -
-
-
- User avatar -
-
-
-

{{ .Title }}

-
{{ .Params.fullname }}
-
-
-
- {{ .Content }} -
- {{ partial "list.html" . }} -{{ end }} \ No newline at end of file diff --git a/themes/patek/layouts/blog/list.html b/themes/patek/layouts/blog/list.html new file mode 100644 index 0000000..0aef6c1 --- /dev/null +++ b/themes/patek/layouts/blog/list.html @@ -0,0 +1,15 @@ +{{ define "main" }} + {{ partial "pageHeader.html" . }} + {{ $baseUrl := .Site.BaseURL }} + {{ $paginator := .Paginate (.Pages.ByPublishDate.Reverse) }} + {{ partial "paginator-buttons.html" $paginator }} + {{ range $paginator.Pages }} +
+
+ {{ partial "blogPageHeader.html" . }} +
+

{{ .Summary }} {{ T "readmore" }}

+
+ {{ end }} + {{ partial "paginator-buttons.html" $paginator }} +{{ end }} \ No newline at end of file diff --git a/themes/patek/layouts/blog/single.html b/themes/patek/layouts/blog/single.html new file mode 100644 index 0000000..a744667 --- /dev/null +++ b/themes/patek/layouts/blog/single.html @@ -0,0 +1,9 @@ +{{ define "main" }} + {{ partial "blogPageHeader.html" . }} +
+ {{ .Content }} +
+ {{ if ne .Params.projects nil }} +

{{ T "part_of_project" (len .Params.projects) }}: {{ range .Params.projects }}{{ with $.Site.GetPage (printf "projects/%s" .) }}{{ .Title }}{{ end }}{{ end }}

+ {{ end }} +{{ end }} \ No newline at end of file diff --git a/themes/patek/layouts/partials/blogPageHeader.html b/themes/patek/layouts/partials/blogPageHeader.html new file mode 100644 index 0000000..7332a13 --- /dev/null +++ b/themes/patek/layouts/partials/blogPageHeader.html @@ -0,0 +1,7 @@ +
+

{{ .Title }}

+

{{- T "published" -}}: 

+

+ {{- T "author" -}}:{{ range .Params.authors }}{{ with $.Site.GetPage (printf "authors/%s" .) }}{{ .Title }}{{ end }}{{ end }} +

+
\ No newline at end of file diff --git a/themes/patek/layouts/partials/list.html b/themes/patek/layouts/partials/list.html index e1fd1c7..2143102 100644 --- a/themes/patek/layouts/partials/list.html +++ b/themes/patek/layouts/partials/list.html @@ -4,11 +4,9 @@ {{ range $paginator.Pages }}
-
-

{{ .Title }}

-
+ {{ partial "pageHeader.html" . }}
-

{{ replaceRE "invisible\\(\\);(?:.|\n)*invisibleEnd\\(\\);" "" .Summary }} {{ T "readmore" }}

+

{{ .Summary }} {{ T "readmore" }}

{{ end }} {{ partial "paginator-buttons.html" $paginator }} diff --git a/themes/patek/layouts/partials/pageHeader.html b/themes/patek/layouts/partials/pageHeader.html new file mode 100644 index 0000000..3bc4de1 --- /dev/null +++ b/themes/patek/layouts/partials/pageHeader.html @@ -0,0 +1,3 @@ +
+

{{ .Title }}

+
\ No newline at end of file diff --git a/themes/patek/layouts/partials/projectPageHeader.html b/themes/patek/layouts/partials/projectPageHeader.html new file mode 100644 index 0000000..b802e5f --- /dev/null +++ b/themes/patek/layouts/partials/projectPageHeader.html @@ -0,0 +1,9 @@ +
+

{{ .Title }}

+

+ {{- T "leader" -}}: {{ range .Params.leader }}{{ with $.Site.GetPage (printf "authors/%s" .) }}{{ .Title }}{{ end }}{{ end }} +

+

+ {{- T "member" (len .Params.authors) -}}: {{ range .Params.authors }}{{ with $.Site.GetPage (printf "authors/%s" .) }}{{ .Title }}{{ end }}{{ end }} +

+
\ No newline at end of file diff --git a/themes/patek/layouts/taxonomy/author.html b/themes/patek/layouts/taxonomy/author.html new file mode 100644 index 0000000..f9d186c --- /dev/null +++ b/themes/patek/layouts/taxonomy/author.html @@ -0,0 +1,20 @@ +{{ define "main" }} +
+
+
+
+ User avatar +
+
+
+

{{ .Title }}

+

{{ .Params.fullname }}

+
+ {{ .Content }} +
+
+
+ +
+ {{ partial "list.html" . }} +{{ end }} \ No newline at end of file diff --git a/themes/patek/layouts/taxonomy/project.html b/themes/patek/layouts/taxonomy/project.html new file mode 100644 index 0000000..8194b65 --- /dev/null +++ b/themes/patek/layouts/taxonomy/project.html @@ -0,0 +1,9 @@ +{{ define "main" }} + {{ if ne .Params.authors nil}} + {{ partial "projectPageHeader.html" . }} +
+ {{ .Content }} +
+ {{ end}} + {{ partial "list.html" . }} +{{ end }} \ No newline at end of file