Merge pull request #24 from aquarist-labs/align-html

website: trying to get meeting minutes to work
aquarist-labs · Apr 23, 2021 · d0f6635 · d0f6635
2 parents 8fcadca + 6ccd9ec
commit d0f6635
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 48 deletions.
diff --git a/_config.yml b/_config.yml
@@ -22,3 +22,7 @@ header_pages:
   - about.md
   - FAQ.md
   - LICENSE.md
+
+collections:
+  minutes:
+    output: true
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -2,29 +2,42 @@
 <footer class="site-footer h-card">
   <data class="u-url" href="{{ "/" | relative_url }}"></data>
 
-  <div class="wrapper">
-
-    <div class="social-links">
-	    <a href="https://join.slack.com/t/aquaristlabs/shared_invite/zt-nphn0jhg-QYKw__It8JPMkUR_sArOug">
-            <img src="{{site.baseurl}}/images/social-media-icon-slack.svg" alt="Join us on Slack!" width="60" height="60"/>
-        </a>
-	    <a href="https://github.com/aquarist-labs/aquarium">
-            <img src="{{site.baseurl}}/images/GitHub-Mark-32px.png" alt="GitHub"/>
-        </a>
-    </div>
-<br>
-    <div class="license">
-	    <a href="https://creativecommons.org/licenses/by-sa/4.0/">
-            <img src="{{site.baseurl}}/images/License-CC BY--SA 4.0-lightgrey.svg" alt="CC BY SA 4.0" />
-        </a>
-    </div>
-<br>
-    <div class="footer-col-wrapper">
-      <div class="footer-col">
-        <p>{{ site.description | escape }}</p>
-      </div>
-    </div>
-
-  </div>
+  <html>
+   <head>
+      <style>
+      {
+          box-sizing: border-box;
+      }
+      /* Set additional styling options for the columns*/
+      .column {
+      float: left;
+      width: 50%;
+      }
+      .row:after {
+      content: "";
+      display: table;
+      clear: both;
+      }
+      </style>
+   </head>
+   <body>
+      <div class="row">
+        <div class="column" align="center">
+            <p>{{ site.description | escape }}</p>
+            <br>
+            <a href="https://creativecommons.org/licenses/by-sa/4.0/">
+                  <img src="{{site.baseurl}}/images/License-CC BY--SA 4.0-lightgrey.svg" alt="CC BY SA 4.0" />
+              </a>
+            </div>
+            <div class="column" align="center">
+              <a href="https://join.slack.com/t/aquaristlabs/shared_invite/zt-nphn0jhg-QYKw__It8JPMkUR_sArOug">
+                    <img src="{{site.baseurl}}/images/social-media-icon-slack.svg" alt="Join us on Slack!" width="60" height="60"/>
+                </a>
+              <a href="https://github.com/aquarist-labs/aquarium">
+                    <img src="{{site.baseurl}}/images/GitHub-Mark-32px.png" alt="GitHub"/>
+                </a>
+            </div>
+   </body>
+  </html>
 
 </footer>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="{{ page.lang | default: site.lang | default: "en" }}">
+
+  {%- include head.html -%}
+
+  <body>
+
+    {%- include header.html -%}
+
+    <main class="page-content" aria-label="Content">
+      <div class="wrapper">
+        {{ content }}
+      </div>
+    </main>
+
+    {%- include footer.html -%}
+
+  </body>
+
+</html>
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -9,34 +9,81 @@ <h1 class="page-heading">{{ page.title }}</h1>
 
   {{ content }}
 
-
   {% if site.paginate %}
     {% assign posts = paginator.posts %}
+    {% assign minutes = paginator.minutes %}
   {% else %}
     {% assign posts = site.posts %}
+    {% assign minutes = site.minutes %}
   {% endif %}
 
+  <html>
+   <head>
+      <style>
+      {
+          box-sizing: border-box;
+      }
+      /* Set additional styling options for the columns*/
+      .column {
+      float: left;
+      width: 50%;
+      }
 
-  {%- if posts.size > 0 -%}
-    {%- if page.list_title -%}
-      <h2 class="post-list-heading">{{ page.list_title }}</h2>
-    {%- endif -%}
-    <ul class="post-list">
-      {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
-      {%- for post in posts -%}
-      <li>
-        <span class="post-meta">{{ post.date | date: date_format }}</span>
-        <h3>
-          <a class="post-link" href="{{ post.url | relative_url }}">
-            {{ post.title | escape }}
-          </a>
-        </h3>
-        {%- if site.show_excerpts -%}
-          {{ post.excerpt }}
-        {%- endif -%}
-      </li>
-      {%- endfor -%}
-    </ul>
+      .row:after {
+      content: "";
+      display: table;
+      clear: both;
+      }
+      </style>
+   </head>
+   <body>
+      <div class="row">
+        <div class="column" align="left">
+          {%- if posts.size > 0 -%}
+            {%- if page.list_title -%}
+              <h2 class="post-list-heading">{{ page.list_title }}</h2>
+            {%- endif -%}
+            <ul class="post-list">
+              {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
+              {%- for post in posts -%}
+              <li>
+                <span class="post-meta">{{ post.date | date: date_format }}</span>
+                <h3>
+                  <a class="post-link" href="{{ post.url | relative_url }}">
+                    {{ post.title | escape }}
+                  </a>
+                </h3>
+                {%- if site.show_excerpts -%}
+                  {{ post.excerpt }}
+                {%- endif -%}
+              </li>
+              {%- endfor -%}
+            </ul>
+        </div>
+        <div class="column" align="left">
+          {%- if minutes.size > 0 -%}
+            <h2 class="post-list-heading">Meeting minutes</h2>
+          {%- endif -%}
+          <ul class="post-list">
+            {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
+            {%- for minutes in minutes -%}
+            <li>
+              <span class="post-meta">{{ minutes.date | date: date_format }}</span>
+              <h3>
+                <a class="post-link" href="{{ minutes.url | relative_url }}">
+                  {{ minutes.title | escape }}
+                </a>
+              </h3>
+              {%- if site.show_excerpts -%}
+                {{ minutes.excerpt }}
+              {%- endif -%}
+            </li>
+            {%- endfor -%}
+          </ul>
+        </div>
+      </div>
+   </body>
+  </html>
 
     {% if site.paginate %}
       <div class="pager">

diff --git a/_minutes/2021-04-22-minutes.md b/_minutes/2021-04-22-minutes.md
@@ -0,0 +1,10 @@
+---
+layout: post
+title:  Aquarium minutes
+date:   2021-04-22 14:35:00 +0100
+categories: meetings
+author:
+- Alexandra Settle
+---
+
+test test test
diff --git a/index.md b/index.md
@@ -16,6 +16,4 @@ an opinionated fashion. The Aquarium project is split into two clearly
 defined work streams: Gravel (backend) and Glass (frontend).
 
 On this website, you're invited to follow along our experiments on
-captive cephalopods in decorative containers! Please see [our license](https://aquarist-labs.github.io/LICENSE)
-and [our quickstart guide on how to
-contribute](https://aquarist-labs.github.io/docs/dev/contributing-to-the-website.html).
+captive cephalopods in decorative containers!