Switched to material icons

Reviewed-on: #15

Dockerfile

@@ -1,7 +1,8 @@
 FROM alpine:latest
 
 ENV TARGET=/opt/polyphonic
-ENV RELEASE=polyphonic-0.8.4-py3-none-any.whl 
+#ENV RELEASE=polyphonic-0.8.4-py3-none-any.whl
+ENV RELEASE=git+https://gitea.tfconsulting.com.au/projects/polyphonic.git
 
 RUN apk add --no-cache python3 py3-pip git ghostscript sqlite
 
@@ -10,7 +11,7 @@ WORKDIR /root
 RUN python3 -m venv ${TARGET}
 ENV PATH="${TARGET}/bin:$PATH"
 
-COPY dist/${RELEASE} .
+#COPY dist/${RELEASE} .
 RUN pip3 install ${RELEASE} --no-cache-dir
 RUN pip3 install gunicorn whitenoise
 

polyphonic/interface/templates/base.html

@@ -11,7 +11,8 @@
     <script src="{% static 'interface/js/interface.js' %}"></script>
     <script src="//unpkg.com/alpinejs" defer></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" defer></script>
-    <script src="//kit.fontawesome.com/c837098e5b.js" crossorigin="anonymous" defer></script>
+    <!-- script src="//kit.fontawesome.com/c837098e5b.js" crossorigin="anonymous" defer></script -->
+    <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined" rel="stylesheet" />
     <title>{% block title %}Polyphonic{% endblock %}</title>
     {% block media %}{% endblock %}
     <style>{% block style %}{% endblock %}</style>
@@ -23,7 +24,7 @@
   <nav class="navbar" role="navigation">
     <div class="navbar-brand has-text-primary">
       <a class="navbar-item" href="/">
-        <span class="icon fancy is-size-2 is-size-4-mobile mx-4"><i class="fas fa-random"></i></span>
+        <span class="icon fancy mx-4"><span class="material-symbols-outlined is-size-1 is-size-3-mobile">groups</span></span>
         <span class="fancy is-size-2 is-size-4-mobile">Polyphonic</span>
       </a>
       <span class="navbar-item is-hidden-mobile fancy is-size-5">Musical Ensemble Manager</span>

polyphonic/interface/templates/bulma/file_upload.html

@@ -6,7 +6,7 @@
         {% crispy_field field 'class' 'file-input'%}
         <span class="file-cta">
             <span class="file-icon">
-            <i class="fas fa-upload"></i>
+              <span class="material-symbols-outlined">file_upload</span>
             </span>
             <span class="file-label">
             Choose a file…
@@ -25,4 +25,4 @@
         fileName.textContent = fileInput.files[0].name;
       }
     }
-  </script>
+  </script>

polyphonic/interface/templates/interface/ensemble_detail.html

@@ -1,19 +1,20 @@
 {% extends "interface/project_base.html" %}
 {% load md2 %}
+{% load polyphonic %}
 
 {% block admin %}
 <a href="{% url 'project_create' object.slug %}" class="button is-link">
-    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    {{ "add_notes"|icon }}
     <span>Add project</span>
 </a>
 {% if inactive %}
 <a href="?" class="button is-link">
-    <span class="icon"><i class="fas fa-archive"></i></span>
+    {{ "preview_off"|icon }}
     <span>Hide old</span>
 </a>
 {% else %}
 <a href="?inactive" class="button is-link">
-    <span class="icon"><i class="fas fa-archive"></i></span>
+    {{ "preview"|icon }}
     <span>Show all</span>
 </a>
 {% endif %}
@@ -54,4 +55,4 @@ Contacts:
 <a href="{% url 'forget_resource' 'ensemble' ensemble.slug %}">Forget this ensemble</a>
 </div>
 
-{% endblock %}
+{% endblock %}

polyphonic/interface/templates/interface/ensemble_list.html

@@ -5,7 +5,7 @@
 {% comment %}
 <div class="admin-tools is-pulled-right">
 <a class="button is-link" href="{% url 'register' %}">
-    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    {% icon "add_file" %}
     <span>Register another</span>
 </a>
 </div>
@@ -25,10 +25,13 @@
                         <img src="https://www.gravatar.com/avatar/{{ ensemble.email }}?d=mp" alt="Placeholder image">
                         </figure>
                     </div>
-                    <div class="media-content" style="min-height: 60px">
+                    <div class="media-content" style="min-height: 100px">
                         <a href="{% url 'ensemble_detail' ensemble.slug %}">
                             <p class="title is-4">{{ ensemble.name }}</p>
                         </a>
+                        <div class="mt-3">
+                          {{ ensemble.details|markdown }}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -45,4 +48,4 @@
     </div>
 {% endfor %}
 </div>
-{% endblock %}
+{% endblock %}

polyphonic/interface/templates/interface/project_detail.html

@@ -4,11 +4,11 @@
 
 {% block admin %}
 <a href="{% url 'wiki_create' project=project.pk %}" class="button is-link">
-    <span class="icon"><i class="fas fa-file"></i></span>
-    <span>Add Page</span>
+  {{ "add_notes"|icon }}
+  <span>Add Page</span>
 </a>
 <a href="{% url 'project_edit' project=project.pk %}" class="button is-link">
-    <span class="icon"><i class="fas fa-edit"></i></span>
+    {{ "edit"|icon }}
     <span>Edit</span>
 </a>
 {% endblock %}

polyphonic/interface/templates/interface/project_items.html

@@ -33,4 +33,4 @@
         </div>
     </div>
 {% endfor %}
-</div>
+</div>

polyphonic/interface/templates/interface/resource_list.html

@@ -1,9 +1,10 @@
 {% extends "interface/project_base.html" %}
 {% load md2 %}
+{% load polyphonic %}
 
 {% block admin %}
 <a class="button is-link" href="{% url 'resource_create' project=project.pk %}">
-    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    {% icon "add_notes" %}
     <span>Add new</span>
 </a>
 {% endblock %}
@@ -27,11 +28,11 @@
 
                 <div class="card-header-icon">
                     {% if request.is_admin %}
-                    <a href="{% url 'resource_upload' project=project.pk pk=resource.pk %}" class="icon" title="Upload">
-                        <i class="fas fa-upload"></i>
+                    <a href="{% url 'resource_upload' project=project.pk pk=resource.pk %}" title="Upload">
+                        {% icon "upload_file" %}
                     </a>
-                    <a href="{% url 'resource_edit' project=project.pk pk=resource.pk %}" class="icon" title="Edit">
-                        <i class="fas fa-edit"></i>
+                    <a href="{% url 'resource_edit' project=project.pk pk=resource.pk %}" title="Edit">
+                        {% icon "edit" %}
                     </a>
                     {% endif %}
                 </div>

polyphonic/interface/templates/interface/wiki.html

@@ -1,9 +1,10 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block admin %}
 <a href="{% url 'wiki_edit' project=project.pk pk=wikipage.pk %}" class="button is-link">
-    <span class="icon"><i class="fas fa-edit"></i></span>
-    <span>Edit</span>
+  {{ "edit"|icon }}
+  <span>Edit</span>
 </a>
 {% endblock %}
 
@@ -12,4 +13,4 @@
 <div class="box content wiki-page">
 {{ wiki_html|safe }}
 </div>
-{% endblock %}
+{% endblock %}

polyphonic/interface/templatetags/polyphonic.py

@@ -1,9 +1,27 @@
 from django import template
 from django.utils import timesince
+from django.utils.html import format_html
 
 register = template.Library()
 
 
+@register.filter("icon", is_safe=True)
+def material_icon(value):
+    return f'<span class="icon"><span class="material-symbols-outlined">{value}</span></span>'
+
+
+@register.simple_tag
+def icon(name, element="span", classes=[]):
+    classes = ["icon"] + classes
+    return format_html(
+        '<{} class="{}"><span class="material-symbols-outlined">{}</span></{}>',
+        element,
+        " ".join(classes),
+        name,
+        element,
+    )
+
+
 def roughtimesince(value):
     return timesince.timesince(value, depth=1)
 

polyphonic/library/gdrive/__init__.py

@@ -7,7 +7,10 @@ logger = logging.getLogger(__name__)
 
 
 def sync_work(work: Work):
-    folder_id = work.meta_info.get(name="folderid").value
+    try:
+        folder_id = work.meta_info.get(name="folderid").value
+    except WorkMeta.DoesNotExist as err:
+        raise IndexError("Work not currently linked to a gdrive folder") from err
 
     logger.info("Syncing '%s' from %r", work.name, folder_id)
 
@@ -15,7 +18,7 @@ def sync_work(work: Work):
 
     existing = set(
         [
-            storage.parse_id(x.partition(":")[2])
+            storage.parse_resource(x.partition(":")[2]).id
             for x in work.docs.values_list("upload", flat=True)
         ]
     )
@@ -42,16 +45,19 @@ def sync_work(work: Work):
         logger.warning("Local entry not in folder: %s", uri)
 
 
+def sync_partial_collection(collection: Collection, sync_existing: bool = True):
+
+    works = Work.objects.filter(collection=collection, meta_info__name="folderid")
+
+    for work in works:
+        sync_work(work)
+
+
 def sync_collection(collection: Collection, sync_existing: bool = False):
     logger.info("Syncing '%s'", collection)
 
     if not collection.storage.storage.endswith("GDriveLinkStorage"):
-        raise RuntimeError("Not a gdrive storage")
-
-    try:
-        folder_id = collection.settings["folder_id"]
-    except KeyError:
-        raise KeyError("Missing 'folder_id' in settings")
+        return sync_partial_collection(collection, sync_existing)
 
     existing = dict(
         WorkMeta.objects.filter(
@@ -59,8 +65,9 @@ def sync_collection(collection: Collection, sync_existing: bool = False):
         ).values_list("value", "work_id")
     )
 
+    folder = collection.prefix
     storage = collection.storage.instance()
-    folders, _ = storage.listdir(folder_id)
+    folders, _ = storage.listdir(folder)
 
     for folder in folders:
         if folder[0] == "_":

polyphonic/library/gdrive/storage.py

@@ -8,19 +8,26 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-SHARED_FOLDER = re.compile(r"https://drive.google.com/drive[u0-9\/]+folders/([\w\-]+)")
-SHARED_FILE = re.compile(r"https://drive.google.com/file/d/([\w\-]+)")
+SHARED_FOLDER = re.compile(
+    r"https://drive.google.com/drive[u0-9\/]+folders/([\w\-]+)(\?resourcekey=([\w\-]+))?"
+)
+SHARED_FILE = re.compile(
+    r"https://drive.google.com/file/d/([\w\-]+)(\?resourcekey=([\w\-]+))?"
+)
 
 FILES_API = "https://www.googleapis.com/drive/v3/files"
 
 
-class DriveObject(namedtuple("DriveObject", ("id", "name"))):
+class DriveObject(namedtuple("DriveObject", ("id", "key", "name"))):
     @classmethod
-    def from_string(cls, s):
-        return cls(*s.split("/", 1))
+    def from_string(cls, s: str):
+        resource, _, name = s.partition("/")
+        id, _, key = resource.partition("#")
+        return cls(id, key, name)
 
     def __str__(self):
-        return f"{self.id}/{self.name}"
+        resource = f"{self.id}#{self.key}" if self.key else self.id
+        return f"{resource}/{self.name}"
 
 
 class GDriveLinkStorage(Storage):
@@ -30,21 +37,28 @@ class GDriveLinkStorage(Storage):
         self.api_key = api_key
         super().__init__()
 
-    def parse_id(self, name):
-        parts = name.split("/")
-        return parts[0]
+    def parse_resource(self, name) -> DriveObject:
+        return DriveObject.from_string(name)
 
-    def extract_id(self, url, *patterns):
-        logger.debug("EXTRACT_ID: %r", url)
+    def extract_resource(self, url, *patterns) -> DriveObject:
+        logger.debug("EXTRACT_RESOURCE: %r", url)
         for pattern in patterns:
             match = pattern.match(url)
             if match:
-                return match.groups()[0]
+                groups = match.groups()
+                logger.debug(groups)
+                if len(groups) == 3:
+                    return DriveObject(groups[0], groups[2], "")
+                return DriveObject(groups[0], None, "")
         raise FileNotFoundError(f"Not a valid url: {url}")
 
-    def get_json(self, url):
-        logger.debug("GET_JSON: %s", url)
-        response = requests.get(url)
+    def get_json(self, url, resource: DriveObject):
+        headers = {}
+        if resource.key:
+            headers["X-Goog-Drive-Resource-Keys"] = f"{resource.id}/{resource.key}"
+
+        logger.debug("GET_JSON: %s %r", url, headers)
+        response = requests.get(url, headers=headers)
         data = response.json()
         logger.debug("Data: %r", data)
         return data
@@ -55,31 +69,36 @@ class GDriveLinkStorage(Storage):
         if path == "":
             return [], []
 
-        folder_id = self.parse_id(path)
-        url = f"{FILES_API}?q='{folder_id}'+in+parents&key={self.api_key}"
-        data = self.get_json(url)
+        folder = self.parse_resource(path)
+        url = f"{FILES_API}?q='{folder.id}'+in+parents&key={self.api_key}"
+        data = self.get_json(url, folder)
         files = []
         folders = []
         for x in data["files"]:
             if x["mimeType"] == "application/vnd.google-apps.folder":
                 # folders.append(f"{x['id']}/{x['name']}")
-                folders.append(DriveObject(x["id"], x["name"]))
+                folders.append(DriveObject(x["id"], x.get("resourceKey"), x["name"]))
             else:
                 # files.append(f"{x['id']}/{x['name']}")
-                files.append(DriveObject(x["id"], x["name"]))
+                files.append(DriveObject(x["id"], x.get("resourceKey"), x["name"]))
 
         return folders, files
 
     def get_meta(self, name):
-        file_id = self.parse_id(name)
-        url = f"{FILES_API}/{file_id}?key={self.api_key}"
-        return self.get_json(url)
+        file_resource = self.parse_resource(name)
+        url = f"{FILES_API}/{file_resource.id}?key={self.api_key}"
+        return self.get_json(url, file_resource)
 
     def open(self, name, mode="rb"):
-        file_id = self.parse_id(name)
-        url = f"{FILES_API}/{file_id}?alt=media&key={self.api_key}"
-        logger.info("URL: %s", url)
-        response = requests.get(url, stream=True)
+        resource = self.parse_resource(name)
+        url = f"{FILES_API}/{resource.id}?alt=media&key={self.api_key}"
+
+        headers = {}
+        if resource.key:
+            headers["X-Goog-Drive-Resource-Keys"] = f"{resource.id}/{resource.key}"
+        logger.info("URL: %s [%r]", url, headers)
+
+        response = requests.get(url, headers=headers, stream=True)
         return GzipFile(name, "rb", 9, response.raw)
 
     def size(self, name):
@@ -90,25 +109,28 @@ class GDriveLinkStorage(Storage):
 
     def url(self, name):
         logger.debug("URL: %r", name)
-        file_id = self.parse_id(name)
-        return f"https://drive.usercontent.google.com/download?export=download&id={file_id}&confirm=yes"
+        resource = self.parse_resource(name)
+        uri = f"https://drive.usercontent.google.com/download?export=download&id={resource.id}&confirm=yes"
+        if resource.key:
+            uri += f"&resourcekey=${resource.key}"
+        return uri
 
     def get_folder_id(self, url):
         try:
-            return self.extract_id(url, SHARED_FOLDER)
+            return self.extract_resource(url, SHARED_FOLDER)
         except FileNotFoundError:
             return None
 
     def get_file_id(self, url):
         try:
-            return self.extract_id(url, SHARED_FILE)
+            return self.extract_resource(url, SHARED_FILE)
         except FileNotFoundError:
             return None
 
     def import_link(self, url) -> str:
-        file_id = self.extract_id(url, SHARED_FILE)
-        meta = self.get_meta(file_id)
-        return f"{file_id}/{meta['name']}"
+        file_resource = self.extract_resource(url, SHARED_FILE)
+        meta = self.get_meta(file_resource)
+        return f"{file_resource}/{meta['name']}"
 
 
 """

polyphonic/library/music_tags.py

@@ -19,6 +19,10 @@ cb      Double Bass
 mall    Mallet Percussion
 vln     Violin
 vla     Viola
+kit     Drumkit
+asax    Alto Sax
+tsax    Tenor Sax
+bsax    Bari Sax
 
 acc 	Accordion 
 afl 	Alto flute 

polyphonic/library/templates/library/collection_list.html

@@ -1,4 +1,5 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block page %}
 <h3 class="title">Library collections for {% firstof request.user.first_name request.user.username %}</h3>
@@ -10,7 +11,9 @@
             <input class="input" name="q" type="text" placeholder="Find a work" value="{{ request.GET.filter }}"/>
         </div>
         <div class="control">
-            <a class="button" href="?"><i class="fas fa-times"></i></a>
+            <a class="button" href="?">
+              {% icon "close" %}
+            </a>
         </div>
     </div>
 </form>
@@ -47,4 +50,5 @@
 <div>
     <small>{{ ensemble.ensemble_code }}</small>
 </div>
+
 {% endblock %}

polyphonic/library/templates/library/document_annotate.html

@@ -1,11 +1,13 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block admin %}
 <a href="#" onclick="saveTags()" class="button is-link">
-  <span class="icon"><i class="fas fa-save"></i></span>
+  {% icon "save" %}
   <span>Save</span>
 </a>
 <a href="{% url 'work_detail' collection=collection.pk pk=object.work_id %}" class="button is-link is-light">
+  {% icon "backspace" %}
   <span>Cancel</span>
 </a>
 {% endblock %}
@@ -76,7 +78,11 @@
   </div>
   <ul id="unassigned-area">
   {% for tag, inst in document.work.music_tags %}
-    <li class="is-clickable" onclick="assignInstrument('{{tag}}', this)")>{{ inst }}</li>
+    <li>
+      <span class="is-clickable" onclick="assignInstrument('{{tag}}', this)")>{{ inst }}</span>
+      &nbsp;
+      <span class="is-clickable" onclick="addNumberedInstrument('{{tag}}', this)">...</span>
+    </li>
   {% endfor %}
   </ul>
   <a onclick="document.getElementById('add-modal').classList.add('is-active')">Add Tag</a>
@@ -275,6 +281,16 @@
     document.getElementById('add-instrument-name').value = "";
     document.getElementById('add-instrument-variant').value = "";
   }
+  
+  function addNumberedInstrument(tag, e) {
+    let modal = document.getElementById('add-modal');
+
+    document.getElementById("add-instrument-name").value = data.instruments[tag];
+    document.getElementById("add-instrument-variant").value = 1;
+    document.getElementById("add-instrument-variant").focus();
+
+    modal.classList.add('is-active');
+  }
 
   function addInstrument() {
     let name = document.getElementById('add-instrument-name');
@@ -326,7 +342,7 @@
 
     let setStart = document.createElement('span');
     setStart.className = "icon is-action";
-    setStart.innerHTML = '<i class="fas fa-sort-amount-down" title="Set start page"></i>';
+    setStart.innerHTML = '<span class="material-symbols-outlined" title="Set start page">vertical_align_top</span>';
     setStart.addEventListener('click', () => setTagStart(el));
     el.appendChild(setStart);
     
@@ -336,22 +352,20 @@
     let name = document.createElement('b');
     name.innerHTML = get_instrument(tag);
     label.appendChild(name);
+    el.appendChild(label);
     
     let del = document.createElement('span');
     del.className = "icon is-action";
-    del.innerHTML = '<i class="fas fa-trash-alt" title="Remove this tag"></i>';
+    del.innerHTML = '<span class="material-symbols-outlined" title="Remove this tag">delete</span>';
     del.addEventListener('click', () => {
       el.remove();
       dirty=true;
     });
-    label.appendChild(del)
-    
-    el.appendChild(label);
-
+    el.appendChild(del)
     
     let setEnd = document.createElement('span');
     setEnd.className = "icon is-action";
-    setEnd.innerHTML = '<i class="fas fa-sort-amount-up" title="Set end page"></i>';
+    setEnd.innerHTML = '<span class="material-symbols-outlined" title="Set end page">vertical_align_bottom</span>';
     setEnd.addEventListener('click', () => setTagEnd(el));
     el.appendChild(setEnd);
 

polyphonic/library/templates/library/document_entry.html

@@ -1,7 +1,10 @@
 {% load path_filters %}
+{% load polyphonic %}
 <tr>
-    <td><a href="{{ doc.upload.url }}" target="_blank">
-            {{ doc.upload.name|basename }}</a></td>
+    <td style="white-space: nowrap">
+      <a href="{{ doc.upload.url }}" target="_blank">
+            {{ doc.upload.name|basename }}</a>
+    </td>
     <td>
         {% for section in doc.sections.all %}
             <a class="tag is-{{ section.bulma_class }}" target="_blank" href="{% url 'part_download' collection.pk section.pk section.filename %}">{{ section.name }}</a>
@@ -10,10 +13,13 @@
     <td class="has-text-right" style="white-space: nowrap;">
     {% if request.is_admin %}
         {% if doc.doctype == 1 %}
-        <a href="{% url 'document_annotate' collection.pk doc.pk %}"><i class="fas fa-tags"
-                title="Manage Tags"></i></a>
+        <a href="{% url 'document_annotate' collection.pk doc.pk %}" title="Annotate">
+          {% icon "toc" %}
+        </a>
         {% endif %}
-        <a href="{% url 'document_delete' collection.pk doc.pk %}"><i class="fas fa-trash-alt" title="Delete Document"></i></a>
+        <a href="{% url 'document_delete' collection.pk doc.pk %}" title="Delete">
+          {% icon "delete" %}
+        </a>
     {% endif %}
     </td>
-</tr>
+</tr>

polyphonic/library/templates/library/gdrive.html

@@ -1,12 +1,18 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block admin %}
 <a href="{% url 'work_detail' collection=collection.pk pk=object.pk %}" class="button is-link is-light">
+  {% icon "backspace" %}
   <span>Back to work</span>
 </a>
 {% endblock %}
 
 {% block page %}
+<h2 class="title">
+  {% icon "add_to_drive" %}
+  <span>Google Drive - Shared Links
+</h2>
 <h3 class="subtitle"><a href="{% url 'work_detail' collection.pk object.pk %}">{{ object.name }}</a></h3>
 <div class="m-3">
 <p>This page lets you link a work to a google drive folder.  You can either paste a public link to a folder to enable syncing or a file to add individually</p>
@@ -14,26 +20,24 @@
 <div class="m-3">
 <p>
     {% if meta.folderid %}
-This work is currently linked to <b>{{ meta.folderid }}</b>.  Pasting a new folder link will overwrite this.
+This work is currently linked to <b>{{ meta.folderid }}</b>.<br/>
+Pasting a new folder link will overwrite this.
     {% else %}
 There is currently no shared drive folder linked to this work - paste one here to enable syncing.
     {% endif %}
 </p>
 </div>
-<div>
+<div class="mt-5">
 <form method="post">
-  <div class="field">
-    <div class="control">
-      <input name="link" class="input is-expanded" type="text" placeholder="Shared link">
-    </div>
-    {% for error in form.errors.link %}
-    <p class="help is-danger">{{ error }}</p>
-    {% endfor %}
-  </div>
-  <div class="field">
-    <div class="control">
-      <button class="button is-info" type="submit">Add</button>
-    </div>
+  <div class="field has-addons mx-6">
+      <div class="control is-expanded">
+          <input class="input" name="link" type="text" placeholder="Paste shared link">
+      </div>
+      <div class="control">
+          <button class="button" type="submit">
+            Add
+          </button>
+      </div>
   </div>
   {% csrf_token %}
 </form>

polyphonic/library/templates/library/item_list.html

@@ -1,4 +1,5 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block page %}
 <form action="" method="post" target="_blank">
@@ -31,12 +32,6 @@
                 </span>
             </span>
         </div>
-        <span class="control">
-            <button type="submit" class="button is-primary">
-                <span class="icon"><i class="fas fa-copy"></i></span>
-                <span>Get My Parts!</span>
-            </button>
-        </span>
     </div>
 </div>
 
@@ -45,6 +40,7 @@
         <tr>
             <th/>
             <th>Piece</th>
+            <th>Composer</th>
             <th class="is-hidden-mobile">Running time</th>
             <th>Part</th>
             <th/>
@@ -61,11 +57,12 @@
                     {{ item.work.name }}
                     {% endif %}
                 </td>
+                <td class="is-hidden-mobile">{{ item.work.composer }}</td>
                 <td class="is-hidden-mobile">{% firstof item.work.running_time "------" %}</td>
                 <td class="select-cell">
                     <input type="hidden" name="works" value="{{ item.work.pk }}"/>
                     <span class="select is-small" style="width: 100%">
-                    <select name="instruments" id="part-{{ item.work.pk }}" style="width: 100%">
+                    <select name="instrument-selection" id="part-{{ item.work.pk }}" style="width: 100%">
                         <option value='-'>None</option>
                         {% for tag, name in item.work.digital_parts %}
                         <option value='{{ tag }}'>{{ name }}</option>
@@ -74,8 +71,9 @@
                     </span>
                 </td>
                 <td>
-                    <span class="is-action" onclick="downloadPart({{ item.work.collection_id }}, {{ item.work.pk }})">
-                        <i class="fas fa-download" title="Download Part"></i>
+                    <span class="button is-link is-small" onclick="downloadPart({{ item.work.collection_id }}, {{ item.work.pk }})">
+                        {% icon "download" %}
+                        <span>Get</span>
                     </span>
                 </td>
             </tr>
@@ -85,13 +83,17 @@
         <tr>
             <td/>
             <td/>
-            <td>{% firstof running_time "------" %}</td>
             <td/>
-            <td>
-            <!--
-                <button class="button is-link is-small" type="submit"><span class="icon"><i class="fas fa-copy"></i></span><span>Single combined PDF</span></button>
-                <a class="button is-link is-small"><span class="icon"><i class="fas fa-archive"></i></span><span>Individual files (zipped)</span></a>
-            -->
+            <td>{% firstof running_time "------" %}</td>
+            <td colspan="2">
+                <button class="button is-link is-small" type="submit" name="action" value="pdf">
+                  {% icon "two_pager" %}
+                  <span>&nbsp;Single combined PDF</span>
+                </button>
+                <button class="button is-link is-small" type="submit" name="action" value="zip">
+                  {% icon "folder_zip" %}
+                  <span>&nbsp;Individual files (zipped)</span>
+                </button>
             </td>
         </tr>
     </tfoot>
@@ -112,16 +114,23 @@
 const INSTRUMENTS = JSON.parse(document.getElementById('instruments').innerText);
 
 function updateParts() {
-    var inst = document.getElementById("instrument-name").value;
+    var inst = document.getElementById("instrument-name").value.toLowerCase();
     window.localStorage.setItem('instrument-name', inst);
+    console.log("Changing to", inst);
 
     for (let i of INSTRUMENTS) {
-        if (i[1] === inst) inst = i[0];
+      if (i[1].toLowerCase() === inst) {
+        inst = i[0];
+
+        break;
+      }
     }
+    console.log("Instrument code:", inst);
 
 
     let part = document.getElementById("part-preference").value;
     window.localStorage.setItem('part-preference', part);
+    console.log("Part preference:", part);
 
 
     selectParts(inst, part);
@@ -132,10 +141,11 @@ function selectParts(inst, part) {
 
     let prefix = inst + "-" + part;
 
-    let instruments = document.getElementsByName("instruments");
-    for(let i=0; i<instruments.length; i++) {
+    let selections = document.getElementsByName("instrument-selection");
+    console.log("Updating selections:", prefix, selections);
+    for(let i=0; i<selections.length; i++) {
         var result = "-"
-        let options = instruments[i].children;
+        let options = selections[i].children;
         for(let j=0; j<options.length; j++) {
             let value = options[j].value;
             if (value.startsWith(prefix)) {
@@ -146,7 +156,8 @@ function selectParts(inst, part) {
                 result = value;
             }
         }
-        instruments[i].value = result;
+        console.log("Selected:", result);
+        selections[i].value = result;
     }
 
 }
@@ -168,4 +179,4 @@ updateParts();
 
 
 </script>
-{% endblock %}
+{% endblock %}

polyphonic/library/templates/library/item_list_manage.html

@@ -1,12 +1,13 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block admin %}
 <a href="{% url 'item_list_append' project.pk %}" class="button is-link">
-  <span class="icon"><i class="fas fa-plus-circle"></i></span>
+  {% icon "add_circle" %}
   <span>Add</span>
 </a>
 <a href="#" onclick="save()" class="button is-link">
-  <span class="icon"><i class="fas fa-save"></i></span>
+  {% icon "save" %}
   <span>Save</span>
 </a>
 {% endblock %}
@@ -26,9 +27,15 @@
                 <td>{{ item.work.name }}</td>
                 <td>{{ item.work.duration }}</td>
                 <td style="text-align: center;">
-                    <i class="fas fa-arrow-up clickable" title="Move up" onclick="moveItem({{ item.pk }}, -1)"></i>
-                    <i class="fas fa-arrow-down clickable" title="Move down" onclick="moveItem({{ item.pk }}, 1)"></i>
-                    <i class="fas fa-trash clickable" title="Remove" onClick="moveItem({{ item.pk }}, 0)"></i>
+                  <span class="clickable" title="Move up" onclick="moveItem({{ item.pk }}, -1)">
+                    {% icon "arrow_upward" %}
+                  </span>
+                  <span class="clickable" title="Move down" onclick="moveItem({{ item.pk }}, 1)">
+                    {% icon "arrow_downward" %}
+                  </span>
+                  <span class="clickable" title="Remove" onClick="moveItem({{ item.pk }}, 0)">
+                    {% icon "delete" %}
+                  </span>
                 </td>
 
             </tr>
@@ -106,4 +113,4 @@ function checkSaved(e) {
 window.addEventListener('beforeunload', checkSaved);
 
 </script>
-{% endblock %}
+{% endblock %}

polyphonic/library/templates/library/work_detail.html

@@ -1,5 +1,6 @@
 {% extends 'interface/project_base.html' %}
 {% load path_filters %}
+{% load polyphonic %}
 
 {% block media %}
 <script src="https://unpkg.com/dropzone@5/dist/min/dropzone.min.js"></script>
@@ -8,12 +9,12 @@
 
 {% block admin %}
 <a href="{% url 'work_edit' collection.pk work.pk %}" class="button is-link">
-    <span class="icon"><i class="fas fa-edit"></i></span>
-    <span>Edit</span>
+  {% icon "edit" %}
+  <span>Edit</span>
 </a>
 <a href="{% url 'work_add_to_project' collection.pk work.pk %}" class="button is-link">
-    <span class="icon"><i class="fas fa-plus-circle"></i></span>
-    <span>Add to project</span>
+  {% icon "add_ad" %}
+  <span>Add to project</span>
 </a>
 {% endblock %}
 
@@ -68,8 +69,8 @@
         <div class="column is-half">
             <div class="box">
                 <h4 class="subtitle is-size-4">
-                    <span class="icon"><i class="fas fa-book"></i></span>
-                    Printed Parts
+                    {% icon "menu_book" %}
+                    <span>Printed Parts</span>
                 </h4>
                 <div class="tags">
                     {% for inst, c in work.physical_parts %}
@@ -81,8 +82,8 @@
             </div>
             <div class="box">
                 <h4 class="subtitle is-size-4">
-                    <span class="icon"><i class="fas fa-print"></i></span>
-                    Digital Parts
+                    {% icon "file_copy" %}
+                    <span>Digital Parts</span>
                 </h4>
                 <div class="tags">
                     {% with sections=work.digital_parts %}
@@ -105,8 +106,8 @@
     <div class="box">
         <div class="level">
             <h4 class="subtitle is-size-4">
-                <span class="icon"><i class="fas fa-file"></i></span>
-                Files
+                {% icon "file_present" %}
+                <span>Files<span>
             </h4>
         </div>
         <div class="columns">
@@ -136,9 +137,9 @@
                 {% endif %}
                 {% if "gdrive" in methods %}
                 <div class="has-text-centered mt-3">
-                  <a class="button button-primary is-size-7" href="{% url 'work_gdrive' collection.pk object.pk %}">
-                    <span class="icon"><i class="fa-brands fa-google-drive"></i></span>
-                    Link Google Drive Files
+                  <a class="button button-is-primary is-size-7" href="{% url 'work_gdrive' collection.pk object.pk %}">
+                    {% icon "add_to_drive" %}
+                    <span>Google Drive</span>
                   </a><br/>
                 </div>
                 {% endif %}
@@ -152,12 +153,14 @@
     <div class="box">
     <div class="level">
         <h4 class="is-size-4">
-            <span class="icon"><i class="fas fa-book-reader"></i></span>
-            Loans
+            {{ "folder_open"| icon }}
+            Projects
         </h4>
         <span class="level-right">
-            <a class="icon-text" href="{% url 'work_add_to_project' collection.pk work.pk %}"><span class="icon"><i
-                        class="fas fa-plus-circle"></i></span> Checkout</a>
+            <a class="icon-text" href="{% url 'work_add_to_project' collection.pk work.pk %}">
+              {% icon "shopping_cart_checkout" %}
+              <span>Checkout</span>
+            </a>
         </span>
     </div>
     <table class="table is-fullwidth">
@@ -181,7 +184,7 @@
             </tr>
             {% empty %}
             <tr>
-                <td>No current loans</td>
+                <td>No current assignments</td>
             </tr>
             {% endfor %}
         </tbody>

polyphonic/library/templates/library/work_list.html

@@ -1,10 +1,11 @@
 {% extends "interface/project_base.html" %}
 {% load url_tools %}
+{% load polyphonic %}
 
 {% block admin %}
 {% if collection %}
 <a href="{% url 'work_add' collection.pk %}" class="button is-link">
-    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    {% icon "add_notes" %}
     <span>Add a work</span>
 </a>
 {% endif %}
@@ -18,7 +19,9 @@
             <input class="input" name="q" type="text" placeholder="Filter" value="{{ request.GET.q }}"/>
         </div>
         <div class="control">
-            <a class="button" href="?"><i class="fas fa-times"></i></a>
+            <a class="button" href="?">
+              {% icon "close" %}
+            </a>
         </div>
     </div>
 </form>
@@ -65,6 +68,7 @@
       {% else %}
         disabled
     {% endif %}>
+      {% icon "arrow_back" %}
       Previous</a>
     <a class="pagination-next"
       {% if page_obj.has_next %}
@@ -73,6 +77,7 @@
         disabled
       {% endif %}>
       Next
+      {% icon "arrow_forward" %}
     </a>
     <ul class="pagination-list">
       {% for page in page_range %}

polyphonic/library/templates/library/work_partset.html

@@ -1,4 +1,5 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 
 
@@ -35,13 +36,14 @@
     <div class="field is-grouped">
         <div class="control">
             <button class="button is-link">
-                <span class="icon"><i class="fas fa-print"></i></span>
+                {% icon "print" %}
                 <span>Print Set</span>
             </button>
         </div>
         <div class="control">
             <a class="button is-link is-light" href="{% url 'work_detail' collection.pk object.pk %}">
-                <span>Cancel</span>
+              {% icon "backspace" %}
+              <span>Cancel</span>
             </a>
         </div>
     </div>
@@ -50,4 +52,4 @@
 
 </div>
 </div>
-{% endblock %}
+{% endblock %}

polyphonic/library/views/__init__.py

@@ -38,7 +38,8 @@ class ProjectItemListView(ProjectMixin, ListView):
 
         project_works = self.project.works.all()
 
-        instruments = request.POST.getlist("instruments")
+        print(request.POST)
+        instruments = request.POST.getlist("instrument-selection")
         works = request.POST.getlist("works")
 
         request.session["part"] = request.POST.get("part", "")
@@ -65,13 +66,16 @@ class ProjectItemListView(ProjectMixin, ListView):
                 (part.doc.upload.path, part.doc.work.name, part.start, part.end, 1)
             )
 
-        result = extract_and_concat(sections)
+        action = request.POST.get("action")
+        if action == "pdf":
+            result = extract_and_concat(sections)
+            download_name = f"{self.project.name}.pdf"
 
-        download_name = f"{self.project.name}.pdf"
+            response = FileResponse(result, content_type="application/pdf")
+            response["Content-Disposition"] = f'inline; filename="{download_name}"'
+            return response
 
-        response = FileResponse(result, content_type="application/pdf")
-        response["Content-Disposition"] = f'inline; filename="{download_name}"'
-        return response
+        return HttpResponse(f"Unknown action: {action}", status=400)
 
     def get_queryset(self):
         return (