jekyll-theme-open-course 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c44228f16269009a36ed91cb93d45493edda39485bce1bcb768a07a22945fb2
-  data.tar.gz: 74ee9d5d5fe34e59b200b6d865c764faa1c55cea6b2f940661ecc8ee7cf566f5
+  metadata.gz: 7b09a6cad886465d099731b73e29af902f0090bd7dd2ea5fa205605db2985d79
+  data.tar.gz: 78eebd7ecb8fcad3138444969f987b3bff2ceeb402114e502bbc523a4c1f860e
 SHA512:
-  metadata.gz: 7aebe324212b4fc8513f218d6298c05a8ea3f0a67f8941a58af242d81aa5169803668f0749d7bd254c6ac18e3828a4e91ccd227f24bbc297c8425046b126c48a
-  data.tar.gz: 29acc9e346bd4d78206878b98394d63b7474c12c1302f2d38da50559bc1e67d2cf02d5092e808db984df4e88863eda618285c53c8d50ac2aea2638b41463a637
+  metadata.gz: b70ff525e5feffc9c4717a1756af5ab92a21fdb095a8f425ecb18e822391a2e8a0345a84d9917c578f8fe249ea99c00516434542f467a43be458e3d970ba98ea
+  data.tar.gz: '0795071f2df2501ed8799f2420ca96223aaaa8319ce7c97f86369cd6977a437fe8536d9b97bc12721317636fcdd9a1a01ca7e821d52f97217fa3a52a8d82ed92'

data/_layouts/calendar.html

@@ -4,13 +4,21 @@ layout: default
 {% assign util = site.data.utility %}
 {% assign projects = site.projects %}
 
+{% assign week_count = site.data.calendar | size %}
+{% assign final_week = week_count | minus: 1 %}
+
+{% assign today = "today" | date: "%s" %}
+{% assign last_expiry = site.data.calendar[final_week].expires | date: "%s" %}
+
 {% assign current = true %}
+{% if today > last_expiry %}
+  {% assign current = false %}
+{% endif %}
 
 {% for entry in site.data.calendar %}
   {% assign week_int = forloop.index | times: 1 %}
   {% capture week_num %}{% if week_int < 10 %}0{% endif %}{{ week_int }}{% endcapture %}
   {% assign week = site.weeks[forloop.index0] %}
-  {% assign today = "today" | date: "%s" %}
   {% assign expiry = entry.expires | date: "%s" %}
 
   <!-- past dates? -->
@@ -66,7 +74,12 @@ layout: default
     <aside class="assigned">
       <header>
         <h3>Assigned Work</h3>
-        <small>Due {{ entry.expires | date: "%A, %B %-e" }}</small>
+        {% if entry.due_date %}
+          {% assign due_date = entry.due_date %}
+        {% else %}
+          {% assign due_date = entry.expires %}
+        {% endif %}
+        <small>Due {{ due_date | date: "%A, %B %-e" }}</small>
       </header>
       {% if week.readings %}
       <section class="readings">

data/assets/js/site.js

@@ -25,73 +25,111 @@ if ('serviceWorker' in navigator) {
   }
 }
 
-function themeSwitcher() {
-  // Exit fast if no CSS properties support
-  if (!('supports' in CSS && CSS.supports("(--foo: bar)"))) {
-    return;
-  }
-
-  var header = document.querySelector('#header h1');
-  var toggle = document.createElement('a');
-  var html = document.querySelector('html');
-  // Icons from https://remixicon.com/
-  var icons = {
-    light: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zm0-2a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85l1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/></svg>',
-    dark: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M11.38 2.019a7.5 7.5 0 1 0 10.6 10.6C21.662 17.854 17.316 22 12.001 22 6.477 22 2 17.523 2 12c0-5.315 4.146-9.661 9.38-9.981z"/></svg>'
-  }
+// Load up the theme switcher if @supports & custom properties available
+if ('supports' in CSS && CSS.supports("(--foo: bar)")) {
 
-  var dark_mode = false;
-  var modes = ['light','dark'];
+  function ThemeSwitch() {
+    var html = document.querySelector('html');
+    var icons = {
+      light: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zm0-2a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85l1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/></svg>',
+      dark: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M11.38 2.019a7.5 7.5 0 1 0 10.6 10.6C21.662 17.854 17.316 22 12.001 22 6.477 22 2 17.523 2 12c0-5.315 4.146-9.661 9.38-9.981z"/></svg>',
+      system: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2V4a8 8 0 1 0 0 16z"/></svg>'
+      // system: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 1l9.5 5.5v11L12 23l-9.5-5.5v-11L12 1zm0 2.311L4.5 7.653v8.694l7.5 4.342 7.5-4.342V7.653L12 3.311zM12 16a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm0-2a2 2 0 1 0 0-4 2 2 0 0 0 0 4z"/></svg>'
+    }
+    var mode = 'system';
+    var modes = ['dark','light'];
+    var button = document.createElement('a');
 
-  if ('matchMedia' in window) {
-    dark_mode = window.matchMedia('(prefers-color-scheme: dark)').matches;
-    if (dark_mode) {
-      modes.reverse(); // ['dark','light']
+    var cleanupOldPreferences = function() {
+      // Clean up earlier `modes` item
+      if (storageAvailable('localStorage')) {
+        localStorage.removeItem('modes');
+      }
     }
-  }
 
-  if (storageAvailable('localStorage')) {
-    if (!localStorage.getItem('modes')) {
-      localStorage.setItem('modes',modes.join(','));
-    } else {
-      modes = localStorage.getItem('modes').split(',');
+    var loadPreference = function() {
+      // read from local storage
+      if (storageAvailable('localStorage')) {
+        if (localStorage.getItem('mode')) {
+          mode = localStorage.getItem('mode');
+        } else {
+          mode = 'system';
+        }
+      }
     }
-  }
 
-  html.classList.add(modes[0]);
+    var setModeOrder = function() {
+      // reverse the modes if dark mode is preferred,
+      // or if dark is set in preferences
+      if ('matchMedia' in window) {
+        if (window.matchMedia('(prefers-color-scheme: dark)').matches && (mode !== 'light')) {
+          modes.reverse(); // ['light','dark']
+        }
+      }
+      // system gets tacked onto the end as the last option, always
+      modes.push('system');
+    }
 
-  toggle.id = 'theme-toggle';
-  toggle.href = '#null';
-  toggle.title = 'Switch to ' + modes[1] + ' theme';
-  toggle.innerHTML = icons[modes[1]];
-  header.appendChild(toggle);
+    var storePreference = function() {
+      // store current mode (default or selected) in local storage
+      if (storageAvailable('localStorage')) {
+        localStorage.setItem('mode', mode);
+      }
+    }
 
-  toggle.addEventListener('click', function(e) {
-    e.preventDefault();
-    html.classList.replace(modes[0],modes[1]);
-    modes.reverse();
-    if (storageAvailable('localStorage')) {
-      localStorage.setItem('modes',modes.join(','));
+    var setHTMLClass = function() {
+      html.classList.replace(mode,modes[0]);
     }
-    toggle.title = 'Switch to ' + modes[1] + ' theme';
-    toggle.innerHTML = icons[modes[1]];
-  });
 
-  function storageAvailable(type) {
-    try {
-      var storage = window[type];
-      var x = '__storage_test__';
-      storage.setItem(x, x);
-      storage.removeItem(x);
-      return true;
+    var cycleModes = function() {
+      mode = modes.shift(); // grab the current mode from the front of the array...
+      modes.push(mode); // ...and push it to the end of the array
     }
-    catch(e) {
-      return false;
+
+    this.switcherButton = function() {
+      button.id = 'theme-button';
+      button.href = '#null';
+      button.title = 'Switch to ' + modes[0] + ' theme';
+      button.innerHTML = icons[modes[0]];
+      button.addEventListener('click', function(e) {
+        e.preventDefault();
+        // fix the class list on <html>
+        setHTMLClass();
+        cycleModes();
+        storePreference();
+        button.title = 'Switch to ' + modes[0] + ' theme';
+        button.innerHTML = icons[modes[0]];
+      });
+      return button;
     }
+
+    // Do things on construction
+    cleanupOldPreferences();
+    loadPreference();
+    setModeOrder();
+    html.classList.add(mode);
   }
+
+  var ts = new ThemeSwitch();
+  var ts_li = document.createElement('li');
+  ts_li.id = 'nav-thm';
+  ts_li.appendChild(ts.switcherButton());
+  document.querySelector('#quick-nav .nav').appendChild(ts_li);
 }
 
-themeSwitcher();
+
+function storageAvailable(type) {
+  try {
+    var storage = window[type];
+    var x = '__storage_test__';
+    storage.setItem(x, x);
+    storage.removeItem(x);
+    return true;
+  }
+  catch(e) {
+    return false;
+  }
+}
 
 // Move the nav to the header when there is room
 // Responsive detection
@@ -107,34 +145,47 @@ function responsiveFeature(feature) {
 }
 
 function ToggledNav() {
-  this.nav = document.querySelector('#full-nav .nav');
-  this.quick_nav = document.querySelector('#quick-nav .nav');
-  this.full_nav = document.querySelector('#full-nav');
-  this.nav_nav;
-  this.nav_items = [];
+  var nav = document.querySelector('#full-nav .nav');
+  var quick_nav = document.querySelector('#quick-nav .nav');
+  var full_nav = document.querySelector('#full-nav');
+  var thm_btn = document.querySelector('#theme-button')
+  var nav_thm;
+  var nav_nav;
+  var nav_items = [];
   this.toggle = function() {
     if (responsiveFeature('navbar') && !html.classList.contains('navbar')) {
-      while (this.nav.firstChild) {
-        if (this.nav.firstChild.tagName) {
-          this.nav_items.push(this.nav.removeChild(this.nav.firstChild));
+      if (thm_btn) {
+        nav_thm = quick_nav.removeChild(document.getElementById('nav-thm'));
+      }
+      while (nav.firstChild) {
+        if (nav.firstChild.tagName) {
+          nav_items.push(nav.removeChild(nav.firstChild));
         } else {
-          this.nav.removeChild(this.nav.firstChild); // remove text nodes
+          nav.removeChild(nav.firstChild); // remove text nodes
         }
       }
-      for (var i = 0; i < this.nav_items.length; i++) {
-        this.quick_nav.appendChild(this.nav_items[i]);
+      for (var i = 0; i < nav_items.length; i++) {
+        quick_nav.appendChild(nav_items[i]);
       }
-      this.nav_nav = this.quick_nav.removeChild(document.getElementById('nav-nav'));
+      if (thm_btn) {
+        quick_nav.appendChild(nav_thm);
+      }
+      nav_nav = quick_nav.removeChild(document.getElementById('nav-nav'));
       html.classList.add('navbar');
-      this.full_nav.classList.add('hidden');
+      full_nav.classList.add('hidden');
     }
     if (!responsiveFeature('navbar') && html.classList.contains('navbar')) {
-      console.log('nav-nav node name:', this.nav_nav.nodeName);
-      this.quick_nav.appendChild(this.nav_nav);
-      for (var i = 0; i < this.nav_items.length; i++) {
-        this.nav.appendChild(this.nav_items[i]);
+      if (thm_btn) {
+        nav_thm = quick_nav.removeChild(document.getElementById('nav-thm'));
+      }
+      quick_nav.appendChild(nav_nav);
+      for (var i = 0; i < nav_items.length; i++) {
+        nav.appendChild(nav_items[i]);
+      }
+      if (thm_btn) {
+        quick_nav.appendChild(nav_thm);
       }
-      this.full_nav.classList.remove('hidden');
+      full_nav.classList.remove('hidden');
       html.classList.remove('navbar');
     }
   }
@@ -149,7 +200,7 @@ window.addEventListener('resize', function() {
 
 
 // Capture and replicate the current week at the top of the calendar
-if (document.querySelector('#calendar')) {
+if ((document.querySelector('#calendar')) && (document.querySelector('#this-week'))) {
   var this_week = document.querySelector('#this-week').closest('article'); // grab this week's <article>
   var current_week = this_week.cloneNode(true); // make a copy of it,
   this_week.querySelector('#this-week').id = ''; // remove the original #this-week id
@@ -204,6 +255,8 @@ if ('fetch' in window) {
       data = data[0]; // only need most recent commit
       // Lowercase commit message's first word to run in `...to XYZ` copy:
       commit.message = data.commit.message.charAt(0).toLowerCase() + data.commit.message.slice(1);
+      // Grab only the first line of a multiline message
+      commit.message = commit.message.split("\n\n")[0];
       commit.url = data.html_url;
       commit.stamp = data.commit.author.date;
       commit.date = new Date(commit.stamp);

data/lib/jtoc.rb

@@ -3,7 +3,7 @@ module JTOpenCourse
   require 'erb'
   require 'date'
 
-  VERSION = "1.1.0"
+  VERSION = "1.2.1"
 
   SPELLED_NUMS = %w(
     Zero One Two Three Four Five Six Seven Eight Nine Ten Eleven Twelve Thirteen Fourteen Fifteen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-open-course
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Karl Stolley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Jekyll theme for accessible course sites.