Melody review

.gitignore

@@ -1,3 +1,29 @@
+## For Jekyll
+
 _site
 .sass-cache
 .jekyll-metadata
+
+## For vim
+
+# Swap
+[._]*.s[a-v][a-z]
+!*.svg  # comment out if you don't need vector files
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+Sessionx.vim
+
+# Temporary
+.netrwhist
+*~
+
+# Auto-generated tag files
+tags
+
+# Persistent undo
+[._]*.un~

Gemfile

@@ -1,33 +1,6 @@
 source "https://rubygems.org"
-
-# 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", "~> 3.8.7"
-
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
-
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
 gem "github-pages", group: :jekyll_plugins
 
-# If you have any plugins, put them here!
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.6"
-end
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-# and associated library.
-install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
-  gem "tzinfo", "~> 1.2"
-  gem "tzinfo-data"
-end
-
-# Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
+end

README.md

@@ -1,7 +1,25 @@
 # worldmusic
 
-This page houses the code for the [World Music Textbook](worldmusictextbook.org).
+This page houses the **development version** of the code for the [World Music Textbook](worldmusictextbook.org).
 
 <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>.
 
 Feel free to email the editors at [[email protected]](mailto:[email protected]) if you are interested in contributing.
+
+## Next up
+
+### For code
+
+* Add home page or clickable spot in header
+* Remove upper border on item list (both for resources and chapters)
+* Add image thumbnails to `chapter.html` and chapters
+* Balance columns in footer (play with form size)
+* Route Kristina’s essay, the call, and the resources to be sure that we don’t break any bookmarks with the update
+
+### For content
+
+* Abstract for Kristina's essay
+* Add news to home page
+* Think about geoTags: do countries get their own? What about the USA? Mexico has one in the chapters
+* Set up custom pages
+  * Markdown files in a `custom` folder that use chapter.html and item.html to include specific resources, with headers

_config.yml

@@ -1,20 +1,5 @@
-# Welcome to Jekyll!
-#
-# This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely edit after that. If you find
-# yourself editing this file very often, consider using Jekyll's data files
-# feature for the data you need to update frequently.
-#
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
-
-# Site settings
-# These are used to personalize your new site. If you look in the HTML files,
-# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
-# You can create any custom variable you would like, and they will be accessible
-# in the templates via {{ site.myvariable }}.
-title: World Music Textbook
 repository: worldmusic/worldmusic.github.io
+title: World Music Textbook
 author: Maintained by Christopher Witulski
 email: [email protected]
 description: >- # this means to ignore newlines until "baseurl:"
@@ -23,9 +8,8 @@ description: >- # this means to ignore newlines until "baseurl:"
 timezone: America/New_York
 baseurl: "" # the subpath of your site, e.g. /blog
 url: https://worldmusictextbook.org # the base hostname & protocol for your site, e.g. http://example.com
-# twitter_username: jekyllrb
-# github_username:  jekyll
-# google_analytics: UA-80548224-5
+facebook_username: WorldMusicTextbook
+twitter_username: music_textbook
 collections:
   - resources
 
@@ -35,16 +19,4 @@ theme: jekyll-theme-cayman
 plugins:
   - jekyll-feed
 sass:
-  sass_dir: _sass
-
-# Exclude from processing.
-# The following items will not be processed, by default. Create a custom list
-# to override the default setting.
-# exclude:
-#   - Gemfile
-#   - Gemfile.lock
-#   - node_modules
-#   - vendor/bundle/
-#   - vendor/cache/
-#   - vendor/gems/
-#   - vendor/ruby/
+  sass_dir: /_sass

_includes/chapter.html

@@ -0,0 +1,18 @@
+<p class="hang">{{ chapter.author }}{% if chapter.author2 %}, {{ chapter.author2 }}{% endif %}, <a href="{{ site.baseurl }}{{ chapter.url }}">"{{ chapter.title }},"</a> ({{ chapter.date | date: "%b %Y" }})</p>
+
+{% if chapter.description %}
+    <p class="description">{{ chapter.description }}</p>
+{% endif %}
+
+{% if chapter.tags %}
+    {% assign sorted-tags = (chapter.tags | sort) %}
+    {% for tag in sorted-tags %}
+        <span class = 'tag btn'>{{ tag }}</span>
+    {% endfor %}
+{% endif %}
+{% if chapter.geoTags %}
+    {% assign sorted-geoTags = (chapter.geoTags | sort) %}
+    {% for geoTag in sorted-geoTags %}
+        <span class = 'tag btn geoTag'>{{ geoTag }}</span>
+    {% endfor %}
+{% endif %}

_includes/footer.html

@@ -0,0 +1,61 @@
+<footer id="content" class="site-footer">
+  <div class="row">
+    <div class="two-column">
+      <h3>Comments, mailing list</h2>
+      <p>
+        With our aim to provide a collaborative and open free resource for instructors and students alike, we invite you to share any ideas about what you wish you had available for your students.
+      </p>
+      <form method="POST" netlify>
+
+        <textarea name="suggestions" rows="4" placeholder = "I have some thoughts"></textarea>
+
+        <p>
+          If you would like to be involved, please contact the editors. For updates, join our mailing list by entering your email below. We will not sell or share your responses without your permission.
+        </p>
+
+        <center>
+          <input type="text" name="name" placeholder="Your name (optional)" size = "50">
+          <input type="text" name="email" placeholder="Your email (optional)" size = "50">
+          <br />
+
+          <input type = "submit" class="btn" value = "Send">
+        </center>
+      </form>
+    </div>
+
+    <div class="two-column">
+      <h3>General Editors</h3>
+      <ul>
+        <li><a href="https://www.smu.edu/Meadows/AreasOfStudy/Music/Faculty/NielsenKristina">Kristina Nielsen</a></li>
+        <li><a href="https://www.cpp.edu/class/music/faculty-staff/jessie-vallejo.shtml">Jessie Vallejo</a></li>
+        <li><a href="https://www.bgsu.edu/musical-arts/faculty-and-staff/christopher-witulski.html">Christopher Witulski</a></li>
+      </ul>
+      <h3>Get in touch</h3>
+      <ul>
+        <li><a href="mailto:{{site.email}}">E-mail</a></li>
+        <li><a href="https://www.facebook.com/{{site.facebook_username}}">Facebook</a></li>
+        <li><a href="https://twitter.com/{{site.twitter_username}}">Twitter</a></li>
+      </ul>
+      <h3>Site Map</h3>
+      <ul>
+        <li><a href="{{ site.baseurl }}/">Site homepage</a></li>
+        <li><a href="{{ site.baseurl }}/chapters">Chapters</a></li>
+        <li><a href="{{ site.baseurl }}/resources">Other open resources</a></li>
+        <li><a href="{{ site.baseurl }}/call">Call for contributions</a></li>
+        <li><a href="{{ site.baseurl }}/about">About the project</a></li>
+      </ul>
+      <h3>License and development</h3>
+      <p>
+        Worldmusictextbook.org is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a> at <a href="{{ site.github.repository_url }}">{{ site.github.repository_name }}</a>.
+      </p>    
+      <p>
+        This work is licensed under a <a href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution — Non-Commercial — No Derivatives 4.0 International License</a>.<br />
+      </p>
+      <center>
+        <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0; margin:0.5rem;" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a>
+      </center>
+    </div>
+  </div>
+
+  <script data-goatcounter="https://worldmusic.goatcounter.com/count" async src="//gc.zgo.at/count.js"></script>
+</footer>

_includes/item.html

@@ -46,4 +46,10 @@
     {% for tag in sorted-tags %}
         <span class = 'tag btn'>{{ tag }}</span>
     {% endfor %}
+{% endif %}
+{% if pub.geoTags %}
+    {% assign sorted-geoTags = (pub.geoTags | sort) %}
+    {% for geoTag in sorted-geoTags %}
+        <span class = 'tag btn geoTag'>{{ geoTag }}</span>
+    {% endfor %}
 {% endif %}

_includes/page-header.html

@@ -0,0 +1,21 @@
+<header role="banner">
+  <input type="checkbox" id="overlay-input" />
+  <label for="overlay-input" id="overlay-button"><span></span></label>
+  <div id="overlay">
+    <ul>
+      <li><a href="{{ site.baseurl }}/">Home</a></li>
+      <li><a href="{{ site.baseurl }}/chapters">Chapters</a></li>
+      <li><a href="{{ site.baseurl }}/resources">Other Resources</a></li>
+      <li><a href="{{ site.baseurl }}/call">Call for Contributions</a></li>
+      <li><a href="{{ site.baseurl }}/about">About the project</a></li>
+    </ul>
+  </div>
+  <div class="page-header turtle">
+    <h1 class="project-name">{{ page.title | site.title | site.github.repository_name }}</h1>
+    <h2 class="project-tagline">
+      {{ page.author | default: page.description | site.description | site.github.project_tagline }}
+      {% if page.author2 %} and {{ page.author2 }}{% endif %}
+    </h2>
+  </div>
+
+</header>

_includes/site-header.html

@@ -0,0 +1,8 @@
+<head>
+  <meta charset="UTF-8">
+  {% seo %}
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="theme-color" content="#157878">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/style.css">
+</head>

_includes/tag-script.html

@@ -0,0 +1,93 @@
+<script>
+
+  // collect tags for the filter list
+  var tagElements = document.getElementsByClassName("tag");
+  var tagList = document.getElementById("tagList");
+  var tags = [];
+  var geoTags = [];
+
+  for (i = 0; i < tagElements.length; i++) {
+      if (tags.indexOf(tagElements[i].innerText) < 0 && geoTags.indexOf(tagElements[i].innerText) < 0) {
+          if (tagElements[i].classList.contains("geoTag")) {
+            geoTags.push(tagElements[i].innerText);
+          }
+          else {
+            tags.push(tagElements[i].innerText);
+          }
+      }
+  }
+
+  // create buttons for the filter list
+  tags.sort();
+  for (i = 0; i < tags.length; i++) {
+      var button = document.createElement("span");
+      var text = document.createTextNode(tags[i]);
+      button.appendChild(text);
+      button.classList.add("tag");
+      button.classList.add("filter");
+      button.classList.add("btn");
+      tagList.appendChild(button);
+  }
+
+  geoTags.sort();
+  for (i = 0; i < geoTags.length; i++) {
+      var button = document.createElement("span");
+      var text = document.createTextNode(geoTags[i]);
+      button.appendChild(text);
+      button.classList.add("tag");
+      button.classList.add("filter");
+      button.classList.add("btn");
+      button.classList.add("geoTag");
+      tagList.appendChild(button);
+  }
+
+  // set events for filter list
+  var active = [];
+
+  var filters = document.getElementsByClassName("filter");
+  var items = document.getElementsByClassName("item");
+  for (i = 0; i < filters.length; i++) {
+      let e = filters[i];
+      e.addEventListener("click", function() {
+
+          // change button status and create list of active tags
+          if (e.classList.contains("active")) {
+              e.classList.remove("active");
+              active.splice(active.indexOf(e.innerText), 1);
+          }
+          else {
+              e.classList.add("active");
+              active.push(e.innerText);
+          }
+
+          // hide and show items
+          if (active.length == 0) {
+              for (j = 0; j < items.length; j++) {
+                  items[j].style.display = "block";
+              }
+          }
+          else {
+
+              // get item tags and check that each one is active
+              for (j = 0; j < items.length; j++) {
+                  let itemTags = items[j].getElementsByTagName("span");
+                  let matches = 0;
+                  for (k = 0; k < itemTags.length; k++) {
+                      if (active.indexOf(itemTags[k].innerText) >= 0) {
+                          matches++;
+                      }
+                  }
+
+                  // show or hide
+                  if (matches >= active.length) {
+                      items[j].style.display = "block";
+                  }
+                  else {
+                      items[j].style.display = "none";
+                  }
+              }
+          }
+      })
+  }
+  </script>
+