Merge branch 'master' into yueqiao_page_update

Author: kyuchia

.github/workflows/broken-link-checker.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Execute Link Checker and Show Broken Links
         env:
           TEMPORARY_WEBSITE_URL: "http://127.0.0.1:8000"
-          ACTUAL_WEBSITE_URL: "https://ddmal.music.mcgill.ca"
+          ACTUAL_WEBSITE_URL: "https://ddmal.ca"
         run: |
           output=$(blc $TEMPORARY_WEBSITE_URL -re | \
             grep -v -E '├───OK───|└───OK───' | \

404.html

@@ -15,49 +15,49 @@
       404: Page not found · DDMAL
     </title>
     <!-- CSS -->
-    <link rel="stylesheet" href="https://ddmal.music.mcgill.ca/assets/css/main.css" />
+    <link rel="stylesheet" href="https://ddmal.ca/assets/css/main.css" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
     <link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway:300,400,500" rel="stylesheet">
     <!-- Icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://ddmal.music.mcgill.ca/public/mcgill_crest.png">
-    <link rel="shortcut icon" href="https://ddmal.music.mcgill.ca/public/mcgill_crest.png">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://ddmal.ca/public/mcgill_crest.png">
+    <link rel="shortcut icon" href="https://ddmal.ca/public/mcgill_crest.png">
     <!-- RSS -->
-    <link rel="alternate" type="application/rss+xml" title="RSS" href="https://ddmal.music.mcgill.ca/atom.xml">
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="https://ddmal.ca/atom.xml">
   </head>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
   <nav class="navbar navbar-light fixed-top navbar-expand-lg bg-white">
-    <a class="navbar-brand" href="https://ddmal.music.mcgill.ca/">DDMAL</a>
+    <a class="navbar-brand" href="https://ddmal.ca/">DDMAL</a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav ml-auto" id="nav-items">
         <li class="nav-item">
-          <a class="nav-link" href="https://ddmal.music.mcgill.ca/index.html">Home <span class="sr-only">(current)</span></a>
+          <a class="nav-link" href="https://ddmal.ca/index.html">Home <span class="sr-only">(current)</span></a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="https://ddmal.music.mcgill.ca/lab_members/">Lab Members</a>
+          <a class="nav-link" href="https://ddmal.ca/lab_members/">Lab Members</a>
         </li>
         <li class="dropdown">
           <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">Activities<span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
-            <li><a href='https://ddmal.music.mcgill.ca/activities/media/' target='_top' >Media</a></li>
-            <li><a href='https://ddmal.music.mcgill.ca/activities/posters/' target='_top' >Posters</a></li>
-            <li><a href='https://ddmal.music.mcgill.ca/activities/presentations/' target='_top' >Presentations</a></li>
-            <li><a href='https://ddmal.music.mcgill.ca/activities/publications/' target='_top' >Publications</a></li>
+            <li><a href='https://ddmal.ca/activities/media/' target='_top' >Media</a></li>
+            <li><a href='https://ddmal.ca/activities/posters/' target='_top' >Posters</a></li>
+            <li><a href='https://ddmal.ca/activities/presentations/' target='_top' >Presentations</a></li>
+            <li><a href='https://ddmal.ca/activities/publications/' target='_top' >Publications</a></li>
           </ul>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="https://ddmal.music.mcgill.ca/research/">Research</a>
+          <a class="nav-link" href="https://ddmal.ca/research/">Research</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="https://ddmal.music.mcgill.ca/software/">Software</a>
+          <a class="nav-link" href="https://ddmal.ca/software/">Software</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="https://ddmal.music.mcgill.ca/events/">Events</a>
+          <a class="nav-link" href="https://ddmal.ca/events/">Events</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="https://ddmal.music.mcgill.ca/resources/">Resources</a>
+          <a class="nav-link" href="https://ddmal.ca/resources/">Resources</a>
         </li>
       </ul>
     </div>
@@ -69,20 +69,20 @@
       <div class="container content">
         <div class="page">
           <h1 class="page-title">404: Page not found</h1>
-          <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="https://ddmal.music.mcgill.ca/index.html">Head back home</a> to try finding it again.</p>
+          <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="https://ddmal.ca/index.html">Head back home</a> to try finding it again.</p>
         </div>
       </div>
     </div>
     <label for="sidebar-checkbox" class="sidebar-toggle"></label>
     <footer id="sticky">
       <div class="footer-img-wrap">
-        <img class="mcgill-img-footer" src="https://ddmal.music.mcgill.ca/assets/schulich_logo.png" alt="">
-        <img class="ddmal-img-footer" src="https://ddmal.music.mcgill.ca/assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
+        <img class="mcgill-img-footer" src="https://ddmal.ca/assets/schulich_logo.png" alt="">
+        <img class="ddmal-img-footer" src="https://ddmal.ca/assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
       </div>
     </footer>
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
-    <script src="https://ddmal.music.mcgill.ca/js/bootstrap.js"></script>
+    <script src="https://ddmal.ca/js/bootstrap.js"></script>
     <script type="text/javascript">
       $(document).ready(function () {
           var url = window.location;

CNAME

@@ -1 +1 @@
-ddmal.music.mcgill.ca
+ddmal.ca

README.md

@@ -22,13 +22,16 @@ Assuming you have [Git](https://www.atlassian.com/git/tutorials/install-git) ins
 git clone https://github.com/DDMAL/ddmal.github.io.git
 ```
 
-Enter the directory with `cd ddmal.github.io`, and pull from the repository to your local folder. Specifically, pull from the 'deforested' branch, the branch used by GitHub Pages to host the site.
+Enter the directory with `cd ddmal.github.io`, and pull from the repository to your local folder. Specifically, pull from 'master' (NOTE: this was once 'deforested'), the branch used by GitHub Pages to host the site.
 
 ```
-git pull origin deforested
+git pull origin master
 ```
 
-At this point, the site is able to be edited and run locally. Use the VSCode "Live Server" extension to view the static website in your browser and track changes automatically.
+At this point, the site is able to be edited and run locally. Use the VSCode "Live Server" extension to view the static website in your browser and track changes automatically. Make sure you make your own branch to be merged later. 
+
+> [!CAUTION]
+> As of [7 July 2023]([url](https://github.com/DDMAL/ddmal.github.io/pull/120)), deforested was merged with master; at this stage make sure you are pulling from master **not deforested** or you will get an error (probably "fatal:..." etc.). See https://github.com/DDMAL/ddmal.github.io/pull/120 . 
 
 ## Creating your lab member page
 

TEMPLATES/lab_member_template/index.html

@@ -74,7 +74,7 @@
             <!-- TODO: add your name here -->
             <h1 style="text-align: left;" class="page-title">Your Name</h1>
             <!-- TODO: link your cv in the href attribute here, or comment this line out -->
-            <a href="../../../assets/lab_members/cv/functionalsample.pdf"><img class="cv-icon" src="../../assets/resume-document.png" /></a>
+            <a href="../../../assets/lab_members/cv/functionalsample.pdf"><img class="cv-icon" src="../../../assets/resume-document.png" /></a>
             <!-- NOTE: make sure to add your pdf file to the assets/lab_members/cv directory -->
           </div>
           <div class="img-wrap">
@@ -142,7 +142,7 @@ <h1 style="text-align: left;" class="page-title">Your Name</h1>
             </div>
           </div>
           <div class="lab_member_bio">
-            <!-- TODO: add your bio in the <p> tag here. Visit https://ddmal.music.mcgill.ca/lab_members/ for reference. -->
+            <!-- TODO: add your bio in the <p> tag here. Visit https://ddmal.ca/lab_members/ for reference. -->
             <p>Your bio goes here.</p>
           </div>
           <div class="flex-wrap">
@@ -167,7 +167,7 @@ <h4 class="lab_member_subtitles">Academic Record</h4>
           <div class="publications">
             <h4 class="lab_member_subtitles">Publications </h4>
             <ul>
-              <li>https://doi.org/10.1145/2970044.2970047</li>
+              <li>https://doi.org/10.1000/182</li> <!--https://doi.org/10.1145/2970044.2970047-->
             </ul>
           </div>
         </div>
@@ -195,4 +195,4 @@ <h4 class="lab_member_subtitles">Publications </h4>
       });
     </script>
   </body>
-</html>
+</html>

activities/posters/content.json

@@ -1,7 +1,10 @@
 {
+    "2025": [
+        "Kun Fang, Kyrie Bouressa, Yu-Chia Kuo, Anna de Bakker, and Ichiro Fujinaga. 2025. \u201cUniversal Musical Instrument Lexicon: A Crowdsourced Platform for Expanding Multilingual Vocabularies and Enhancing Global Access to Musical Instrument Metadata.\u201d Accepted by 12th International Conference on Digital Libraries for Musicology, Sogang University, Seoul, South Korea."
+    ],
     "2019": [
         "Hopkins, Emily, Yaolong Ju, Gustavo Polins Pedro, Cory McKay, Julie Cumming, and Ichiro Fujinaga. 2019. \u201cSIMSSA DB: Symbolic Music Discovery and Search.\u201d Poster presented at the 6th International Conference on Digital Libraries for Musicology, Den Haag, Netherlands, November 9.",
-        "Ju, Yaolong. 2019. \u201cAn Interactive Workflow for Generating Chord Labels for Homorhythmic Music in Symbolic Formats.\u201d Presented at the The 20thInternational Society of Music Information Retrieval Conference, Delft, Netherlands, November 8. <a href=\"http://cloud.simssa.ca/index.php/f/996\">http://cloud.simssa.ca/index.php/f/996</a>.",
+        "Ju, Yaolong. 2019. \u201cAn Interactive Workflow for Generating Chord Labels for Homorhythmic Music in Symbolic Formats.\u201d Poster presented at the 20th International Society of Music Information Retrieval Conference, Delft, Netherlands, November 8. <a href=\"http://cloud.simssa.ca/index.php/f/996\">http://cloud.simssa.ca/index.php/f/996</a>.",
         "N\u00e1poles, N\u00e9stor L\u00f3pez, Gabriel Vigliensoni, and Ichiro Fujinaga. 2019. \u201cThe Effects of Translation between Symbolic Music Formats: A Case Study with Humdrum, Lilypond, MEI, and MusicXML.\u201d Poster presented at the annual Music Encoding Conference, Vienna, Austria, June 29.",
         "Reuse, Tim de, and Ichiro Fujinaga. 2019. \u201cCopyForward: Point-Set Matching for Predicting Patterns.\u201d Poster presented at the 15th running of the Music Information Retrieval Evaluation eXchange at the 20th International Society for Music Information retrieval Conference, Delft, Netherlands, November 4."
     ],
@@ -104,4 +107,4 @@
         "McEnnis, Daniel, Cory McKay, Ichiro Fujinaga, and Philippe Depalle. 2005. \u201cJAudio: A Feature Extraction Library.\u201d Posrer presented at the 6th International Conference on Music Information Retrieval, London, UK, September 11.",
         "Sinyor, Elliot, Cory McKay, Rebecca Fiebrink, Daniel McEnnis, and Ichiro Fujinaga. 2005. \u201cBeatbox Classification Using ACE.\u201d Poster presented at the 6th International Conference on Music Information Retrieval, London, UK, September 11."
     ]
-}
+}

activities/posters/gallery.js

@@ -0,0 +1,89 @@
+// gallery.js — Parses a CSV file of poster filenames and years, then dynamically generates a thumbnail gallery grouped by year.
+// Also controls view switching between list and grid.
+
+document.addEventListener("DOMContentLoaded", function () {
+  console.log("Page loaded, starting CSV parsing...");
+
+  // Toggle view logic
+  function showView(view) {
+    document.getElementById('text-view').classList.toggle('hidden', view !== 'text');
+    document.getElementById('gallery-view').classList.toggle('hidden', view !== 'gallery');
+
+    const icons = document.querySelectorAll('.toggle-buttons i');
+    icons.forEach(icon => icon.classList.remove('active'));
+
+    if (view === 'text') {
+      document.querySelector('.toggle-buttons i.fa-list-ul').classList.add('active');
+    } else {
+      document.querySelector('.toggle-buttons i.fa-grip').classList.add('active');
+    }
+  }
+
+  // Make showView globally accessible
+  window.showView = showView;
+
+  // Set default view on load
+  showView('gallery');
+
+  // Load and parse CSV
+  Papa.parse("poster_filenames_v2.csv", {
+    download: true,
+    header: true,
+    complete: function (results) {
+      console.log("CSV parsed results:", results.data);
+
+      const data = results.data.filter(row => row.filename && row.year);
+      const groupedByYear = {};
+
+      data.forEach(row => {
+        const year = row.year.trim();
+        if (!groupedByYear[year]) groupedByYear[year] = [];
+        groupedByYear[year].push(row.filename.trim());
+      });
+
+      const container = document.getElementById("poster-gallery-container");
+
+      Object.keys(groupedByYear).sort((a, b) => b - a).forEach(year => {
+        // Create a wrapper for both heading and gallery
+        const yearBlock = document.createElement("div");
+        yearBlock.className = "year-block";
+        // Add year heading and horizontal line
+        yearBlock.innerHTML = `<h2 id="${year}">${year}</h2><hr />`;
+
+        // Create the gallery grid
+        const gallery = document.createElement("div");
+        gallery.className = "gallery";
+
+        groupedByYear[year].forEach(filename => {
+          const posterDiv = document.createElement("div");
+          posterDiv.className = "poster";
+
+          const img = document.createElement("img");
+          img.src = `../../posters/jpg/${filename}`;
+          img.alt = filename;
+
+          img.onerror = function () {
+            console.warn("Image not found:", img.src);
+          };
+
+          const link = document.createElement("a");
+          link.href = `../../posters/jpg/${filename}`;
+          link.target = "_blank";
+          link.appendChild(img);
+
+          // const caption = document.createElement("p");
+          // caption.textContent = filename;
+
+          posterDiv.appendChild(link);
+          // posterDiv.appendChild(caption); // Removed caption text below thumbnail
+          gallery.appendChild(posterDiv);
+        });
+
+        yearBlock.appendChild(gallery);   // Add gallery inside year block
+        container.appendChild(yearBlock); // Append full block to container
+      });
+    }
+  });
+
+
+});