diff --git a/content/authors/adam-buttrick/_index.md b/content/authors/adam-buttrick/_index.md new file mode 100644 index 00000000..23a20685 --- /dev/null +++ b/content/authors/adam-buttrick/_index.md @@ -0,0 +1,17 @@ ++++ +title = "Adam Buttrick" +draft = false +layout = "author" +orcid = "https://orcid.org/0000-0003-1507-1031" +affiliation = "Crossref" +affiliation2 = "California Digital Library" +affiliation2start = "2024-05-23" +ror = "https://ror.org/02twcfp32" +ror2 = "https://ror.org/03yrm5c26" +link = "" +bio = "" +avatar = "" +jobtitle = "" ++++ + + diff --git a/content/authors/amanda-french/_index.md b/content/authors/amanda-french/_index.md new file mode 100644 index 00000000..78766453 --- /dev/null +++ b/content/authors/amanda-french/_index.md @@ -0,0 +1,17 @@ ++++ +title = "Amanda French" +draft = false +layout = "author" +orcid = "https://orcid.org/0000-0002-4325-1809" +affiliation = "Crossref" +affiliation2 = "" +affiliation2start = "" +ror = "https://ror.org/02twcfp32" +ror2 = "" +link = "" +bio = "" +avatar = "" +jobtitle = "" ++++ + + diff --git a/content/authors/datacite/_index.md b/content/authors/datacite/_index.md new file mode 100644 index 00000000..7a420d56 --- /dev/null +++ b/content/authors/datacite/_index.md @@ -0,0 +1,12 @@ ++++ +title = "DataCite" +draft = false +layout = "author" +orcid = "" +affiliation = "" +ror = "https://ror.org/04wxnsj81" +link = "" +bio = "" +avatar = "" +jobtitle = "" ++++ \ No newline at end of file diff --git a/content/authors/maria-gould/_index.md b/content/authors/maria-gould/_index.md new file mode 100644 index 00000000..bcf702a1 --- /dev/null +++ b/content/authors/maria-gould/_index.md @@ -0,0 +1,15 @@ ++++ +title = "Maria Gould" +draft = false +layout = "author" +orcid = "https://orcid.org/0000-0002-2916-3423" +affiliation = "California Digital Library" +affiliation2 = "DataCite" +affiliation2start = "2024-01-23" +ror = "https://ror.org/03yrm5c26" +ror2 = "https://ror.org/04wxnsj81" +link = "" +bio = "" +avatar = "" +jobtitle = "" ++++ diff --git a/content/authors/ror-core-team/_index.md b/content/authors/ror-core-team/_index.md new file mode 100644 index 00000000..d53eab4e --- /dev/null +++ b/content/authors/ror-core-team/_index.md @@ -0,0 +1,12 @@ ++++ +title = "ROR Core Team" +draft = false +layout = "author" +orcid = "" +affiliation = "" +ror = "" +link = "https://ror.org/about/#core-team" +bio = "" +avatar = "" +jobtitle = "" ++++ \ No newline at end of file diff --git a/content/blog/2023-09-14-beta-test.md b/content/blog/2023-09-14-beta-test.md index 6206076f..30aaaa3c 100644 --- a/content/blog/2023-09-14-beta-test.md +++ b/content/blog/2023-09-14-beta-test.md @@ -10,7 +10,7 @@ banner = "/img/banners/ROR_Banner-green.png" thumb = "/img/ror-v2.png" images = ['img/ror-v2.png'] authors = ["Liz Krznarich", "Amanda French"] -description = "After nearly a year of planning and community input, we are thrilled to release a beta version of ROR's first major schema and API update, which is open to the public for testing through **October 16, 2023.**" +description = "After nearly a year of planning and community input, we are thrilled to release a beta version of ROR's first major schema and API update, which is open to the public for testing through October 16, 2023." +++ {{< callout color="green" icon="no-icon" >}} diff --git a/data/authors/authors.yaml b/data/authors/authors.yaml deleted file mode 100644 index 5a82bd30..00000000 --- a/data/authors/authors.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- fullname: Amanda French - orcid: https://orcid.org/0000-0002-4325-1809 - ror: https://ror.org/02twcfp32 - affiliation: Crossref -- fullname: Maria Gould - orcid: https://orcid.org/0000-0002-2916-3423 - ror: https://ror.org/04wxnsj81 - affiliation: DataCite - diff --git a/static/img/ror-icon-rgb.svg b/static/img/ror-icon-rgb.svg new file mode 100644 index 00000000..58c14b91 --- /dev/null +++ b/static/img/ror-icon-rgb.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/themes/hugo-ror/archetypes/authors.md b/themes/hugo-ror/archetypes/authors.md new file mode 100644 index 00000000..7a7df7df --- /dev/null +++ b/themes/hugo-ror/archetypes/authors.md @@ -0,0 +1,13 @@ ++++ +title = "{{ title (replace .ContentBaseName "-" " ") }}" +draft = false +layout = "author" +orcid = "" +affiliation = "" +ror = "" +link = "" +bio = "" +avatar = "" +jobtitle = "" ++++ + diff --git a/themes/hugo-ror/archetypes/blog.md b/themes/hugo-ror/archetypes/blog.md index c2f7d512..fbcb1e42 100644 --- a/themes/hugo-ror/archetypes/blog.md +++ b/themes/hugo-ror/archetypes/blog.md @@ -1,5 +1,5 @@ +++ -title = "{{replace .TranslationBaseName "-" " "}}" +title = "{{title (replace .TranslationBaseName "-" " ")}}" date = "{{.Date}}" draft = false tags = ["", ""] diff --git a/themes/hugo-ror/archetypes/default.md b/themes/hugo-ror/archetypes/default.md index 17cf7594..cafd5bc7 100644 --- a/themes/hugo-ror/archetypes/default.md +++ b/themes/hugo-ror/archetypes/default.md @@ -1,5 +1,5 @@ +++ -title = "{{replace .TranslationBaseName "-" " "}}" +title = "{{title (replace .TranslationBaseName "-" " ")}}" date = "{{.Date}}" author = "Research Organization Registry (ROR)" draft = false diff --git a/themes/hugo-ror/archetypes/events.md b/themes/hugo-ror/archetypes/events.md index 9592d0fb..6f3113b8 100644 --- a/themes/hugo-ror/archetypes/events.md +++ b/themes/hugo-ror/archetypes/events.md @@ -1,5 +1,5 @@ +++ -title = "{{ replace .TranslationBaseName "-" " " | title }}" +title = "{{ title (replace .TranslationBaseName "-" " ")}}" date = "{{ .Date }}" draft = "false" style = "card-plain" diff --git a/themes/hugo-ror/assets/sass/partials/_hugo-ror.scss b/themes/hugo-ror/assets/sass/partials/_hugo-ror.scss index 03f5a259..458315a2 100644 --- a/themes/hugo-ror/assets/sass/partials/_hugo-ror.scss +++ b/themes/hugo-ror/assets/sass/partials/_hugo-ror.scss @@ -7022,6 +7022,12 @@ font-size: 2.75rem; } } +/* jumbotron */ + +.jumbotron { + padding: .75em 0 .75em 0; +} + /* header anchor links */ @@ -7146,3 +7152,37 @@ margin-bottom: 1em; border: 1px solid gray; } +/* blog authors with metadata on single posts */ + +.blogauthors { + display: inline; + flex-wrap: wrap; + float: left; + max-width: 75%; + font-family:AH-Bold; + line-height: 1.75em; + padding: 0; + margin: 0; +} + +.iconlink:hover { + opacity: 70%; + text-decoration:none; +} + +.blogdate { + display: inline; + float: right; + font-family:AH-Bold; +} + +.fa-arrow-up-right-from-square { + color: grey; +} + + +/* author page */ + +.medium-text { +font-size:medium; +} diff --git a/themes/hugo-ror/layouts/_default/author.html b/themes/hugo-ror/layouts/_default/author.html index 80b4e539..96a3673c 100644 --- a/themes/hugo-ror/layouts/_default/author.html +++ b/themes/hugo-ror/layouts/_default/author.html @@ -16,32 +16,59 @@
-
-
-

Hi I'm the author template

- +
+ + +

{{ .Title }}

- {{ if .Params.orcid }} -

ORCID: {{ .Params.orcid }}

- {{ end }} - - {{ if .Params.affiliation }} -

Affiliation: {{ .Params.affiliation }}{{ if .Params.ror }} - - {{ .Params.ror }}{{ end }}

- {{ end }} +

{{ if .Params.orcid }}{{ end }} + {{ if .Params.affiliation2start }} + {{ else if .Params.ror }}{{ end }} + {{ if .Params.link }} {{ end }}

- {{ .Content }} - {{ range .Data.Terms.ByCount }} -

{{ .Page.LinkTitle }} ({{ .Count }})

- - {{ end }} + +
+ +
+ + +
+ +

{{ .Title }}'s posts

+ + {{ $authorposts := where .Data.Pages "Type" "blog" }} + {{ range $authorposts }} + +
+
+
+
+
+ {{ .Date.Format "Jan 02, 2006" }} +
+
+ {{ .Title }} +
+
+
+
+
+ {{ end }} + +
+ +
+ +
+ + + + {{ partial "sidebar.html" . }} + +
diff --git a/themes/hugo-ror/layouts/_default/index.atom.xml b/themes/hugo-ror/layouts/_default/index.atom.xml index 823015d6..4455a3d1 100644 --- a/themes/hugo-ror/layouts/_default/index.atom.xml +++ b/themes/hugo-ror/layouts/_default/index.atom.xml @@ -37,7 +37,9 @@ {{- range .GetTerms "authors" }} {{ .Page.Title }} - {{ with .Page.Params.orcid }}{{ . }}{{ end }} + {{ if .Page.Params.orcid }}{{ .Page.Params.orcid }} + {{ else if .Page.Params.ror }}{{ .Page.Params.ror }} + {{ else if .Page.Params.link }}{{ .Page.Params.link }}{{ end }} {{- end }} diff --git a/themes/hugo-ror/layouts/_default/taxonomy.html b/themes/hugo-ror/layouts/_default/taxonomy.html index cf48a26f..502a0a05 100644 --- a/themes/hugo-ror/layouts/_default/taxonomy.html +++ b/themes/hugo-ror/layouts/_default/taxonomy.html @@ -28,7 +28,7 @@

{{ .Page.LinkTitle }} ({{ .Count }})< {{ end }} {{ end }} - +

diff --git a/themes/hugo-ror/layouts/blog/single.html b/themes/hugo-ror/layouts/blog/single.html index 48dbd14c..887a2c53 100755 --- a/themes/hugo-ror/layouts/blog/single.html +++ b/themes/hugo-ror/layouts/blog/single.html @@ -19,6 +19,7 @@
{{ partial "author-metadata.html" . }} +
{{ .Content }} diff --git a/themes/hugo-ror/layouts/partials/author-metadata.html b/themes/hugo-ror/layouts/partials/author-metadata.html index 6da6d7d5..cc9c6704 100644 --- a/themes/hugo-ror/layouts/partials/author-metadata.html +++ b/themes/hugo-ror/layouts/partials/author-metadata.html @@ -1,17 +1,36 @@ -

- - {{ if .Params.authors }} - - {{ $authors := .Params.authors }} - - By {{ delimit $authors ", " " and " }} - - {{ else if .Params.author }} - By {{ .Params.author }} - - {{ else }} - By {{ .Site.Params.author.name }} - {{ end }} - - | {{ .Date.Format "January 2, 2006" }} -

+
+ +{{- $blogdate := time.AsTime .Date }} + + +By +{{- range $index, $author := .GetTerms "authors" }} +{{- if gt $index 0 }}, {{- end }} + + {{ .Page.Title }} + +{{- with .Page.Params.orcid }} {{- end }} + +{{- if .Page.Params.affiliation2start }} + {{- $affdate := time.AsTime .Page.Params.affiliation2start }} + {{- if $blogdate.After $affdate }} + {{- with .Page.Params.ror2 }} {{- end }} + {{- else }} + {{- if $blogdate.Before $affdate }} + {{- with .Page.Params.ror }} {{- end }} + {{- end }} + {{- end }} + +{{- else if .Page.Params.ror }} + +{{- end }} + +{{- with .Page.Params.link }} {{- end }} + +{{- end -}} + + + +{{- .Date.Format "January 2, 2006" }} + +
diff --git a/themes/hugo-ror/layouts/partials/authors-date.html b/themes/hugo-ror/layouts/partials/authors-date.html index 2aee73b1..2f413a19 100644 --- a/themes/hugo-ror/layouts/partials/authors-date.html +++ b/themes/hugo-ror/layouts/partials/authors-date.html @@ -1,10 +1,8 @@

{{ if .Params.authors }} - - {{ $authors := .Params.authors }} - - By {{ delimit $authors ", " " and " }} + + By {{ delimit .Params.authors ", " " and " }} {{ else if .Params.author }} By {{ .Params.author }}