diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index c99a108a..d8ca5cd2 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -131,27 +131,19 @@ sharing = true # Examples: "Mon, Jan 2, 2006" or "2006-01-02" date_format = "January 2006" + # Citation style ("apa" or "mla") + citation_style = "apa" + # Configuration of project pages. [projects] - # Post list format. - # 0 = Simple - # 1 = Detailed - # 2 = Stream - post_format = 2 - - # Publication list format. - # 0 = Simple - # 1 = Detailed - # 2 = APA - # 3 = MLA - # 4 = Stream - publication_format = 4 - - # Talk list format. - # 0 = Simple - # 1 = Detailed - # 2 = Stream - talk_format = 2 + # Views for associated content. + # 1: List + # 2: Compact + # 3: Card + # 4: Citation (publications only) + post_view = 2 + publication_view = 4 + talk_view = 2 # Search. [search] diff --git a/exampleSite/content/author/admin/_index.md b/exampleSite/content/author/admin/_index.md index b15df05b..c1e2a992 100644 --- a/exampleSite/content/author/admin/_index.md +++ b/exampleSite/content/author/admin/_index.md @@ -42,22 +42,9 @@ interests = [ year = 2008 # Social/Academic Networking -# -# Icon pack "fab" includes the following social network icons: -# -# twitter, weibo, linkedin, github, facebook, pinterest, google-plus, -# youtube, instagram, soundcloud -# -# For email icon, use "fas" icon pack, "envelope" icon, and -# "mailto:your@email.com" as the link. -# -# Full list: https://fontawesome.com/icons -# -# Icon pack "ai" includes the following academic icons: -# -# cv, google-scholar, arxiv, orcid, researchgate, mendeley -# -# Full list: https://jpswalsh.github.io/academicons/ +# For available icons, see: https://sourcethemes.com/academic/docs/widgets/#icons +# For an email link, use "fas" icon pack, "envelope" icon, and a link in the +# form "mailto:your-email@example.com" or "#contact" for contact widget. [[social]] icon = "envelope" diff --git a/exampleSite/content/home/about.md b/exampleSite/content/home/about.md index 9284093d..cdc6a6d3 100644 --- a/exampleSite/content/home/about.md +++ b/exampleSite/content/home/about.md @@ -3,7 +3,6 @@ widget = "about" # Do not modify this line! active = true # Activate this widget? true/false weight = 5 # Order that this section will appear in. -date = 2016-04-20T00:00:00 title = "Biography" diff --git a/exampleSite/content/home/accomplishments.md b/exampleSite/content/home/accomplishments.md index e829b103..0c8463bb 100644 --- a/exampleSite/content/home/accomplishments.md +++ b/exampleSite/content/home/accomplishments.md @@ -7,7 +7,7 @@ title = "Accomplish­ments" subtitle = "" # Order that this section will appear in. -weight = 15 +weight = 9 # Date format # Refer to https://sourcethemes.com/academic/docs/customization/#date-format diff --git a/exampleSite/content/home/contact.md b/exampleSite/content/home/contact.md index d8e684c7..bc63b2ae 100644 --- a/exampleSite/content/home/contact.md +++ b/exampleSite/content/home/contact.md @@ -1,8 +1,7 @@ +++ # Contact widget. -widget = "contact" -active = true -date = 2016-04-20T00:00:00 +widget = "contact" # Do not modify this line! +active = true # Activate this widget? true/false title = "Contact" subtitle = "" diff --git a/exampleSite/content/home/hero.md b/exampleSite/content/home/hero.md index 0c0bbff9..a12c8249 100644 --- a/exampleSite/content/home/hero.md +++ b/exampleSite/content/home/hero.md @@ -1,8 +1,7 @@ +++ # Hero widget. -widget = "hero" -active = true -date = 2017-10-15T00:00:00 +widget = "hero" # Do not modify this line! +active = true # Activate this widget? true/false title = "Academic" diff --git a/exampleSite/content/home/hero_carousel.md b/exampleSite/content/home/hero_carousel.md index e9902207..e9b23986 100644 --- a/exampleSite/content/home/hero_carousel.md +++ b/exampleSite/content/home/hero_carousel.md @@ -1,8 +1,7 @@ +++ # Hero Carousel widget. -widget = "hero_carousel" -active = false -date = 2017-10-15T00:00:00 +widget = "hero_carousel" # Do not modify this line! +active = false # Activate this widget? true/false # Order that this section will appear in. weight = 1 diff --git a/exampleSite/content/home/posts.md b/exampleSite/content/home/posts.md index e4d85897..97db3a5c 100644 --- a/exampleSite/content/home/posts.md +++ b/exampleSite/content/home/posts.md @@ -4,7 +4,6 @@ widget = "posts" # Do not modify this line! active = true # Activate this widget? true/false weight = 40 # Order that this section will appear. -date = 2016-04-20T00:00:00 title = "Recent Posts" subtitle = "" @@ -12,11 +11,11 @@ subtitle = "" # Number of recent posts to list. count = 5 -# List format. -# 0 = Simple -# 1 = Detailed -# 2 = Stream -list_format = 2 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +view = 2 # Filter posts by tag or category. # E.g. to only show posts tagged with `Academic`, set `filter_tag = "Academic"` diff --git a/exampleSite/content/home/projects.md b/exampleSite/content/home/projects.md index 4927f634..19281c3b 100644 --- a/exampleSite/content/home/projects.md +++ b/exampleSite/content/home/projects.md @@ -1,8 +1,7 @@ +++ # Projects widget. -widget = "projects" -active = true -date = 2016-04-20T00:00:00 +widget = "projects" # Do not modify this line! +active = true # Activate this widget? true/false title = "Projects" subtitle = "" @@ -16,9 +15,10 @@ weight = 50 folder = "project" # View. -# Customize how projects are displayed. -# Legend: 0 = list, 1 = cards, 2 = showcase. -view = 1 +# 1 = List +# 3 = Card +# 5 = Showcase +view = 3 # Widget layout # Legend: 0 = two columns (default), 1 = single column diff --git a/exampleSite/content/home/publications.md b/exampleSite/content/home/publications.md index 8a4760d2..27b91c3c 100644 --- a/exampleSite/content/home/publications.md +++ b/exampleSite/content/home/publications.md @@ -1,9 +1,8 @@ +++ # Recent Publications widget. # This widget displays recent publications from `content/publication/`. -widget = "publications" -active = true -date = 2016-04-20T00:00:00 +widget = "publications" # Do not modify this line! +active = true # Activate this widget? true/false title = "Recent Publications" subtitle = "" @@ -14,13 +13,12 @@ weight = 20 # Number of publications to list. count = 10 -# List format. -# 0 = Simple -# 1 = Detailed -# 2 = APA -# 3 = MLA -# 4 = Stream -list_format = 4 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +# 4 = Citation +view = 2 # Filter by publication type. # -1: Any diff --git a/exampleSite/content/home/publications_featured.md b/exampleSite/content/home/publications_featured.md index 2b6839f2..68ef514d 100644 --- a/exampleSite/content/home/publications_featured.md +++ b/exampleSite/content/home/publications_featured.md @@ -1,10 +1,9 @@ +++ # Featured Publications widget. # This widget displays publications from `content/publication/` which have -# `featured = true` in their `+++` front matter. -widget = "publications_featured" -active = true -date = 2016-04-20T00:00:00 +# `featured = true` in their front matter. +widget = "publications_featured" # Do not modify this line! +active = true # Activate this widget? true/false title = "Featured Publications" subtitle = "" @@ -12,13 +11,12 @@ subtitle = "" # Order that this section will appear in. weight = 10 -# List format. -# 0 = Simple -# 1 = Detailed -# 2 = APA -# 3 = MLA -# 4 = Stream -list_format = 1 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +# 4 = Citation +view = 3 # Filter by publication type. # -1: Any diff --git a/exampleSite/content/home/skills.md b/exampleSite/content/home/skills.md index 6fe72e51..015ac24c 100644 --- a/exampleSite/content/home/skills.md +++ b/exampleSite/content/home/skills.md @@ -1,10 +1,7 @@ +++ # Feature/Skill widget. widget = "featurette" # Do not modify this line! -date = 2017-09-20T00:00:00 - -# Activate this widget? true/false -active = true +active = true # Activate this widget? true/false title = "Skills" subtitle = "" @@ -16,10 +13,7 @@ weight = 7 # # Add/remove as many `[[feature]]` blocks below as you like. # -# Available icon packs and icons: -# * fas - Font Awesome standard icons (see https://fontawesome.com/icons) -# * fab - Font Awesome brand icons (see https://fontawesome.com/icons) -# * ai - academic icons (see https://jpswalsh.github.io/academicons/) +# For available icons, see: https://sourcethemes.com/academic/docs/widgets/#icons [[feature]] icon = "r-project" diff --git a/exampleSite/content/home/tags.md b/exampleSite/content/home/tags.md index 5ac0755a..84a59667 100644 --- a/exampleSite/content/home/tags.md +++ b/exampleSite/content/home/tags.md @@ -1,8 +1,7 @@ +++ # Tag Cloud widget. -widget = "tag_cloud" -active = true -date = 2017-09-20T00:00:00 +widget = "tag_cloud" # Do not modify this line! +active = true # Activate this widget? true/false title = "Tags" subtitle = "" diff --git a/exampleSite/content/home/talks.md b/exampleSite/content/home/talks.md index 37ec9c3f..b76ac36a 100644 --- a/exampleSite/content/home/talks.md +++ b/exampleSite/content/home/talks.md @@ -1,8 +1,7 @@ +++ # Recent and Upcoming Talks widget. -widget = "talks" -active = true -date = 2016-04-20T00:00:00 +widget = "talks" # Do not modify this line! +active = true # Activate this widget? true/false title = "Recent & Upcoming Talks" subtitle = "" @@ -13,11 +12,11 @@ weight = 30 # Number of talks to list. count = 10 -# List format. -# 0 = Simple -# 1 = Detailed -# 2 = Stream -list_format = 2 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +view = 2 # Exclude talks that are shown in the Featured Talks widget? exclude_featured = false diff --git a/exampleSite/content/home/talks_featured.md b/exampleSite/content/home/talks_featured.md index 30846179..b02b5e34 100644 --- a/exampleSite/content/home/talks_featured.md +++ b/exampleSite/content/home/talks_featured.md @@ -1,8 +1,7 @@ +++ # Featured Talks widget. -widget = "talks_featured" -active = false -date = 2016-04-20T00:00:00 +widget = "talks_featured" # Do not modify this line! +active = false # Activate this widget? true/false title = "Featured Talks" subtitle = "" @@ -10,9 +9,9 @@ subtitle = "" # Order that this section will appear in. weight = 29 -# List format. -# 0 = Simple -# 1 = Detailed -# 3 = Stream -list_format = 0 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +view = 3 +++ diff --git a/exampleSite/content/home/teaching.md b/exampleSite/content/home/teaching.md index 23a110cd..3394864f 100644 --- a/exampleSite/content/home/teaching.md +++ b/exampleSite/content/home/teaching.md @@ -2,9 +2,8 @@ # Custom widget. # An example of using the custom widget to create your own homepage section. # To create more sections, duplicate this file and edit the values below as desired. -widget = "custom" -active = true -date = 2016-04-20T00:00:00 +widget = "custom" # Do not modify this line! +active = true # Activate this widget? true/false # Note: a full width section format can be enabled by commenting out the `title` and `subtitle` with a `#`. title = "Teaching" diff --git a/exampleSite/content/post/_index.md b/exampleSite/content/post/_index.md index 196690b8..026a4b4b 100644 --- a/exampleSite/content/post/_index.md +++ b/exampleSite/content/post/_index.md @@ -1,12 +1,11 @@ +++ title = "Posts" -date = 2017-01-01T00:00:00 -# List format. -# 0 = Simple -# 1 = Detailed -# 2 = Stream -list_format = 2 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +view = 2 # Optional featured image (relative to `static/img/` folder). [header] diff --git a/exampleSite/content/publication/_index.md b/exampleSite/content/publication/_index.md index 22984353..bc92542c 100644 --- a/exampleSite/content/publication/_index.md +++ b/exampleSite/content/publication/_index.md @@ -1,14 +1,12 @@ +++ title = "Publications" -date = 2017-01-01T00:00:00 -# List format. -# 0 = Simple -# 1 = Detailed -# 2 = APA -# 3 = MLA -# 4 = Stream -list_format = 3 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +# 4 = Citation +view = 4 # Optional featured image (relative to `static/img/` folder). [header] diff --git a/exampleSite/content/talk/_index.md b/exampleSite/content/talk/_index.md index 1bd2ab2c..2758568d 100644 --- a/exampleSite/content/talk/_index.md +++ b/exampleSite/content/talk/_index.md @@ -1,12 +1,11 @@ +++ title = "Recent & Upcoming Talks" -date = 2017-01-01T00:00:00 -# List format. -# 0 = Simple -# 1 = Detailed -# 2 = Stream -list_format = 2 +# View. +# 1 = List +# 2 = Compact +# 3 = Card +view = 2 # Optional featured image (relative to `static/img/` folder). [header] diff --git a/i18n/en.yaml b/i18n/en.yaml index 37cb2097..36036355 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -88,7 +88,7 @@ # Publications widget - id: more_publications - translation: More Publications + translation: See all publications # Posts widget @@ -96,12 +96,12 @@ translation: CONTINUE READING - id: more_posts - translation: More Posts + translation: See all posts # Talks widget - id: more_talks - translation: More Talks + translation: See all talks # Contact widget diff --git a/layouts/author/list.html b/layouts/author/list.html index ea5c40f8..6abcc011 100644 --- a/layouts/author/list.html +++ b/layouts/author/list.html @@ -1,8 +1,14 @@ {{ partial "header.html" . }} {{ partial "navbar.html" . }} -{{ partial "page_header.html" . }} -
+{{/* Just display author name as title if user profile unavailable. */}} +{{ if not ($.Site.GetPage (printf "/author/%s" (urlize .Title))) }} +
+

{{ .Title }}

+
+{{ end }} + +
{{/* Only show About widget if a profile has been configured for this user. */}} {{ $widget := "widgets/about.html" }} diff --git a/layouts/partials/css/academic.css b/layouts/partials/css/academic.css index c97ff411..44a9dd67 100644 --- a/layouts/partials/css/academic.css +++ b/layouts/partials/css/academic.css @@ -522,6 +522,15 @@ a[data-fancybox] img { color: #b2b2b2; } +/************************************************* + * Widgets (common) + **************************************************/ + +.see-all { + margin-top: 2rem; + text-transform: uppercase; +} + /************************************************* * Hero Widget **************************************************/ @@ -600,7 +609,7 @@ a[data-fancybox] img { } /************************************************* - * Biography + * About widget **************************************************/ #profile { @@ -1069,11 +1078,6 @@ article .article-metadata { margin-right: auto; } -.pub .pub-authors { - font-style: italic; - line-height: 30px; /* Match share bar line height. */ -} - .pub-row-heading { font-weight: bold; } @@ -1082,24 +1086,6 @@ article .article-metadata { font-size: 1rem; } -.pub-list-item .pub-authors { - line-height: normal; - font-style: normal; - font-size: 0.9rem; - color: rgba(0,0,0,0.54); -} - -.pub-list-item .pub-publication { - color: rgba(0,0,0,0.54); - font-size: 0.9rem; -} - - -.dark .pub-authors, -.dark .pub-publication { - color: rgba(255,255,255,0.54); -} - .pub-list-item .btn-links { padding-top: 10px; } diff --git a/layouts/partials/page_header.html b/layouts/partials/page_header.html index f4ee60ad..cd2b641f 100644 --- a/layouts/partials/page_header.html +++ b/layouts/partials/page_header.html @@ -47,7 +47,7 @@

{{ . | markdownify | emojify }}

{{end}} - {{ partial "page_metadata" (dict "content" $page "is_list" 1) }} + {{ partial "page_metadata" (dict "content" $page "is_list" 0) }} {{ partial "page_links_div.html" $page }} @@ -70,8 +70,7 @@

{{ . | markdownify | emojify }}

{{end}} - {{ partial "page_metadata" (dict "content" $page "is_list" 0) }} - + {{ partial "page_metadata" (dict "content" $page "is_list" 0 "share" true) }} {{ partial "page_links_div.html" $page }}
{{else}} @@ -90,7 +89,7 @@ {{end}} {{ if not .IsNode }} - {{ partial "page_metadata" (dict "content" $page "is_list" 0) }} + {{ partial "page_metadata" (dict "content" $page "is_list" 0 "share" true) }} {{ partial "page_links_div.html" $page }} {{end}} diff --git a/layouts/partials/page_metadata.html b/layouts/partials/page_metadata.html index 0f1ce7d2..568c0590 100644 --- a/layouts/partials/page_metadata.html +++ b/layouts/partials/page_metadata.html @@ -1,4 +1,5 @@ {{ $is_list := .is_list }} +{{ $share := .share | default false }} {{ $ := .content }} @@ -11,16 +12,7 @@ {{ $authorLen := len $.Params.authors }} {{ if gt $authorLen 0 }}
- {{ range $k, $v := $.Params.authors -}} - - {{- if lt $k (sub $authorLen 1) -}}, {{ end }} - {{ end }} + {{ partial "page_metadata_authors" $ }}
{{ end }} {{ end }} @@ -39,6 +31,17 @@ {{ end }} + {{ if and (eq $is_list 1) (eq $.Type "publication") }} + + + {{ if $.Params.publication_short }} + {{ $.Params.publication_short | markdownify }} + {{ else if $.Params.publication }} + {{ $.Params.publication | markdownify }} + {{ end }} + + {{ end }} + {{ if and (eq $.Type "post") (not (or (eq $.Site.Params.reading_time false) (eq $.Params.reading_time false))) }} @@ -66,8 +69,8 @@ {{ end }} {{ end }} - {{ if ne $is_list 1 }} - {{ partial "share.html" $ }} + {{ if $share }} + {{ partial "share.html" $ }} {{ end }} diff --git a/layouts/partials/page_metadata_authors.html b/layouts/partials/page_metadata_authors.html new file mode 100644 index 00000000..ba0c0e74 --- /dev/null +++ b/layouts/partials/page_metadata_authors.html @@ -0,0 +1,23 @@ +{{/* If `authors` is set and is not empty. */}} +{{ if $.Params.authors }} +{{ $authorLen := len $.Params.authors }} +{{ if gt $authorLen 0 }} + {{ range $k, $v := $.Params.authors -}} + + {{- if lt $k (sub $authorLen 1) -}}, {{ end }} + {{ end }} +{{ end }} +{{ end }} diff --git a/layouts/partials/post_li_detailed.html b/layouts/partials/post_li_card.html similarity index 100% rename from layouts/partials/post_li_detailed.html rename to layouts/partials/post_li_card.html diff --git a/layouts/partials/post_li_stream.html b/layouts/partials/post_li_compact.html similarity index 100% rename from layouts/partials/post_li_stream.html rename to layouts/partials/post_li_compact.html diff --git a/layouts/partials/post_li_simple.html b/layouts/partials/post_li_list.html similarity index 100% rename from layouts/partials/post_li_simple.html rename to layouts/partials/post_li_list.html diff --git a/layouts/partials/project_li_simple.html b/layouts/partials/project_li_list.html similarity index 100% rename from layouts/partials/project_li_simple.html rename to layouts/partials/project_li_list.html diff --git a/layouts/partials/publication_li_apa.html b/layouts/partials/publication_li_apa.html deleted file mode 100644 index cc91cdce..00000000 --- a/layouts/partials/publication_li_apa.html +++ /dev/null @@ -1,16 +0,0 @@ -
- - - ({{- .Date.Format "2006" -}}). - {{ .Title }}. - {{ if .Params.publication_short }} - {{- .Params.publication_short | markdownify -}}. - {{ else if .Params.publication }} - {{- .Params.publication | markdownify -}}. - {{ end }} -

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

-
diff --git a/layouts/partials/publication_li_detailed.html b/layouts/partials/publication_li_card.html similarity index 62% rename from layouts/partials/publication_li_detailed.html rename to layouts/partials/publication_li_card.html index 563815f0..454d26cb 100644 --- a/layouts/partials/publication_li_detailed.html +++ b/layouts/partials/publication_li_card.html @@ -1,4 +1,5 @@
+ {{ partial "page_metadata" (dict "content" $ "is_list" 1) }} {{ $resource := (.Resources.ByType "image").GetMatch "*featured*" }} {{ $anchor := .Params.image.focal_point | default "Smart" }} @@ -17,27 +18,12 @@
{{ if .Params.abstract_short }} - {{ .Params.abstract_short | markdownify }} + {{ .Params.abstract_short | markdownify }} {{ else }} - {{ .Params.abstract | markdownify}} + {{ .Params.abstract | markdownify}} {{ end }}
- - -
- {{ if .Params.publication_short }} - {{ .Params.publication_short | markdownify }}, - {{ else if .Params.publication }} - {{ .Params.publication | markdownify }}, - {{ end }} - {{ .Date.Format "2006" }} -
-
{{ partial "page_links" (dict "content" . "is_list" 1) }}
diff --git a/layouts/partials/publication_li_citation.html b/layouts/partials/publication_li_citation.html new file mode 100644 index 00000000..b33b0d0a --- /dev/null +++ b/layouts/partials/publication_li_citation.html @@ -0,0 +1,35 @@ +
+ + + {{/* APA Style */}} + {{ if eq ($.Site.Params.publications.citation_style | default "apa") "apa" }} + + + ({{- .Date.Format "2006" -}}). + {{ .Title }}. + {{ if .Params.publication_short }} + {{- .Params.publication_short | markdownify -}}. + {{ else if .Params.publication }} + {{- .Params.publication | markdownify -}}. + {{ end }} +

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

+ + {{/* MLA Style */}} + {{ else }} + + . + {{ .Title }}. + {{ if .Params.publication_short }} + {{- .Params.publication_short | markdownify -}}, + {{ else if .Params.publication }} + {{- .Params.publication | markdownify -}}, + {{ end }} + {{- .Date.Format "2006" -}}. +

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

+ + {{ end }} +
diff --git a/layouts/partials/publication_li_stream.html b/layouts/partials/publication_li_compact.html similarity index 92% rename from layouts/partials/publication_li_stream.html rename to layouts/partials/publication_li_compact.html index 59472d5a..abd47cfb 100644 --- a/layouts/partials/publication_li_stream.html +++ b/layouts/partials/publication_li_compact.html @@ -21,9 +21,7 @@
diff --git a/layouts/partials/publication_li_simple.html b/layouts/partials/publication_li_list.html similarity index 79% rename from layouts/partials/publication_li_simple.html rename to layouts/partials/publication_li_list.html index 62573d8e..25f92cf4 100644 --- a/layouts/partials/publication_li_simple.html +++ b/layouts/partials/publication_li_list.html @@ -2,9 +2,7 @@ {{ .Title }}

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

diff --git a/layouts/partials/publication_li_mla.html b/layouts/partials/publication_li_mla.html deleted file mode 100644 index a8a47955..00000000 --- a/layouts/partials/publication_li_mla.html +++ /dev/null @@ -1,16 +0,0 @@ -
- - . - {{ .Title }}. - {{ if .Params.publication_short }} - {{- .Params.publication_short | markdownify -}}, - {{ else if .Params.publication }} - {{- .Params.publication | markdownify -}}, - {{ end }} - {{- .Date.Format "2006" -}}. -

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

-
diff --git a/layouts/partials/talk_li_detailed.html b/layouts/partials/talk_li_card.html similarity index 100% rename from layouts/partials/talk_li_detailed.html rename to layouts/partials/talk_li_card.html diff --git a/layouts/partials/talk_li_stream.html b/layouts/partials/talk_li_compact.html similarity index 100% rename from layouts/partials/talk_li_stream.html rename to layouts/partials/talk_li_compact.html diff --git a/layouts/partials/talk_li_simple.html b/layouts/partials/talk_li_list.html similarity index 100% rename from layouts/partials/talk_li_simple.html rename to layouts/partials/talk_li_list.html diff --git a/layouts/partials/widgets/posts.html b/layouts/partials/widgets/posts.html index 69a9807c..5e66d329 100644 --- a/layouts/partials/widgets/posts.html +++ b/layouts/partials/widgets/posts.html @@ -13,37 +13,36 @@ {{ $query = $query | intersect $archive_page.Pages }} {{ end }} -{{ $count := len ($query) }} +{{ $count := len $query }}
-

{{ with $page.Title }}{{ . | markdownify }}{{ end }}

{{ with $page.Params.subtitle }}

{{ . | markdownify }}

{{ end }} - {{ if gt $count $page.Params.count }} -

- - {{ i18n "more_posts" | markdownify }} - - -

- {{ end }} -
{{ with $page.Content }}

{{ . | markdownify }}

{{ end }} {{ range $post := first $page.Params.count $query }} - {{ if eq $page.Params.list_format 0 }} - {{ partial "post_li_simple" . }} - {{ else if eq $page.Params.list_format 1 }} - {{ partial "post_li_detailed" . }} + {{ if eq $page.Params.view 1 }} + {{ partial "post_li_list" . }} + {{ else if eq $page.Params.view 3 }} + {{ partial "post_li_card" . }} {{ else }} - {{ partial "post_li_stream" . }} + {{ partial "post_li_compact" . }} {{ end }} {{end}} + {{ if gt $count $page.Params.count }} +
+ + {{ i18n "more_posts" | markdownify }} + + +
+ {{ end }} +
diff --git a/layouts/partials/widgets/projects.html b/layouts/partials/widgets/projects.html index ca140e4a..1693b810 100644 --- a/layouts/partials/widgets/projects.html +++ b/layouts/partials/widgets/projects.html @@ -71,9 +71,9 @@ {{ $link = $item.Params.external_link }} {{ $target = "target=\"_blank\" rel=\"noopener\"" }} {{ end }} - {{ if eq $page.Params.view 0 }} - {{ partial "project_li_simple" (dict "widget" $page "index" $idx "item" $item "link" $link "target" $target) }} - {{ else if eq $page.Params.view 1 }} + {{ if eq $page.Params.view 1 }} + {{ partial "project_li_list" (dict "widget" $page "index" $idx "item" $item "link" $link "target" $target) }} + {{ else if eq $page.Params.view 3 }} {{ partial "project_li_card" (dict "widget" $page "index" $idx "item" $item "link" $link "target" $target) }} {{ else }} {{ partial "project_li_showcase" (dict "widget" $page "index" $idx "item" $item "link" $link "target" $target) }} diff --git a/layouts/partials/widgets/publications.html b/layouts/partials/widgets/publications.html index 5426e20b..28a04d46 100644 --- a/layouts/partials/widgets/publications.html +++ b/layouts/partials/widgets/publications.html @@ -1,48 +1,45 @@ {{ $ := .root }} {{ $page := .page }} -{{ $pubs_len := len (where $.Site.RegularPages "Type" "publication") }} + +{{ $query := where $.Site.RegularPages "Type" "publication" }} +{{ if and ($page.Params.publication_type) (ne $page.Params.publication_type "-1") }} + {{ $query = where $query ".Params.publication_types" "intersect" (slice $page.Params.publication_type) }} +{{ end }} +{{ if $page.Params.exclude_featured }} + {{ $query = $query | intersect (where (where $.Site.RegularPages "Type" "publication") ".Params.featured" "!=" true) }} +{{ end }} + +{{ $count := len $query }}

{{ with $page.Title }}{{ . | markdownify }}{{ end }}

{{ with $page.Params.subtitle }}

{{ . | markdownify }}

{{ end }} - {{ if gt $pubs_len $page.Params.count }} -

- - {{ i18n "more_publications" | markdownify }} - - -

- {{ end }}
{{ with $page.Content }}

{{ . | markdownify }}

{{ end }} - {{ if and ($page.Params.publication_type) (ne $page.Params.publication_type "-1") }} - {{ $.Scratch.Set "recent_pubs" (where (where $.Site.RegularPages "Type" "publication") ".Params.publication_types" "intersect" (slice $page.Params.publication_type)) }} - {{ else }} - {{ $.Scratch.Set "recent_pubs" (where $.Site.RegularPages "Type" "publication") }} - {{ end }} - - {{ if $page.Params.exclude_featured }} - {{ $.Scratch.Set "recent_pubs" ( ($.Scratch.Get "recent_pubs") | intersect (where (where $.Site.RegularPages "Type" "publication") ".Params.featured" "!=" true) ) }} - {{ end }} - - {{ $recent_pubs := $.Scratch.Get "recent_pubs" }} - {{ range first $page.Params.count $recent_pubs }} - {{ if eq $page.Params.list_format 1 }} - {{ partial "publication_li_detailed" . }} - {{ else if eq $page.Params.list_format 2 }} - {{ partial "publication_li_apa" . }} - {{ else if eq $page.Params.list_format 3 }} - {{ partial "publication_li_mla" . }} - {{ else if eq $page.Params.list_format 4 }} - {{ partial "publication_li_stream" . }} + {{ range first $page.Params.count $query }} + {{ if eq $page.Params.view 1 }} + {{ partial "publication_li_list" . }} + {{ else if eq $page.Params.view 3 }} + {{ partial "publication_li_card" . }} + {{ else if eq $page.Params.view 4 }} + {{ partial "publication_li_citation" . }} {{ else }} - {{ partial "publication_li_simple" . }} + {{ partial "publication_li_compact" . }} {{ end }} {{ end }} + {{ if gt $count $page.Params.count }} +
+ + {{ i18n "more_publications" | markdownify }} + + +
+ {{ end }} +
diff --git a/layouts/partials/widgets/publications_featured.html b/layouts/partials/widgets/publications_featured.html index f62e2dfe..c7158beb 100644 --- a/layouts/partials/widgets/publications_featured.html +++ b/layouts/partials/widgets/publications_featured.html @@ -18,16 +18,14 @@ {{ $sel_pubs := $.Scratch.Get "sel_pubs" }} {{ range $sel_pubs }} - {{ if eq $page.Params.list_format 1 }} - {{ partial "publication_li_detailed" . }} - {{ else if eq $page.Params.list_format 2 }} - {{ partial "publication_li_apa" . }} - {{ else if eq $page.Params.list_format 3 }} - {{ partial "publication_li_mla" . }} - {{ else if eq $page.Params.list_format 4 }} - {{ partial "publication_li_stream" . }} + {{ if eq $page.Params.view 1 }} + {{ partial "publication_li_list" . }} + {{ else if eq $page.Params.view 3 }} + {{ partial "publication_li_card" . }} + {{ else if eq $page.Params.view 4 }} + {{ partial "publication_li_citation" . }} {{ else }} - {{ partial "publication_li_simple" . }} + {{ partial "publication_li_compact" . }} {{ end }} {{ end }} diff --git a/layouts/partials/widgets/talks.html b/layouts/partials/widgets/talks.html index fe79b923..8db286f2 100644 --- a/layouts/partials/widgets/talks.html +++ b/layouts/partials/widgets/talks.html @@ -1,39 +1,41 @@ {{ $ := .root }} {{ $page := .page }} -{{ $talks_len := len (where $.Site.RegularPages "Type" "talk") }} +{{ $count := len (where $.Site.RegularPages "Type" "talk") }}

{{ with $page.Title }}{{ . | markdownify }}{{ end }}

{{ with $page.Params.subtitle }}

{{ . | markdownify }}

{{ end }} - {{ if gt $talks_len $page.Params.count }} -

- - {{ i18n "more_talks" | markdownify }} - - -

- {{ end }}
{{ with $page.Content }}

{{ . | markdownify }}

{{ end }} - {{ $.Scratch.Set "talks" (where $.Site.RegularPages "Type" "talk") }} + {{ $talks := where $.Site.RegularPages "Type" "talk" }} {{/* Exclude talks shown in Featured Talks widget? */}} {{ if $page.Params.exclude_featured }} - {{ $.Scratch.Set "talks" (where ($.Scratch.Get "talks") ".Params.featured" "!=" true) }} + {{ $talks = (where $talks ".Params.featured" "!=" true) }} {{ end }} - {{ range first $page.Params.count (sort ($.Scratch.Get "talks") ".Params.time_start" "desc") }} - {{ if eq $page.Params.list_format 1 }} - {{ partial "talk_li_detailed" . }} - {{ else if eq $page.Params.list_format 2 }} - {{ partial "talk_li_stream" . }} + {{ range first $page.Params.count (sort $talks ".Params.time_start" "desc") }} + {{ if eq $page.Params.view 1 }} + {{ partial "talk_li_list" . }} + {{ else if eq $page.Params.view 3 }} + {{ partial "talk_li_card" . }} {{ else }} - {{ partial "talk_li_simple" . }} + {{ partial "talk_li_compact" . }} {{ end }} {{ end }} + + {{ if gt $count $page.Params.count }} +
+ + {{ i18n "more_talks" | markdownify }} + + +
+ {{ end }} +
diff --git a/layouts/partials/widgets/talks_featured.html b/layouts/partials/widgets/talks_featured.html index 2837ce30..6788e5b0 100644 --- a/layouts/partials/widgets/talks_featured.html +++ b/layouts/partials/widgets/talks_featured.html @@ -11,12 +11,12 @@ {{ with $page.Content }}

{{ . | markdownify }}

{{ end }} {{ range (sort (where (where $.Site.RegularPages "Type" "talk") ".Params.featured" true) ".Params.time_start" "desc") }} - {{ if eq $page.Params.list_format 1 }} - {{ partial "talk_li_detailed" . }} - {{ else if eq $page.Params.list_format 2 }} - {{ partial "talk_li_stream" . }} + {{ if eq $page.Params.view 1 }} + {{ partial "talk_li_list" . }} + {{ else if eq $page.Params.view 3 }} + {{ partial "talk_li_card" . }} {{ else }} - {{ partial "talk_li_simple" . }} + {{ partial "talk_li_compact" . }} {{ end }} {{ end }} diff --git a/layouts/project/single.html b/layouts/project/single.html index 7a1b7cf8..8b9b9695 100644 --- a/layouts/project/single.html +++ b/layouts/project/single.html @@ -22,12 +22,12 @@ {{ if ge $count 1 }}

{{ (i18n "posts") }}

{{ range $items }} - {{ if eq $page.Site.Params.projects.post_format 0 }} - {{ partial "post_li_simple" . }} - {{ else if eq $page.Site.Params.projects.post_format 1 }} - {{ partial "post_li_detailed" . }} + {{ if eq $page.Site.Params.projects.post_format 1 }} + {{ partial "post_li_list" . }} + {{ else if eq $page.Site.Params.projects.post_format 3 }} + {{ partial "post_li_card" . }} {{ else }} - {{ partial "post_li_stream" . }} + {{ partial "post_li_compact" . }} {{ end }} {{ end }} {{ end }} @@ -38,15 +38,13 @@

{{ (i18n "publications") }}

{{ range $items }} {{ if eq $page.Site.Params.projects.publication_format 1 }} - {{ partial "publication_li_detailed" . }} - {{ else if eq $page.Site.Params.projects.publication_format 2 }} - {{ partial "publication_li_apa" . }} + {{ partial "publication_li_list" . }} {{ else if eq $page.Site.Params.projects.publication_format 3 }} - {{ partial "publication_li_mla" . }} + {{ partial "publication_li_card" . }} {{ else if eq $page.Site.Params.projects.publication_format 4 }} - {{ partial "publication_li_stream" . }} + {{ partial "publication_li_citation" . }} {{ else }} - {{ partial "publication_li_simple" . }} + {{ partial "publication_li_compact" . }} {{ end }} {{ end }} {{ end }} @@ -57,11 +55,11 @@

{{ (i18n "talks") }}

{{ range sort $items ".Params.time_start" "desc" }} {{ if eq $page.Site.Params.projects.talk_format 1 }} - {{ partial "talk_li_detailed" . }} - {{ else if eq $page.Site.Params.projects.talk_format 2 }} - {{ partial "talk_li_stream" . }} + {{ partial "talk_li_list" . }} + {{ else if eq $page.Site.Params.projects.talk_format 3 }} + {{ partial "talk_li_card" . }} {{ else }} - {{ partial "talk_li_simple" . }} + {{ partial "talk_li_compact" . }} {{ end }} {{ end }} {{ end }} diff --git a/layouts/section/post.html b/layouts/section/post.html index ce3c7480..10adb21e 100644 --- a/layouts/section/post.html +++ b/layouts/section/post.html @@ -11,12 +11,12 @@ {{ $paginator := .Paginate .Data.Pages }} {{ range $paginator.Pages }} - {{ if eq $.Params.list_format 0 }} - {{ partial "post_li_simple" . }} - {{ else if eq $.Params.list_format 1 }} - {{ partial "post_li_detailed" . }} + {{ if eq $.Params.view 1 }} + {{ partial "post_li_list" . }} + {{ else if eq $.Params.view 3 }} + {{ partial "post_li_card" . }} {{ else }} - {{ partial "post_li_stream" . }} + {{ partial "post_li_compact" . }} {{ end }} {{ end }} diff --git a/layouts/section/publication.html b/layouts/section/publication.html index 602388ae..53a6e7ab 100644 --- a/layouts/section/publication.html +++ b/layouts/section/publication.html @@ -58,16 +58,14 @@ {{ end }}
- {{ if eq $.Params.list_format 1 }} - {{ partial "publication_li_detailed" . }} - {{ else if eq $.Params.list_format 2 }} - {{ partial "publication_li_apa" . }} - {{ else if eq $.Params.list_format 3 }} - {{ partial "publication_li_mla" . }} - {{ else if eq $.Params.list_format 4 }} - {{ partial "publication_li_stream" . }} + {{ if eq $.Params.view 1 }} + {{ partial "publication_li_list" . }} + {{ else if eq $.Params.view 3 }} + {{ partial "publication_li_card" . }} + {{ else if eq $.Params.view 4 }} + {{ partial "publication_li_citation" . }} {{ else }} - {{ partial "publication_li_simple" . }} + {{ partial "publication_li_compact" . }} {{ end }}
diff --git a/layouts/section/talk.html b/layouts/section/talk.html index d21948a4..a544583e 100644 --- a/layouts/section/talk.html +++ b/layouts/section/talk.html @@ -19,12 +19,12 @@
{{ range sort .Pages ".Params.time_start" "desc" }} - {{ if eq $.Params.list_format 1 }} - {{ partial "talk_li_detailed" . }} - {{ else if eq $.Params.list_format 2 }} - {{ partial "talk_li_stream" . }} + {{ if eq $.Params.view 1 }} + {{ partial "talk_li_list" . }} + {{ else if eq $.Params.view 3 }} + {{ partial "talk_li_card" . }} {{ else }} - {{ partial "talk_li_simple" . }} + {{ partial "talk_li_compact" . }} {{ end }} {{ end }} diff --git a/static/img/portrait.jpg b/static/img/portrait.jpg deleted file mode 100644 index d1361fd8..00000000 Binary files a/static/img/portrait.jpg and /dev/null differ