add new threads and fix // issue

Gemfile.lock

@@ -1,74 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.7)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    ffi (1.14.2)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.3)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.0)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (~> 2.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.2.1)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.4.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.5)
+    public_suffix (5.0.0)
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.20.0)
+    rexml (3.2.5)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   jekyll
   jekyll-sitemap
   pygments.rb
 
 BUNDLED WITH
-   2.0.2
+   2.2.0

README.md

@@ -1,33 +1,48 @@
 SPARC Community-Owned Infrastructure Microsite
 =====
-
 # About
 
 This site provides a custom home for SPARC's Community-Owned Infrastructure project materials.
 
+# Status
+
+* Live:  [![Netlify Status](https://api.netlify.com/api/v1/badges/547e2215-6ab1-4a29-84f1-ef0d8fa8b508/deploy-status)](https://app.netlify.com/sites/upbeat-swirles-009f3e/deploys)
+* Test: [![Netlify Status](https://api.netlify.com/api/v1/badges/01cb4f7c-2d26-4eed-ba5b-70084a7ae9a6/deploy-status)](https://app.netlify.com/sites/keen-panini/deploys)
+
 # How to make a new post via Github web interface
 
+Posts are usually different sections of the report.
+
+* You need to have access to add posts to the website. This can be done by adding your github account to the [Staff Team](https://github.com/orgs/sparcopen/teams/staff/members).
 * Clicking [here](https://github.com/sparcopen/infrastructure/new/dev/_posts). That will start a new post in [`_posts`](https://github.com/sparcopen/infrastructure/tree/dev/_posts) on the `dev` branch.
 * Give your post a name. Your name must start with the date you want it posted plus a friendly title and `.md` at the end. This means post names look like this YYYY-MM-DD-your-title.md
 * Start writing. It can be helpful to [start by copying template](https://github.com/sparcopen/infrastructure/edit/dev/_drafts/template.md).
 * When you're ready to save, hit `commit changes` at the bottom.
-* In about a minute you'll find your post at http://test.infrastructure.sparcopen.org/. This will only happen if the post date is *today*. Think of this as a preview, it won't show up on Google or anything like that.
+* The site will then update, this can take about a minute (you can check the status above). You'll find your post at http://test.infrastructure.sparcopen.org/. This will only happen if the post date is *today*. Think of this as a preview, it won't show up on Google or be discoverable from the live website.
 * If you want to make edits to your post, find it in [`_posts`](https://github.com/sparcopen/infrastructure/tree/dev/_posts)
-* Once you're happy, it's time to put your post on the live site. To go that, [click here](https://github.com/sparcopen/infrastructure/compare/dev?expand=1). If it shows only your post as being added, great! If it doesn't, best to reach out to Joe for help. If that isn't possible, clicking [here](https://github.com/sparcopen/infrastructure/new/live/_posts) and copy your post. This will put your post directly on live, and while this can be bad practice is fine in a pinch.
+* Once you're happy, it's time to put your post on the live site. To do that, [click here](https://github.com/sparcopen/infrastructure/compare/dev?expand=1). If it shows only your post as being added, great! If it doesn't, best to reach out to @JosephMcArthur for help. If that isn't possible, clicking [here](https://github.com/sparcopen/infrastructure/new/live/_posts) and copy your post. This will put your post directly on live, and while this can be bad practice is fine in a pinch.
+
+# How to add a report
+
+* Click [here](https://github.com/sparcopen/infrastructure/new/dev/_reports) to make a new report file. That will start a new report in [`_reports`](https://github.com/sparcopen/infrastructure/tree/dev/_reports).
+* Create a file name. It needs start with `report` and end `.md`. Keep it just a few words.
+* Copy file contents from https://github.com/sparcopen/infrastructure/blob/dev/_reports/report-2021-update.md. This will give you the key field names and some documentation about them. Don't delete any key.
+* When you're ready to save, hit `commit changes` at the bottom.
 
 # How to add different type of content
 
-* Threads: Go to `_topics`, duplicate any file and adjust to your liking. The tag element on posts affect what topic it goes into.
-* Reports: Go to `_reports`, duplicate any file and adjust to your liking. The catagory element on posts affects what report is used.
-* Media (e.g images): Go to [`_media`](https://github.com/sparcopen/infrastructure/tree/dev/media). If you find a folder that makes sense go there, and then upload your image. Then, reference is as you see in the template.
+* Threads: Go to [`_topics`](https://github.com/sparcopen/infrastructure/tree/dev/_topics), duplicate any file and adjust to your liking. The tag element on posts affect what topic it goes into.
+* Reports: Go to [`_reports`](https://github.com/sparcopen/infrastructure/tree/dev/_reports), duplicate any file and adjust to your liking. The catagory element on posts affects what report is used.
+* Media (e.g images, report PDFs): Go to [`_media`](https://github.com/sparcopen/infrastructure/tree/dev/media). If you find a folder that makes sense go there, and then upload your image. Then, reference is as you see in the template.
+* Authors. If there is a new author go to [_data/authors.yml](https://github.com/sparcopen/infrastructure/blob/dev/_data/authors.yml) and copy previous entries.
 
 # About the code
 
 https://github.com/sssoz was the main designer and developer for this project.
 
 The live version of the site is at https://infrastructure.sparcopen.org/ (using `live` in this repo). [![Netlify Status](https://api.netlify.com/api/v1/badges/547e2215-6ab1-4a29-84f1-ef0d8fa8b508/deploy-status)](https://app.netlify.com/sites/upbeat-swirles-009f3e/deploys)
 
-A dev version is at https://test.infrastructure.sparcopen.org/ (using `dev` in this repo). An earlier version existing in Joe's personal repo but this has been retired. [![Netlify Status](https://api.netlify.com/api/v1/badges/01cb4f7c-2d26-4eed-ba5b-70084a7ae9a6/deploy-status)](https://app.netlify.com/sites/keen-panini/deploys)
+A dev version is at https://test.infrastructure.sparcopen.org/ (using `dev` in this repo). [![Netlify Status](https://api.netlify.com/api/v1/badges/01cb4f7c-2d26-4eed-ba5b-70084a7ae9a6/deploy-status)](https://app.netlify.com/sites/keen-panini/deploys)
 
 Another version of the site for members exists too.
 

_config.yml

@@ -1,4 +1,4 @@
-# visit https://github.com/mojombo/jekyll/wiki/Configuration for more settings
+# visit https://github.com/mojombo/jekyll/wiki/Configuration for more settings 
 
 title: "SPARC: Community Owned Infrastructure"
 sass:
@@ -21,7 +21,7 @@ author:
   twitter: sparc_na
   facebook: sparcopen
 
-BASE_PATH: https://keen-panini.netlify.app
+BASE_PATH: https://test.infrastructure.sparcopen.org
 # LIVE: https://infrastructure.sparcopen.org/ NETFLY https://upbeat-swirles-009f3e.netlify.app LOCAL: http://127.0.0.1:4000
 url: https://infrastructure.sparcopen.org # for sitemap. Doesn't need to change on live / dev.
 plugins:
@@ -30,4 +30,7 @@ plugins:
 collections:
   members:
     output: true
-  featured:
+  topics:
+    output: true
+  reports:
+    output: true

_data/authors.yml

@@ -1,5 +1,6 @@
 sparc:
 - full_name: Scholarly Publishing and Academic Resources Coalition
+  acronym: SPARC
   short_bio: "SPARC is a coalition of academic and research libraries that work to enable the open sharing of research outputs and educational materials in order to democratize access to knowledge, accelerate discovery, and increase the return on our investment in research and education."
   bio:
   contact: "https://sparcopen.org/contact/"
@@ -59,5 +60,45 @@ shawn:
   first_name: Shawn
   last_name: Daugherty
   short_bio:
-  bio: 
+  bio:
   contact:
+
+val:
+- full_name: Valorie Hollister
+  first_name: Valorie
+  last_name: Hollister
+  short_bio:
+  bio: "https://sparcopen.org/people/val-hollister/"
+  contact: "mailto:val@sparcopen.org"
+
+katie:
+- full_name: Katie Steen
+  first_name: Katie
+  last_name: Steen
+  short_bio:
+  bio: "https://sparcopen.org/people/katie-steen-2/"
+  contact: "mailto:katie@sparcopen.org"
+
+marty:
+- full_name: Marty Lentz
+  first_name: Marty
+  last_name: Lentz
+  short_bio: "Report editor"
+  bio: "https://words-matter.org/"
+  contact: 
+
+nancy:
+- full_name: Nancy Maron
+  first_name: Nancy
+  last_name: Maron
+  short_bio: 
+  bio:
+  contact:
+
+juan:
+- full_name: Juan Pablo Alperin
+  first_name: Juan
+  last_name: Alperin
+  short_bio: 
+  bio: 
+  contact: 

_data/homepage.yml

@@ -0,0 +1,31 @@
+side_quote:
+- content: "As research and grey data become an increasingly integral part of how institutions operate, there is a great risk of losing control of this data if not tracked and managed across the often distributed operating architecture of higher education institutions."
+  author: joe
+  institution: "University of Cambridge"
+
+featured_quote:
+- content: "Our leadership is increasingly concerned about letting black box tools drive decisions for how we run our institution. These reports have been an essential in helping educate us and guide our thinking on how to seize the benefits, and while managing the risks, of the increasing prevalence of digital tools and data analytics."
+  author: heather
+  institution: "McGill University"
+
+highlighted_by:
+- name: Science
+  logo: "science.png"
+
+- name: Bloomberg
+  logo: "bloomberg.png"
+
+- name: CUNY UFS
+  logo: "cuny-ufs.png"
+
+- name: Swiss Universities
+  logo: "swiss-universities.png"
+
+- name: University of California
+  logo: "uc.png"
+
+- name: Inside Higher Ed
+  logo: "inside-higher-ed.png"
+
+- name: National Academies
+  logo: "national-academies.png"

_drafts/template.md

@@ -8,7 +8,6 @@ permalink: /template # This is the link it'll show up at.
 pdf: "https://osf.io/preprints/lissa/2pwft/download" # if you have a pdf for the post put this here and it'll be used for the print button
 
 # RARELY USED
-
 hidden: true # exclude a post/page from pagination
 date: 2019-03-29 03:00:00 # This date will override the date in the file name. Mainly we use it to handle ordering in reports / threads. The date can be the day the report was published, and the time can be used to sort posts.
 authors: # This can be used to specify authors as below. This will change what the author box does. If you don't give any authors it'll use Claudio and SPARC, and you can delete this.
@@ -19,6 +18,7 @@ authors: # This can be used to specify authors as below. This will change what t
 #  - joe
 #  - nick
 featured: true # This will make it turn up at the top of threads
+homepage_latest: true # This will add it to the homepage’s "Latest Analysis" section 
 
 # FOR LINK ONLY POSTS
 link: https://sparcopen.org/news/2020/qa-cengage-mcgraw-hill-merger-one-year-and-counting/ # If you're doing a link only post, put the link here. Otherwise, delete this.

_includes/authors-box.html

@@ -7,13 +7,13 @@ <h2>
   {% for author in page.authors %}
   {% assign au = site.data.authors[author] %}
   <article class="row">
-    <div class="col col--1of6 col--group">
+    <div class="col col--2of6 col--group">
       <figure class="portrait">
         <img src="{{ site.BASE_PATH }}/media/team/{{ au[0].first_name | downcase }}.png" alt="Portrait of {{ au[0].full_name }}"/>
       </figure>
     </div>
 
-    <div class="col col--5of6 col--group">
+    <div class="col col--4of6 col--group">
       <h3>{{ au[0].full_name }}</h3>
       <p>{{ au[0].short_bio }}</p>
       {% if au[0].contact %}

_includes/footer.html

@@ -9,11 +9,9 @@
         {% include svg/by.svg %}
       </a>
 
-      <a>
         <a href="https://github.com/{{ site.author.github }}/infrastructure" target="_blank" rel="noopener" title="The code is open source on Github.">
           {% include svg/github.svg %}
         </a>
-      </a>
       {% endif %}
     </p>
     <p class="print-only">

_includes/pagination.html

@@ -1,8 +1,20 @@
+{% if page.previous.link %}
+{% capture previous_link %}{{ page.previous.link }}{% endcapture %}
+{% else %}
+{% capture previous_link %}{{ site.BASE_PATH }}{{ page.previous.url }}{% endcapture %}
+{% endif %}
+
+{% if page.next.link %}
+{% capture next_link %}{{ page.next.link }}{% endcapture %}
+{% else %}
+{% capture next_link %}{{ site.BASE_PATH }}{{ page.next.url }}{% endcapture %}
+{% endif %}
+
 <nav class="pagination">
   <div class="pagination__prev">
     <h2 class="sr-only">Previous article</h2>
     {% if page.previous.url %}
-    <a href="{{ site.BASE_PATH }}/{{ page.previous.url }}">
+    <a href="{{ previous_link }}"{% if page.previous.link %} target="_blank" rel="noopener"{% endif %}>
       {% include svg/arrow-left.svg %}
       {{ page.previous.title }}
     </a>
@@ -12,7 +24,7 @@ <h2 class="sr-only">Previous article</h2>
   <div class="pagination__next">
     <h2 class="sr-only">Next article</h2>
     {% if page.next.url %}
-    <a href="{{ site.BASE_PATH }}/{{ page.next.url }}">
+    <a href="{{ next_link }}"{% if page.next.link %} target="_blank" rel="noopener"{% endif %}>
       {{ page.next.title }}
       {% include svg/arrow-right.svg %}
     </a>

_includes/post.html

@@ -1,6 +1,7 @@
 <li class="toc__item">
   <article class="row">
     <header class="col col--group col--1of3">
+      {% if post.section %}<p class="label"><small>{{ post.section }}</small></p>{% endif %}
       <h4>
         <a {% if post.link %}href="{{ post.link }}" target="_blank" rel="noopener"{% else %}href="{{ post.permalink }}"{% endif %} class="toc__link">
           {{ post.title }}{% if post.link %} {% include svg/arrow-northeast.svg %}{% endif %}

_includes/thread-toc.html

@@ -5,7 +5,7 @@
   - reports (using categories)
   - topics (using tags)
 {% endcomment %}
-{% if page.name contains "report-" %}
+{% if page.collection == 'reports' %}
   {% assign thread_type = "categories" %}
 {% else %}
   {% assign thread_type = "tags" %}
@@ -17,7 +17,7 @@
 {% if page.name == "latest.md" %}
   {% assign posts = site.posts %}
 {% elsif page.name == "members.md" %}
-  {% assign posts = site.members %}
+  {% assign posts = site.members | reverse %}
 {% elsif page.reversed %}
   {% assign posts = site.[thread_type].[thread] | reverse %}
 {% else %}