Merge pull request #17 from sliao7/improvement/code-restructuring

sbryngelson · May 29, 2024 · 4bdbc6d · 4bdbc6d
2 parents 006b9b9 + 60a38ce
commit 4bdbc6d
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 125 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,11 @@
 source 'https://rubygems.org'
 
-gem "jekyll", "4.1.1"
-gem "thin", ">=1.8.0"
+gem "jekyll", "4.3.3"
 gem "rack", ">= 2.2.3"
-gem "sassc", ">2.0.1"
 gem "kramdown-parser-gfm"
 gem 'jekyll-scholar'
 gem "webrick", "~> 1.7"
+gem "csv"
+gem "base64"
+gem "bigdecimal"
+gem "observer"
diff --git a/_data/pi.yml b/_data/pi.yml
@@ -6,17 +6,12 @@
   researchgate: https://www.researchgate.net/
   scholar: https://scholar.google.com/citations?user=B7vSqZsAAAAJ
   cv: cv/cv.pdf
-  # Change the number below to the number of "educations" you have (up to 6)
-  number_educ: 2
-  education1: "(1942) Ph.D. Physics, Princeton University"
-  education2: "(1939) B.S. Physics, Massachusetts Institute of Technology"
-  # education3: 
-  # education4: 
-  # education5: 
-  # education6: 
-  education1short: (1942) Ph.D. Physics, Princeton
-  education2short: (1939) B.S. Physics, MIT
-  # education3short: 
-  # education4short: 
-  # education5short: 
-  # education6short: 
+  # Change the items in "education" you have (up to 6)
+  education:
+    [
+      "(1942) Ph.D. Physics, Princeton University",
+      "(1939) B.S. Physics, Massachusetts Institute of Technology",
+    ]
+
+  educationshort:
+    ["(1942) Ph.D. Physics, Princeton", "(1939) B.S. Physics, MIT"]
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -14,45 +14,11 @@ <h4>{{ member.name }}</h4>
   </center>
 
   <ul style="overflow: hidden">
-  {% if member.number_educ == 1 %}
-  <li> {{ member.education1short | replace: "-","&#8211;"}} </li>
-  {% endif %}
-
-  {% if member.number_educ == 2 %}
-  <li> {{ member.education1short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2short | replace: "-","&#8211;"}} </li>
-  {% endif %}
-
-  {% if member.number_educ == 3 %}
-  <li> {{ member.education1short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3short }} </li>
-  {% endif %}
-
-  {% if member.number_educ == 4 %}
-  <li> {{ member.education1short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education4short | replace: "-","&#8211;"}} </li>
-  {% endif %}
-
-  {% if member.number_educ == 5 %}
-  <li> {{ member.education1short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education4short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education5short | replace: "-","&#8211;"}} </li>
-  {% endif %}
-
-  {% if member.number_educ == 6 %}
-  <li> {{ member.education1short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3short | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education4short | replace: "-","&#8211;"}} </li>
-  <!-- <li> {{ member.education5short | replace: "-","&#8211;"}} </li> -->
-  <li> {{ member.education6short | replace: "-","&#8211;"}} </li>
-  {% endif %}
+    {% for education in member.educationshort %}
+      <li>{{ education | replace: "-","&#8211;" }}</li>
+    {% endfor %}
   </ul>
+
 </div>
 {% endfor %}
 </div>

diff --git a/_layouts/bibtemplate.html b/_layouts/bibtemplate.html
@@ -9,8 +9,9 @@
     padding-bottom:0px;
     padding-left:15px;
     padding-right:15px;
-    height:20px:
+    height:20px
 }
+
 pre{
     white-space: pre-wrap;  
     white-space: -moz-pre-wrap; 

diff --git a/_layouts/homelay.html b/_layouts/homelay.html
@@ -5,6 +5,7 @@
   <div id="homeid" class="col-sm-7 col-xs-12">
 	{{ content }}
   </div>
+
   <div id="newsid" class="col-sm-5 col-xs-12" >
 	{% include sidebar.html %}
   </div>
diff --git a/_pages/about.md b/_pages/about.md
@@ -5,9 +5,10 @@ sitemap: false
 permalink: /about/
 ---
 
-## About 
+## About
 
 {% for member in site.data.pi %}
+
 <div class="jumbotron">
 <div class="row">
 <div class="col-sm-4">
@@ -23,81 +24,55 @@ permalink: /about/
   {% if member.researchgate %} <a href="{{ member.researchgate }}" target="_blank"><i class="ai ai-researchgate-square ai-3x"></i></a> {% endif %}
 
   <ul style="overflow: hidden">
-  {% if member.number_educ == 1 %}
-  <li> {{ member.education1 | replace: "-","&#8211;"}} </li>
-  {% endif %}
-  {% if member.number_educ == 2 %}
-  <li> {{ member.education1 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2 | replace: "-","&#8211;"}} </li>
-  {% endif %}
-  {% if member.number_educ == 3 %}
-  <li> {{ member.education1 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3 | replace: "-","&#8211;"}} </li>
-  {% endif %}
-  {% if member.number_educ == 4 %}
-  <li> {{ member.education1 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education4 | replace: "-","&#8211;"}} </li>
-  {% endif %}
-  {% if member.number_educ == 5 %}
-  <li> {{ member.education1 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education4 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education5 | replace: "-","&#8211;"}} </li>
-  {% endif %}
-  {% if member.number_educ == 6 %}
-  <li> {{ member.education1 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education2 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education3 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education4 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education5 | replace: "-","&#8211;"}} </li>
-  <li> {{ member.education6 | replace: "-","&#8211;"}} </li>
-  {% endif %}
+    {% for education in member.education %}
+      <li>{{ education | replace: "-","&#8211;" }}</li>
+    {% endfor %}
   </ul>
+
 </div>
 </div>
 </div>
 {% endfor %}
 
 {% if site.data.grants %}
+
 <div class="jumbotron">
-### Grants
-<ul>
-{% for grant in site.data.grants %}
- <li> {{ grant.name }} </li>
-{% endfor %}
-</ul>
+  <h3>Grants</h3>
+  <ul>
+    {% for grant in site.data.grants %}
+      <li>{{ grant.name }}</li>
+    {% endfor %}
+  </ul>
 </div>
 {% endif %}
 
 {% if site.data.awards %}
+
 <div class="jumbotron">
-### Awards
-<ul>
-{% for award in site.data.awards %}
- <li> {{ award.name | replace: "-","&#8211;"}} </li>
-{% endfor %}
-</ul>
+  <h3>Awards</h3>
+  <ul>
+    {% for award in site.data.awards %}
+      <li>{{ award.name | replace: "-","&#8211;" }}</li>
+    {% endfor %}
+  </ul>
 </div>
 {% endif %}
 
 {% if site.data.people %}
+
 <div class="jumbotron">
-### Students and mentoring
-<ul>
-{% for student in site.data.people %}
- <li> {{ student.name }}, {{student.location}} ({{student.degree}}, {{student.year}}) </li>
-{% endfor %}
-</ul>
+  <h3>Students and Mentoring</h3>
+  <ul>
+    {% for student in site.data.people %}
+      <li>{{ student.name }}, {{ student.location }} ({{ student.degree }}, {{ student.year }})</li>
+    {% endfor %}
+  </ul>
 </div>
 {% endif %}
 
 <div class="jumbotron">
   <h4>Sponsors</h4>
   <div style='display:block; text-align:center; margin-left:auto; margin-right:auto;'>
- {% for funder in site.data.funders %}<a href="{{ funder.url }}" target="_blank"><img src='{{ site.url }}{{ site.baseurl }}/images/{{ funder.image }}' style='max-height: 80px; max-width: 200px; margin: 1%'/></a>{% endfor %}
+  {% for funder in site.data.funders %}<a href="{{ funder.url }}" target="_blank"><img src='{{ site.url }}{{ site.baseurl }}/images/{{ funder.image }}' style='max-height: 80px; max-width: 200px; margin: 1%'/></a>{% endfor %}
   </div>
 </div>
diff --git a/_pages/allnews.md b/_pages/allnews.md
@@ -13,4 +13,5 @@ permalink: /allnews.html
 
 {{ article.headline }}
 {% endfor %}
+
 </div>
diff --git a/_pages/home.md b/_pages/home.md
@@ -29,5 +29,4 @@ Feynman R., The theory of positrons. <i>Phys. Rev.</i> (1949)
 I am a physicist working in the field of quantum mechanics and quantum electrodynamics.
 I received my undergraduate degree in physics from the Massachusetts Institute of Technology (MIT) in 1939 and went on to earn my PhD from Princeton University in 1942.
 After completing my doctoral studies, I worked on the Manhattan Project, where I helped develop the first atomic bombs.
-After the war, I returned to academia, holding teaching and research positions at Cornell and now the California Institute of Technology.
-
+After the war, I returned to academia, holding teaching and research positions at Cornell and now at the California Institute of Technology.
diff --git a/_pages/talks.md b/_pages/talks.md
@@ -31,4 +31,3 @@ permalink: /talks/
 ### Regular talks
 {% bibliography --query @incollection[keywords != invited] %}
 </div>
-
diff --git a/_pages/team.md b/_pages/team.md
@@ -7,7 +7,7 @@ permalink: /team/
 
 ## Team
 
- **We are  looking for new team members** [(see openings)]({{ site.url }}{{ site.baseurl }}/vacancies) **!**
+**We are looking for new team members** [(see openings)]({{ site.url }}{{ site.baseurl }}/vacancies) **!**
 
 ## PI
 
@@ -23,17 +23,17 @@ permalink: /team/
 <i>{{ member.info }}</i><br>
 
 {% if member.website %}<a href="{{ member.website }}" target="_blank"><i class="fa fa-home fa-2x"></i></a> {% endif %} {% if member.email %}<a href="mailto:{{ member.email }}" target="_blank"><i class="fa fa-envelope-square fa-2x"></i></a> {% endif %} {% if member.scholar %} <a href="{{ member.scholar }}" target="_blank"><i class="ai ai-google-scholar-square ai-2x"></i></a> {% endif %} {% if member.cv %} <a href="{{ member.cv }}" target="_blank"><i class="ai ai-cv-square ai-2x"></i></a> {% endif %} {% if member.github %} <a href="{{ member.github }}" target="_blank"><i class="fa fa-github-square fa-2x"></i></a> {% endif %} {% if member.researchgate %} <a href="{{ member.researchgate }}" target="_blank"><i class="ai ai-researchgate-square ai-2x"></i></a> {% endif %}
+
 <ul style="overflow: hidden">
-<li> {{ member.education1 }} </li>
-<li> {{ member.education2 }} </li>
+<li> {{ member.education[0] }} </li>
+<li> {{ member.education[1] }} </li>
 </ul>
 </div>
 </div>
 </div>
 
 {% endfor %}
 
-
 ## Current Students and Postdocs
 
 <div class='jumbotron'>
@@ -43,6 +43,7 @@ permalink: /team/
 {% assign even_odd = number_printed | modulo: 2 %}
 
 {% if even_odd == 0 %}
+
 <div class="row">
 {% endif %}
 
@@ -53,30 +54,32 @@ permalink: /team/
   <h4>{{ member.name }}</h4>
   <i>{{ member.info }}<br></i>
 
-  {% if member.website %}<a href="{{ member.website }}" target="_blank"><i class="fa fa-home fa-2x"></i></a> {% endif %}
-  {% if member.email %}<a href="mailto:{{ member.email }}" target="_blank"><i class="fa fa-envelope-square fa-2x"></i></a> {% endif %}
-  {% if member.scholar %} <a href="{{ member.scholar }}" target="_blank"><i class="ai ai-google-scholar-square ai-2x"></i></a> {% endif %}
-  {% if member.cv %} <a href="{{ member.cv }}" target="_blank"><i class="ai ai-cv-square ai-2x"></i></a> {% endif %}
-  {% if member.github %} <a href="{{ member.github }}" target="_blank"><i class="fa fa-github-square fa-2x"></i></a> {% endif %}
-  {% if member.researchgate %} <a href="{{ member.researchgate }}" target="_blank"><i class="ai ai-researchgate-square ai-2x"></i></a> {% endif %}
+{% if member.website %}<a href="{{ member.website }}" target="_blank"><i class="fa fa-home fa-2x"></i></a> {% endif %}
+{% if member.email %}<a href="mailto:{{ member.email }}" target="_blank"><i class="fa fa-envelope-square fa-2x"></i></a> {% endif %}
+{% if member.scholar %} <a href="{{ member.scholar }}" target="_blank"><i class="ai ai-google-scholar-square ai-2x"></i></a> {% endif %}
+{% if member.cv %} <a href="{{ member.cv }}" target="_blank"><i class="ai ai-cv-square ai-2x"></i></a> {% endif %}
+{% if member.github %} <a href="{{ member.github }}" target="_blank"><i class="fa fa-github-square fa-2x"></i></a> {% endif %}
+{% if member.researchgate %} <a href="{{ member.researchgate }}" target="_blank"><i class="ai ai-researchgate-square ai-2x"></i></a> {% endif %}
+
 </div>
 <!-- </div> -->
 
 {% assign number_printed = number_printed | plus: 1 %}
 
 {% if even_odd == 1 %}
+
 </div>
 {% endif %}
 
 {% endfor %}
 
 {% assign even_odd = number_printed | modulo: 2 %}
 {% if even_odd == 1 %}
+
 </div>
 {% endif %}
 </div>
 
-
 ## Alumni
 
 <div class="jumbotron">
@@ -86,6 +89,7 @@ permalink: /team/
 {% assign even_odd = number_printed | modulo: 2 %}
 
 {% if even_odd == 0 %}
+
 <div class="row">
 {% endif %}
 
@@ -102,18 +106,18 @@ permalink: /team/
 {% assign number_printed = number_printed | plus: 1 %}
 
 {% if even_odd == 1 %}
+
 </div>
 {% endif %}
 {% endfor %}
 
 {% assign even_odd = number_printed | modulo: 2 %}
 {% if even_odd == 1 %}
+
 </div>
 {% endif %}
 </div>
 
-
 ## Administrative Support
 
 <a href="[email protected]">Example staff</a> is helping us (and other groups) with administration.
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,5 @@ permalink: /allnews.html

		{{ article.headline }}
		{% endfor %}

		</div>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@ permalink: /talks/
		### Regular talks
		{% bibliography --query @incollection[keywords != invited] %}
		</div>