linaro-jekyll-theme 4.1.6 → 4.2.0

data/assets/js/app/main.js

@@ -204,13 +204,30 @@ $(document).ready(function () {
   $(window).scroll(function () {
     navbar();
   });
-
-  //   Multi-level dropdowns
-  $(".navbar .dropdown-menu > li:not(.dropdown-item)").on("click", function (
-    e
-  ) {
-    e.stopPropagation();
-  });
+  // Sticky tab bar setup
+  if ($("#tabbed-nav-bar").length > 0) {
+    var text = $("#tabbed-nav-bar ul li a.active").text();
+    $("#sub-navigation-header").text(text);
+    var stickyTabBarOffset = $("#tabbed-nav-bar").offset().top;
+    const stickyNav = () => {
+      var scroll = $(window).scrollTop();
+      if (scroll > stickyTabBarOffset) {
+        $("#tabbed-nav-bar").addClass("fixed-top");
+      } else {
+        $("#tabbed-nav-bar").removeClass("fixed-top");
+      }
+    };
+    $(window).scroll(function () {
+      stickyNav();
+    });
+  }
+  // Multi-level dropdowns
+  $(".navbar .dropdown-menu > li:not(.dropdown-item)").on(
+    "click",
+    function (e) {
+      e.stopPropagation();
+    }
+  );
   $(".navbar .dropdown-item").on("click", function (e) {
     var $el = $(this).children(".dropdown-toggle");
     var $parent = $el.offsetParent(".dropdown-menu");
@@ -390,36 +407,144 @@ $(document).ready(function () {
     $('[data-toggle="tooltip"]').tooltip();
   });
 
-  if ($("#post_search").length > 0) {
-    var file_path = $("#post_search").data("file-path");
+  // SimpleJekyllSearch
+  // if ($("#post_search").length > 0) {
+  //   var file_path = $("#post_search").data("file-path");
+
+  //   $("#results-container").hide();
+  //   $("#search-input").keyup(function () {
+  //     if ($("#search-input").val().length == 0) {
+  //       $("#results-container").fadeOut("fast");
+  //       $(".close_search").hide();
+  //     } else {
+  //       $("#results-container").fadeIn("fast");
+  //       $(".close_search").show();
+  //     }
+  //   });
+  //   $(".close_search").click(function (e) {
+  //     e.preventDefault();
+  //     $("#search-input").val("");
+  //     $("#results-container").fadeOut("fast");
+  //     $(".close_search").hide();
+  //   });
 
+  //   console.log(file_path);
+  //   SimpleJekyllSearch({
+  //     searchInput: document.getElementById("search-input"),
+  //     resultsContainer: document.getElementById("results-container"),
+  //     searchResultTemplate:
+  //       '<li class="media flex-row"><picture><img class="lazyload mr-3 img-thumbnail suggested_post_thumb search_result_img" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="{image}"></picture><div class="media-body"><a href="{url}"><h5 class="mt-0 mb-1">{title}</h5><em class="suggested_post_date">{date}</em><p>{description}</p></a></div></li>',
+  //     json: file_path,
+  //     success: function (data) {
+  //       console.log(data);
+  //     },
+  //   });
+  // }
+  // Post Search Functionality using the FESS search API.
+  if ($("#post_search").length > 0) {
     $("#results-container").hide();
-    $("#search-input").keyup(function () {
+
+    function getSearchResults(
+      progress,
+      url,
+      searchLabel,
+      searchVal,
+      startPosition,
+      limit,
+      searchResults = []
+    ) {
+      return new Promise((resolve, reject) =>
+        fetch(url)
+          .then((response) => {
+            if (response.status !== 200) {
+              throw `${response.status}: ${response.statusText}`;
+            }
+            console.log(searchVal);
+            response
+              .json()
+              .then((data) => {
+                console.log(data);
+                searchResults = searchResults.concat(data.response.result);
+                if (data.response.next_page && searchResults.length < limit) {
+                  //   progress && progress(searchResults);
+                  startPosition += 10;
+                  var nextUrl = `https://search.linaro.org/json/?fields.label=${searchLabel}&q=${searchVal}&start=${startPosition}&sort=last_modified.desc`;
+                  getSearchResults(
+                    progress,
+                    nextUrl,
+                    searchLabel,
+                    searchVal,
+                    startPosition,
+                    limit,
+                    searchResults
+                  )
+                    .then(resolve)
+                    .catch(reject);
+                } else {
+                  var responseData = {
+                    results: searchResults.slice(0, limit),
+                    response: data.response,
+                  };
+                  resolve(responseData);
+                }
+              })
+              .catch(reject);
+          })
+          .catch(reject)
+      );
+    }
+    var timer;
+    $("#search-input").keyup(() => {
       if ($("#search-input").val().length == 0) {
         $("#results-container").fadeOut("fast");
         $(".close_search").hide();
       } else {
         $("#results-container").fadeIn("fast");
         $(".close_search").show();
+        clearTimeout(timer);
+        timer = setTimeout(function () {
+          var searchLabel = $("#post_search").data("search-label");
+          var searchQuery = $("#search-input").val();
+          var searchUrl = `https://search.linaro.org/json/?fields.label=${searchLabel}&q=${searchQuery}&start=0&sort=last_modified.desc`;
+          getSearchResults(
+            0,
+            searchUrl,
+            searchLabel,
+            $("#search-input").val(),
+            0,
+            10,
+            []
+          )
+            .then((responseData) => {
+              console.log(responseData);
+              console.log("Results:", responseData.results);
+              console.log("Response:", responseData.response);
+              var pageElements = [];
+              pageElements += `<li class="text-center">Found ${responseData.response.record_count} results</li>`;
+              for (var i = 0; i < responseData.results.length; i++) {
+                var formattedDate = new Date(
+                  responseData.results[i].last_modified
+                ).toDateString();
+                var contentDigest = responseData.results[i].digest.slice(
+                  0,
+                  200
+                );
+                pageElements += `
+                  <li class="media flex-row"><div class="media-body"><a href="${responseData.results[i].url}"><h5 class="mt-0 mb-1"> ${responseData.results[i].title}</h5><p>${contentDigest}</p></a></div></li>`;
+              }
+              pageElements += `<li class="text-center"><a href="/search/?q=${searchQuery}">View all search results</a></li>`;
+              $("#results-container").html(pageElements);
+            })
+            .catch(console.error);
+        }, 1000);
       }
     });
+
     $(".close_search").click(function (e) {
       e.preventDefault();
       $("#search-input").val("");
       $("#results-container").fadeOut("fast");
       $(".close_search").hide();
     });
-
-    console.log(file_path);
-    SimpleJekyllSearch({
-      searchInput: document.getElementById("search-input"),
-      resultsContainer: document.getElementById("results-container"),
-      searchResultTemplate:
-        '<li class="media flex-row"><picture><img class="lazyload mr-3 img-thumbnail suggested_post_thumb search_result_img" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="{image}"></picture><div class="media-body"><a href="{url}"><h5 class="mt-0 mb-1">{title}</h5><em class="suggested_post_date">{date}</em><p>{description}</p></a></div></li>',
-      json: file_path,
-      success: function (data) {
-        console.log(data);
-      },
-    });
   }
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linaro-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.2.0
 platform: ruby
 authors:
 - Kyle Kirkby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: jekyll-toc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: jekyll-feed
   requirement: !ruby/object:Gem::Requirement
@@ -134,28 +148,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 1.17.2
 description: 
 email:
 - kyle.kirkby@linaro.org
@@ -169,6 +169,7 @@ files:
 - _data/footer.yml
 - _data/nav.yml
 - _data/picture.yml
+- _data/sticky_tab_bar.yml
 - _data/universal_nav.yml
 - _includes/blog/authors_posts.html
 - _includes/blog/blog_filler_element.html
@@ -177,6 +178,7 @@ files:
 - _includes/blog/latest_posts.html
 - _includes/blog/pagination.html
 - _includes/blog/post_search.html
+- _includes/blog/post_search_fess.html
 - _includes/blog/post_series.html
 - _includes/blog/post_sidebar.html
 - _includes/blog/read_time.html
@@ -193,6 +195,7 @@ files:
 - _includes/components/linaro_404.html
 - _includes/components/schema.html
 - _includes/components/sidebar.html
+- _includes/components/sticky_tab_bar.html
 - _includes/examples/custom_include.html
 - _includes/examples/custom_include_row.html
 - _includes/flow/blocks.html
@@ -220,11 +223,11 @@ files:
 - _includes/nav/nav.html
 - _includes/nav/universal_nav.html
 - _includes/social_media_icons.html
-- _includes/sticky-tab-bar.html
 - _includes/youtube.html
 - _layouts/author.html
 - _layouts/base.html
 - _layouts/default.html
+- _layouts/documentation.html
 - _layouts/flow.html
 - _layouts/page.html
 - _layouts/post.html
@@ -324,6 +327,7 @@ files:
 - _sass/core/carousel-styles.scss
 - _sass/core/carousel.scss
 - _sass/core/cookies.scss
+- _sass/core/documentation.scss
 - _sass/core/error.scss
 - _sass/core/featherlight.scss
 - _sass/core/flow.scss
@@ -334,6 +338,7 @@ files:
 - _sass/core/normalize.scss
 - _sass/core/owl.carousel.min.scss
 - _sass/core/owl.theme.default.min.scss
+- _sass/core/sticky_tab_bar.scss
 - _sass/core/syntax.scss
 - _sass/core/theme.scss
 - assets/css/main.scss
@@ -352,6 +357,7 @@ files:
 - assets/images/Linaro-Sprinkle.png
 - assets/images/Linaro-logo-white.png
 - assets/images/avatar-placeholder.jpg
+- assets/images/breadcrumb-banner.png
 - assets/images/breadcrumb-image.jpg
 - assets/images/clipboard.svg
 - assets/images/close.png

data/_includes/sticky-tab-bar.html

@@ -1,61 +0,0 @@
-{% if page.sticky-tab-bar %}
-    {% assign tab-list = page.sticky-tab-bar %}
-{% else %}
-    {% assign sub-nav-tabs = site.data.sticky-tab-bar.pages %}
-{% endif %}
-{% if sub-nav-tabs %}
-    {% assign page-base =  page.url | split:'/' %}
-    {% for each in sub-nav-tabs %}
-        {% for each-url in each.urls %}
-            {% if each-url == page.url %}
-                {% if each.list %}
-                    {% assign tab-list = each.list %}
-                {% endif %}
-            {% elsif each.sub-pages-enabled %}
-                {% if page.url contains each-url %}
-                    {% assign tab-list = each.list %}
-                {% endif %}
-            {% endif %}
-        {% endfor %}
-        {% if each.custom-include %}
-            {% assign custom-include = each.custom-include %}
-        {% endif %}
-    {% endfor %}
-{% endif %}
-{% if tab-list %}
-<div class="tabbed-area non-sticky-nav" id="tabbed-nav-bar"><!-- Nav tabs Wrapper-->
-    <nav class="navbar-default" role="navigation"><!-- Nav -->
-        <div class="container">
-            <div class="navbar-header"><!-- Navbar Header -->
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#tabbed-nav-bar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar top-bar"></span>
-                    <span class="icon-bar middle-bar"></span>
-                    <span class="icon-bar bottom-bar"></span>
-                </button><!-- Navbar Icon Bar Toggle -->
-                <a class="navbar-brand" id="sub-navigation-header" href=""></a><!-- Navbar Brand -->
-            </div>
-            <div class="collapse navbar-collapse" id="tabbed-nav-bar-collapse"><!-- Navbar Collapse -->
-                <ul class="nav nav-tabs tabbed-nav" id="tab-row" role="tablist">
-                    {% for tab in tab-list %}
-                        <li role="presentation" {% if page.url == tab.url %}
-                                                    class="active tabbed-nav-btn {% if tab.right %}pull-right{% endif %}"
-                                                {% elsif tab.sub-pages and page.url contains tab.url %}
-                                                    class="active tabbed-nav-btn {% if tab.right %}pull-right{% endif %}"
-                                                {% elsif tab.active %}
-                                                    class="active tabbed-nav-btn {% if tab.right %}pull-right{% endif %}"
-                                                {% else %}
-                                                    class="tabbed-nav-btn {% if tab.right %}pull-right{% endif %}"
-                                                {% endif %}>
-                                    <a href="{{tab.url}}" aria-controls="overview" role="link">{{tab.title}}</a></li>
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-    </nav>
-</div>
-{% elsif custom-include %}
-    {% include {{custom-include}}.html %}
-{% else %}
-No sticky-nav.yml content found - please add to _data/sticky-tab-bar.yml. More information available <a href="/jekyll/includes/sticky-tab-bar/">here</a>.
-{% endif %}