rice-solar-physics · wtbarnes · Dec 11, 2017 · Sep 28, 2017 · Sep 29, 2017 · Oct 2, 2017
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# Ignore lock file
+Gemfile.lock
+
 # Ignore PSD files
 images/*.psd
 

diff --git a/_config.yml b/_config.yml
@@ -10,7 +10,7 @@ permalink:        pretty
 # Setup
 title:            Solar@Rice
 name:             Solar@Rice
-description:      'The <b>Solar Physics Research Group</b> at <b>Rice University</b> uses computational modeling and observational tools to explore a variety of topics in solar and space plasma physics. Our current <a href="/Research.html">research projects</a> range from forward modeling of nanoflare-heated solar active regions to magnetic interactions between stars and planets. We are housed within the Department of Physics and Astronomy and located primarily in <a href="http://www.rice.edu/maps/Rice-University-Color-Campus-Map.pdf">Herman Brown Hall for Mathematical Sciences</a>.'
+description:      'The **Solar Physics Research Group** at **Rice University** uses computational modeling and observational tools to explore a variety of topics in solar and space plasma physics. Our current [research projects](/Research.html) range from forward modeling of nanoflare-heated solar active regions to magnetic interactions between stars and planets. We are housed within the Department of Physics and Astronomy and located primarily in [Herman Brown Hall for Mathematical Sciences](http://www.rice.edu/maps/Rice-University-Color-Campus-Map.pdf).'
 url:              http://solar.rice.edu
 baseurl:          /
 
@@ -20,12 +20,6 @@ author:
 
 include: ['_pages','images']
 
-# Gems
-gems:
-  - jekyll-paginate
-  - jekyll-gist
-  - pygments.rb
-
 # Collections
 collections:
   research:

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -0,0 +1,7 @@
+<div class="footer">
+    <p><a href="{{ site.url }}">Solar@Rice</a> -
+        <a href="http://physics.rice.edu/">Physics and Astronomy</a>
+        at
+        <a href="http://www.rice.edu/">Rice University</a> / Built with <a href="https://jekyllrb.com/">Jekyll</a> / Template and design courtesy of <a href="https://github.com/uwsampa/research-group-web">sampa</a>
+    </p>
+</div>
diff --git a/_includes/head.html b/_includes/head.html
@@ -3,12 +3,18 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <!-- JS -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js" integrity="sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8" crossorigin="anonymous"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js" integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK" crossorigin="anonymous"></script>
+<!-- Bootstrap -->
+<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh" crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js" integrity="sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ" crossorigin="anonymous"></script>
+<!-- MathJax, for LaTeX rendering -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
+
 
 <!-- CSS -->
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css" integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi" crossorigin="anonymous">
+<!-- Bootstrap -->
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous">
+<!-- Custom CSS -->
 <link href="{{ site.baseurl }}css/group.css" rel="stylesheet">
 <link href="{{ site.baseurl }}css/custom.css" rel="stylesheet">
 <!-- Font Awesome Icons-->

diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -0,0 +1,21 @@
+<nav class="navbar navbar-expand-lg navbar-light">
+    <!-- Group Logo -->
+    <a href="{{ site.baseurl }}" class="navbar-brand">
+    <img src="{{ site.baseurl }}images/rsp_logo.png" srcset="{{ site.baseurl }}images/[email protected]" alt="Awesome" id="logo">
+    </a>
+    <!-- Collapse Menu on Mobile -->
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <!-- Menu -->
+    <div class="collapse navbar-collapse">
+        <ul class="navbar-nav ml-auto">
+        {% for item in site.navigation %}
+        {% assign shortlink = item.link | prepend: '/' %}
+            <li class="nav-item">
+                <a class="nav-link {% if page.url == shortlink %}active{% endif %}" href="{{ item.link | prepend: site.baseurl }}">{{ item.title }}</a>
+            </li>
+        {% endfor %}
+        </ul>
+    </div>
+</nav>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,45 +1,23 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        {% include head.html %}
-    </head>
-    <body>
-        <div class="container">
-          <div class="header">
-            <nav class="navbar">
-              <a href="{{ site.baseurl }}" class="navbar-brand">
-              <img src="{{ site.baseurl }}images/rsp_logo.png" srcset="{{ site.baseurl }}images/[email protected]" alt="Awesome" id="logo">
-              </a>
-              <ul class="nav nav-pills pull-right">
-                {% for item in site.navigation %}
-                {% assign shortlink = item.link | prepend: '/' %}
-                <li class="nav-item">
-                  <a class="nav-link {% if page.url == shortlink %}active{% endif %}" href="{{ item.link | prepend: site.baseurl }}">{{ item.title }}</a>
-                </li>
-                {% endfor %}
-              </ul>
-            </nav>
-          </div>
-
-          {% comment %}Liquid is sort of terrible! I think "!= true" is the
-          only way to do negation?{% endcomment %}
-          {% if page.notitle != true %}
-          <h2>{{ page.title }}</h2>
-          {% endif %}
-
-          {{ content }}
-
-          <div class="footer">
-            <p><a href="{{ site.url }}">Solar@Rice</a> -
-              <a href="http://physics.rice.edu/">Physics and Astronomy</a>
-              at
-              <a href="http://www.rice.edu/">Rice University</a> / Built with <a href="https://jekyllrb.com/">Jekyll</a> / Template and design courtesy of <a href="https://github.com/uwsampa/research-group-web">sampa</a>
-            </p>
-          </div>
-
-        </div> <!-- /container -->
-
-        <!-- Support retina images. -->
-        <script type="text/javascript" src="{{ site.base }}/js/srcset-polyfill.js"></script>
-    </body>
+  <head>
+    {% include head.html %}
+  </head>
+  <body>
+    <div class="container">
+      <!-- Navbar/menu -->
+      {% include navbar.html %}
+      <!-- -->
+      {% if page.notitle != true %}
+      <h2>{{ page.title }}</h2>
+      {% endif %}
+      <div class="container" id="inner-body">
+        {{ content }}          
+      </div>
+      <!-- Footer -->
+      {% include footer.html %}
+    </div>
+    <!-- Support retina images. -->
+    <script type="text/javascript" src="{{ site.base }}/js/srcset-polyfill.js"></script>
+  </body>
 </html>
diff --git a/_pages/blog.md → _pages/blog.html b/_pages/blog.md → _pages/blog.html
diff --git a/_pages/people.html b/_pages/people.html
@@ -0,0 +1,59 @@
+---
+layout: default
+permalink: /People
+title: People
+notitle: true
+---
+<!-- List current members alphabetically -->
+{% assign sortedpeople = site.data.people | sort: 'last_name' %}
+<!-- List alumni chronologically, newest first -->
+{% assign sortedpeople_year = site.data.people | sort: 'year' | reverse %}
+<div class="container-fluid">
+  <!-- Current Members -->
+  <div class="row">
+  {% for role in site.roles %}
+  {% if role.key != 'alum' %}
+  {% for person in sortedpeople%}
+  {% if person.role == role.key %}
+    <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
+      <div class="card" style="border:0;box-shadow:none">
+        {% if person.image != null %}
+        <img class="card-img-top img-fluid rounded-circle" src="{{site.baseurl}}{{person.image}}"/>
+        {% else %}
+        <img class="card-img-top img-fluid rounded-circle" src="http://placehold.it/200x200?text=no+picture" />
+        {% endif %}
+        <div class="card-body text-lg-center text-md-center text-sm-center text-xs-center">
+          <div class="card-title">
+            <h5>
+            {% if person.webpage != null %}
+            <a href="{{ person.webpage }}">
+            {% endif %}
+            {{ person.first_name }} {{ person.last_name}}
+            {% if person.webpage != null %}
+            </a>
+            {% endif %}
+            </h5>
+            <p class="text-muted">{{ role.name }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  {% endif %}
+  {% endfor %}
+  {% endif %}
+  {% endfor %}
+  </div>
+  <!-- Former Members -->
+  <h3>Alumni</h3>
+  <ul>
+  {% for person in sortedpeople_year %}
+  {% if person.role == 'alum' %}
+    <li class="list-unstyled">
+      <h5>{{ person.first_name }} {{ person.last_name }}
+      <span class="lead text-muted">{% if person.degree != null and person.year != null %}{{ person.degree }} ({{ person.year }}){% endif %}{% if person.position != null %}{{ person.position }}{% endif %}</span>
+      </h5>
+    </li>
+  {% endif %}
+  {% endfor %}
+  </ul>
+</div>
diff --git a/_pages/people.md b/_pages/people.md
diff --git a/_pages/publications.html b/_pages/publications.html
@@ -0,0 +1,29 @@
+---
+layout: default
+permalink: /Publications
+title: Publications
+notitle: true
+---
+{% for year in site.data.publications.years %}
+<div id="list-spacing">
+<div class="card">
+<h4 class="card-header">{{ year }}</h4>
+<div class="list-group list-group-flush">
+  {% for paper in site.data.publications.pubs %}
+  {% if paper.year == year %}
+  <a href="http://adsabs.harvard.edu/abs/{{ paper.bibcode }}" class="list-group-item list-group-item-action d-flex justify-content-between align-items-center">
+    <p class="list-group-item-text">
+      <em>{{ paper.title }}</em><br>
+      {% for au in paper.author %}
+      {% if paper.rs_author contains au %}<strong>{{ au }}</strong>, {% else %}{{ au }}, {% endif %}
+      {% endfor %}
+      {{ paper.pub }}
+    </p>
+    <span class="badge badge-pill badge-primary">{{ paper.citation_count }}</span>
+  </a>
+  {% endif %}
+  {% endfor %}
+</div>
+</div>
+</div>
+{% endfor %}
diff --git a/_pages/publications.md b/_pages/publications.md
diff --git a/_pages/research.html b/_pages/research.html
@@ -0,0 +1,29 @@
+---
+layout: default
+permalink: /Research
+title: Research
+notitle: true
+---
+<div class="row">
+  {% for res in site.research %}
+  <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12" id="list-spacing">      
+    <div class="card">
+      <div class="card-body">
+        <a href="{{ res.url }}">
+        <h4 class="card-title">{{ res.title }}</h4>
+        </a>
+        <p class="card-text">{{ res.short_description }}</p>
+      </div>
+      <div class="card-footer">
+        {% for people in res.people %}
+        {% for subpeople in site.data.people %}
+        {% if people == subpeople.last_name and subpeople.image != null%}
+        <img class="card-img-top rounded-circle pull-right" src="{{ site.baseurl }}{{ subpeople.image }}" style="width:35px;margin-right:5px"/>
+        {% endif %}
+        {% endfor %}
+        {% endfor %}
+      </div>
+    </div>
+  </div>
+  {% endfor %}
+</div>
diff --git a/_pages/research.md b/_pages/research.md
diff --git a/_pages/resources.md → _pages/resources.html b/_pages/resources.md → _pages/resources.html