merge branch 'music-projects'

music info is messed up now, but kinda works

8 files changed, 142 insertions, 20 deletions

diff --git a/_includes/art-menu.html b/_includes/art-menu.html
index 99ba18b..01a455b 100644
--- a/_includes/art-menu.html
+++ b/_includes/art-menu.html
@@ -3,9 +3,13 @@
     {%- include pic-path.html -%}
     {%- assign pagedir = page.dir | remove_first: "/" | split: "/" -%}
     {%- if pagedir.first == "art" and pagedir.size > 1 -%}
-    <li class="art-category">
-        <a class="link-mask" href="{{ page.url }}">{{ page.title }}</a>
-        <div class="thumbnail">
+    <li class="art-menu-item">
+        <a class="art-menu-item-mask" href="{{ page.url }}">
+            <span class="art-menu-item-text">
+                {{ page.title }}
+            </span>
+        </a>
+        <div class="art-menu-item-img">
             <img src="{{ artthumbs | sample }}">
         </div>
     </li>
diff --git a/_includes/footer.html b/_includes/footer.html
index d3e9dc5..e83385f 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,18 +1,19 @@
 <footer>
-	<p>
-		licensed under
-		<a href="http://creativecommons.org/licenses/by-sa/4.0/">
+    <hr>
+    <p>
+        licensed under
+        <a href="http://creativecommons.org/licenses/by-sa/4.0/">
             cc-by-sa-4.0
-		</a>
-	</p>
-	<p>
+        </a>
+    </p>
+    <p>
     <p>gpg key:
     <a href="/pgp.asc">
         405C2C163EF6A2C9
     </a>
     </p>
-	<a rel="site source" href="https://git.aaoth.xyz/aaoth.xyz.git/about">
-		site source
-	</a>
-	</p>
+    <a rel="site source" href="https://git.aaoth.xyz/aaoth.xyz.git/about">
+        site source
+    </a>
+    </p>
 </footer>
diff --git a/_includes/music-project-release-by-year.html b/_includes/music-project-release-by-year.html
new file mode 100644
index 0000000..cdc4675
--- /dev/null
+++ b/_includes/music-project-release-by-year.html
@@ -0,0 +1,16 @@
+{%- assign releases = include.releases %}
+{%- assign print_author = include.print_author %}
+<div class="music-project-release-list">
+    <h2>{{ include.title }}</h2>
+
+    {% for year_group in releases %}
+        <div class="music-project-release-by_year"
+             id="{{ year_group.name }}">
+            <h3 class="music-project-release-year"
+                id="{{ year_group.name }}">{{ year_group.name }}</h3>
+            {%- for release in year_group.items -%}
+                {% include music-project-release-info.html release=release print_author=print_author %}
+            {%- endfor -%}
+        </div>
+    {%- endfor -%}
+</div>
diff --git a/_includes/music-project-release-info.html b/_includes/music-project-release-info.html
new file mode 100644
index 0000000..6381e5c
--- /dev/null
+++ b/_includes/music-project-release-info.html
@@ -0,0 +1,68 @@
+{%- assign release = include.release %}
+{%- assign print_author = include.print_author %}
+
+<div class="music-project-release-info"
+     id="{{ release.title | slugify }}">
+
+    <h4>{% if print_author %}
+        {% assign author_page = site.music_projects |
+        find: "title", release.author %}
+        <a href="{{ author_page.permalink }}">{{ release.author }}</a>
+        &mdash;
+    {% endif %}
+    {% if release.r_tag %}
+        <a href="{{ release.permalink }}">
+            {{ release.title }}
+        </a>
+    {% else %}
+        {{ release.title }}
+    {% endif %}
+    {% if release.r_tag %}
+        <span class="music-project-release-type">
+            ({{ release.type }})</span>
+    {% endif %}
+    {%- if release.bandcamp -%}
+        <a href="{{ release.bandcamp }}"
+           title="listen on bandcamp">
+            <img src="/assets/img/bandcamp-icon.png"
+                 alt="listen on bandcamp"
+                 width="24px" height="24px">
+        </a>
+    {%- endif -%}
+    </h4>
+
+    <p>released {{ release.date | date_to_string }}
+        / <em>{{ release.style }}</em>
+    </p>
+
+    {%- if release.r_tag -%}
+        <h5>tracklist</h5>
+        <div class="music-project-tracklist">
+            {%- assign release_tracks = site.music_titles |
+            where: "r_tag", release.r_tag | sort: "num" -%}
+            <ol>
+                {%- for track in release_tracks -%}
+                    <li value="{{ track.num }}">
+                        {%- if release.author == track.author -%}
+                            {{ track.title }}
+                        {%- else -%}
+                            {%- assign
+                            t_a_has_url = site.music_projects
+                            | find: "title", track.author -%}
+                            {%- if t_a_has_url -%}
+                                <a href="{{ t_a_has_url.url }}">
+                                    {{ track.author }}</a>
+                            {%- else -%}
+                                {{ track.author }}
+                            {% endif %}
+                            &mdash; {{ track.title }}
+                        {% endif %}
+                    </li>
+                {% endfor %}
+            </ol>
+        </div>
+    {%- endif -%}
+
+    {{ release.content | markdownify }}
+
+</div>
diff --git a/_includes/music-projects-list.html b/_includes/music-projects-list.html
new file mode 100644
index 0000000..2e713fe
--- /dev/null
+++ b/_includes/music-projects-list.html
@@ -0,0 +1,20 @@
+<ul class="music-project-list">
+{% for project in include.projects %}
+    <li class="music-project-list-item">
+        <a class="music-project-list-item-mask"
+           href="{{ project.url }}">
+            <span class="music-project-list-item-text">
+                {{ project.title }}
+            </span>
+            <strong>{{ project.description }}</strong>
+            {%- if project.roles -%}
+            <em>({{ project.roles | split: " " | join: ", "}})</em>
+            {%- endif -%}
+        </a>
+        <div class="music-project-list-item-img">
+            <img src="/art/logos/thumbs/{{ project.logo }}_thumb.png"
+            alt="{{ project.title }} logo">
+       </div>
+    </li>
+{% endfor %}
+</ul>
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 0069ec8..3615a1a 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -1,8 +1,17 @@
 <nav>
-	<ul>
-		{% for item in site.data.navigation %}
-		<li><a href="{{ item.link }}" {% if page.url == item.link %}class="current"{% endif %}>{{ item.name }}</a></li>
-		{% endfor %}
-	</ul>
-	<img src="/assets/img/aaoth-logo.png" alt="aaoth" width="376px" height="auto">
+    <img src="/assets/img/aaoth-logo.png" alt="aaoth website logo"
+         width="376px" height="auto">
+    <ul>
+        {%- for item in site.data.navigation -%}
+            <li>
+                <a href="{{ item.link }}"
+                   {%- if page.url == item.link -%}
+                   class="current"
+                   {%- endif -%}>
+                    {{ item.name }}
+                </a>
+            </li>
+        {%- endfor -%}
+    </ul>
+    <hr>
 </nav>
diff --git a/_includes/post-preview.html b/_includes/post-preview.html
index 53ed59d..05cc4f1 100644
--- a/_includes/post-preview.html
+++ b/_includes/post-preview.html
@@ -7,7 +7,7 @@
     <a href="{{ post.url }}">read more...</a>
     </p>
     <small>
-        <p>{{ post.date | date_to_string }} |
+        <p>{{ post.date | date_to_string }} /
         {% for tag in post.tags %}<a href="/tags/{{tag}}">{{tag}} </a>
         {% endfor %}
         </p>
diff --git a/_includes/title-with-backlink.html b/_includes/title-with-backlink.html
new file mode 100644
index 0000000..ee7a10e
--- /dev/null
+++ b/_includes/title-with-backlink.html
@@ -0,0 +1,4 @@
+<div class="title_with_backlink">
+    <h1>{{ include.title }}</h1>
+    <a class="backlink" href="{{ include.backlink }}">go back</a>
+</div>