Merge pull request #220 from gonuke/fall23_maintenance

Fall23 maintenance
cnerg · Sep 12, 2023 · 7cf2c4c · 7cf2c4c
2 parents 58d465a + cf599af
commit 7cf2c4c
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 84 deletions.
diff --git 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
@@ -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
@@ -2,74 +2,54 @@
 layout: default
 ---
 <article>
-
+  
   <header>
   </header>
-
+  
   <section>
     <p><a href="/">CNERG</a> / <a href="../">Members of CNERG Community</a></p>
     <div class="container">
-
-      {% if page.services.twitter != null  and page.twitter-feed == true %}
       <div class="row">
-        <div class="col-sm-10">
-      {% endif %}
-
-          <div class="row">
-            <div class="col-sm-4">
-              <img class="cnerg-person-headshot" src="{{ page.image }}">
-            </div>
-            <div class="col-sm-8">
-              <h1>{{ page.title | escape }}</h1>
-              <h2>{{ page.role | escape}}</h2>
-              {% for address in page.email %}
-              <a href="mailto:{{ address }}">{{ address }}</a></br>
-              {% endfor %}
-              {{ page.phone }}</br>
-              {{ page.room }}</br>
-              {% if page.google_map != null %}
-              <a href="{{ page.google_map }}" target=_blank>
-                  {{ page.address }}</br>
-              </a>
-              {% else %}
-              {{ page.address }}</br>
-              {% endif %}
-              {{ page.city_state_zip }}</br>
-              <p></p>
-              {% 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 %}
-              <a href="{{ baseurl }}{{ username }}" target="_blank">
-                <img class="cnerg-service-icon" src="{{ site.baseurl }}/services/icons/{{ icon }}" alt="icon for {{ key }}">
-              </a>
-              {% endfor %}
-              {% if page.personal_website != null %}
-              <br/><a href="{{ page.personal_website }}">Personal Website</a>
-              {% endif %}
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-sm-12">
-              {{ content }}
-            </div>
-          </div>
-
-
-      {% if page.services.twitter != null  and page.twitter-feed == true %}
+        <div class="col-sm-4">
+          <img class="cnerg-person-headshot" src="{{ page.image }}">
         </div>
-        <div class="col-sm-2">
-          <a class="twitter-timeline"
-             href="https://twitter.com/{{ page.services.twitter }}"
-             data-width="300"
-             data-height="600"
-             data-chrome="nofooter noborders transparent">News from {{ page.services.twitter }}</a>
-          <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+        <div class="col-sm-8">
+          <h1>{{ page.title | escape }}</h1>
+          <h2>{{ page.role | escape}}</h2>
+          {% for address in page.email %}
+          <a href="mailto:{{ address }}">{{ address }}</a></br>
+          {% endfor %}
+          {{ page.phone }}</br>
+          {{ page.room }}</br>
+          {% if page.google_map != null %}
+          <a href="{{ page.google_map }}" target=_blank>
+            {{ page.address }}</br>
+          </a>
+          {% else %}
+          {{ page.address }}</br>
+          {% endif %}
+          {{ page.city_state_zip }}</br>
+          <p></p>
+          {% 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 %}
+          <a href="{{ baseurl }}{{ username }}" target="_blank">
+            <img class="cnerg-service-icon" src="{{ site.baseurl }}/services/icons/{{ icon }}" alt="icon for {{ key }}">
+          </a>
+          {% endfor %}
+          {% if page.personal_website != null %}
+          <br/><a href="{{ page.personal_website }}">Personal Website</a>
+          {% endif %}
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm-12">
+          {{ content }}
         </div>
       </div>
-      {% endif %}
     </div>
   </section>
-
+  
 </article>
diff --git a/index.html b/index.html
@@ -11,7 +11,7 @@ <h1 class="cnerg-center">Mission: <br/>{{ site.data.mission_and_values.mission }
     <div class="container">
       <div class="row row-no-gutters">
           {% for area in site.data.areas %}
-          <div class="col-sm-3 portfolio-item">
+          <div class="col-sm-4 portfolio-item">
             <div class="cnerg-home-title">
               <h2>{{ area.title }}</h2>
             </div>
@@ -27,14 +27,6 @@ <h2>{{ area.title }}</h2>
             {{ area.desc }}
           </div>
           {% endfor %}
-          <div class="col-sm-3">
-          <a class="twitter-timeline"
-             href="https://twitter.com/uw_cnerg"
-             data-width="300"
-             data-height="600"
-             data-chrome="nofooter noborders transparent">News from @uw_cnerg</a>
-          <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-          </div>
       </div>
     </div>
   </section>