j1-template 2022.5.3 → 2022.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a5581be2b6342dea15b95fa98a981177d66caa213f1a86e3c4e14a7ad37cd51
-  data.tar.gz: f4347d1033d3a1cc7900a7e7c87717a8e99d8da30e72e91c7ad663f345ec0662
+  metadata.gz: 49cd6bd2786efc61475518a1aaa26c2b5c108a3251479ebdb7d70cf71b32f6db
+  data.tar.gz: 6788281d57f2063be956763a83fcbced5cf3df9ac4944b602c0f4ad9bc4d3838
 SHA512:
-  metadata.gz: f350e2446da3d97634e3877e26aee69fdf03a91d830d41ed8ba009ae768b475f939c6c817ec4047ee7ed7bd3e04eec58f181b82f49358add466a1f2418b9e476
-  data.tar.gz: b7254baa608d0f65b33982dda48e4be6d7cfe17ba2b010c3ecb42c77374a78389115bb77efee6ecd87d429f2cbdaf5344bca848160b296c533a7991571dd6ef3
+  metadata.gz: 855f6389e520309b385cd6ca4b3a87457b0696d2ce6c3c905717c8b0a3796aa27fb5df5dd97697e918b6a2ae2398efffc28cca622b93a79ab5d90f7a35f3b916
+  data.tar.gz: ed73a9f55e3c54d65da753811876932da1537835a14b5f8cc5e15fe1271bfb8d97e5c49a64877f37a330a59cd233343c512fb7049ca3874328708c5c25709d20

data/_includes/themes/j1/layouts/content_generator_news_panel_posts.html

@@ -2,7 +2,7 @@
  # -----------------------------------------------------------------------------
  # ~/_includes/themes/j1/layouts/content_generator_news_panel_posts.html
  # Liquid template to create the content portion of all posts to be used
- # for infinite scroll by the news panel (home page)
+ # for infinite scroll by the news panel.
  #
  # Product/Info:
  # https://jekyll.one
@@ -26,51 +26,58 @@
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config             = site.data.j1_config %}
-{% assign blocks                      = site.data.blocks %}
-{% assign modules                     = site.data.modules %}
-{% assign builder                     = site.data.builder %}
-{% assign plugins                     = site.data.plugins %}
-
+{% assign template_config                 = site.data.j1_config %}
+{% assign blocks                          = site.data.blocks %}
+{% assign modules                         = site.data.modules %}
+{% assign builder                         = site.data.builder %}
+{% assign plugins                         = site.data.plugins %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign panel_config_defaults       = blocks.defaults.panel %}
-{% assign panel_config_settings       = blocks.panel %}
-{% assign bs_config                   = template_config.bootstrap %}
-
-{% assign blog_navigator_defaults     = modules.defaults.blog_navigator.defaults %}
-{% assign blog_navigator_settings     = modules.blog_navigator.settings %}
-{% assign paginator_defaults          = plugins.defaults.paginator.defaults %}
-{% assign paginator_settings          = plugins.paginator.settings %}
+{% assign panel_config_defaults           = blocks.defaults.panel %}
+{% assign panel_config_settings           = blocks.panel %}
+{% assign bs_config                       = template_config.bootstrap %}
 
-{% assign panel_config_defaults       = panel_config_defaults.defaults %}
-{% assign panel_config_settings       = panel_config_settings.settings %}
+{% assign blog_navigator_defaults         = modules.defaults.blog_navigator.defaults %}
+{% assign blog_navigator_settings         = modules.blog_navigator.settings %}
+{% assign paginator_defaults              = plugins.defaults.paginator.defaults %}
+{% assign paginator_settings              = plugins.paginator.settings %}
 
+{% assign panel_config_defaults           = panel_config_defaults.defaults %}
+{% assign panel_config_settings           = panel_config_settings.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign blog_navigator_options              = blog_navigator_defaults | merge: blog_navigator_settings %}
-{% assign paginator_options                   = paginator_defaults | merge: paginator_settings %}
+{% assign blog_navigator_options          = blog_navigator_defaults | merge: blog_navigator_settings %}
+{% assign paginator_options               = paginator_defaults | merge: paginator_settings %}
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign article_navigator                   = blog_navigator_settings.article_navigator %}
-{% assign article_previewer                   = blog_navigator_settings.article_previewer %}
-{% assign article_navigator_description       = blog_navigator_options.article_navigator.description %}
-{% assign article_previewer_description       = blog_navigator_options.article_previewer.description %}
-
-{% assign previewer                           = blog_navigator_options.previewer %}
-{% assign paginate                            = paginator_options.pagination.enabled %}
-
-{% assign truncate_words                      = site.excerpt_truncate_words %}
+{% assign article_navigator               = blog_navigator_settings.article_navigator %}
+{% assign article_previewer               = blog_navigator_settings.article_previewer %}
+{% assign article_navigator_description   = blog_navigator_options.article_navigator.description %}
+{% assign article_previewer_description   = blog_navigator_options.article_previewer.description %}
 
+{% assign previewer                       = blog_navigator_options.previewer %}
+{% assign paginate                        = paginator_options.pagination.enabled %}
+{% assign truncate_words                  = site.excerpt_truncate_words %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
 {% endif %}
 
+{% comment %} Collect CSS image filters
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if blog_navigator_options.filters %}
+  {% for filter in blog_navigator_options.filters %}
+    {% capture css_filters %}{{css_filters}} {{filter[0]}}({{filter[1]}}){% endcapture %}
+  {% endfor %}
+  {% capture image_filters %}filter:{{css_filters}}{% endcapture %}
+{% else %}
+  {% assign image_filters = '' %}
+{% endif %}
+
 {% comment %} language detection  (i18n)
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if {{site.language}} == "en" %}
@@ -122,7 +129,7 @@
 {% endif %}
 
 {% comment %} Main
-================================================================================ {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% for items in panel_config_settings %}
   {% assign key             = items[0] %}
   {% assign value           = items[1] %}
@@ -176,7 +183,7 @@
       {% if raised %}
         {% capture card_raised %}raised-z{{raised}}{% endcapture %}
       {% else %}
-        {% assign card_raised = 'raised-z3' %}
+        {% assign card_raised = 'raised-z0' %}
       {% endif %}
 
       {% if icon_family == 'fontawesome' or icon_family == 'fontawesome5' or icon_family == 'fa'%}
@@ -263,15 +270,15 @@
               {% comment %} default for card_block: card-deck
               ------------------------------------------------------------------ {% endcomment %}
               {% if card_block == "card-deck" or card_block == "card-list" %}
-                <!-- [INFO   ] [j1.assets.data.panel.html             ] [ blocktype detected as: {{card_block}} ] -->
+                <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ blocktype detected as: {{card_block}} ] -->
 			        {% else %}
-				        <!-- [INFO   ] [j1.assets.data.panel.html             ] [ set blocktype to: card-deck ] -->
+				        <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ set blocktype to: card-deck ] -->
                 {% assign card_block = "card-deck" %}
               {% endif %}
 
-              <!-- [INFO   ] [j1.assets.data.panel.html             ] [ blocktype detected as: {{card_block}} ] -->
+              <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ blocktype detected as: {{card_block}} ] -->
               {% if card_block == 'card-list' %}
-
+              <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ card block detected: 'card-list' ] -->
               {% if debug %}
               <!-- paginator.per_page:      {{paginator.per_page}} -->
               <!-- paginator.total_posts:   {{paginator.total_posts}} -->
@@ -283,17 +290,24 @@
                   {% for post in paginator.posts %}
                   <!-- post items-->
                   <li id="{{panel_settings.id}}-scroll-item" class="scroll-group-item items-{{cards_per_row}} p-0">
-                    <article class="card card-same-height raised-z3 mb-5">
+                    <article class="card card-same-height raised-z0 mb-5">
+                      <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ place post image ] -->
                       {% if post.image %}
-                        <img class="img-fluid img-object--cover g-height-200" src="{{post.image}}" alt="{{post.title}}">
+                        {% if post.image.path %}
+                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image.path}}" alt="{{post.title}}" style="{{image_filters}};">
                         {% assign post_width = '80x' %}
+                        {% else %}
+                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image}}" alt="{{post.title}}" style="{{image_filters}};">
+                        {% assign post_width = '80x' %}
+                        {% endif %}
                       {% else %}
                         <img class="mt-2" src="" alt="">
                         {% assign post_width = '100x' %}
                       {% endif %}
+
                       <h3 class="card-header bg-primary notoc notranslate">{{post.title}}</h3>
                       <!-- Body|Excerpt -->
-                      <div class="card-body r-text-300">
+                      <div class="card-body r-text-300 mt-0">
                         {{post.excerpt|truncatewords: truncate_words}}
                       </div>
                       <!-- End Body|Excerpt -->
@@ -339,6 +353,7 @@
               {% endif %}
 
               {% if card_block == 'card-deck' %}
+              <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ card block detected: 'card-deck' ] -->
               <!-- Recent posts -->
               <div id="{{panel_settings.id}}-scroll-group" class="row card-deck">
               {% for post in paginator.posts %} {% for category in post.categories %}
@@ -347,17 +362,23 @@
                 {% if category == post_category and last_post_written != true %}
                   {% assign posts_written = posts_written|plus:1 %}
                     <!-- Posts -->
-                    <article id="{{panel_settings.id}}-scroll-item" class="card raised-z3 mb-3">
+                    <article id="{{panel_settings.id}}-scroll-item" class="card raised-z0 mb-3">
+                      <!-- [INFO   ] [j1.layouts.content_generator_news_panel_posts.html ] [ place post image ] -->
                       {% if post.image %}
-                        <img class="img-fluid img-object--cover g-height-200" src="{{post.image}}" alt="{{post.title}}">
+                        {% if post.image.path %}
+                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image.path}}" alt="{{post.title}}" style="{{image_filters}};">
+                        {% assign post_width = '80x' %}
+                        {% else %}
+                          <img class="img-fluid img-object--cover g-height-200" src="{{post.image}}" alt="{{post.title}}" style="{{image_filters}};">
                         {% assign post_width = '80x' %}
+                        {% endif %}
                       {% else %}
                         <img class="mt-2" src="" alt="">
                         {% assign post_width = '100x' %}
                       {% endif %}
                       <h3 class="card-header bg-primary notoc">{{post.title}}</h3>
                       <!-- Body|Excerpt -->
-                      <div class="card-body r-text-300">
+                      <div class="card-body r-text-300 mt-0">
                         {% comment %} {{post.excerpt|truncatewords: 50|replace:'...',' ...'|remove:'<div class="paragraph">'|remove:'</div>'|remove:'<p>'|remove:'</p>'}} {% endcomment %}
                         {{post.excerpt|truncatewords: truncate_words}}
                       </div>

data/_includes/themes/j1/layouts/content_generator_page.html

@@ -66,28 +66,28 @@
   {% capture browser_page_url %}{{page.url}}{% endcapture %}
 {% endif %}
 
-<!-- [INFO   ] [j1.page.{{page.title}}                   ] [Save the current page to UserState cookie] -->
+<!-- [INFO   ] [j1.page.{{page.title}}                   ] [Save the current page to j1_user_state cookie] -->
 <!-- script>
-        var logger   = log4javascript.getLogger("j1.page.{{page.title|downcase}}.init");
-        var cookieUserState = 'j1.user.state'
-        var log_text = 'Save the current browser page ({{page.title|downcase}}) to cookie: ' +cookieUserState;
+  var logger          = log4javascript.getLogger("j1.page.{{page.title|downcase}}.init");
+  var cookieUserState = 'j1.user.state'
+  var log_text        = 'Save the current browser page ({{page.title|downcase}}) to cookie: ' +cookieUserState;
 
-        var j1_user_state = {
-          'authenticated' : 'false',
-          'cookies_accepted' : 'false',
-          'theme_css' : 'unknown',
-          'theme_extension_css' : 'unknown',
-          'theme_name' : 'unknown',
-          'last_page' : 'unknown',
-          'last_provider' : 'unknown',
-          'last_signin' : 'unknown',
-          'provider' : 'unknown',
-          'user_name' : 'unknown',
-          'user_id' : 'unknown'
-        };
+  var j1_user_state = {
+    'authenticated' : 'false',
+    'cookies_accepted' : 'false',
+    'theme_css' : 'unknown',
+    'theme_extension_css' : 'unknown',
+    'theme_name' : 'unknown',
+    'last_page' : 'unknown',
+    'last_provider' : 'unknown',
+    'last_signin' : 'unknown',
+    'provider' : 'unknown',
+    'user_name' : 'unknown',
+    'user_id' : 'unknown'
+  };
 
-        // Set|Detect J1 App status
-        j1_user_state.last_page = "{{browser_page_url}}"
-        j1.setUserState( j1_user_state );
-        logger.info(log_text);
-        </script -->
+  // Set|Detect J1 App status
+  j1_user_state.last_page = "{{browser_page_url}}"
+  j1.setUserState( j1_user_state );
+  logger.info(log_text);
+</script -->

data/_includes/themes/j1/layouts/content_generator_post.html

@@ -95,7 +95,7 @@
       {% if page.series %}
       <header class="bmd-layout-header">
         <!-- jadams, 2021-02-28 added mb-3 to the navbar -->
-        <div class="navbar navbar-dark bg-primary raised-z2">
+        <div class="navbar navbar-dark bg-primary raised-z0">
           <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-bs-toggle="drawer" data-bs-target="#post_navigator" aria-label="drawer-toggler-button">
             <span class="mdi mdi-menu mdi-2x"></span>
           </button>

data/_includes/themes/j1/layouts/layout_metadata_generator.html

@@ -68,87 +68,11 @@
 <meta name="{{template_config.translation.google.meta_data}}" content="enabled" />
 {% endif %}
 
-{% comment %} Disabled old meta description tags in favour of Jekyll SEO Tags
---------------------------------------------------------------------------------
-{% if page.layout == 'home' %}
-  <title>{{site.slogan}}</title>
-{% else %}
-  <title>{{page.tagline}}</title>
-{% endif %}
-
-{% if page.layout == 'home' %}
-  {% if site.description %}
-    {% assign size = site.description|size %}
-    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ SIZE of site description: {{size}} chars ] -->
-    {% if size >= 70 %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Gratulations! Your site description has more than 70 chars. Recommended: 70-160 characters ] -->
-    {% else %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! IMPROVE|INCREASE your site description, recommended: 70-160 characters ] -->
-    {% endif %}
-    <meta name="description" content="{{site.description}}" />
-  {% endif %}
-{% else %}
-  {% if page.description %}
-    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ detected content type: PAGE ] -->
-    {% assign size = site.description|size %}
-    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ SIZE of page description: {{size}} chars ] -->
-    {% if size >= 70 %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ GRATULATIONS. Your page description has more than 70 characters. (Recommended: 70-160 characters) ] -->
-    {% else %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider to IMPROVE|INCREASE your page description! ] -->
-    {% endif %}
-    <meta name="description" content="{{page.description}}" />
-  {% elsif page.excerpt %}
-    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ detected content type: POST ] -->
-    {% assign size = page.excerpt|size %}
-    <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ SIZE of page exerpt: {{size}} chars ] -->
-    {% if size >= 70 %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ GRATULATIONS. Your page description (exerpt) has more than 70 characters. (Recommended: 70-160 characters) ] -->
-    {% else %}
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider to IMPROVE|INCREASE your post excerpt for a valid page description! ] -->
-    {% endif %}
-    <meta name="description" content="{{page.excerpt|strip_html}}" />
-  {% else %}
-    <!-- [WARNING] [j1.layout.meta_data_generator.html    ] [ NO page description detected ] -->
-    <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider to add a page description! ] -->
-  {% endif %}
-{% endif %}
-
-{% if page.layout == 'home' %}
-  {% if page.author %}
-    <meta name="author" content="{{page.author}}" />
-  {% else %}
-    <meta name="author" content="{{site.author.name}}" />
-  {% endif %}
-{% else %}
-  {% if page.author %}
-    <meta name="author" content="{{page.author}}" />
-  {% else %}
-    <meta name="author" content="{{site.author.name}}" />
-  {% endif %}
-{% endif %}
-
-{% if page.layout == 'home' %}
-  {% if page.keywords %}
-    <meta name="keywords" content="{{page.keywords}}" />
-  {% else %}
-    {% if site.keywords %}
-      <meta name="keywords" content="{{site.keywords}}" />
-    {% endif %}
-  {% endif %}
-{% else %}
-  {% if page.keywords %}
-    <meta name="keywords" content="{{page.keywords}}" />
-  {% else %}
-    {% if site.keywords %}
-      <meta name="keywords" content="{{site.keywords}}" />
-    {% endif %}
-  {% endif %}
-{% endif %}
--------------------------------------------------------------------------------- {% endcomment %}
-
 {% if site.favicon.image %}
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ favicon for browser ] -->
   <link rel="icon" type="{{site.favicon.type}}" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}" />
+  <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ favicon for the google crawler ] -->
+  <link rel="shortcut icon" href="{{site.data.j1_config.image_path}}/{{site.favicon.image}}" />
 {% endif %}
 
 {% comment %} Check robot settings from site configuration
@@ -350,15 +274,10 @@
   <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ Consider! PRECONNECT 3rd party origins to establish early connections ] -->
 {% endif %}
 
-{% comment %} Add Jekyll SEO Tags (if plugin is enabled)
+{% comment %} Add J1 SEO Tags
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ add Jekyll SEO Tags ] -->
+<!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ add J1 SEO Tags ] -->
 {% seo %}
-
-<!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ place additional site preview image data ] -->
-<meta property="og:image" content="{{site.url}}/{{site.preview-image}}" />
-<meta property="og:image:type" content="image/jpeg" />
-<meta property="og:image:alt" content="{{site.title}} · {{site.slogan}}" />
 <!-- [SEO    ] [j1.layout.meta_data_generator.html    ] [ end SEO Optimization ] -->
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ end meta-data processing ] -->

data/_includes/themes/j1/modules/navigator/generator.html

@@ -23,7 +23,7 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% include themes/{{site.template.name}}/procedures/global/setup.proc %}
 {% capture select_color %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
-{% capture topsearch_create %}themes/{{site.template.name}}/modules/navigator/procedures/topsearch.proc{% endcapture %}
+
 
 {% comment %} Not longer used (loaded via AJAX)
 --------------------------------------------------------------------------------
@@ -59,8 +59,6 @@
 {% assign nav_bar_settings            = navigator_settings.nav_bar %}
 {% assign nav_quicklinks_defaults     = navigator_defaults.nav_quicklinks %}
 {% assign nav_quicklinks_settings     = navigator_settings.nav_quicklinks %}
-{% assign nav_topsearch_defaults      = navigator_defaults.nav_topsearch %}
-{% assign nav_topsearch_settings      = navigator_settings.nav_topsearch %}
 
 {% assign nav_authclient_defaults     = authentication_defaults.auth_client %}
 {% assign nav_authclient_settings     = authentication_settings.auth_client %}
@@ -72,7 +70,6 @@
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign nav_bar_options             = nav_bar_defaults | merge: nav_bar_settings %}
 {% assign quicklinks_options          = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
-{% assign topsearch_options           = nav_topsearch_defaults | merge: nav_topsearch_settings %}
 {% assign authclient_options          = nav_authclient_defaults | merge: nav_authclient_settings %}
 {% assign authentication_options      = authentication_defaults | merge: authentication_settings %}
 {% assign auth_manager_options        = authentication_options.j1_auth %}
@@ -111,15 +108,6 @@
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} Generate search container
--------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/generator.html ] [ check for topsearch ] -->
-{% if topsearch_options.enabled %}
-  <!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/generator.html ] [ start processing: topsearch ] -->
-  {% include {{topsearch_create}} options=topsearch_options %}
-  <!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/generator.html ] [ end processing: topsearch ] -->
-{% endif %}
-
 {% comment %} Place MMobile NAV menu containers (HTML data loaded via AJAX)
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/generator.html ] [ start processing: mmenu ] -->

data/_includes/themes/j1/modules/searcher/generator.html

@@ -0,0 +1,61 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ #  ~/_includes/themes/j1/modules/searcher/generator.html
+ #  Liquid HTML template to create the HTML portion for the J1 Search Module
+ #
+ #  Product/Info:
+ #  https://jekyll.one
+ #
+ #  Copyright (C) 2022 Juergen Adams
+ #
+ #  J1 Template is licensed under the MIT License.
+ #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ #
+ # -----------------------------------------------------------------------------
+ #  Test data:
+ #   liquid_var: {{liquid_var | debug}}
+ #
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% include themes/{{site.template.name}}/procedures/global/setup.proc %}
+{% capture topsearch_create %}themes/{{site.template.name}}/modules/searcher/procedures/topsearch.proc{% endcapture %}
+
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config         = site.data.j1_config %}
+{% assign blocks                  = site.data.blocks %}
+{% assign modules                 = site.data.modules %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign lunr_defaults           = site.data.modules.defaults.lunr.defaults %}
+{% assign lunr_settings           = site.data.modules.lunr.settings %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign topsearch_defaults      = lunr_defaults.topsearch %}
+{% assign topsearch_settings      = lunr_settings.topsearch %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign topsearch_options       = topsearch_defaults | merge: topsearch_settings %}
+
+
+{% comment %} Main
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Generate Search Modal
+-------------------------------------------------------------------------------- {% endcomment %}
+<!-- [INFO   ] [_includes/themes/j1/modules/searcher/generator.html ] [ check for topsearch ] -->
+{% if topsearch_options.enabled %}
+  <!-- [INFO   ] [~/_includes/themes/j1/modules/searcher/generator.html ] [ start processing: topsearch ] -->
+  {% include {{topsearch_create}} options=topsearch_options %}
+{% endif %}
+<!-- [INFO   ] _includes/themes/j1/modules/searcher/generator.html ] [ end processing: topsearch ] -->

data/_includes/themes/j1/modules/{navigator → searcher}/procedures/topsearch.proc

@@ -1,7 +1,7 @@
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/_includes/templates/j1/modules/navigator/procedures/topsearch.proc
- # Liquid PROCEDURE template to create search input for the quicklinks bar
+ # ~/_includes/templates/j1/modules/searcher/procedures/topsearch.proc
+ # Liquid PROCEDURE template to create search input for J1 Quicksearch
  #
  # Product/Info:
  # https://jekyll.one
@@ -57,11 +57,11 @@
 {% assign quick_search   = true %}
 {% assign elastic_search = false %}
 
-{% if topsearch_options.type == 'quick_search' %}
+{% if topsearch_options.type == 'quicksearch' %}
   {% assign quick_search   = true %}
 {% endif %}
 
-{% if topsearch_options.type == 'elastic_search' %}
+{% if topsearch_options.type == 'elasticsearch' %}
   {% assign elastic_search = true %}
   {% assign quick_search   = false %}
 {% endif %}
@@ -88,42 +88,63 @@
   {% comment %} lunrSearch engine
   ------------------------------------------------------------------------------ {% endcomment %}
   {% if quick_search %}
-    <!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/procedures/topsearch.proc ] [ start processing: top search ] -->
-    <div id="{{topsearch_id}}" class="top-search ml-4 mr-4" style="display: none;">
-    	<div class="input-group">
-    	  <span class="input-group-addon"><i class="mdi mdi-magnify mdi-2x mb-2" style="color:#9E9E9E"></i></span>
-    	  <input id="search-query" type="text" name="q" placeholder="{{placeholder}}" autocomplete="off" class="form-control">
-    	  <span id="clear-topsearch" class="form-clear form-clear-searcher d-none" style="margin-top: 0.75rem"><i class="mdi mdi-format-clear mdi-2x" style="color:#9E9E9E"></i></span>
-    	  <span class="input-group-addon close-search"><i class="mdi mdi-close mdi-3x" style="color:#9E9E9E"></i></span>
-    	</div>
-
-      <!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/procedures/topsearch.proc ] [ place: results container ] -->
-      <div class="search-results hide-scrollbar">
-        <section id="search-results" style="display: none"></section>
-      </div>
+    <!-- Modal Top Search -->
+    <div id="searchModal"
+      class="modal fade top"
+      tabindex="-1"
+      role="dialog"
+      aria-labelledby="myModalLabel" aria-hidden="true"
+      data-keyboard="false"
+      data-backdrop="static">
+
+      <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
+
+        <!-- Content -->
+        <div class="modal-content">
+          <!-- Body -->
+          <div class="modal-body">
+            <div id="navigator_nav_topsearch" class="top-search ml-4 mr-4">
+              <span class="bmd-form-group">
+                <div class="input-group">
+                  <span class="input-group-addon"><i class="mdi mdi-magnify mdi-2x mb-2" style="color:#9E9E9E"></i></span>
+                  <input id="search-query" type="text" name="q" placeholder="Your search expression" autocomplete="off" class="form-control">
+                  <span id="clear-topsearch" class="form-clear form-clear-searcher d-none" style="margin-top: 0.75rem"> <i class="mdi mdi-format-clear mdi-2x" style="color:#9E9E9E"></i> </span>
+                </div>
+              </span>
+              <!-- [INFO   ] [~/assets/data/top_search_modal.html                    ] [ place: results container ] -->
+              <div class="search-results hide-scrollbar mt-4">
+                <section id="search-results" style="display: none;"></section>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- END Content -->
 
-      <!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/procedures/topsearch.proc ] [ place: mustache template ] -->
-      {% raw %}
-      <script id="search-results-template" type="text/mustache">
-        <ul style="list-style: none; margin-left: .5rem; margin-right: 4.25rem">
-        {{#docs}}
-          <li>
-            <h4 class="result-item"> <a class="link-no-decoration" href="{{url}}" target="_blank">{{title}} · {{tagline}}</a> </h4>
-            <p class="result-item-text small text-muted mt-2 mb-0">
-              <i class="mdi mdi-calendar-blank mdi-18px mr-1"></i>{{displaydate}}
-            </p>
-            <p class="result-item-text">{{description}}</p>
-            <p class="result-item-text small text-muted mb-3">
-              <i class="mdi mdi-tag-text-outline mdi-18px mr-1"></i><span class="sr-categories">{{#categories}} {{.}} · {{/categories}}</span>
-              <i class="mdi mdi-tag mdi-18px mr-1 ml-2"></i><span class="sr-tags">{{#tags}} {{.}} · {{/tags}}</span>
-            </p>
-          </li>
-        {{/docs}}
-        <ul>
-      </script>
-      {% endraw %}
-
-    {% endif %}
+      </div>
     </div>
-    <!-- [INFO   ] [~/_includes/themes/j1/modules/navigator/procedures/topsearch.proc ] [ end processing: top search ] -->
+    <!-- END Modal Top Search -->
+
+    <!-- [INFO   ] [_includes/themes/j1/modules/searcher/procedures/topsearch.proc ] [ place: mustache template ] -->
+    {% raw %}
+    <script id="search-results-template" type="text/mustache">
+      <ul style="list-style: none; margin-left: .5rem; margin-right: 4.25rem">
+      {{#docs}}
+        <li>
+          <h4 class="result-item"> <a class="link-no-decoration" href="{{url}}" target="_blank">{{title}} · {{tagline}}</a> </h4>
+          <p class="result-item-text small text-muted mt-2 mb-0">
+            <i class="mdi mdi-calendar-blank mdi-18px mr-1"></i>{{displaydate}}
+          </p>
+          <p class="result-item-text">{{description}}</p>
+          <p class="result-item-text small text-muted mb-3">
+            <i class="mdi mdi-tag-text-outline mdi-18px mr-1"></i><span class="sr-categories">{{#categories}} {{.}} · {{/categories}}</span>
+            <i class="mdi mdi-tag mdi-18px mr-1 ml-2"></i><span class="sr-tags">{{#tags}} {{.}} · {{/tags}}</span>
+          </p>
+        </li>
+      {{/docs}}
+      <ul>
+    </script>
+    {% endraw %}
+
+  {% endif %}
+  <!-- [INFO   ] [_includes/themes/j1/modules/searcher/procedures/topsearch.proc ] [ end processing: top search ] -->
 {% endif %}