use the same author format for everything (#405)

Fix #385
ropensci-archive · Jan 19, 2019 · 9964cfc · 9964cfc
1 parent c57381e
commit 9964cfc
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 50 deletions.
diff --git a/content/events/2018-12-11-karthik-agu.md b/content/events/2018-12-11-karthik-agu.md
@@ -6,8 +6,7 @@ description: 'At AGU? Come say hi!'
 location: 'Washington, DC, USA'
 country: '🇺🇸'
 attendees:
-  - name: 'Karthik Ram'
-    twitter: _inundata
+  - Karthik Ram
 ---
 
-Are you attending [AGU18](https://fallmeeting.agu.org/2018/)? Have questions about rOpenSci? Our Project Lead and co-founder Karthik Ram will be there and happy to chat.
+Are you attending [AGU18](https://fallmeeting.agu.org/2018/)? Have questions about rOpenSci? Our Project Lead and co-founder Karthik Ram will be there and happy to chat.
diff --git a/content/events/2019-01-12-stef-aaas.md b/content/events/2019-01-12-stef-aaas.md
@@ -6,8 +6,7 @@ description: 'Stefanie participating as mentor. Meet up in DC?'
 location: 'Washington, DC, USA'
 country: '🇺🇸'
 attendees:
-  - name: 'Stefanie Butland'
-    twitter: stefaniebutland
+  - Stefanie Butland
 ---
 
 Our Community Manager, Stefanie Butland, will be participating as a mentor for the 2019 cohort of [AAAS-Community Engagement Fellows](https://www.aaas.org/programs/community-engagement-fellows). Are you in DC and have questions about rOpenSci? Let's find time to chat. Contact stefanie [at] ropensci.org
diff --git a/content/events/2019-01-15-rstudioconf.md b/content/events/2019-01-15-rstudioconf.md
@@ -6,10 +6,8 @@ description: 'Karthik and Jeroen giving talks'
 location: 'Austin, TX, USA'
 country: '🇺🇸'
 attendees:
-  - name: 'Karthik Ram'
-    twitter: _inundata
-  - name: 'Jeroen Ooms'
-    twitter: opencpu
+  - Karthik Ram
+  - Jeroen Ooms
 ---
 
 Two members of our team will attend [rstudio::conf](http://www.cvent.com/events/rstudio-conf-austin/event-summary-dd6d75526f3c4554b67c4de32aeffb47.aspx), chat with them if you have questions about rOpenSci.

diff --git a/content/events/2019-01-25-conectar.md b/content/events/2019-01-25-conectar.md
@@ -6,8 +6,7 @@ description: 'Keynote talk'
 location: 'San Jose, Costa Rica'
 country: '🇨🇷'
 attendees:
-  - name: 'Maëlle Salmon'
-    twitter: ma_salmon
+  - Maëlle Salmon
 ---
 
-Our software engineer Maëlle Salmon will give a keynote talk about rOpenSci at the [ConectaR 2019 conference](https://www.conectar2019.org/).
+Our software engineer Maëlle Salmon will give a keynote talk about rOpenSci at the [ConectaR 2019 conference](https://www.conectar2019.org/).
diff --git a/content/events/2019-02-12-dataone.md b/content/events/2019-02-12-dataone.md
@@ -6,10 +6,8 @@ description: 'rOpenSci: high quality research software for reproducible data sci
 location: 'webinar'
 country: "\U0001F310"
 attendees:
-  - name: 'Karthik Ram'
-    twitter: _inundata
-  - name: 'Scott Chamberlain'
-    twitter: sckottie
+  - Karthik Ram
+  - Scott Chamberlain
 ---
 
 ### rOpenSci: high quality research software for reproducible data science

diff --git a/content/events/2019-03-29-urfist-bordeaux.md b/content/events/2019-03-29-urfist-bordeaux.md
@@ -6,8 +6,7 @@ description: 'Repenser la robustesse et la fiabilité en recherche - les cherche
 location: 'Bordeaux, France'
 country: '🇫🇷'
 attendees:
-  - name: 'Maëlle Salmon'
-    twitter: ma_salmon
+  - Maëlle Salmon
 ---
 
 Our software engineer and associate editor Maëlle Salmon will give an invited talk about rOpenSci [Software Peer Review](http://ropensci.org/software-review), in French, at the ["Repenser la robustesse et la fiabilité en recherche : les chercheurs face à la crise de la reproductibilité" scientific meeting](https://sygefor.reseau-urfist.fr/#/training/7705/8525/7338a781b57bf45847c702bfd05b2a80) organized by [URFIST de Bordeaux](http://weburfist.univ-bordeaux.fr/).
diff --git a/themes/ropensci/layouts/events/single.html b/themes/ropensci/layouts/events/single.html
@@ -8,7 +8,7 @@ <h1 style="text-align: center;">{{ .Title }}</h1>
 
                     <div class="col-offset-2 col-8 top-10 bottom-5" style="font-size: 20px; text-align: center;">
                         <p class="authors" style="text-align: center;">
-                            {{$authors := .Params.attendees}} {{ partial "authorsevents.html" (dict "authors" $authors "Site" $.Site) }}
+                            {{$authors := .Params.attendees}} {{ partial "authors.html" (dict "authors" $authors "Site" $.Site) }}
                         </p>
                         <br> {{ $start := (time .Params.dateStart)}} {{ $beautifulstart := $start.Format "Monday, 2006/01/02"}}
                         {{ $end := (time .Params.dateEnd)}} {{ $beautifulend := $end.Format "Monday, 2006/01/02"}}

diff --git a/themes/ropensci/layouts/partials/authorsevents.html b/themes/ropensci/layouts/partials/authorsevents.html
diff --git a/themes/ropensci/layouts/partials/authorssimpler.html b/themes/ropensci/layouts/partials/authorssimpler.html
@@ -1,16 +1,10 @@
-{{$staff := .Site.Params.staff}}
-{{$leadership := .Site.Params.leadership}}
-
+{{$pages := .Site.Pages.ByPublishDate.Reverse}}
 {{ range $i, $e := .authors }}
 {{ if $i }}, 
   {{ end }}
-                            {{ if in $leadership .name }}
-                              <a href="/about/#team">{{ .name }}</a> 
-                            {{ else if in $staff .name }}
-                              <a href="/about/#team">{{ .name }}</a>
-                            {{ else if eq .name "Ted Hart" }}
-                              <a href="{{.Site.BaseURL}}/about/#team">{{ .name }}</a>
-                            {{ else }}
-                              <a href="{{ .url }}" target="_blank">{{ .name }}</a>
-                            {{end}}
-                        {{ end }}
+
+  {{ range first 1 (where $pages ".Params.name" $e) }}
+                            &nbsp;
+                            <a href="{{ .Permalink }}">{{ .Params.name }}</a>
+  {{ end }}
+{{end}}