prereqs for more buddhist highlights

Author: khemarato

Gemfile

@@ -20,7 +20,7 @@ gem "jekyll-sass-converter", ">= 3.0", "< 4.0"
 group :jekyll_plugins do
   gem "jekyll-feed", github: 'buddhist-uni/jekyll-feed', branch: 'collection-tags'
   gem "jekyll-sitemap", "~> 1.4.0"
-  gem "jekyll-seo-tag", github: "buddhist-uni/jekyll-seo-tag", ref: '9d3cf62'
+  gem "jekyll-seo-tag", github: "buddhist-uni/jekyll-seo-tag", ref: '5a9a962'
   gem "jekyll-last-modified-at", github: "buddhist-uni/jekyll-last-modified-at", branch: 'post-date'
   gem 'jekyll-include-cache'
 end

Gemfile.lock

@@ -17,8 +17,8 @@ GIT
 
 GIT
   remote: https://github.com/buddhist-uni/jekyll-seo-tag.git
-  revision: 9d3cf620ed53cc2b0d0f5a6cefffed2aeb34289b
-  ref: 9d3cf62
+  revision: 5a9a962027516970a0983d3ed5b006d363504aa7
+  ref: 5a9a962
   specs:
     jekyll-seo-tag (2.7.1)
       jekyll (>= 3.8, < 5.0)

_includes/big_content_table.html

@@ -35,44 +35,7 @@
           {%- include_cached content_authors_string.html authors=translators -%}
         {%- endif -%}
         </td>
-        {%- assign primarytag = false -%}
-        {%- assign ordinality = 9999 -%}
-        {%- if p.course -%}
-          {%- for candidatecourse in site.courses -%}
-            {%- if p.course == candidatecourse.slug -%}
-              {%- capture primarytag -%}<a href="{{ candidatecourse.url }}">
-                <i class="{{ candidatecourse.icon }}"></i>
-                {{ candidatecourse.title | escape }}
-              </a>{%- endcapture -%}
-              {%- assign ordinality = forloop.index -%}
-              {%- break -%}
-            {%- endif -%}
-          {%- endfor -%}
-          {%- unless primarytag -%}
-            {%- for candidatetag in site.tags -%}
-              {%- if candidatetag.slug == p.course -%}
-                {%- capture primarytag -%}<a href="{{ candidatetag.url }}">
-                  <i class="fas fa-tag"></i>
-                  {{ candidatetag.title | escape }}
-                </a>{%- endcapture -%}
-                {%- assign ordinality = forloop.index | plus: site.courses.size -%}
-                {%- break -%}
-              {%- endif -%}
-            {%- endfor -%}
-          {%- endunless -%}
-        {%- endif -%}
-        {%- unless primarytag -%}
-          {%- for candidatetag in site.tags -%}
-            {%- if p.tags contains candidatetag.slug -%}
-              {%- capture primarytag -%}<a href="{{ candidatetag.url }}">
-                <i class="fas fa-tag"></i>
-                {{ candidatetag.title | escape }}
-              </a>{%- endcapture -%}
-              {%- assign ordinality = forloop.index | plus: site.courses.size -%}
-              {%- break -%}
-            {%- endif -%}
-          {%- endfor -%}
-        {%- endunless -%}
+        {%- include content_primarytag_ordinality.liquid item=p -%}
         <td data-order="{{ ordinality }}">
           {%- if primarytag -%}
             {{ primarytag }}

_includes/content_primarytag_ordinality.liquid

@@ -0,0 +1,38 @@
+{%- assign primarytag = false -%}
+{%- assign ordinality = 9999 -%}
+{%- if include.item.course -%}
+  {%- for candidatecourse in site.courses -%}
+    {%- if include.item.course == candidatecourse.slug -%}
+      {%- capture primarytag -%}<a href="{{ candidatecourse.url }}">
+        <i class="{{ candidatecourse.icon }}"></i>
+        {{ candidatecourse.title | escape }}
+      </a>{%- endcapture -%}
+      {%- assign ordinality = forloop.index -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+  {%- unless primarytag -%}
+    {%- for candidatetag in site.tags -%}
+      {%- if candidatetag.slug == include.item.course -%}
+        {%- capture primarytag -%}<a href="{{ candidatetag.url }}">
+          <i class="fas fa-tag"></i>
+          {{ candidatetag.title | escape }}
+        </a>{%- endcapture -%}
+        {%- assign ordinality = forloop.index | plus: site.courses.size -%}
+        {%- break -%}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- endunless -%}
+{%- endif -%}
+{%- unless primarytag -%}
+  {%- for candidatetag in site.tags -%}
+    {%- if include.item.tags contains candidatetag.slug -%}
+      {%- capture primarytag -%}<a href="{{ candidatetag.url }}">
+        <i class="fas fa-tag"></i>
+        {{ candidatetag.title | escape }}
+      </a>{%- endcapture -%}
+      {%- assign ordinality = forloop.index | plus: site.courses.size -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- endunless -%}

scripts/website.py

@@ -94,14 +94,20 @@ def sortChildren(self):
   def get(self, tag: str):
     return self.tags.get(tag)
   def __iter__(self):
-    return iter(self.tags.values())
+    for filename in config['collections']['tags']['order']:
+      yield self.tags[filename[:-3]]
   def __len__(self):
     return len(self.tags)
   def __contains__(self, item):
     if isinstance(item, TagFile):
       return item.slug in self.tags
     return bool(self.get(item))
 
+content = []
+tags = TagCollection()
+authors = AuthorCollection()
+courses = []
+
 class ContentFile(JekyllFile):
   def __init__(self, fd: Path, content, handler=None, **kwargs) -> None:
     fd = Path(fd)
@@ -138,9 +144,19 @@ def external_url_linkfmt(self):
       return "YouTube (link)"
     return ""
 
-content = []
-tags = TagCollection()
-authors = AuthorCollection()
+  def primarytag_ordinality(self) -> tuple[str, int]:
+    """Mirrors the logic of _include/content_primarytag_ordinality.liquid"""
+    if self.course:
+      for idx, candidatecourse in enumerate(courses):
+        if self.course == candidatecourse.slug:
+          return (self.course, idx)
+    for idx, candidatetag in enumerate(tags):
+      if candidatetag.slug == self.course:
+        return (self.course, idx+len(courses))
+    for idx, candidatetag in enumerate(tags):
+      if candidatetag.slug in self.tags:
+        return (candidatetag.slug, idx+len(courses))
+    return (False, 9999)
 
 def entry_with_drive_id(gid):
   for entry in content:
@@ -174,6 +190,9 @@ def load():
   if content:
     return
   filecreationtimes.update(get_file_creation_times())
+  for filepath in root_folder.joinpath("_courses").rglob("*.md"):
+    courses.append(JekyllFile.load(filepath))
+  courses.sort(key=lambda c: c.created_at)
   for contentfolder in root_folder.joinpath('_content').iterdir():
     if (not contentfolder.is_dir()) or contentfolder.name.startswith('.'):
       continue

search.html

@@ -3,6 +3,7 @@
 slug: search
 section: search
 custom_css: ["search"]
+canonical_url: "none"
 ---
 <search>
 <form class="TableObject" id="search" action="/search/" method="GET">