Adding personnel YML files and display pages

Author: rct225

Diff for: Gemfile

@@ -1,8 +1,59 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem 'jekyll', '~> 4.2.0'
 
-# gem "rails"
-gem "jekyll"
+# This is needed for GitHub Flavored Markdown
+gem 'kramdown-parser-gfm'
+
+group :development do
+  # Check resulting HTML for dead links and other issues
+  gem 'html-proofer', require: false
+
+  # Allow running this with rake (especially for rake check)
+  gem 'rake', require: false
+
+  # Verify good coding practices in Ruby files
+  # Pinning 1.12.x since 1.13 drops 2.4 support
+  gem 'rubocop', '~>1.12.0', require: false
+
+  # Extension for Rake files
+  gem 'rubocop-rake', require: false
+end
+
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem 'minima', '~> 2.5'
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem 'jekyll-feed', '~> 0.15'
+  gem 'jekyll-include-cache'
+  #gem 'jekyll-indico', '~> 0.3.0'
+  # gem 'jekyll-indico', github: 'iris-hep/jekyll-indico', branch: 'main'
+end
+
+# This is used like a library, not as a plugin
+gem 'jekyll-last-modified-at', '~> 1.3.0'
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
+
+# Needed by Nokogiri sometimes
+gem 'pkg-config', '~> 1.1'
+
+# Performance-booster for watching directories on Windows
+gem 'wdm', '~> 0.1.0' if Gem.win_platform?
+
+# Pinning this for now since macOS + default Ruby needs this
+# Please use rbenv to pick Ruby versions; the next Jekyll release
+# will not work with macOS's Ruby 2.3
+gem 'ffi', '~> 1.10'

Diff for: _config.yml

@@ -1,5 +1,12 @@
 url: "" # the base hostname & protocol for your site, e.g. http://example.com
 baseurl: "" # the subpath of your site, e.g. /blog
 title: "" # the name of your site, e.g. ACME Corp.
+
+markdown: kramdown
+plugins:
+  - jekyll-feed
+  - jekyll-include-cache
+
+
 sass:
-  sass_dir: assets/css
+  sass_dir: _sass

Diff for: _data/institutions/fnal.yml

@@ -0,0 +1,3 @@
+name: Fermilab
+personnel:
+  - o_gutsche

Diff for: _data/institutions/princeton.yml

@@ -0,0 +1,3 @@
+name: Princeton University
+personnel:
+  - rct225

Diff for: _data/people/o_gutsche.yml

@@ -0,0 +1,9 @@
+active: true
+hidden: false
+institution: Fermilab
+name: Oliver Gutsche
+photo: "/assets/images/team/Oliver_Gutsche.jpg"
+shortname: o_gutsche
+title: Operations Program Manager
+website: https://gutsche.github.io/
+presentations:

Diff for: _includes/head.html

@@ -2,7 +2,8 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta charset="utf-8">
 <title>{{ page.title }} - US CMS Software and Computing</title>
-<link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}">
+<link rel="stylesheet" href="/assets/css/bootstrap.css" crossorigin="anonymous">
+<link rel="stylesheet" href="{{ "/assets/css/style.css" | relative_url }}">
 <script defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js" integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ" crossorigin="anonymous"></script>
 <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.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>

Diff for: _includes/institution_list.html

@@ -0,0 +1 @@
+{% assign institution_list = site.data.institutions | keys | sort %}

Diff for: _includes/standard_person_card.md

@@ -0,0 +1,25 @@
+<!doctype html>
+
+{% include layout_header_navbar.html %}
+
+<div id="container">
+    <div class="container page">
+        <main role="main">
+            <div class="presentation toppagelinks">
+                <div class="inner">
+                    Team:
+                    <a href="/about/team.html">by institution</a>
+                    &#8226;
+                    <a href="/about/team_alphabetical.html">by name</a>.
+                </div>
+            </div>
+
+            {{ content }}
+        </main>
+    </div>
+    {% include_cached footer.html %}
+</div>
+
+
+</body>
+</html>

Diff for: _layouts/people.html

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module IrisHep
+  # Adding useful filters
+  module Filters
+    # Access the basename (all extensions)
+    def basename(input, ext = '.*')
+      File.basename(input, ext)
+    end
+
+    # Sort by title, within groups of position if present
+    def smart_title_sort(input)
+      input.sort_by { |p| [p['position'] || 0, p['title'].downcase] }
+    end
+
+    # Force an array to be an array of arrays
+    def ensure_arrays(input)
+      input.map do |v|
+        return [] if v.nil?
+
+        v.is_a?(Array) ? v : [v]
+      end
+    end
+
+    # Force an item to be an array
+    def ensure_array(input)
+      return [] if input.nil?
+
+      input.is_a?(Array) ? input : [input]
+    end
+
+    # Flatten an array of arrays
+    def flat_map(input)
+      ensure_arrays(input.lazy).flat_map { |p| p || [] }.to_a
+    end
+
+    # Convert array of keys to array of values using a hash, nil where no mapping exists
+    def hash_fetch(input, hash)
+      input.map { |k| hash.fetch(k, nil) }
+    end
+
+    # Keys of a hash
+    def keys(input)
+      input.keys
+    end
+
+    # Values of a hash
+    def values(input)
+      input.values
+    end
+
+    # Selects items where there is an overlap between items
+    def where_overlap(input, key, values)
+      input.select { |v| ensure_array(v[key]).to_set.intersect? values.to_set }
+    end
+
+    # Sort "First ..., Last" by "last, first, ..."
+    def last_name_sort(input, key)
+      input.sort_by do |v|
+        vals = v[key].downcase.split
+        vals[-1..-1] + vals[0..-2]
+      end
+    end
+
+    # Print to console
+    def puts(input, msg = '')
+      print "#{msg} #{input}\n"
+      input
+    end
+
+    # Filter in range of days, can use nil
+    def where_day_range(input, key, start_day, stop_day = nil)
+      input.select do |v|
+        start = start_day ? v[key] >= (Date.today - start_day) : true
+        stop = stop_day ? v[key] < (Date.today - stop_day) : true
+        start && stop
+      end
+    end
+
+    # Filter in range of months, can use nil
+    def where_month_range(input, key, start_month, stop_month = nil)
+      input.select do |v|
+        start = start_month ? v[key] >= (Date.today << start_month) : true
+        stop = stop_month ? v[key] < (Date.today << stop_month) : true
+        start && stop
+      end
+    end
+
+    # Pretty-print a daterange
+    def print_date_range(start, stop = nil)
+      stop = stop.nil? ? start : stop
+      if start.year != stop.year
+        "#{start.strftime '%b&nbsp;%-d, %Y'}&ndash;#{stop.strftime '%b&nbsp;%-d, %Y'}"
+      elsif start.month != stop.month
+        "#{start.strftime '%b&nbsp;%-d'}&ndash;#{stop.strftime '%b&nbsp;%-d, %Y'}"
+      elsif start.day != stop.day
+        "#{start.strftime '%b&nbsp;%-d'}&ndash;#{stop.strftime '%-d, %Y'}"
+      else
+        start.strftime '%b&nbsp;%-d, %Y'
+      end
+    end
+
+    # Pretty print month date range
+    def print_date_range_month(start, stop = nil)
+      stop = stop.nil? ? start : stop
+      if start.year == stop.year
+        "#{start.strftime '%b'} &ndash; #{stop.strftime '%b, %Y'}"
+      else
+        "#{start.strftime '%b, %Y'} &ndash; #{stop.strftime '%b, %Y'}"
+      end
+    end
+  end
+end
+
+Liquid::Template.register_filter(IrisHep::Filters)

Diff for: _plugins/filters.rb

@@ -1,5 +1,7 @@
+---
+---
 /*!
- * Bootstrap Grid v4.0.0 (https://getbootstrap.com)
+ * Bootstrap Grid v4.1.3 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

Diff for: assets/css/bootstrap/_alert.scss renamed to _sass/_alert.scss

@@ -1,5 +1,7 @@
+---
+---
 /*!
- * Bootstrap Reboot v4.0.0 (https://getbootstrap.com)
+ * Bootstrap Reboot v4.1.3 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

Diff for: assets/css/bootstrap/_badge.scss renamed to _sass/_badge.scss

@@ -1,5 +1,7 @@
+---
+---
 /*!
- * Bootstrap v4.0.0 (https://getbootstrap.com)
+ * Bootstrap v4.1.3 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

Diff for: assets/css/bootstrap/_breadcrumb.scss renamed to _sass/_breadcrumb.scss

@@ -1,6 +1,9 @@
 ---
 ---
-@import 'bootstrap/bootstrap';
+
+@import "functions";
+@import "variables";
+@import "mixins";
 
 body {
   background: #FFF;
@@ -176,4 +179,4 @@ main {
   main {
     padding-top: 30px;
   }
-}
+}