diff --git a/_data/people.yml b/_data/people.yml index 2f9dd4f5..e8a4b6f2 100644 --- a/_data/people.yml +++ b/_data/people.yml @@ -10,14 +10,6 @@ - group: 'Graduate Students' people: - - name: "Lucas Jacobson" - url: "ljj" - role: "PhD Candidate" - image: jacobson_avatar.png - - name: "Young Hui Park" - url: "yhp" - role: "PhD Candidate" - image: hacker_park.jpg - name: "Nancy Granda-Duarte" url: "ngd" role: "PhD Candidate, GERS" @@ -58,10 +50,6 @@ url: "bq" role: "Undergraduate Researcher" image: Bowen_Quan.jpg - - name: "Kenneth Lee" - url: "kl" - role: "Undergraduate Intern" - image: Kenneth_Lee.jpeg - name: "Damian Jilk" url: "dj" role: "Undergraduate Intern" @@ -79,7 +67,7 @@ role: "Undergraduate Researcher" image: synh.png -- group: 'Alumni' +- group: 'Alumni and Former CNERG members' people: - name: Tae Wook Ahn url: @@ -98,11 +86,11 @@ employer: Oak Ridge National Laboratory employer_url: http://www.ornl.gov - name: Philip Britt - url: + url: https://www.linkedin.com/in/philip-britt-aa1a2b1b6/ year: 2021 role: PhD - employer: Oak Ridge National Laboratory - employer_url: http://www.ornl.gov + employer: TerraPower + employer_url: https://www.terrapower.com/ - name: Goeff Bull url: year: 2005 @@ -215,6 +203,9 @@ role: Programmer employer: employer_url: + - name: "Lucas Jacobson" + role: MS + year: 2018 - name: C Grace Kelly year: 2021 role: Undergraduate intern @@ -246,6 +237,8 @@ role: BS Nuclear Engineering employer: Naval Nuclear Laboratory employer_url: https://navalnuclearlab.energy.gov/ + - name: "Kenneth Lee" + role: "Undergraduate Intern" - name: Piper Lincoln url: https://www.linkedin.com/in/piperlincoln year: 2020 @@ -298,6 +291,9 @@ role: PhD employer: TerraPower employer_url: https://www.terrapower.com + - name: "Young Hui Park" + year: 2021 + role: MS - name: Phiphat Phruksarojanakun url: year: 2007 diff --git a/_data/services.yml b/_data/services.yml index 52d8844a..b45d6350 100644 --- a/_data/services.yml +++ b/_data/services.yml @@ -32,4 +32,7 @@ zotero: orcid: baseurl: https://orcid.org/ icon: orcid.png +bluesky: + baseurl: "https://bsky.app/profile/" + icon: bluesky.png diff --git a/_layouts/person.html b/_layouts/person.html index 20feac7d..2436776b 100644 --- a/_layouts/person.html +++ b/_layouts/person.html @@ -2,74 +2,54 @@ layout: default ---
- +
- +

CNERG / Members of CNERG Community

- - {% if page.services.twitter != null and page.twitter-feed == true %}
-
- {% endif %} - -
-
- -
-
-

{{ page.title | escape }}

-

{{ page.role | escape}}

- {% for address in page.email %} - {{ address }}
- {% endfor %} - {{ page.phone }}
- {{ page.room }}
- {% if page.google_map != null %} - - {{ page.address }}
-
- {% else %} - {{ page.address }}
- {% endif %} - {{ page.city_state_zip }}
-

- {% for service in page.services %} - {% assign key = service[0] %} - {% assign username = service[1] %} - {% assign baseurl = site.data.services[key].baseurl %} - {% assign icon = site.data.services[key].icon %} - - icon for {{ key }} - - {% endfor %} - {% if page.personal_website != null %} -
Personal Website - {% endif %} -
-
-
-
- {{ content }} -
-
- - - {% if page.services.twitter != null and page.twitter-feed == true %} +
+
-
- - +
+

{{ page.title | escape }}

+

{{ page.role | escape}}

+ {% for address in page.email %} + {{ address }}
+ {% endfor %} + {{ page.phone }}
+ {{ page.room }}
+ {% if page.google_map != null %} + + {{ page.address }}
+
+ {% else %} + {{ page.address }}
+ {% endif %} + {{ page.city_state_zip }}
+

+ {% for service in page.services %} + {% assign key = service[0] %} + {% assign username = service[1] %} + {% assign baseurl = site.data.services[key].baseurl %} + {% assign icon = site.data.services[key].icon %} + + icon for {{ key }} + + {% endfor %} + {% if page.personal_website != null %} +
Personal Website + {% endif %} +
+
+
+
+ {{ content }}
- {% endif %}
- +
diff --git a/index.html b/index.html index 73fc3a90..192b9567 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@

Mission:
{{ site.data.mission_and_values.mission }
{% for area in site.data.areas %} -
+

{{ area.title }}

@@ -27,14 +27,6 @@

{{ area.title }}

{{ area.desc }}
{% endfor %} -