diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 02e8557f..111b551c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,18 +2,19 @@ {{ partial "navbar.html" . }}
-

{{ .Title }}

- {{ partial "article_metadata" . }} +
+

{{ .Title }}

-
- {{ .Content }} -
+ {{ partial "article_metadata" (dict "content" . "is_list" 0) }} - {{ partial "section_item_pager.html" . }} +
+ {{ .Content }} +
+
+ {{ partial "section_pager.html" . }} {{ partial "comments.html" . }} {{ partial "footer_container.html" . }} -
{{ partial "footer.html" . }} diff --git a/layouts/index.html b/layouts/index.html index ca034de5..11eaa6af 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -7,7 +7,7 @@ - {{ range $index, $page := where .Site.Pages "Section" "=" "home" }} + {{ range where .Data.Pages "Type" "home" }} {{ if eq .Title "about" }}
{{ partial "home_biography" . }} @@ -17,6 +17,8 @@ + {{ $pubs_len := len (where .Data.Pages "Type" "publication") }} + {{ if gt $pubs_len 0 }}
@@ -25,20 +27,23 @@
    - {{ range first 5 (where .Data.Pages.ByDate "Section" "publication").Reverse }} + {{ range $index, $page := first 10 (where .Data.Pages "Type" "publication") }}
  • - {{ .Title | markdownify }} -

    {{ partial "publication_list_buttons" . }}

    + {{ .Title }} +

    {{ partial "publication_links" (dict "content" $page "is_list" 1) }}

    • {{ end }}
+ {{ end }} + {{ $posts_len := len (where .Data.Pages "Type" "post") }} + {{ if gt $posts_len 0 }}
@@ -46,15 +51,15 @@

More Posts

- {{ range last 5 (where .Data.Pages "Section" "=" "post") }} -
-

{{ .Title }}

- {{ partial "article_metadata_compact" . }} -

+ {{ range first 5 (where .Data.Pages "Type" "post") }} +

+

+ {{ partial "article_metadata" (dict "content" . "is_list" 1) }} +

{{ if .Truncated }} {{ .Summary }} {{ else }} - {{ .Content | markdownify }} + {{ .Content }} {{ end }}

@@ -65,9 +70,12 @@

+ {{ end }} + {{ $projects_len := len (where .Data.Pages "Type" "project") }} + {{ if gt $projects_len 0 }}
@@ -75,11 +83,11 @@
+ {{ end }} - {{ range $index, $page := where .Site.Pages "Section" "=" "home" }} + {{ range $index, $page := where .Data.Pages "Type" "home" }} {{ if and (isset .Params "section_id") (not (eq .Params.section_id 0)) }} {{ $title_words := split $page.Title " " }}
diff --git a/layouts/partials/article_metadata.html b/layouts/partials/article_metadata.html index 0015429a..d26edaf1 100644 --- a/layouts/partials/article_metadata.html +++ b/layouts/partials/article_metadata.html @@ -1,24 +1,27 @@ +{{ $is_list := .is_list }} +{{ $ := .content }}
- + - {{ if isset .Params "tags" }} - {{ $tagsLen := len .Params.tags }} + {{ if isset $.Params "tags" }} + {{ $tagsLen := len $.Params.tags }} {{ if gt $tagsLen 0 }} - {{ range $k, $v := .Params.tags }} + {{ range $k, $v := $.Params.tags }} {{ . }}{{ if lt $k (sub $tagsLen 1) }}, {{ end }} {{ end }} {{ end }} {{ end }} - + {{ if ne $is_list 1 }}
{{ partial "share.html" . }}
+ {{ end }}
diff --git a/layouts/partials/article_metadata_compact.html b/layouts/partials/article_metadata_compact.html deleted file mode 100644 index f9093bfd..00000000 --- a/layouts/partials/article_metadata_compact.html +++ /dev/null @@ -1,19 +0,0 @@ -
- - - - - - {{ if isset .Params "tags" }} - {{ $tagsLen := len .Params.tags }} - {{ if gt $tagsLen 0 }} - - - {{ range $k, $v := .Params.tags }} - {{ . }}{{ if lt $k (sub $tagsLen 1) }}, {{ end }} - {{ end }} - - {{ end }} - {{ end }} - -
diff --git a/layouts/partials/publication_links.html b/layouts/partials/publication_links.html new file mode 100644 index 00000000..08830a00 --- /dev/null +++ b/layouts/partials/publication_links.html @@ -0,0 +1,17 @@ +{{ $is_list := .is_list }} +{{ $ := .content }} + +{{ if $is_list }} +Details +{{ end }} + +{{ with $.Params.url_pdf }}PDF{{ end }} +{{ with $.Params.url_slides }}Slides{{ end }} +{{ with $.Params.url_video }}Video{{ end }} +{{ with $.Params.url_code }}Code{{ end }} +{{ with $.Params.url_dataset }}Dataset{{ end }} +{{ with $.Params.url_project }}Project{{ end }} + +{{ range $.Params.url_custom }} +{{ .name }} +{{ end }} diff --git a/layouts/partials/publication_list_buttons.html b/layouts/partials/publication_list_buttons.html deleted file mode 100644 index 54b08cfc..00000000 --- a/layouts/partials/publication_list_buttons.html +++ /dev/null @@ -1,8 +0,0 @@ -Details -{{ with .Params.url_pdf }}PDF{{ end }} -{{ with .Params.url_code }}Code{{ end }} -{{ with .Params.url_dataset }}Dataset{{ end }} -{{ with .Params.url_project }}Project{{ end }} -{{ with .Params.url_slides }}Slides{{ end }} -{{ with .Params.url_video }}Video{{ end }} -{{ range .Params.url_custom }}{{ .name }}{{ end }} diff --git a/layouts/partials/section_item_pager.html b/layouts/partials/section_pager.html similarity index 100% rename from layouts/partials/section_item_pager.html rename to layouts/partials/section_pager.html diff --git a/layouts/project/single.html b/layouts/project/single.html index 2fcc3e55..5da1aaf8 100644 --- a/layouts/project/single.html +++ b/layouts/project/single.html @@ -2,13 +2,17 @@ {{ partial "navbar.html" . }}
-

{{ .Title }}

- {{ with .Params.external_link }}Go to Project Site{{ end }} -
- {{ .Content }} -
+
+

{{ .Title }}

- {{ partial "section_item_pager.html" . }} + {{ with .Params.external_link }}Go to Project Site{{ end }} + +
+ {{ .Content }} +
+
+ + {{ partial "section_pager.html" . }} {{ partial "footer_container.html" . }} diff --git a/layouts/publication/single.html b/layouts/publication/single.html index 3194c768..773f1e12 100644 --- a/layouts/publication/single.html +++ b/layouts/publication/single.html @@ -49,13 +49,7 @@
Links
- {{ with .Params.url_pdf }}PDF{{ end }} - {{ with .Params.url_code }}Code{{ end }} - {{ with .Params.url_dataset }}Dataset{{ end }} - {{ with .Params.url_project }}Project{{ end }} - {{ with .Params.url_slides }}Slides{{ end }} - {{ with .Params.url_video }}Video{{ end }} - {{ range .Params.url_custom }}{{ .name }}{{ end }} + {{ partial "publication_links" (dict "content" . "is_list" 0) }}
@@ -70,7 +64,7 @@ - {{ partial "section_item_pager.html" . }} + {{ partial "section_pager.html" . }} {{ partial "footer_container.html" . }} {{ partial "footer.html" . }} diff --git a/layouts/section/post.html b/layouts/section/post.html index 342c9f0b..8bf6f055 100644 --- a/layouts/section/post.html +++ b/layouts/section/post.html @@ -6,7 +6,7 @@ {{ range $paginator.Pages }}

{{ .Title }}

-

{{ .Date.Format .Site.Params.date_format }}

+ {{ partial "article_metadata" (dict "content" . "is_list" 1) }}

{{ .Summary }}

{{ end }} diff --git a/layouts/section/publication.html b/layouts/section/publication.html index 87a3beb1..72dc1e43 100644 --- a/layouts/section/publication.html +++ b/layouts/section/publication.html @@ -1,37 +1,34 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -
- -

Publications

- {{ range .Data.Pages.GroupByDate "2006" }} + {{ range .Data.Pages.GroupByDate "2006" }}

{{ .Key }}

    + {{ range .Pages.ByDate.Reverse }}
  • - {{ .Title | markdownify }} -

    {{ partial "publication_list_buttons" . }}

    + + {{ .Title }} +

    {{ partial "publication_links" (dict "content" . "is_list" 1) }}

    • {{ end }} +
- {{ end }} -
-
+
+ {{ partial "footer_container.html" . }} - - -{{ partial "footer.html" . }} \ No newline at end of file +{{ partial "footer.html" . }}