Use Jekyll collections

natario1 · natario1 · commit d91d6ffb338e · 2020-01-05T21:15:51.000+01:00
diff --git a/docs/_about/changelog.md b/docs/_about/changelog.md
@@ -1,8 +1,6 @@
 ---
 layout: page
 title: "Changelog"
-category: about
-date: 2018-12-20 17:49:29
 order: 3
 ---
 
diff --git a/docs/_about/getting-started.md b/docs/_about/getting-started.md
@@ -2,8 +2,6 @@
 layout: page
 title: "Getting Started"
 description: "Simple guide to transcode your first video"
-category: about
-date: 2018-12-20 17:48:58
 order: 2
 disqus: 1
 ---
diff --git a/docs/_about/install.md b/docs/_about/install.md
@@ -2,9 +2,7 @@
 layout: page
 title: "Install"
 description: "Integrate in your project"
-category: about
 order: 1
-date: 2018-12-20 17:47:32
 ---
 
 The library works on API 18+, which is the only requirement and should be met by many projects nowadays.
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -14,13 +14,20 @@ github: [metadata] # TODO What's this?
 github_repo: Transcoder
 github_version: 0.7.4
 github_branch: master
-donateurl: '/extra/donate' # relative URL for donations, used in footer.html
 baseurl: '/Transcoder' # Keep as an empty string if served up at the root
-sections: [
-['about', 'Overview'],
-['docs', 'Documentation'],
-['extra', 'More']
-]
+collections:
+  about:
+    name: Overview
+    output: true
+  docs:
+    name: Documentation
+    output: true
+  extra:
+    name: More
+    output: true
+screenshots:
+  - 'screenshot-1.png'
+  - 'screenshot-2.png'
 
 # Jekyll specific stuff
 author:
@@ -32,20 +39,7 @@ plugins:
   - jekyll-seo-tag # Add SEO tags
 permalink: /:categories/:title # Ensure permalinks have no date nor extension
 exclude: ['script', 'README.md'] # Exclude non-site files
-
 highlighter: rouge # Syntax highlighting
-future: true # What's this?
 markdown: kramdown # Use the kramdown Markdown renderer
-redcarpet:
-  extensions: [
-    'no_intra_emphasis',
-    'fenced_code_blocks',
-    'autolink',
-    'strikethrough',
-    'superscript',
-    'with_toc_data',
-    'tables',
-    'hardwrap'
-  ]
 kramdown:
   input: GFM # Use Github Flavored Markdown
diff --git a/docs/_docs/advanced-options.md b/docs/_docs/advanced-options.md
@@ -2,8 +2,6 @@
 layout: page
 title: "Advanced Options"
 description: "Advanced transcoding options"
-category: docs
-date: 2018-12-20 20:02:08
 order: 6
 disqus: 1
 ---
diff --git a/docs/_docs/concatenation.md b/docs/_docs/concatenation.md
@@ -2,8 +2,6 @@
 layout: page
 title: "Video Concatenation"
 description: "How to concatenate video segments"
-category: docs
-date: 2018-12-20 20:02:08
 order: 2
 disqus: 1
 ---
diff --git a/docs/_docs/data-sources.md b/docs/_docs/data-sources.md
@@ -2,8 +2,6 @@
 layout: page
 title: "Data Sources"
 description: "Sources of media data"
-category: docs
-date: 2018-12-20 20:02:08
 order: 1
 disqus: 1
 ---
diff --git a/docs/_docs/events.md b/docs/_docs/events.md
@@ -2,8 +2,6 @@
 layout: page
 title: "Transcoding Events"
 description: "Listening to transcoding events"
-category: docs
-date: 2018-12-20 20:02:08
 order: 3
 disqus: 1
 ---
diff --git a/docs/_docs/track-strategies.md b/docs/_docs/track-strategies.md
@@ -2,8 +2,6 @@
 layout: page
 title: "Track Strategies"
 description: "Per-track transcoding options"
-category: docs
-date: 2018-12-20 20:02:08
 order: 5
 disqus: 1
 ---
diff --git a/docs/_docs/validators.md b/docs/_docs/validators.md
@@ -2,8 +2,6 @@
 layout: page
 title: "Validators"
 description: "Validate or abort the transcoding process"
-category: docs
-date: 2018-12-20 20:02:08
 order: 4
 disqus: 1
 ---
diff --git a/docs/_extra/contact.md b/docs/_extra/contact.md
@@ -1,8 +1,6 @@
 ---
 layout: page
 title: "Contact"
-category: extra
-date: 2018-12-20 19:47:10
 order: 3
 ---
 
diff --git a/docs/_extra/contributing.md b/docs/_extra/contributing.md
@@ -1,8 +1,6 @@
 ---
 layout: page
 title: "Contributing & License"
-category: extra
-date: 2018-12-20 19:28:45
 order: 1
 ---
 
diff --git a/docs/_extra/donate.md b/docs/_extra/donate.md
@@ -1,8 +1,6 @@
 ---
 layout: page
 title: "Donate"
-category: extra
-date: 2018-12-21 13:51:39
 order: 2
 ---
 
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
@@ -1,4 +1,4 @@
 <footer class="text-center py-3 border-top has-divider">
-    <span>View on <a href="https://github.com/{{ site.author.github }}/{{ site.github_repo }}">GitHub</a> or become <a href="{{ site.baseurl }}{{ site.donateurl }}">a sponsor</a>!</span>
+    <span>View on <a href="https://github.com/{{ site.author.github }}/{{ site.github_repo }}">GitHub</a> or become <a href="{{ site.baseurl }}/extra/donate">a sponsor</a>!</span>
     <span class="d-block">Made by <a href="{{ site.author.website }}">{{ site.author.name }}</a></span>
 </footer>
diff --git a/docs/_includes/navigation.html b/docs/_includes/navigation.html
@@ -1,17 +1,18 @@
 <ul id="navigation" class="py-4">
     <li><a href="{{ site.baseurl }}/home">Home</a></li>
-    {% for section in site.sections %}
-    {% assign attr = section[0] %}
-    {% assign label = section[1] %}
-    <li class="mt-3"><h5 class="mt-0 mb-1">{{ label }}</h5>
+    {% for collection in site.collections %}
+    {% if collection.label != "posts" %}
+    <li class="mt-3"><h5 class="mt-0 mb-1">{{ collection.name }}</h5>
         <ul>
-            {% for page in site.categories[attr] %}
-            <li class="pt-2 pb-2" data-order="{{ page.order }}">
-                <a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a>
+            {% assign docs = (collection.docs | sort: "order") %}
+            {% for doc in docs %}
+            <li class="pt-2 pb-2">
+                <a href="{{ site.baseurl }}{{ doc.url }}">{{ doc.title }}</a>
             </li>
             {% endfor %}
         </ul>
     </li>
+    {% endif %}
     {% endfor %}
 </ul>
 <script>
@@ -23,19 +24,4 @@
             link.parentElement.classList.add('active')
         }
     });
-
-    /* reorder elements */
-    const sections = document.querySelectorAll('#navigation ul');
-    sections.forEach((section) => {
-        const entries = section.querySelectorAll('li');
-        const ordered = [];
-        entries.forEach((entry) => {
-            const order = entry.getAttribute('data-order');
-            ordered.push([entry, order]);
-        });
-        ordered.sort((a, b) => a[1] - b[1]);
-        ordered.forEach((entry) => {
-            section.appendChild(entry[0]);
-        })
-    });
 </script>
diff --git a/docs/_layouts/landing.html b/docs/_layouts/landing.html
@@ -17,12 +17,16 @@ <h1 id="title" class="display-2 font-weight-bold mt-2">{{ site.title }}</h1>
                 <a class="btn rounded-pill px-3 py-2 mx-2 mt-2" href="{{ site.baseurl }}/home">Documentation</a>
                 <a class="btn rounded-pill px-3 py-2 mx-2 mt-2" href="{{ site.baseurl }}/about/changelog">Changelog</a>
                 <a class="btn rounded-pill px-3 py-2 mx-2 mt-2" href="https://github.com/{{ site.author.github }}/{{ site.github_repo }}">GitHub</a>
-                <a class="btn rounded-pill px-3 py-2 mx-2 mt-2" href="{{ site.baseurl }}{{ site.donateurl }}">Support</a>
+                <a class="btn rounded-pill px-3 py-2 mx-2 mt-2" href="{{ site.baseurl }}/extra/donate">Support</a>
             </div>
             <br/>
             <div class="row">
-                <div class="col-12 col-sm-6 mt-4"><img class="img-fluid" src="{{ site.baseurl }}/static/screenshot-1.png" alt="Screenshot 1"></div>
-                <div class="col-12 col-sm-6 mt-4"><img class="img-fluid" src="{{ site.baseurl }}/static/screenshot-2.png" alt="Screenshot 2"></div>
+                {% assign col = 12 | divided_by: site.screenshots.size %}
+                {% for screenshot in site.screenshots %}
+                <div class="col-12 col-sm-{{ col }} mt-4">
+                    <img class="img-fluid" src="{{ site.baseurl }}/static/{{ screenshot }}" alt="Screenshot">
+                </div>
+                {% endfor %}
             </div>
         </div>
     </body>
diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html
@@ -12,18 +12,19 @@ <h1 class="d-inline-block mt-1 mb-0 mr-2">{{ page.title }}</h1>
 </div>
 <div class="page-footer border-top has-divider">
     <div class="row text-center">
+        {% assign collection = site.collections | where:"label", page.collection | first %}
         {% assign next = page.order | plus: 1 %}
         {% assign previous = page.order | minus: 1 %}
-        {% for other in site.categories[page.category] %}
-        {% if other.order == previous %}
-        <a class="previous col mt-3" href="{{ site.baseurl }}{{ other.url }}">< {{ other.title }}</a>
+        {% for doc in collection.docs %}
+        {% if doc.order == previous %}
+        <a class="previous col mt-3" href="{{ site.baseurl }}{{ doc.url }}">< {{ doc.title }}</a>
         {% endif %}
         {% endfor %}
 
-        {% for other in site.categories[page.category] %}
-        {% if other.order == next %}
-        <a class="next col mt-3" href="{{ site.baseurl }}{{ other.url }}">{{ other.title }} ></a>
+        {% for doc in collection.docs %}
+        {% if doc.order == next %}
+        <a class="next col mt-3" href="{{ site.baseurl }}{{ doc.url }}">{{ doc.title }} ></a>
         {% endif %}
         {% endfor %}
     </div>
-</div>
+</div>
diff --git a/docs/_posts/.gitkeep b/docs/_posts/.gitkeep
diff --git a/docs/home.md b/docs/home.md
