diff --git a/.gitignore b/.gitignore index 2140b67..eaf4a6e 100644 --- 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 index 5d6fc3c..8f517f2 100644 --- a/_config.yml +++ b/_config.yml @@ -10,7 +10,7 @@ permalink: pretty # Setup title: Solar@Rice name: Solar@Rice -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 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.' +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 new file mode 100644 index 0000000..0536fa7 --- /dev/null +++ b/_includes/footer.html @@ -0,0 +1,7 @@ +
+

Solar@Rice - + Physics and Astronomy + at + Rice University / Built with Jekyll / Template and design courtesy of sampa +

+
\ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html index 5880c86..f8f95f8 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -3,12 +3,18 @@ - - - + + + + + + + - + + + diff --git a/_includes/navbar.html b/_includes/navbar.html new file mode 100644 index 0000000..2cea665 --- /dev/null +++ b/_includes/navbar.html @@ -0,0 +1,21 @@ + diff --git a/_layouts/default.html b/_layouts/default.html index 7867e96..51d6f51 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,45 +1,23 @@ - - {% include head.html %} - - -
-
- -
- - {% comment %}Liquid is sort of terrible! I think "!= true" is the - only way to do negation?{% endcomment %} - {% if page.notitle != true %} -

{{ page.title }}

- {% endif %} - - {{ content }} - -
-

Solar@Rice - - Physics and Astronomy - at - Rice University / Built with Jekyll / Template and design courtesy of sampa -

-
- -
- - - - + + {% include head.html %} + + +
+ + {% include navbar.html %} + + {% if page.notitle != true %} +

{{ page.title }}

+ {% endif %} +
+ {{ content }} +
+ + {% include footer.html %} +
+ + + diff --git a/_pages/blog.md b/_pages/blog.html similarity index 100% rename from _pages/blog.md rename to _pages/blog.html diff --git a/_pages/people.html b/_pages/people.html new file mode 100644 index 0000000..5e4b962 --- /dev/null +++ b/_pages/people.html @@ -0,0 +1,59 @@ +--- +layout: default +permalink: /People +title: People +notitle: true +--- + +{% assign sortedpeople = site.data.people | sort: 'last_name' %} + +{% assign sortedpeople_year = site.data.people | sort: 'year' | reverse %} +
+ +
+ {% for role in site.roles %} + {% if role.key != 'alum' %} + {% for person in sortedpeople%} + {% if person.role == role.key %} +
+
+ {% if person.image != null %} + + {% else %} + + {% endif %} +
+
+
+ {% if person.webpage != null %} + + {% endif %} + {{ person.first_name }} {{ person.last_name}} + {% if person.webpage != null %} + + {% endif %} +
+

{{ role.name }}

+
+
+
+
+ {% endif %} + {% endfor %} + {% endif %} + {% endfor %} +
+ +

Alumni

+ +
diff --git a/_pages/people.md b/_pages/people.md deleted file mode 100644 index b9e9d72..0000000 --- a/_pages/people.md +++ /dev/null @@ -1,75 +0,0 @@ ---- -layout: default -permalink: /People -title: People -notitle: true ---- -{% comment %}Hardcoding is bad!{% endcomment %} -{% comment %} Set profile picture width {% endcomment %} -{% assign biopic_width = 200 %} -{% comment %} Set number of people per row {% endcomment %} -{% assign num_per_row = 4 %} -{% comment %} Set width of person column {% endcomment %} -{% assign col_width = 12 | divided_by: num_per_row %} -{% comment %} Sort current people alphabetically {% endcomment %} -{% assign sortedpeople = site.data.people | sort: 'last_name' %} -{% comment %} Sort alumni by year, newest on top {% endcomment %} -{% assign sortedpeople_year = site.data.people | sort: 'year' | reverse %} -{% comment %}Additional counter because there are nested loops{% endcomment %} -{% assign people_counter = 0 %} -{% comment %}Count number of current members{% endcomment %} -{% assign current_member_count = 0 %} -{% for people in site.data.people %} -{% if people.role != 'alum' %} -{% assign current_member_count = current_member_count | plus:1 %} -{% endif %} -{% endfor %} -
- {% for role in site.roles %} - {% if role.key != 'alum' %} - {% for person in sortedpeople%} - {% if person.role == role.key %} - {% assign modindex0 = people_counter | modulo:num_per_row %} - {% if modindex0 == 0 %} -
- {% endif %} -
-
- {% if person.image != null %} - - {% else %} - - {% endif %} -
- {% if person.webpage != null %} - - {% endif %} -
{{ person.first_name }} {{ person.last_name}}
- {% if person.webpage != null %} - - {% endif %} -

{{ role.name }}

-
-
-
- {% assign modindex1 = people_counter | plus:1 | modulo:num_per_row %} - {% assign modindex2 = people_counter | plus:1 %} - {% if modindex1 == 0 or modindex2 == current_member_count %} -
- {% endif %} - {% assign people_counter = people_counter | plus:1 %} - {% endif %} - {% endfor %} - {% else %} -

{{ role.name }}

- {% for person in sortedpeople_year %} - {% if person.role == role.key %} -
-
{{ person.first_name }} {{ person.last_name }}
- {% if person.degree != null and person.year != null %}{{ person.degree }} ({{ person.year }}){% endif %}{% if person.position != null %}{{ person.position }}{% endif %} -
- {% endif %} - {% endfor %} - {% endif %} - {% endfor %} -
diff --git a/_pages/publications.html b/_pages/publications.html new file mode 100644 index 0000000..cbb4efb --- /dev/null +++ b/_pages/publications.html @@ -0,0 +1,29 @@ +--- +layout: default +permalink: /Publications +title: Publications +notitle: true +--- +{% for year in site.data.publications.years %} +
+
+

{{ year }}

+
+ {% for paper in site.data.publications.pubs %} + {% if paper.year == year %} + +

+ {{ paper.title }}
+ {% for au in paper.author %} + {% if paper.rs_author contains au %}{{ au }}, {% else %}{{ au }}, {% endif %} + {% endfor %} + {{ paper.pub }} +

+ {{ paper.citation_count }} + + {% endif %} + {% endfor %} +
+
+
+{% endfor %} diff --git a/_pages/publications.md b/_pages/publications.md deleted file mode 100644 index 9da4f4a..0000000 --- a/_pages/publications.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -layout: default -permalink: /Publications -title: Publications -notitle: true ---- -{% for year in site.data.publications.years %} -
-

{{ year }}

-
- {% for paper in site.data.publications.pubs %} - {% if paper.year == year %} - - {{ paper.citation_count }} -
{{ paper.title }}
-

{% for au in paper.author %}{% if paper.rs_author contains au %}{{ au }}, {% else %}{{ au }}, {% endif %}{% endfor %} - {{ paper.pub }}

- - {% endif %} - {% endfor %} -
-
-{% endfor %} diff --git a/_pages/research.html b/_pages/research.html new file mode 100644 index 0000000..5ea3970 --- /dev/null +++ b/_pages/research.html @@ -0,0 +1,29 @@ +--- +layout: default +permalink: /Research +title: Research +notitle: true +--- +
+ {% for res in site.research %} +
+
+
+ +

{{ res.title }}

+ +

{{ res.short_description }}

+
+
+ {% for people in res.people %} + {% for subpeople in site.data.people %} + {% if people == subpeople.last_name and subpeople.image != null%} + + {% endif %} + {% endfor %} + {% endfor %} +
+
+
+ {% endfor %} +
diff --git a/_pages/research.md b/_pages/research.md deleted file mode 100644 index 3a068be..0000000 --- a/_pages/research.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -layout: default -permalink: /Research -title: Research -notitle: true ---- -
- {% for res in site.research %} -
-
- -

{{ res.title }}

- -

{{ res.short_description }}

-
-
- {% for people in res.people %} - {% for subpeople in site.data.people %} - {% if people == subpeople.last_name and subpeople.image != null%} - - {% endif %} - {% endfor %} - {% endfor %} -
-
- {% endfor %} -
diff --git a/_pages/resources.md b/_pages/resources.html similarity index 100% rename from _pages/resources.md rename to _pages/resources.html diff --git a/_pages/software.md b/_pages/software.html similarity index 89% rename from _pages/software.md rename to _pages/software.html index 9dd114d..3f36d7c 100644 --- a/_pages/software.md +++ b/_pages/software.html @@ -5,6 +5,7 @@ notitle: true --- {% for sw in site.data.software %} +
@@ -15,8 +16,9 @@

{{ sw.name }}

-
+

{{ sw.description | markdownify }}

+
{% endfor %} diff --git a/_research/flares.md b/_research/flares.md index b4eb615..60dfdfa 100644 --- a/_research/flares.md +++ b/_research/flares.md @@ -5,6 +5,7 @@ short_description: Modeling impulsively heated flaring loops with hydrodynamic s people: - Alexander - Bradshaw + - Mandage --- Solar flare work by Alexander/Bradshaw Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut commodo, turpis sed hendrerit volutpat, nisi tellus interdum eros, eget iaculis nisi tellus ut sapien. Quisque pulvinar vitae felis maximus finibus. Vestibulum egestas mi quis sem pretium finibus. Sed feugiat tincidunt semper. Proin pellentesque rutrum dui at commodo. Etiam eget urna ut mi suscipit pulvinar. Nullam accumsan tincidunt sodales. Pellentesque id lorem ac dui vulputate faucibus eu et tortor. Vivamus consequat ullamcorper maximus. Ut vulputate tincidunt ante non mattis. Nulla feugiat quis mauris id bibendum. Donec cursus accumsan leo vel fringilla. Praesent turpis est, ultrices ac leo ut, convallis bibendum ex. Etiam et eros egestas, pretium mi vitae, sodales tortor. Vestibulum finibus est semper iaculis dapibus. Pellentesque aliquam tristique quam, id viverra nisl tempus quis. diff --git a/_research/star_planets.md b/_research/star_planets.md index 2f5039d..24c5d90 100644 --- a/_research/star_planets.md +++ b/_research/star_planets.md @@ -5,6 +5,7 @@ short_description: Modeling of magnetic interactions between stars and planets people: - Alexander - Bradshaw + - Farrish - Sciola --- diff --git a/css/custom.css b/css/custom.css index 7051654..f7410bc 100644 --- a/css/custom.css +++ b/css/custom.css @@ -18,3 +18,12 @@ .newstitle{ font-size: 18px; } + +#list-spacing { + padding-top:5px; +} + +#inner-body { + padding-bottom:10px; + padding-top:10px; +} diff --git a/index.html b/index.html index 9578be8..9176263 100644 --- a/index.html +++ b/index.html @@ -6,14 +6,12 @@
{% if site.front_page_pics != null %} - {% comment %}Get the needed offset, assume they are all the same width{% endcomment %} - {% assign offset = site.front_page_pics[0].width | times: site.front_page_pics.size %} {% for pic in site.front_page_pics %} -
-
- -
{{ pic.description }}
-
+
+
+ +

{{ pic.description }}

+
{% endfor %} {% endif %}