From c50d008881cf02326ed1a767f94b50bc9c36b4fc Mon Sep 17 00:00:00 2001 From: George Cushen Date: Mon, 4 Feb 2019 22:42:51 +0000 Subject: [PATCH] sync Academic v4 (list_format -> view) --- config/_default/params.toml | 30 ++++++++++----------------- content/author/admin/_index.md | 19 +++-------------- content/home/about.md | 1 - content/home/accomplishments.md | 2 +- content/home/contact.md | 5 ++--- content/home/hero.md | 5 ++--- content/home/hero_carousel.md | 5 ++--- content/home/posts.md | 11 +++++----- content/home/projects.md | 12 +++++------ content/home/publications.md | 18 +++++++--------- content/home/publications_featured.md | 20 ++++++++---------- content/home/skills.md | 10 ++------- content/home/tags.md | 5 ++--- content/home/talks.md | 15 +++++++------- content/home/talks_featured.md | 15 +++++++------- content/home/teaching.md | 5 ++--- content/post/_index.md | 11 +++++----- content/publication/_index.md | 14 ++++++------- content/talk/_index.md | 11 +++++----- themes/academic | 2 +- 20 files changed, 86 insertions(+), 130 deletions(-) diff --git a/config/_default/params.toml b/config/_default/params.toml index c99a108..b75eb70 100644 --- a/config/_default/params.toml +++ b/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 = 2 + talk_view = 2 # Search. [search] diff --git a/content/author/admin/_index.md b/content/author/admin/_index.md index b15df05..c1e2a99 100644 --- a/content/author/admin/_index.md +++ b/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/content/home/about.md b/content/home/about.md index 9284093..cdc6a6d 100644 --- a/content/home/about.md +++ b/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/content/home/accomplishments.md b/content/home/accomplishments.md index e829b10..0c8463b 100644 --- a/content/home/accomplishments.md +++ b/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/content/home/contact.md b/content/home/contact.md index d8e684c..bc63b2a 100644 --- a/content/home/contact.md +++ b/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/content/home/hero.md b/content/home/hero.md index 4cdd1f5..f903b64 100644 --- a/content/home/hero.md +++ b/content/home/hero.md @@ -1,8 +1,7 @@ +++ # Hero widget. -widget = "hero" -active = false -date = 2017-10-15T00:00:00 +widget = "hero" # Do not modify this line! +active = false # Activate this widget? true/false title = "Academic" diff --git a/content/home/hero_carousel.md b/content/home/hero_carousel.md index e990220..e9b2398 100644 --- a/content/home/hero_carousel.md +++ b/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/content/home/posts.md b/content/home/posts.md index e4d8589..97db3a5 100644 --- a/content/home/posts.md +++ b/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/content/home/projects.md b/content/home/projects.md index acbf9fe..70929a4 100644 --- a/content/home/projects.md +++ b/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/content/home/publications.md b/content/home/publications.md index 8a4760d..27b91c3 100644 --- a/content/home/publications.md +++ b/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/content/home/publications_featured.md b/content/home/publications_featured.md index 2b6839f..68ef514 100644 --- a/content/home/publications_featured.md +++ b/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/content/home/skills.md b/content/home/skills.md index 6fe72e5..015ac24 100644 --- a/content/home/skills.md +++ b/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/content/home/tags.md b/content/home/tags.md index 5ac0755..84a5966 100644 --- a/content/home/tags.md +++ b/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/content/home/talks.md b/content/home/talks.md index 37ec9c3..b76ac36 100644 --- a/content/home/talks.md +++ b/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/content/home/talks_featured.md b/content/home/talks_featured.md index 3084617..b02b5e3 100644 --- a/content/home/talks_featured.md +++ b/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/content/home/teaching.md b/content/home/teaching.md index 06a1a45..8250cb3 100644 --- a/content/home/teaching.md +++ b/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 = "Custom Section" diff --git a/content/post/_index.md b/content/post/_index.md index 196690b..026a4b4 100644 --- a/content/post/_index.md +++ b/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/content/publication/_index.md b/content/publication/_index.md index 2298435..bc92542 100644 --- a/content/publication/_index.md +++ b/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/content/talk/_index.md b/content/talk/_index.md index 1bd2ab2..2758568 100644 --- a/content/talk/_index.md +++ b/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/themes/academic b/themes/academic index e913aac..2838919 160000 --- a/themes/academic +++ b/themes/academic @@ -1 +1 @@ -Subproject commit e913aacb340d161c20f2e3e50e113e5d0e3df833 +Subproject commit 283891941513e0dcfc40027847eaed96242e9c57