ols-theme 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e2905715f937c96f36f448c64e6a53d7fa02d5150d0b92d05f273fcb7561c5
-  data.tar.gz: 3e248763cf900aabf92fb6ddc75eec5ddb920a9d38e88480bb91552bfa077341
+  metadata.gz: f3ad191687ed79576d794e2a6953acadbf844f43a29819c6a12c5d1a10e8576c
+  data.tar.gz: 86ce6edd2dc9281d087258846f03c855c42176ceef61c6f4d85a202a980ada71
 SHA512:
-  metadata.gz: 777a9994c2bbca3e15da6ad099df89574763b8fe4ac90788cbe764ec5451e9aa49f8152eea084f469c61e0b6d64b7f0e0f34d0fc3d20b043f6f118616fe7eaba
-  data.tar.gz: 82d3562ef6dc8d10b7566df7e0e79221dc1a1a31198361c128d99f965a198b713ce32da048ce18de3a19b620caa797c4ec4ca67c1443081ab756708732a54cae
+  metadata.gz: feaedfb429b3dc7168f18872f2891d57c452a6c2b856007a02912a26de79765461b45a2382f970f23c28341f37950bcc3a2e8312b40e59e89033153b28374cb7
+  data.tar.gz: ad4adb868cddc7e4beae6a66644718ff38c0cbd5fa16f5c055ba14c7ec2beb05bf3d2db85813f5ab17f24038261106eefde911ea6fd2b1f0c58893e84f62372e

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2023 NPDebs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2023 NPDebs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,50 +1,50 @@
-# ols-theme
-
-Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes`, your sass files in `_sass` and any other assets in `assets`.
-
-To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site!
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your Jekyll site's `Gemfile`:
-
-```ruby
-gem "ols-theme"
-```
-
-And add this line to your Jekyll site's `_config.yml`:
-
-```yaml
-theme: ols-theme
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install ols-theme
-
-## Usage
-
-TODO: Write usage instructions here. Describe your available layouts, includes, sass and/or assets.
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ols-theme. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](https://www.contributor-covenant.org/) code of conduct.
-
-## Development
-
-To set up your environment to develop this theme, run `bundle install`.
-
-Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
-
-When your theme is released, only the files in `_layouts`, `_includes`, `_sass` and `assets` tracked with Git will be bundled.
-To add a custom directory to your theme-gem, please edit the regexp in `ols-theme.gemspec` accordingly.
-
-## License
-
-The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# ols-theme
+
+Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes`, your sass files in `_sass` and any other assets in `assets`.
+
+To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site!
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your Jekyll site's `Gemfile`:
+
+```ruby
+gem "ols-theme"
+```
+
+And add this line to your Jekyll site's `_config.yml`:
+
+```yaml
+theme: ols-theme
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install ols-theme
+
+## Usage
+
+TODO: Write usage instructions here. Describe your available layouts, includes, sass and/or assets.
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ols-theme. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](https://www.contributor-covenant.org/) code of conduct.
+
+## Development
+
+To set up your environment to develop this theme, run `bundle install`.
+
+Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
+
+When your theme is released, only the files in `_layouts`, `_includes`, `_sass` and `assets` tracked with Git will be bundled.
+To add a custom directory to your theme-gem, please edit the regexp in `ols-theme.gemspec` accordingly.
+
+## License
+
+The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/_includes/default-footer.html

@@ -37,7 +37,7 @@
           </p>
           <p>
             The website content is licensed
-            <a href="http://creativecommons.org/licenses/by-sa/4.0/">CC BY SA 4.0</a>.
+            <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY SA 4.0</a>.
             The code behind the infrastructure is licensed under the <a href="{{ site.github.repository_url }}/blob/main/LICENSE.md">MIT License</a>
           </p>
           <p>
@@ -48,9 +48,9 @@
           <p>
             Open Life Science Limited is a non-profit charitable company limited by guarantee, based in the United Kingdom. 
             Company number 
-            <a href="http://data.companieshouse.gov.uk/doc/company/12824090">12824090</a>.
+            <a href="https://data.companieshouse.gov.uk/doc/company/12824090">12824090</a>.
           </p>
         </div>
       </div>
     </div>
-  </footer>
+  </footer>

data/_includes/default-header.html

@@ -1,8 +1,8 @@
 <nav class="navbar is-fixed-top" role="navigation" aria-label="main navigation">
     <div class="container">
       <div class="navbar-brand">
-        <a class="navbar-item" href="/">
-            <img src="{{ site.baseurl }}/assets/images/logo.png" alt="OLS">
+        <a class="navbar-item" href="{% link index.md %}">
+            <img src="/images/logo.png" alt="OLS">
         </a>
         <a
           role="button"
@@ -19,63 +19,62 @@
       <div id="top-menu" class="navbar-menu">
         <div class="navbar-end">
           <div class="navbar-item has-dropdown is-hoverable">
-            <a class="navbar-link">OLS program</a>
+            <a class="navbar-link" href="{% link openseeds/index.md %}">OLS program</a>
             <div class="navbar-dropdown">
-              <a class="navbar-item" href="/index#applications"> Applications </a>
-              <a class="navbar-item" href="/about"> The program itself </a>
-              <a class="navbar-item" href="/about#projects"> Projects </a>
-              <a class="navbar-item navbar-previous-title" href="/about#the-roles"> Role description </a>
-              <a class="navbar-item" href="/about#mentees"> Mentees </a>
-              <a class="navbar-item" href="/about#mentors"> Mentors </a>
-              <a class="navbar-item" href="/about#experts"> Experts </a>
-              <a class="navbar-item" href="/about#facilitators"> Facilitators </a>
-              <a class="navbar-item navbar-previous-title" href="/index#cohorts"> Cohorts </a>
+              <a class="navbar-item" href="{% link openseeds/index.md %}#applications"> Applications </a>
+              <a class="navbar-item" href="{% link about.md %}"> The program itself </a>
+              <a class="navbar-item" href="{% link about.md %}#projects"> Projects </a>
+              <a class="navbar-item navbar-previous-title" href="{% link about.md %}#the-roles"> Role description </a>
+              <a class="navbar-item" href="{% link about.md %}#mentees"> Mentees </a>
+              <a class="navbar-item" href="{% link about.md %}#mentors"> Mentors </a>
+              <a class="navbar-item" href="{% link about.md %}#experts"> Experts </a>
+              <a class="navbar-item" href="{% link about.md %}#facilitators"> Facilitators </a>
+              <a class="navbar-item navbar-previous-title" href="{% link openseeds/index.md %}#cohorts"> Cohorts </a>
+              <a class="navbar-item navbar-previous-title" href="{% link library.md %}"> Video Library </a>
             </div>
           </div>
 
           <div class="navbar-item has-dropdown is-hoverable">
-            <a class="navbar-link" href="/ols-7">OLS-7</a>
+            <a class="navbar-link" href="{% link openseeds/ols-8/index.md %}">OLS-8</a>
             <div class="navbar-dropdown">
-              <a class="navbar-item" href="/ols-7"> Syllabus </a>
-              <a class="navbar-item" href="/ols-7/schedule"> Schedule</a>
-              <a class="navbar-item" href="/ols-7/projects-participants/"> Projects & Participants</a>
+              <a class="navbar-item" href="{% link openseeds/ols-8/index.md %}"> Syllabus </a>
+              <a class="navbar-item" href="{% link openseeds/ols-8/schedule.md %}"> Schedule</a>
+              <!--<a class="navbar-item" href="/ols-7/projects-participants/"> Projects & Participants</a>
               <a class="navbar-item" href="/ols-7#mentors"> Mentors & Experts </a>
               <a class="navbar-item" href="/ols-7#collaborators"> Collaborators </a>
-              <a class="navbar-item" href="/ols-7#resources"> Resources </a>
+              <a class="navbar-item" href="/ols-7#resources"> Resources </a>-->
             </div>
           </div>
 
           <div class="navbar-item has-dropdown is-hoverable">
-            <a class="navbar-link" href="/about">Policies</a>
+            <a class="navbar-link" href="{% link about.md %}">Policies</a>
             <div class="navbar-dropdown">
               <a class="navbar-item" href="{{ site.github.owner_url }}/policies-procedures-and-docs/blob/main/CODE_OF_CONDUCT.md"> Code of Conduct </a>
             </div>
           </div>
 
           <div class="navbar-item has-dropdown is-hoverable">
-            <a class="navbar-link" href="/about">About</a>
+            <a class="navbar-link" href="{% link about.md %}">About</a>
             <div class="navbar-dropdown">
-              <a class="navbar-item" href="/people"> People </a>
-              <a class="navbar-item" href="/community"> Team & Community </a>
-              <a class="navbar-item" href="/funders"> Funding & Supporters </a>
-              <a class="navbar-item" href="/partners"> Partners </a>
+              <a class="navbar-item" href="{% link people.md %}"> People </a>
+              <a class="navbar-item" href="{% link community.md %}"> Team </a>
+              <a class="navbar-item" href="{% link funders.md %}"> Funding & Supporters </a>
+              <a class="navbar-item" href="{% link partners.md %}"> Partners </a>
               <!--<a class="navbar-item" href="/events"> Events </a>-->
             </div>
           </div>
 
-          <!--<div class="navbar-item has-dropdown is-hoverable">
-            <a class="navbar-link" href="/about">Services</a>
+          <div class="navbar-item has-dropdown is-hoverable">
+            <a class="navbar-link" href="{% link about.md %}">Services</a>
             <div class="navbar-dropdown">
-              <a class="navbar-item" href="/consulting"> Consulting </a>
-              <a class="navbar-item" href="/training"> On demand training </a>
-              <a class="navbar-item" href="/"> Fiscal hosting </a>
+              <a class="navbar-item" href="{% link consulting.md %}"> Consulting </a>
+              <!--<a class="navbar-item" href="/training"> On demand training </a>
+              <a class="navbar-item" href="/"> Fiscal hosting </a>-->
             </div>
-          </div>-->
-
-
-
-          <a class="navbar-item" href="/posts"> Stories </a>
+          </div>
+          
+          <a class="navbar-item" href="{% link posts.md %}"> Stories </a>
         </div>
       </div>
     </div>
-  </nav>
+  </nav>

data/_layouts/base.html

@@ -1,66 +1,64 @@
----
----
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>{{ page.title }} | {{ site.title }}</title>
-        {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
-        <link href="{{ site.baseurl }}/assets/css/custom.css" rel="stylesheet" type="text/css">
-        <link rel="stylesheet" href="https://cdn.rawgit.com/jpswalsh/academicons/master/css/academicons.min.css">
-        <!--Below is the schema annotation for blogposts-->
-        {% if page.layout == 'post' %}
-        <script type="application/ld+json">
-          {
-            "@context": "https://schema.org",
-            "@type": "BlogPosting",
-            "mainEntityOfPage": {
-              "@type": "WebPage",
-              "@id": "{{ site.url }}/posts/"
-              },
-            "headline": "{{ page.title }}",
-            "description": "{{ page.excerpt | strip_html | strip_newlines | truncate: 200 }}",
-            "image": "{{ page.image }}",
-            "author": [
-            {%- for author in page.authors -%}
-              {
-              "@type": "Person",
-              "name": "{{ site.data.people[author].first-name }} {{ site.data.people[author].last-name }}",
-              "url": "{{ site.url }}/people#{{ author }}"
-                {%- if forloop.last -%}
-                  }
-                  {%- else -%}
-                  },
-                {% endif %}
-            {%- endfor -%}],
-            "publisher": {
-              "@type": "Organization",
-              "name": "Open Life Science",
-              "url": "{{ site.url }}",
-              "logo": {
-                  "@type": "ImageObject",
-                  "url": "{{ site.url }}/images/logo.png"
-                }
-              },
-            "datePublished": "{{ page.date | date: "%Y-%m-%d" }}"
-          }
-        </script>
-        {% endif %}
-    </head>
-
-    <body>
-      {% include _includes/default-header.html %}
-        {{ content }}
-      {% include _includes/default-footer.html %}
-
-
-        <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
-        <script src="{{ site.baseurl }}/assets/js/scripts.js"></script>
-        <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-        {% if page.layout == 'posts' %}
-          <script src="{{ site.baseurl }}/assets/js/posts.js"></script>
-        {% endif %}
-      </body>
-</html>
+---
+---
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>{{ page.title }} | {{ site.title }}</title>
+        {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
+        <link href="{{ site.baseurl }}/css/custom.css" rel="stylesheet" type="text/css">
+        <link rel="stylesheet" href="https://cdn.rawgit.com/jpswalsh/academicons/master/css/academicons.min.css">
+        <!--Below is the schema annotation for blogposts-->
+        {% if page.layout == 'post' %}
+        <script type="application/ld+json">
+          {
+            "@context": "https://schema.org",
+            "@type": "BlogPosting",
+            "mainEntityOfPage": {
+              "@type": "WebPage",
+              "@id": "{{ site.url }}/posts/"
+              },
+            "headline": "{{ page.title }}",
+            "description": "{{ page.excerpt | strip_html | strip_newlines | truncate: 200 }}",
+            "image": "{{ page.image }}",
+            "author": [
+            {%- for author in page.authors -%}
+              {
+              "@type": "Person",
+              "name": "{{ site.data.people[author].first-name }} {{ site.data.people[author].last-name }}",
+              "url": "{{ site.url }}/people#{{ author }}"
+                {%- if forloop.last -%}
+                  }
+                  {%- else -%}
+                  },
+                {% endif %}
+            {%- endfor -%}],
+            "publisher": {
+              "@type": "Organization",
+              "name": "Open Life Science",
+              "url": "{{ site.url }}",
+              "logo": {
+                  "@type": "ImageObject",
+                  "url": "{{ site.url }}/images/logo.png"
+                }
+              },
+            "datePublished": "{{ page.date | date: "%Y-%m-%d" }}"
+          }
+        </script>
+        {% endif %}
+    </head>
+
+    <body>
+        {{ content }}
+
+        <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
+        <script src="/js/bulma-collapsible.min.js"></script>
+        <script src="/js/scripts.js"></script>
+        <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+        {% if page.layout == 'posts' %}
+          <script src="/js/posts.js"></script>
+        {% endif %}
+      </body>
+</html>

data/_layouts/default.html

@@ -1,37 +1,39 @@
----
-layout: base
----
-
-{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
-
-<section class="hero {% unless page.image %} no-image{% endunless %}"{% if page.image %} style="background-image: linear-gradient(to top, #000, transparent), url({{ page.image }});"{% endif %}>
-  <div class="hero-body">
-    <h1 class="title is-1">{{ page.title }}</h1>
-
-    {% if page.description %}
-      <p class="subtitle is-3">{{ page.description }}</p>
-    {% endif %}
-
-    {% if page.layout == 'post' %}
-      {% capture authors %}
-      {% for id in page.authors %}, {% assign name = site.data['people'][id].first-name | default: id %}<a href="/people#{{ id }}">{{ name }}</a>{% endfor %}
-      {% endcapture %}
-      <p class="subtitle is-5">
-          <time datetime="{{ page.date | date: date_format }}">{{ page.date | date: date_format }}</time>
-          - {{ authors | remove_first: ', ' | strip }}
-      </p>
-    {% endif %}
-  </div>
-
-  {% if page.photos %}
-  <div class="hero-foot">
-    <p class="credit"><a href="{{ page.photos.link }}">{{ page.photos.name }}</a> ({{ page.photos.license }})</p>
-  </div>
-  {% endif %}
-</section>
-
-<section class="section">
-  <div class="container content {{ layout.css }} {{ page.css }}">
-    {{ content }}
-  </div>
-</section>
+---
+layout: index
+---
+
+{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
+
+<section class="hero {% unless page.image %} no-image{% endunless %}"{% if page.image %} style="background-image: linear-gradient(to top, #000, transparent), url({{ page.image }});"{% endif %}>
+  <div class="hero-body">
+    <h1 class="title is-1">{{ page.title }}</h1>
+
+    {% if page.description %}
+      <p class="subtitle is-3">{{ page.description }}</p>
+    {% endif %}
+
+    {% if page.layout == 'post' %}
+      {% capture authors %}
+      {% for id in page.authors %}, {% assign name = site.data['people'][id].first-name | default: id %}<a href="{% link people.md %}#{{ id }}">{{ name }}</a>{% endfor %}
+      {% endcapture %}
+      <p class="subtitle is-5">
+          <time datetime="{{ page.date | date: date_format }}">{{ page.date | date: date_format }}</time>
+          - {{ authors | remove_first: ', ' | strip }}
+      </p>
+    {% endif %}
+  </div>
+
+  {% if page.photos %}
+  <div class="hero-foot">
+    {% if page.photos.name or page.photos.url or page.photos.license %}
+    <p class="credit">{% if page.photos.url %}<a href="{{ page.photos.url }}">{% if page.photos.name %}{{ page.photos.name }}{% else %}{{ page.photos.url }}{% endif %}</a>{% elsif page.photos.name %}}{{ page.photos.name }}{% endif %} {% if page.photos.license %}({{ page.photos.license }}){% endif %}</p>
+    {% endif %}
+  </div>
+  {% endif %}
+</section>
+
+<section class="section">
+  <div class="container content {{ layout.css }} {{ page.css }}">
+    {{ content }}
+  </div>
+</section>

data/_layouts/index.html

@@ -0,0 +1,7 @@
+---
+layout: base
+---
+
+{% include _includes/default-header.html %}
+{{ content }}
+{% include _includes/default-footer.html %}

data/_layouts/page.html

@@ -1,9 +1,9 @@
----
-layout: default
----
-
-<section>
-    <div class="article-post">
-        {{content}}
-    </div>    
+---
+layout: default
+---
+
+<section>
+    <div class="article-post">
+        {{ content }}
+    </div>
 </section>