diff --git a/Gemfile.lock b/Gemfile.lock index cefc804..7bba4e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) builder (3.2.4) colorator (1.1.0) @@ -86,7 +86,7 @@ GEM forwardable-extended (2.6.0) globalid (1.1.0) activesupport (>= 5.0) - google-protobuf (3.22.2-x64-mingw-ucrt) + google-protobuf (3.22.3-x64-mingw-ucrt) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) @@ -106,9 +106,9 @@ GEM safe_yaml (~> 1.0) terminal-table (>= 1.8, < 4.0) webrick (~> 1.7) - jekyll-github-metadata (2.15.0) + jekyll-github-metadata (2.16.0) jekyll (>= 3.4, < 5.0) - octokit (~> 4.0, != 4.4.0) + octokit (>= 4, < 7, != 4.4.0) jekyll-last-modified-at (1.3.0) jekyll (>= 3.7, < 5.0) posix-spawn (~> 0.3.9) @@ -124,7 +124,7 @@ GEM jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) - jekyll-target-blank (2.0.0) + jekyll-target-blank (2.0.2) jekyll (>= 3.0, < 5.0) nokogiri (~> 1.10) jekyll-time-to-read (0.1.2) @@ -143,7 +143,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.8.1) @@ -165,10 +165,10 @@ GEM timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) - nokogiri (1.14.2-x64-mingw-ucrt) + nio4r (2.5.9) + nokogiri (1.14.3-x64-mingw-ucrt) racc (~> 1.4) - octokit (4.25.1) + octokit (6.1.1) faraday (>= 1, < 3) sawyer (~> 0.9) pathutil (0.16.2) @@ -176,7 +176,7 @@ GEM posix-spawn (0.3.15) public_suffix (5.0.1) racc (1.6.2) - rack (2.2.6.4) + rack (2.2.7) rack-test (2.1.0) rack (>= 1.3) rails (7.0.4.3) @@ -218,7 +218,7 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) safe_yaml (1.0.5) - sass-embedded (1.60.0-x64-mingw-ucrt) + sass-embedded (1.62.0-x64-mingw-ucrt) google-protobuf (~> 3.21) sawyer (0.9.2) addressable (>= 2.3.5) diff --git a/src/_includes/content-collection.html b/src/_includes/content-collection.html index d0a95cc..ca50148 100644 --- a/src/_includes/content-collection.html +++ b/src/_includes/content-collection.html @@ -1,5 +1,4 @@ {% if include.collection != null %} - {% if include.pageStatus == null %} {% assign filterPageStatus = "published" %} {% else %} @@ -7,6 +6,10 @@ {% endif %} {% assign items = include.collection | where: "category", include.category | where: "pageStatus", filterPageStatus | sort: "importance" | reverse %} + {% if items == empty or items == 0 %} +

No items in {{include.pageStatus}} currently...

+ {% else %} + + {% endif %} {% else %}

No items in collection

{% endif %} \ No newline at end of file diff --git a/src/_includes/recommended-videos.html b/src/_includes/recommended-videos.html index 6267448..58814a8 100644 --- a/src/_includes/recommended-videos.html +++ b/src/_includes/recommended-videos.html @@ -4,7 +4,7 @@

Recommended Videos

{% for item in videos %} -
+
@@ -12,8 +12,7 @@

Recommended Videos

{{item.title}}
-
- +
{% endfor %}
diff --git a/src/_includes/sidebar-collection.html b/src/_includes/sidebar-collection.html index d319c6e..c732d83 100644 --- a/src/_includes/sidebar-collection.html +++ b/src/_includes/sidebar-collection.html @@ -1,51 +1,30 @@ {% assign collection = site.collections | where: "label", include.collection | first %}
  • - {{ include.collection | capitalize_all }} + +
    +
      {% assign overview = site.pages | where: "pageType", "index" | where: "indexForCollection", include.collection | first %} {% if overview != null %} - Overview +
    • + Overview +
    • {% endif %} {% if collection != null %} {% assign items = collection.docs | where: "category", null | where: "pageStatus", "published" | sort: "importance" | reverse %} - -
        - {% for item in items %} - {% if item.pageStatus != "draft" %} -
      • - - {{ item.title }} - -
      • - {% endif %} - {% endfor %} - {% assign items = collection.docs | except: "pageStatus", "published" | where: "category", null | sort: "importance" | reverse %} + {% assign items = collection.docs | where: "pageStatus", "published" | where: "category", null | sort: "importance" | reverse %} {% if items != empty %} -
      • - - -
        - -
        -
        -
      • {% endif %} -
      {% else %} -

      No items in collection

      +
    • No items in collection
    • {% endif %} +
    +
  • diff --git a/src/_includes/sidebar-pagetype.html b/src/_includes/sidebar-pagetype.html index 697f8a2..e38b33b 100644 --- a/src/_includes/sidebar-pagetype.html +++ b/src/_includes/sidebar-pagetype.html @@ -1,19 +1,41 @@ {% assign pages = site.pages | where: "pageType", include.pageType | where: "pageStatus", "published" | sort: "importance" | reverse %}
  • -{{ include.title | capitalize_all }} -