jekyll-theme-centos 2.52.0.beta.52 → 2.52.0.beta.53

data/_includes/base/bits.html.liquid

@@ -40,36 +40,48 @@ Component Layout:
 ================================================================================
 {% endcomment %}
 
-{%- if page.with_bits -%}
-{%- assign bits = include.data | default: page.with_bits_data | default: site.data.bits | default: site.data.base.bits %}
+{%- assign with_bits = include.with_bits
+| default: page.with_bits
+%}
+
+{%- assign with_bits_data = include.data
+| default: page.with_bits_data
+| default: site.data.bits
+| default: site.data.base.bits
+%}
+
+{%- assign with_bits_schema = site.data.base.bits_schema.properties.with_bits_data.items.properties %}
+
+{%- if with_bits %}
 
 {%- comment %} === Presentation === {% endcomment %}
-{%- assign upstream_bits = bits | where: "type", "upstream" %}
+{%- assign upstream_bits = with_bits_data | where: "type", "upstream" %}
 {%- for upstream_bit in upstream_bits %}
 
   {%- comment %} --- Upstream Defaults --- {% endcomment %}
-  {%- assign upstream_bit_id                    = upstream_bit.name            | replace: " ", "" | capitalize %}
-  {%- assign upstream_bit_class                 = upstream_bit.class           | default: "bg-primary bg-opacity-10 border border-primary-subtle mb-3 p-5 align-items-center text-center rounded" %}
-  {%- assign upstream_bit_card_class            = upstream_bit.card_class      | default: "flex-column align-items-center text-center mb-3" %}
-  {%- assign upstream_bit_preamble_class        = upstream_bit.preamble_class  | default: "mb-3" %}
-  {%- assign upstream_bit_finale_class          = upstream_bit_finale_class    | default: "" %}
-  {%- assign upstream_bit_color                 = upstream_bit.color           | default: "primary" %}
-  {%- assign upstream_bit_index_page_name       = upstream_bit.index_page_name | default: "" %}
-  {%- assign upstream_bit_index_page_url        = upstream_bit.index_page_url  | default: "" %}
-  {%- assign upstream_bit_btn_class             = "btn btn-sm m-1 btn-"        | append: upstream_bit_color %}
+  {%- assign upstream_bit_id                    = upstream_bit.name             | replace: " ", "" | capitalize %}
+  {%- assign upstream_bit_class                 = upstream_bit.class            | default: with_bits_schema.class.default %}
+  {%- assign upstream_bit_card_class            = upstream_bit.card_class       | default: with_bits_schema.card_class.default %}
+  {%- assign upstream_bit_preamble_class        = upstream_bit.preamble_class   | default: with_bits_schema.preamble_class.default %}
+  {%- assign upstream_bit_finale_class          = upstream_bit_finale_class     | default: with_bits_schema.finale_class.default %}
+  {%- assign upstream_bit_color                 = upstream_bit.color            | default: with_bits_schema.color.default %}
+  {%- assign upstream_bit_index_page_name       = upstream_bit.index_page_name  | default: with_bits_schema.index_page_name.default %}
+  {%- assign upstream_bit_index_page_url        = upstream_bit.index_page_url   | default: with_bits_schema.index_page_url.default %}
+  {%- assign upstream_bit_screenshot_class      = upstream_bit.screenshot_class | default: with_bits_schema.screenshot_class.default %}
+  {%- assign upstream_bit_btn_class             = "btn btn-sm m-1 btn-"         | append: upstream_bit_color %}
 
   <div class="d-flex flex-column{% if upstream_bit_class != "" %} {{ upstream_bit_class }}{% endif %}">
 
     {%- comment %} --- Upstream Peamble --- {% endcomment %}
     {%- if upstream_bit.preamble %}
-      <div{% if upstream_bit_preamble_class != "" %} class="{{ upstream_bit_preamble_class }}"{% endif %}>{{ upstream_bit.preamble }}</div>
+      <p{% if upstream_bit_preamble_class != "" %} class="{{ upstream_bit_preamble_class }}"{% endif %}>{{ upstream_bit.preamble }}</p>
     {%- endif %}
 
     {%- comment %} --- Upstream Card --- {% endcomment %}
     {%- include base/card.html.liquid
     class             = upstream_bit_card_class
     screenshot        = upstream_bit.screenshot
-    screenshot_class  = upstream_bit.screenshot_class
+    screenshot_class  = upstream_bit_screenshot_class
     screenshot_style  = upstream_bit.screenshot_style
     screenshot_alt    = upstream_bit.screenshot_alt
     icon              = upstream_bit.icon
@@ -88,13 +100,13 @@ Component Layout:
     %}
 
     {%- comment %} --- Upstream Finale (Downstream Introduction) --- {% endcomment %}
-    {%- assign downstream_bits           = bits                         | where: "type", "downstream" | where: "relationship", upstream_bit.name %}
+    {%- assign downstream_bits           = with_bits_data               | where: "type", "downstream" | where: "relationship", upstream_bit.name %}
     {%- assign downstream_bit_total      = downstream_bits              | size %}
     {%- assign downstream_bit_index_name = upstream_bit_index_page_name | append: " (" | append: downstream_bit_total | append: ")"  %}
 
     {%- if upstream_bit.finale %}
       <div class="d-flex flex-row w-100 justify-content-between align-items-center my-3">
-        <div class="m-1{% if upstream_bit_finale_class != "" %} {{ upstream_bit_finale_class }}{% endif %}">{{ upstream_bit.finale }}</div>
+        <p class="m-1{% if upstream_bit_finale_class != "" %} {{ upstream_bit_finale_class }}{% endif %}">{{ upstream_bit.finale }}</p>
         {%- if downstream_bit_total > 3 %}
           <div class="m-1">
             {% include base/link.html.liquid
@@ -114,10 +126,10 @@ Component Layout:
       {%- for downstream_bit in downstream_bits | limit: 3 %}
         <div class="card border-{{ upstream_bit_color }}-subtle m-1">
           <div class="bg-{{ upstream_bit_color }} rounded-top">
-          <img src="{{ site.url }}{{ site.baseurl }}/assets/img/{{ downstream_bit.screenshot }}" class="card-img-top" alt="{{ downstream_bit.screenshot }}">
+            <img src="{{ site.url }}{{ site.baseurl }}/assets/img/{{ downstream_bit.screenshot }}" class="card-img-top" alt="{{ downstream_bit.screenshot }}">
           </div>
           <div class="card-body">
-            <div class="h5 card-title">{{ downstream_bit.name }}</div>
+            <p class="h5 card-title">{{ downstream_bit.name }}</p>
             <p class="card-text">{{ downstream_bit.description }}</p>
             {% for action in downstream_bit.actions | limit: 1 %}
               {% include base/link.html.liquid
@@ -134,4 +146,5 @@ Component Layout:
 
   </div>
 {% endfor %}
+
 {%- endif -%}

data/_includes/base/breadcrumb.html.liquid

@@ -24,7 +24,12 @@ Data Sources:
 ================================================================================
 {% endcomment %}
 
-{%- if page.with_breadcrumb -%}
+{%- assign with_breadcrumb = include.with_breadcrumb
+| default: page.with_breadcrumb
+%}
+
+{%- if with_breadcrumb %}
+
 {%- comment %} Use original_url if available (without locale), otherwise use full url {%- endcomment %}
 {%- assign breadcrumb_url = page.original_url | default: page.url %}
 
@@ -57,4 +62,5 @@ Data Sources:
     {%- endfor %}
   </ol>
 </nav>
+
 {%- endif -%}

data/_includes/base/breakingnews.html.liquid

@@ -29,15 +29,26 @@ Data Source Hierarchy (priority):
 ================================================================================
 {% endcomment %}
 
-{%- if page.with_breakingnews and page.with_breakingnews_data.size > 0 -%}
-{%- assign breakingnews = include.data | default: page.with_breakingnews_data | default: site.data.breakingnews | default: site.data.base.breakingnews %}
+{%- assign with_breakingnews = include.with_breakingnews
+| default: page.with_breakingnews
+%}
+
+{%- assign with_breakingnews_data = include.data
+| default: page.with_breakingnews_data
+| default: site.data.breakingnews
+| default: site.data.base.breakingnews
+%}
+
+{%- assign with_breakingnews_schema = site.data.base.breakingnews_schema.properties.with_breakingnews_data.items.properties %}
+
+{%- if with_breakingnews %}
 
 {%- comment %} === Presentation === {% endcomment %}
 {% assign breakingnews_alert_height = 38 %}
 {% assign navbar_height             = 42 %}
 
 <div class="sticky-top sticky-top-breakingnews">
-  {% for item in breakingnews %}
+  {% for item in with_breakingnews_data %}
 
     {%- comment %} --- Defaults --- {% endcomment %}
     {% if forloop.first %}
@@ -45,9 +56,9 @@ Data Source Hierarchy (priority):
     {% else %}
       {% assign breakingnews_alerts_height = breakingnews_alerts_height | plus: breakingnews_alert_height %}
     {% endif %}
-    {% assign breakingnews_color     = item.color                    | default: "primary" %}
-    {% assign breakingnews_btn_class = "btn btn-sm text-nowrap btn-" | append: breakingnews_color %}
-    {% assign breakingnews_icon      = item.icon                     | default: "fa-solid fa-bullhorn" %}
+    {%- assign breakingnews_color     = item.color                    | default: with_breakingnews_schema.color.default %}
+    {%- assign breakingnews_btn_class = "btn btn-sm text-nowrap btn-" | append: breakingnews_color %}
+    {%- assign breakingnews_icon      = item.icon                     | default: with_breakingnews_schema.icon.default %}
 
     {%- comment %} --- HTML --- {% endcomment %}
     <div class="breakingnews alert alert-{{ breakingnews_color }} p-2 rounded-0 m-0 border-start-0 border-end-0 shadow" role="alert">
@@ -55,7 +66,7 @@ Data Source Hierarchy (priority):
         <div class="me-3">
           <div class="h6 mb-0"><i class="{{ breakingnews_icon }}"></i></div>
         </div>
-        <div class="flex-fill text-start">{{ item.content }}</div>
+        <p class="flex-fill text-start mb-0">{{ item.content }}</p>
         {%- if item.link %}
           <div>
             {% include base/link.html.liquid
@@ -73,4 +84,5 @@ Data Source Hierarchy (priority):
     </div>
   {% endfor %}
 </div>
+
 {%- endif -%}

data/_includes/base/card.html.liquid

@@ -25,52 +25,65 @@ Data Source:
 ================================================================================
 {% endcomment %}
 
-{%- assign card_class              = include.class             | default: "flex-column align-items-start mb-3" %}
-{%- assign card_color              = include.color             | default: "primary" %}
-{%- assign card_image              = include.image             | default: "" %}
-{%- assign card_image_class        = include.image_class       | default: "img-fluid mb-3 rounded" -%}
-{%- assign card_image_style        = include.image_style       | default: "" -%}
+{%- assign with_card_schema = site.data.base.card_schema.properties %}
+
+{%- assign card_class              = include.class             | default: with_card_schema.class.default %}
+{%- assign card_color              = include.color             | default: with_card_schema.color.default %}
+{%- assign card_image              = include.image             | default: with_card_schema.image.default %}
+{%- assign card_image_class        = include.image_class       | default: with_card_schema.image_class.default %}
+{%- assign card_image_style        = include.image_style       | default: with_card_schema.image_style.default %}
 {%- assign card_image_alt          = include.image_alt         | default: card_image %}
-{%- assign card_icon               = include.icon              | default: "" %}
-{%- assign card_icon_class         = include.icon_class        | default: "display-6 mb-3" %}
-{%- assign card_name               = include.name              | default: "" %}
-{%- assign card_name_class         = include.name_class        | default: "display-5 fw-bold mb-3" %}
-{%- assign card_screenshot         = include.screenshot        | default: "" %}
-{%- assign card_screenshot_class   = include.screenshot_class  | default: "img-fluid" %}
-{%- assign card_screenshot_style   = include.screenshot_style  | default: "" %}
+{%- assign card_icon               = include.icon              | default: with_card_schema.icon.default %}
+{%- assign card_icon_class         = include.icon_class        | default: with_card_schema.icon_class.default %}
+{%- assign card_name               = include.name              | default: with_card_schema.name.default %}
+{%- assign card_name_class         = include.name_class        | default: with_card_schema.name_class.default %}
+{%- assign card_screenshot         = include.screenshot        | default: with_card_schema.screenshot.default %}
+{%- assign card_screenshot_class   = include.screenshot_class  | default: with_card_schema.screenshot_class.default %}
+{%- assign card_screenshot_style   = include.screenshot_style  | default: with_card_schema.screenshot_style.default %}
 {%- assign card_screenshot_alt     = include.screenshot_alt    | default: card_screenshot %}
-{%- assign card_description        = include.description       | default: "" %}
-{%- assign card_description_class  = include.description_class | default: "mb-3" %}
-{%- assign card_actions            = include.actions           | default: "" %}
-{%- assign card_actions_class      = include.actions_class     | default: "" %}
+{%- assign card_description        = include.description       | default: with_card_schema.description.default %}
+{%- assign card_description_class  = include.description_class | default: with_card_schema.description_class.default %}
+{%- assign card_actions            = include.actions           | default: with_card_schema.actions.default %}
+{%- assign card_actions_class      = include.actions_class     | default: with_card_schema.actions_class.default %}
 {%- assign card_actions_btn_class  = include.actions_btn_class | default: "btn m-1 btn-" | append: card_color %}
 
 {%- comment %} === Presentation === {% endcomment %}
 
 {%- comment %} --- Defaults --- {% endcomment %}
 {%- capture html_card_screenshot -%}
-  <div class="bg-{{ card_color }} rounded mb-3">
-  <img class="{{ card_screenshot_class }}"{% if card_screenshot_style != "" %} style="{{ card_screenshot_style }}"{% endif %} src="{{ site.baseurl }}/assets/img/{{ card_screenshot }}" alt="{{ card_screenshot_alt }}">
-  </div>
+  {% if card_screenshot != "" %}
+    <div class="bg-{{ card_color }} rounded mb-3">
+      <img class="{{ card_screenshot_class }}"{% if card_screenshot_style != "" %} style="{{ card_screenshot_style }}"{% endif %} src="{{ site.baseurl }}/assets/img/{{ card_screenshot }}" alt="{{ card_screenshot_alt }}">
+    </div>
+  {% endif %}
 {%- endcapture %}
 
 {%- capture html_card_image -%}
-  <img class="{{ card_image_class }}"{% if card_image_style != "" %} style="{{ card_image_style }}"{% endif %} src="{{ site.baseurl }}/assets/img/{{ card_image }}" alt="{{ card_image_alt }}">
+  {% if card_image != "" %}
+    <img class="{{ card_image_class }}"{% if card_image_style %} style="{{ card_image_style }}"{% endif %} src="{{ site.baseurl }}/assets/img/{{ card_image }}" alt="{{ card_image_alt }}">
+  {% endif %}
 {%- endcapture %}
 
 {%- capture html_card_icon -%}
-  <div class="{{ card_icon_class }}"><i class="{{ card_icon }}"></i></div>
+  {% if card_icon != "" %}
+    <div class="{{ card_icon_class }}"><i class="{{ card_icon }}"></i></div>
+  {% endif %}
 {%- endcapture %}
 
 {%- capture html_card_name -%}
-  <div class="{{ card_name_class }}">{{ card_name }}</div>
+  {% if card_name != "" %}
+    <p class="{{ card_name_class }}">{{ card_name }}</p>
+  {% endif %}
 {%- endcapture %}
 
 {%- capture html_card_description -%}
-  <div class="{{ card_description_class }}">{{ card_description }}</div>
+  {% if card_description != "" %}
+    <p class="{{ card_description_class }}">{{ card_description }}</p>
+  {% endif %}
 {%- endcapture %}
 
 {%- capture html_card_actions -%}
+  {%- if card_actions.size > 0 %}
   <div class="{{ card_actions_class }}">
     {%- for action in card_actions %}
       {% include base/link.html.liquid
@@ -83,14 +96,15 @@ Data Source:
       %}
     {% endfor %}
   </div>
+  {% endif %}
 {%- endcapture %}
 
 {%- comment %} --- HTML --- {% endcomment %}
 <div class="d-flex{% if card_class != "" %} {{ card_class }}{% endif %}">
-  {%- if card_image != "" %}{{ html_card_image }}{% endif %}
-  {%- if card_icon != "" %}{{ html_card_icon }}{% endif %}
-  {%- if card_name != "" %}{{ html_card_name }}{% endif %}
-  {%- if card_description != "" %}{{ html_card_description }}{% endif %}
-  {%- if card_screenshot != "" %}{{ html_card_screenshot }}{% endif -%}
-  {%- if card_actions.size > 0 %}{{ html_card_actions }}{% endif %}
+  {{ html_card_image }}
+  {{ html_card_icon }}
+  {{ html_card_name }}
+  {{ html_card_description }}
+  {{ html_card_screenshot }}
+  {{ html_card_actions }}
 </div>

data/_includes/base/configuration-variables-nested.html.liquid

@@ -47,7 +47,7 @@ others. Requires two distinct loops for valid HTML structure.
         {% assign default_value = prop_details.default | default: "—" %}
 
         <tr>
-          <td>{{ prop_key }}</td>
+          <td><code>{{ prop_key }}</code></td>
           {% if columns %}
             {% for col in columns %}<td>{{ prop_details[col.key] | strip_newlines | markdownify | default: "—" }}</td>{% endfor %}
           {% else %}

data/_includes/base/configuration-variables.html.liquid

@@ -23,7 +23,7 @@ of separate, nested DataTables for complex properties.
   {% comment %} 2. Determine the CSS classes for the top-level table. {% endcomment %}
   {% assign table_classes = "table dataTable" %}
 
-  The `{{ page.component.name }}` {{ page.component.type }} {{ pt }} understands the following configuration variables:
+  <p>The <code>{{ page.component.name }}</code> {{ page.component.type }} understands the following configuration variables:</p>
 
   {% comment %} 3. Render the top-level table completely {% endcomment %}
   <table class="{{ table_classes }}">
@@ -44,7 +44,7 @@ of separate, nested DataTables for complex properties.
         {% assign prop_key = property[0] %}
         {% assign prop_details = property[1] %}
         <tr>
-          <td>{{ prop_key }}</td>
+          <td><code>{{ prop_key }}</code></td>
           {% if columns %}
             {% for col in columns %}<td>{{ prop_details[col.key] | strip_newlines | markdownify | default: "—" }}</td>{% endfor %}
           {% else %}
@@ -94,5 +94,5 @@ of separate, nested DataTables for complex properties.
   {% endfor -%}
 
 {% else %}
-  The `{{ page.component.name }}` {{ page.component.type }} {{ pt }} doesn't have configuration variables.
+  <p>The `{{ page.component.name }}` {{ page.component.type }} {{ pt }} doesn't have configuration variables.</p>
 {% endif %}

data/_includes/base/copyright.html.liquid

@@ -31,16 +31,28 @@ Data Source Hierarchy (priority):
 ================================================================================
 {% endcomment %}
 
-{%- if page.with_copyright -%}
-{%- assign copyright = include.data | default: page.with_copyright_data | default: site.data.copyright | default: site.data.base.copyright %}
+{%- assign with_copyright = include.with_copyright
+| default: page.with_copyright
+%}
+
+{%- assign with_copyright_data = include.data
+| default: page.with_copyright_data
+| default: site.data.copyright
+| default: site.data.base.copyright
+%}
+
+{%- assign with_copyright_schema = site.data.base.copyright_schema.properties.with_copyright_data.properties %}
+
+{%- if with_copyright %}
 
 {%- comment %} === Presentation === {% endcomment %}
 {%- comment %} --- Defaults --- {% endcomment %}
-{% assign copyright_author = copyright.author %}
-{% assign copyright_legals = copyright.legals %}
+{%- assign copyright_author = with_copyright_data.author | default: with_copyright_schema.author.default %}
+{%- assign copyright_legals = with_copyright_data.legals | default: with_copyright_schema.legals.default %}
+
 {%- capture copyright_links -%}
 {%- for item in copyright_legals -%}
-{% assign copyright_link_class = item.class | default: "link link-offset-3 link-offset-3-hover link-underline-primary link-underline-opacity-0 link-underline-opacity-100-hover border-start ms-2 ps-2 link-light" %}
+{%- assign copyright_link_class = item.class | default: "link link-offset-3 link-offset-3-hover link-underline-primary link-underline-opacity-0 link-underline-opacity-100-hover border-start ms-2 ps-2 link-light" %}
 {%- include base/link.html.liquid
     class         = copyright_link_class
     name          = item.name
@@ -54,5 +66,5 @@ Data Source Hierarchy (priority):
 {%- endcapture -%}
 
 {%- comment %} --- HTML --- {% endcomment %}
-<div class="my-1">Copyright &copy; {{ site.time | date: "%Y" }} {{ copyright_author }} {{ copyright_links }}</div>
+<p class="my-1">Copyright &copy; {{ site.time | date: "%Y" }} {{ copyright_author }} {{ copyright_links }}</p>
 {%- endif -%}

data/_includes/base/copyvalue.html.liquid

@@ -39,15 +39,27 @@ Bootstrap 5, FontAwesome 6+, Clipboard API (modern browsers)
 ================================================================================
 {% endcomment %}
 
-{%- assign copyvalue = include.data | default: page.with_copyvalue_data | default: site.data.copyvalue | default: site.data.base.copyvalue %}
+{%- assign with_copyvalue = include.with_copyvalue
+| default: page.with_copyvalue
+%}
+
+{%- assign with_copyvalue_data = include.data
+| default: page.with_copyvalue_data
+| default: site.data.copyvalue
+| default: site.data.base.copyvalue
+%}
+
+{%- assign with_copyvalue_schema = site.data.base.copyvalue_schema.properties.with_copyvalue_data.properties %}
+
+{%- if with_copyvalue %}
 
 {%- comment %} === Presentation === {% endcomment %}
 
 {%- comment %} --- Defaults --- {% endcomment %}
-{%- assign copyvalue_reset_delay      = copyvalue.reset_delay      | default: site.data.base.copyvalue_schema.properties.with_copyvalue_data.properties.reset_delay.default %}
-{%- assign copyvalue_checkmark_path   = copyvalue.checkmark_path   | default: site.data.base.copyvalue_schema.properties.with_copyvalue_data.properties.checkmark_path.default %}
-{%- assign copyvalue_checkmark_viewbox = copyvalue.checkmark_viewbox | default: site.data.base.copyvalue_schema.properties.with_copyvalue_data.properties.checkmark_viewbox.default %}
-{%- assign copyvalue_success_message  = copyvalue.success_message  | default: site.data.base.copyvalue_schema.properties.with_copyvalue_data.properties.success_message.default %}
+{%- assign copyvalue_reset_delay       = with_copyvalue_data.reset_delay       | default: with_copyvalue_schema.reset_delay.default %}
+{%- assign copyvalue_checkmark_path    = with_copyvalue_data.checkmark_path    | default: with_copyvalue_schema.checkmark_path.default %}
+{%- assign copyvalue_checkmark_viewbox = with_copyvalue_data.checkmark_viewbox | default: with_copyvalue_schema.checkmark_viewbox.default %}
+{%- assign copyvalue_success_message   = with_copyvalue_data.success_message   | default: with_copyvalue_schema.success_message.default %}
 
 {%- comment %} --- HTML --- {% endcomment %}
 <!-- Load Copy Value functionality with configuration via data attributes -->
@@ -57,3 +69,5 @@ Bootstrap 5, FontAwesome 6+, Clipboard API (modern browsers)
         data-checkmark-viewbox="{{ copyvalue_checkmark_viewbox }}"
         data-success-message="{{ copyvalue_success_message }}"
         src="{{ site.baseurl }}/assets/js/base/copyvalue.min.js"></script>
+
+{%- endif %}

data/_includes/base/datatable.html.liquid

@@ -29,15 +29,27 @@ Data Source Hierarchy (priority):
 ================================================================================
 {% endcomment %}
 
-{%- assign datatable = include.data | default: page.with_datatable_data | default: site.data.datatable | default: site.data.base.datatable %}
+{%- assign with_datatable = include.with_datatable
+| default: page.with_datatable
+%}
+
+{%- assign with_datatable_data = include.data
+| default: page.with_datatable_data
+| default: site.data.datatable
+| default: site.data.base.datatable
+%}
+
+{%- assign with_datatable_schema = site.data.base.datatable_schema.properties.with_datatable_data.properties %}
+
+{%- if with_datatable %}
 
 {%- comment %} === Presentation === {% endcomment %}
 {%- comment %} --- Defaults --- {% endcomment %}
-{%- assign datatable_version          = datatable.version | default: site.data.base.datatable_schema.properties.with_datatable_data.properties.version.default %}
-{%- assign datatable_css_integrity    = datatable.css_integrity | default: site.data.base.datatable_schema.properties.with_datatable_data.properties.css_integrity.default %}
-{%- assign datatable_script_integrity = datatable.script_integrity | default: site.data.base.datatable_schema.properties.with_datatable_data.properties.script_integrity.default %}
-{%- assign datatable_page_length      = datatable.page_length | default: site.data.base.datatable_schema.properties.with_datatable_data.properties.page_length.default %}
-{%- assign datatable_length_menu      = datatable.length_menu | default: site.data.base.datatable_schema.properties.with_datatable_data.properties.length_menu.default %}
+{%- assign datatable_version          = with_datatable_data.version          | default: with_datatable_schema.version.default %}
+{%- assign datatable_css_integrity    = with_datatable_data.css_integrity    | default: with_datatable_schema.css_integrity.default %}
+{%- assign datatable_script_integrity = with_datatable_data.script_integrity | default: with_datatable_schema.script_integrity.default %}
+{%- assign datatable_page_length      = with_datatable_data.page_length      | default: with_datatable_schema.page_length.default %}
+{%- assign datatable_length_menu      = with_datatable_data.length_menu      | default: with_datatable_schema.length_menu.default %}
 
 {%- capture html_datatable_head %}
   <link href="https://cdn.datatables.net/{{ datatable_version }}/datatables.min.css" rel="stylesheet" integrity="{{ datatable_css_integrity }}" crossorigin="anonymous" />
@@ -62,3 +74,5 @@ Data Source Hierarchy (priority):
 {%- when "script" %}
   {{ html_datatable_script }}
 {%- endcase %}
+
+{%- endif %}

data/_includes/base/event.html.liquid

@@ -34,44 +34,55 @@ Data Source Hierarchy (priority):
 ================================================================================
 {% endcomment %}
 
-{%- if page.with_event -%}
-{%- assign events = include.data | default: page.with_event_data | default: site.data.event | default: site.data.base.event %}
+{%- assign with_event = include.with_event
+| default: page.with_event
+%}
+
+{%- assign with_event_data = include.data
+| default: page.with_event_data
+| default: site.data.event
+| default: site.data.base.event
+%}
+
+{%- assign with_event_schema = site.data.base.event_schema.properties.with_event_data.properties %}
+
+{%- if with_event %}
 
 {%- comment %} === Presentation === {% endcomment %}
 <div class="mb-3">
-  {% for event in events %}
+  {%- for event in with_event_data %}
     {%- comment %} --- Defaults --- {% endcomment %}
-    {%- assign event_address     = event.address     | default: nil %}
-    {%- assign event_city        = event.city        | default: nil %}
-    {%- assign event_color       = event.color       | default: "secondary" %}
-    {%- assign event_location    = event.location    | default: nil %}
-    {%- assign event_date        = event.date        | default: nil %}
-    {%- assign event_description = event.description | default: nil %}
-    {%- assign event_icon        = event.icon        | default: "fa-solid fa-calendar" %}
-    {%- assign event_image_url   = event.image_url   | default: nil %}
-    {%- assign event_link        = event.link        | default: nil %}
-    {%- assign event_title       = event.title       | default: nil %}
+    {%- assign event_address     = event.address     | default: with_event_schema.address.default %}
+    {%- assign event_city        = event.city        | default: with_event_schema.city.default %}
+    {%- assign event_color       = event.color       | default: with_event_schema.color.default %}
+    {%- assign event_location    = event.location    | default: with_event_schema.location.default %}
+    {%- assign event_date        = event.date        | default: with_event_schema.date.default %}
+    {%- assign event_description = event.description | default: with_event_schema.description.default %}
+    {%- assign event_icon        = event.icon        | default: with_event_schema.icon.default %}
+    {%- assign event_image_url   = event.image_url   | default: with_event_schema.image_url.default %}
+    {%- assign event_link        = event.link        | default: with_event_schema.link.default %}
+    {%- assign event_title       = event.title       | default: with_event_schema.title.default %}
 
     {%- assign event_btn_class = "btn btn-sm text-nowrap btn-" | append: event_color %}
 
     {%- comment %} --- HTML --- {% endcomment %}
     <div class="alert alert-{{ event_color }} rounded mb-1" role="alert">
       <div class="d-flex justify-content-between align-items-start">
-        {%- if event_icon != nil %}
+        {%- if event_icon != "" %}
           <div class="h6 my-1 me-2"><i class="{{ event_icon }}"></i></div>
         {%- endif %}
         <div class="flex-fill text-start">
-          {%- if event_title != nil %}
-            <div class="ms-1 fw-bold">{{ event_title }}</div>
+          {%- if event_title != "" %}
+            <p class="ms-1 fw-bold mb-0">{{ event_title }}</p>
           {%- endif %}
-          {%- if event_date != nil %}
-            <div class="ms-1">{{ event_date }}{% if event_location != nil %} • {{ event_location }}{%- endif %}</div>
+          {%- if event_date != "" %}
+            <p class="ms-1 mb-0">{{ event_date }}{% if event_location != "" %} • {{ event_location }}{%- endif %}</p>
           {%- endif %}
-          {%- if event_description != nil %}
-            <div class="ms-1">{{ event_description }}</div>
+          {%- if event_description != "" %}
+            <p class="ms-1 mb-0">{{ event_description }}</p>
           {%- endif %}
         </div>
-        {%- if event_link != nil %}
+        {%- if event_link != "" %}
           <div class="ms-1">
             {% include base/link.html.liquid
             name          = "Know more"
@@ -88,4 +99,5 @@ Data Source Hierarchy (priority):
     </div>
   {% endfor %}
 </div>
+
 {%- endif -%}

data/_includes/base/fontawesome.html.liquid

@@ -28,17 +28,29 @@ Data Source Hierarchy (priority):
 ================================================================================
 {% endcomment %}
 
-{%- assign fontawesome = include.data | default: page.with_fontawesome_data | default: site.data.fontawesome | default: site.data.base.fontawesome %}
+{%- assign with_fontawesome = include.with_fontawesome
+| default: page.with_fontawesome
+%}
+
+{%- assign with_fontawesome_data = include.data
+| default: page.with_fontawesome_data
+| default: site.data.fontawesome
+| default: site.data.base.fontawesome
+%}
+
+{%- assign with_fontawesome_schema = site.data.base.fontawesome_schema.properties.with_fontawesome_data.properties %}
+
+{%- if with_fontawesome %}
 
 {%- comment %} === Presentation === {% endcomment %}
 
 {%- comment %} --- Defaults --- {% endcomment %}
-{%- assign fontawesome_version              = fontawesome.version              | default: site.data.base.fontawesome_schema.properties.with_fontawesome_data.properties.version.default %}
-{%- assign fontawesome_cdn                  = fontawesome.cdn                  | default: site.data.base.fontawesome_schema.properties.with_fontawesome_data.properties.cdn.default %}
-{%- assign fontawesome_css_bundle_name      = fontawesome.css_bundle_name      | default: site.data.base.fontawesome_schema.properties.with_fontawesome_data.properties.css_bundle_name.default %}
-{%- assign fontawesome_css_bundle_integrity = fontawesome.css_bundle_integrity | default: site.data.base.fontawesome_schema.properties.with_fontawesome_data.properties.css_bundle_integrity.default %}
-{%- assign fontawesome_js_bundle_name       = fontawesome.js_bundle_name       | default: site.data.base.fontawesome_schema.properties.with_fontawesome_data.properties.js_bundle_name.default %}
-{%- assign fontawesome_js_bundle_integrity  = fontawesome.js_bundle_integrity  | default: site.data.base.fontawesome_schema.properties.with_fontawesome_data.properties.js_bundle_integrity.default %}
+{%- assign fontawesome_version              = with_fontawesome_data.version              | default: with_fontawesome_schema.version.default %}
+{%- assign fontawesome_cdn                  = with_fontawesome_data.cdn                  | default: with_fontawesome_schema.cdn.default %}
+{%- assign fontawesome_css_bundle_name      = with_fontawesome_data.css_bundle_name      | default: with_fontawesome_schema.css_bundle_name.default %}
+{%- assign fontawesome_css_bundle_integrity = with_fontawesome_data.css_bundle_integrity | default: with_fontawesome_schema.css_bundle_integrity.default %}
+{%- assign fontawesome_js_bundle_name       = with_fontawesome_data.js_bundle_name       | default: with_fontawesome_schema.js_bundle_name.default %}
+{%- assign fontawesome_js_bundle_integrity  = with_fontawesome_data.js_bundle_integrity  | default: with_fontawesome_schema.js_bundle_integrity.default %}
 
 {%- capture html_fontawesome_head %}
 <link rel="stylesheet" href="{{ fontawesome_cdn }}/{{ fontawesome_version }}/css/{{ fontawesome_css_bundle_name }}.min.css" integrity="{{ fontawesome_css_bundle_integrity }}" crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -56,3 +68,5 @@ Data Source Hierarchy (priority):
 {%- when "script" %}
 {{ html_fontawesome_script }}
 {%- endcase %}
+
+{% endif %}