j1-template 2023.9.1 → 2023.10.0

data/lib/starter_web/_data/templates/feed.xml

@@ -10,7 +10,7 @@
  #
  # Copyright (C) 2023 Juergen Adams
  #
- # J1 Theme is licensed under the MIT License.
+ # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
  # Test data:
@@ -57,7 +57,7 @@
   <id>{{ page.url | absolute_url | xml_escape }}</id>
   <post_limited>{{ limit_posts }}</post_limited>
   <template_name>J1 Theme</template_name>
-  <template_version>2023.9.1</template_version>
+  <template_version>2023.10.0</template_version>
 
   {% assign title = site.title | default: site.name %}
   {% if page.collection != "posts" %}

data/lib/starter_web/_data/templates/robots.txt

@@ -10,7 +10,7 @@
  #
  # Copyright (C) 2023 Juergen Adams
  #
- # J1 Theme is licensed under the MIT License.
+ # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
  # Test data:

data/lib/starter_web/_data/templates/seo-tags.html

@@ -8,7 +8,7 @@
  #
  # Copyright (C) 2023 Juergen Adams
  #
- # J1 Theme is licensed under the MIT License.
+ # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
  # Test data:

data/lib/starter_web/_data/templates/sitemap.xml

@@ -10,7 +10,7 @@
  #
  # Copyright (C) 2023 Juergen Adams
  #
- # J1 Theme is licensed under the MIT License.
+ # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  # -----------------------------------------------------------------------------
  # Test data:

data/lib/starter_web/_data/utilities/defaults/util_srv.yml

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one/J1 Theme/blob/master/LICENSE
 # ------------------------------------------------------------------------------
 # NOTE: For the utility server, toplevel ports like 44444 are used to prevent

data/lib/starter_web/_data/utilities/util_srv.yml

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one/j1-template/blob/master/LICENSE
 # ------------------------------------------------------------------------------
 # NOTE: For the utility server, toplevel ports like 44444 are used to prevent

data/lib/starter_web/_includes/custom/static/bs5_accordion.html

@@ -7,7 +7,7 @@
 #
 #  Copyright (C) 2023 Juergen Adams
 #
-#  J1 Theme is licensed under the MIT License.
+#  J1 Template is licensed under the MIT License.
 #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # -----------------------------------------------------------------------------

data/lib/starter_web/_includes/custom/templates/bs5_accordion.html

@@ -7,7 +7,7 @@
  #
  #  Copyright (C) 2023 Juergen Adams
  #
- #  J1 Theme is licensed under the MIT License.
+ #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  #
  # -----------------------------------------------------------------------------

data/lib/starter_web/_includes/custom/templates/collection_panel.html

@@ -7,7 +7,7 @@
  #
  #  Copyright (C) 2023 Juergen Adams
  #
- #  J1 Theme is licensed under the MIT License.
+ #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  #
  # -----------------------------------------------------------------------------

data/lib/starter_web/_includes/custom/templates/custom_header.html

@@ -7,7 +7,7 @@
  #
  #  Copyright (C) 2023 Juergen Adams
  #
- #  J1 Theme is licensed under the MIT License.
+ #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  #
  # -----------------------------------------------------------------------------

data/lib/starter_web/_includes/custom/templates/people_panel.html

@@ -7,7 +7,7 @@
  #
  #  Copyright (C) 2023 Juergen Adams
  #
- #  J1 Theme is licensed under the MIT License.
+ #  J1 Template is licensed under the MIT License.
  #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
  #
  # -----------------------------------------------------------------------------

data/lib/starter_web/_includes/google/static/google_ad__your-slot-id.html

@@ -7,7 +7,7 @@
 #
 #  Copyright (C) 2023 Juergen Adams
 #
-#  J1 Theme is licensed under the MIT License.
+#  J1 Template is licensed under the MIT License.
 #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # -----------------------------------------------------------------------------

data/lib/starter_web/_includes/google/templates/google_ads.html

@@ -7,7 +7,7 @@
 #
 #  Copyright (C) 2023 Juergen Adams
 #
-#  J1 Theme is licensed under the MIT License.
+#  J1 Template is licensed under the MIT License.
 #  See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # -----------------------------------------------------------------------------

data/lib/starter_web/_plugins/asciidoctor/admonition-block-answer.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -37,12 +37,13 @@ Asciidoctor::Extensions.register do
     on_contexts :example, :paragraph
 
     def process parent, reader, attrs
+
       attrs['name'] = 'answer'
       attrs['caption'] = 'Answer'
+
       create_block parent, :admonition, reader.lines, attrs, content_model: :compound
     end
   end
 
   block CustomAdmonitionBlockAnswer
-
 end

data/lib/starter_web/_plugins/asciidoctor/admonition-block-question.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -36,13 +36,14 @@ Asciidoctor::Extensions.register do
     named :QUESTION
     on_contexts :example, :paragraph
 
-    def process parent, reader, attrs
-      attrs['name'] = 'question'
-      attrs['caption'] = 'Question'
-      create_block parent, :admonition, reader.lines, attrs, content_model: :compound
+    def process parent, reader, attributes
+
+      attributes['name'] = 'question'
+      attributes['caption'] = 'Question'
+
+      create_block parent, :admonition, reader.lines, attributes, content_model: :compound
     end
   end
 
   block CustomAdmonitionBlockQuestion
-
 end

data/lib/starter_web/_plugins/asciidoctor/banner.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -31,13 +31,16 @@ Asciidoctor::Extensions.register do
 
     named :banner
     name_positional_attributes 'role'
+    default_attributes 'role' => 'mt-3 mb-3'
 
-    def process parent, target, attrs
-      html = %(<div id="#{target}" class="#{attrs['role']}"></div>)
-      create_pass_block parent, html, attrs, subs: nil
+    def process parent, target, attributes
+      html = %(
+        <div id="#{target}" class="#{attributes['role']}"></div>
+      )
+
+      create_pass_block parent, html, attributes, subs: nil
     end
   end
 
   block_macro J1BlockMacro
-
 end

data/lib/starter_web/_plugins/asciidoctor/callout.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -30,21 +30,23 @@ Asciidoctor::Extensions.register do
     use_dsl
     named :callout
     name_positional_attributes 'text', 'modifier'
-    default_attrs 'text' => 'callout text to be specified', 'modifier' => 'ml-2 mb-1'
+    default_attributes 'text' => 'callout text to be specified',
+                        'modifier' => 'ml-2 mb-1'
+
+    def process parent, target, attributes
+
+      doc             = parent.document
+      modifier_class  = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
+      text_content    = (text = attributes['text']) ? %(#{text}) : nil
 
-    def process parent, target, attrs
-      doc = parent.document
-      modifier_class = (modifier = attrs['modifier']) ? %(#{modifier}) : nil
-      text_content = (text = attrs['text']) ? %(#{text}) : nil
       html = %(
         <div class="paragraph speak2me-ignore">
         	<p class="#{modifier}"> <i class="conum" data-value="#{target}"></i> #{text} </p>
         </div>
       )
 
-      create_pass_block parent, html, attrs, subs: nil
+      create_pass_block parent, html, attributes, subs: nil
     end
-
   end
 
   block_macro CalloutBlockMacro

data/lib/starter_web/_plugins/asciidoctor/carousel-block.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -18,11 +18,11 @@ include Asciidoctor
 #
 # Usage
 #
-#   carousel::carousel:id[role="additional classes"]
+#   carousel::carousel_id[role="additional classes"]
 #
 # Example:
 #
-#   .The carousel title
+#   .Carousel title
 #   carousel::owl_demo_simple[role="mb-5"]
 #
 Asciidoctor::Extensions.register do
@@ -32,15 +32,21 @@ Asciidoctor::Extensions.register do
 
     named :carousel
     name_positional_attributes 'role'
+    default_attrs 'role' => 'mt-3 mb-3'
 
-    def process parent, target, attrs
+    def process parent, target, attributes
 
-      title_html  = (attrs.has_key? 'title') ? %(<div class="carousel-title">#{attrs['title']}</div>\n) : nil
-      html = %(#{title_html} <carousel id="#{target}" class="#{attrs['role']}"></carousel>)
-      create_pass_block parent, html, attrs, subs: nil
+      title_html  = (attributes.has_key? 'title') ? %(<div class="carousel-title">#{attributes['title']}</div>\n) : nil
+      html        = %(
+        <div class="#{attributes['role']}">
+          #{title_html}
+          <div id="#{target}" class="slider"></div>
+        </div>
+      )
+
+      create_pass_block parent, html, attributes, subs: nil
     end
   end
 
   block_macro ImageBlockMacro
-
 end

data/lib/starter_web/_plugins/asciidoctor/conum.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -28,9 +28,11 @@ include Asciidoctor
 Asciidoctor::Extensions.register do
   inline_macro do
     named :conum
+
     process do |parent, target, attrs|
       # TODO validate that this conum is valid
       Asciidoctor::Inline.new(parent, :callout, target.to_i).convert
     end
   end
+
 end

data/lib/starter_web/_plugins/asciidoctor/dailymotion-block.rb

@@ -0,0 +1,83 @@
+# ------------------------------------------------------------------------------
+# ~/_plugins/asciidoctor-extensions/dailymotion-block.rb
+# Asciidoctor extension for J1 Dailymotion Video
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2023 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+#
+# ------------------------------------------------------------------------------
+require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
+include Asciidoctor
+
+# ------------------------------------------------------------------------------
+# A block macro that embeds a video from the Dailymotion platform
+# into the output document
+#
+# Usage:
+#
+#   dailymotion::video_id[theme="vjs_theme_name" role="CSS classes"]
+#
+# Example:
+#
+#   .Video title
+#   dailymotion::x87ycik[theme="city" role="mt-5 mb-5"]
+#
+# ------------------------------------------------------------------------------
+# See:
+# https://www.tutorialspoint.com/creating-a-responsive-video-player-using-video-js
+# ------------------------------------------------------------------------------
+
+Asciidoctor::Extensions.register do
+
+  class DailymotionBlockMacro < Extensions::BlockMacroProcessor
+    use_dsl
+
+    named :dailymotion
+    name_positional_attributes 'theme', 'role'
+    default_attrs 'theme' => 'uno',
+                  'role' => 'mt-3 mb-3'
+
+    def process parent, target, attributes
+
+      chars         = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map(&:to_a).flatten
+      video_id      = (0...11).map { chars[rand(chars.length)] }.join
+
+      title_html    = (attributes.has_key? 'title') ? %(<div class="video-title">#{attributes['title']}</div>\n) : nil
+      theme_name    = (theme = attributes['theme'])  ? %(#{theme}) : nil
+
+      html = %(
+        <div class="dailymotion-player #{attributes['role']}">
+          #{title_html}
+          <video
+            id="#{video_id}"
+            class="video-js vjs-theme-#{theme_name}"
+            controls
+            width="640" height="360"
+            aria-label="#{attributes['title']}"
+            data-setup='{
+              "fluid" : true,
+              "techOrder": [
+                "dailymotion", "html5"
+              ],
+              "sources": [{
+                "type": "video/dailymotion",
+                "src": "//dailymotion.com/video/#{target}"
+              }],
+              "controlBar": {
+                "pictureInPictureToggle": false
+              }
+            }'
+          > </video>
+        </div>
+      )
+      create_pass_block parent, html, attributes, subs: nil
+    end
+  end
+
+  block_macro DailymotionBlockMacro
+end

data/lib/starter_web/_plugins/asciidoctor/fab-icon-inline.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -22,12 +22,15 @@ Asciidoctor::Extensions.register do
     default_attrs 'size' => '1x', 'modifier' => ''
 
     def process parent, target, attributes
-      doc = parent.document
-      size_class = (size = attributes['size']) ? %(fa-#{size}) : nil
-      modifier_class = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
-      icon_name = target.tr '_', '-'
+
+      doc             = parent.document
+      size_class      = (size = attributes['size']) ? %(fa-#{size}) : nil
+      modifier_class  = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
+      icon_name       = target.tr '_', '-'
+
       %(<i class="fa fab fa-#{icon_name} #{size_class} #{modifier}"></i>)
     end
   end
+
   inline_macro FabIconInlineMacro
 end

data/lib/starter_web/_plugins/asciidoctor/fas-icon-inline.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 #
 # ------------------------------------------------------------------------------
@@ -22,12 +22,15 @@ Asciidoctor::Extensions.register do
     default_attrs 'size' => '1x', 'modifier' => ''
 
     def process parent, target, attributes
-      doc = parent.document
-      size_class = (size = attributes['size']) ? %(fa-#{size}) : nil
-      modifier_class = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
-      icon_name = target.tr '_', '-'
+
+      doc             = parent.document
+      size_class      = (size = attributes['size']) ? %(fa-#{size}) : nil
+      modifier_class  = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
+      icon_name       = target.tr '_', '-'
+
       %(<i class="fa fas fa-#{icon_name} #{size_class} #{modifier}"></i>)
     end
   end
+
   inline_macro FasIconInlineMacro
 end

data/lib/starter_web/_plugins/asciidoctor/flag-icon-inline.rb

@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2023 Juergen Adams
 #
-# J1 Theme is licensed under the MIT License.
+# J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
 # ------------------------------------------------------------------------------
 # <i class="flag-icon flag-icon-gr rectangle size-xs"></i>
@@ -25,13 +25,16 @@ Asciidoctor::Extensions.register do
     default_attrs 'style' => 'rectangle', 'size' => '', 'modifier' => ''
 
     def process parent, target, attributes
+
       doc = parent.document
-      style_class = (style = attributes['style']) ? %(#{style}) : nil
-      size_class = (size = attributes['size']) ? %(size-#{size}) : nil
-      modifier_class = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
-      country_name = target.tr '_', '-'
+      style_class     = (style = attributes['style']) ? %(#{style}) : nil
+      size_class      = (size = attributes['size']) ? %(size-#{size}) : nil
+      modifier_class  = (modifier = attributes['modifier']) ? %(#{modifier}) : nil
+      country_name    = target.tr '_', '-'
+
       %(<i class="flag-icon flag-icon-#{country_name} #{style_class} #{size_class} #{modifier}"></i>)
     end
   end
+
   inline_macro FlagIconInlineMacro
 end

data/lib/starter_web/_plugins/asciidoctor/gallery-block.rb

@@ -1,44 +1,50 @@
-# ------------------------------------------------------------------------------
-# ~/_plugins/asciidoctor-extensions/gallery-block.rb
-# Asciidoctor extension for J1 Galleries
-#
-# Product/Info:
-# https://jekyll.one
-#
-# Copyright (C) 2023 Juergen Adams
-#
-# J1 Theme is licensed under the MIT License.
-# See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
-# ------------------------------------------------------------------------------
-require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
-include Asciidoctor
-
-# A block macro that embeds a Gallery block into the output document
-#
-# Usage
-#
-#   gallery::gallery_id[role="additional classes"]
-#
-# Example:
-#
-#   .The gallery title
-#   gallery::jg_live_demo[]
-#
-Asciidoctor::Extensions.register do
-
-  class ImageBlockMacro < Extensions::BlockMacroProcessor
-    use_dsl
-
-    named :gallery
-    name_positional_attributes 'role'
-
-    def process parent, target, attrs
-      title_html  = (attrs.has_key? 'title') ? %(<div class="gallery-title">#{attrs['title']}</div>\n) : nil
-      html = %(#{title_html} <gallery><div id="#{target}" class="#{attrs['role']}"></div></gallery>)
-      create_pass_block parent, html, attrs, subs: nil
-    end
-  end
-
-  block_macro ImageBlockMacro
-
-end
+# ------------------------------------------------------------------------------
+# ~/_plugins/asciidoctor-extensions/gallery-block.rb
+# Asciidoctor extension for J1 Galleries
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2023 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+# ------------------------------------------------------------------------------
+require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
+include Asciidoctor
+
+# A block macro that embeds a Gallery block into the output document
+#
+# Usage
+#
+#   gallery::gallery_id[role="additional classes"]
+#
+# Example:
+#
+#   .The gallery title
+#   gallery::jg_live_demo[role="mt-4 mb-5"]
+#
+Asciidoctor::Extensions.register do
+
+  class ImageBlockMacro < Extensions::BlockMacroProcessor
+    use_dsl
+
+    named :gallery
+    name_positional_attributes 'role'
+    default_attrs 'role' => 'mt-4 mb-4'
+
+    def process parent, target, attributes
+      title_html  = (attributes.has_key? 'title') ? %(<div class="gallery-title">#{attributes['title']}</div>\n) : nil
+      html        = %(
+        <div class="#{attributes['role']}">
+          #{title_html}
+          <div id="#{target}_parent" class="gallery"></div>
+        </div>
+      )
+
+      create_pass_block parent, html, attributes, subs: nil
+    end
+  end
+
+  block_macro ImageBlockMacro
+end