diff --git a/Dockerfile b/Dockerfile
index e5f58c4..6092462 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
FROM alpine:latest
+ARG VERSION=0.8.4
+
ENV TARGET=/opt/polyphonic
-ENV RELEASE=polyphonic-0.8.4-py3-none-any.whl
-#ENV RELEASE=git+https://gitea.tfconsulting.com.au/projects/polyphonic.git
+#ENV RELEASE=polyphonic-${VERSION}-py3-none-any.whl
+ENV RELEASE=git+https://gitea.tfconsulting.com.au/projects/polyphonic.git@${VERSION}
RUN apk add --no-cache python3 py3-pip git ghostscript sqlite
@@ -11,7 +13,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
diff --git a/docker-compose.yml b/docker-compose.yml
index 71953b9..a7c84b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
services:
polyphonic:
image: "polyphonic:0.8.4"
- build: "."
+ build: .
ports:
- "8001:8000"
volumes:
@@ -12,3 +12,4 @@ services:
DJANGO_SETTINGS_MODULE: local_settings
PYTHONPATH: /opt/polyphonic
WORK_DIR: /var/polyphonic
+ VERSION: 0.8.4
diff --git a/polyphonic/interface/static/interface/css/polyphonic.css b/polyphonic/interface/static/interface/css/polyphonic.css
index 828ab97..161428d 100644
--- a/polyphonic/interface/static/interface/css/polyphonic.css
+++ b/polyphonic/interface/static/interface/css/polyphonic.css
@@ -32,10 +32,11 @@
.menu-label {
color: var(--primary);
}
-
+/*
.button.is-primary, .button.is-primary:hover {
background-color: var(--primary);
}
+*/
A.admin-link:after {
content: "*";
@@ -60,4 +61,4 @@ TEXTAREA.input {
padding: 10px 10px;
margin-top: 30px;
border-top-left-radius: 6px;
-}
\ No newline at end of file
+}
diff --git a/polyphonic/interface/templates/base.html b/polyphonic/interface/templates/base.html
index 3bc4692..cf64fbd 100644
--- a/polyphonic/interface/templates/base.html
+++ b/polyphonic/interface/templates/base.html
@@ -1,12 +1,13 @@
{% load static %}
-
+
-
+
+
diff --git a/polyphonic/library/models.py b/polyphonic/library/models.py
index ff5dd9c..26d2e33 100644
--- a/polyphonic/library/models.py
+++ b/polyphonic/library/models.py
@@ -366,8 +366,8 @@ class Work(models.Model):
def music_tags(self):
tags = dict(self.orchestration.as_list())
- for section in Section.objects.filter(doc__work_id=self.pk):
- tags.setdefault(section.tag, section.name)
+ # for section in Section.objects.filter(doc__work_id=self.pk):
+ # tags.setdefault(section.tag, section.name)
return tags.items()
diff --git a/polyphonic/library/music_tags.py b/polyphonic/library/music_tags.py
index 423a31e..c35094f 100644
--- a/polyphonic/library/music_tags.py
+++ b/polyphonic/library/music_tags.py
@@ -4,9 +4,10 @@ import re
GENERAL = """
mvmt Movement
ex Excerpt
-sec Section
+sect Section
pce Piece
-no Number
+no No.
+page Page
"""
# taken from https://imslp.org/wiki/IMSLP:Abbreviations_for_MusicTags
diff --git a/polyphonic/library/templates/library/document_annotate.html b/polyphonic/library/templates/library/document_annotate.html
index 71bd48f..740abf1 100644
--- a/polyphonic/library/templates/library/document_annotate.html
+++ b/polyphonic/library/templates/library/document_annotate.html
@@ -14,42 +14,97 @@
{% block media %}