j1-template 2020.0.19 → 2020.0.25

data/lib/j1/commands/generate.rb

@@ -51,7 +51,7 @@ module J1
         #
         # Returns the filename of the sample post, as a String
         def initialized_post_name
-          "collections/posts/public/featured/_posts/#{Time.now.strftime("%Y-%m-%d")}-welcome-to-J1 Template.adoc"
+          "collections/posts/public/featured/_posts/#{Time.now.strftime("%Y-%m-%d")}-welcome-to-j1-template.adoc"
         end
 
         private
@@ -60,7 +60,7 @@ module J1
           <<-RUBY
           source "https://rubygems.org"
           #ruby RUBY_VERSION
-          
+
           # Hello! This is where you manage which Jekyll version is used to run.
           # When you want to use a different version, change it below, save the
           # file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
@@ -72,19 +72,19 @@ module J1
           # jadams
           #gem "jekyll", "#{Jekyll::VERSION}"
           gem "jekyll", "~> 3.8"
-          
+
           # This is the default theme for generate Jekyll sites. You may change this to anything you like.
           gem "minima", "~> 2.0"
-          
+
           # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
           # uncomment the line below. To upgrade, run `bundle update github-pages`.
           # gem "github-pages", group: :jekyll_plugins
-          
+
           # If you have any plugins, put them here!
           group :jekyll_plugins do
              gem "jekyll-feed", "~> 0.6"
           end
-          
+
           # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
           gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2020.0.19'
+  VERSION = '2020.0.25'
 end

data/lib/j1_app/j1_auth_manager/config.rb

@@ -48,8 +48,8 @@ module J1App
   end
 
   def self.template_config_file
-    # File.join(Dir.pwd, '_data/template_settings.yml')
-    File.join(J1App.project_path, '_data/template_settings.yml')
+    # File.join(Dir.pwd, '_data/j1_config.yml')
+    File.join(J1App.project_path, '_data/j1_config.yml')
   end
 
   def self.template_config

data/lib/starter_web/Gemfile

@@ -52,13 +52,9 @@ ruby RUBY_VERSION
 #
 gem 'jekyll', '~> 4.0'
 
-# Theme Rubie
-# Note: Currently, the version lookup range is LOCKED to the
-#       current version to NOT conflict with changes in higher
-#       versions available for unsupported settings
-# TODO: Open range if template settings are stable
+# Theme Rubies, default: J1 Template (NOT used for the developmnet system)
 #
-gem 'j1-template', '~> 2020.0.19' , '= 2020.0.19'
+gem 'j1-template', '~> 2020.0.25'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -142,7 +138,7 @@ end
 # web application, e.g. on Docker or a Heroku Dyno, to define and use
 # of identical Ruby runtime environments.
 #
-# ruby '2.4.5'
+# ruby '2.6.5'
 
 # ------------------------------------------------------------------------------
 # Enable the `rake` Gem if needed. For container-based apps, Rake can
@@ -185,18 +181,18 @@ gem "puma", '>= 4.3.1'
 # authentication. For default, the Omniauth (authentication) strategies
 # for Github, Twitter, Facebook and Patreon are implemented.
 #
-# gem 'rack', '~> 2.2', '>= 2.2.3'
-# gem 'rack-protection', '~> 2.0'
-# gem 'rack-ssl-enforcer', '~> 0.2'
-# gem 'rest-client', '~> 2.0'
+gem 'rack', '~> 2.2', '>= 2.2.3'
+gem 'rack-protection', '~> 2.0'
+gem 'rack-ssl-enforcer', '~> 0.2'
+gem 'rest-client', '~> 2.0'
 
-# gem 'omniauth', '>= 1.3.0'
-# gem 'omniauth-oauth2', '~> 1.4'
+gem 'omniauth', '>= 1.3.0'
+gem 'omniauth-oauth2', '~> 1.4'
 
-# gem 'sinatra', '~> 2.0'
-# gem 'sinatra-cross_origin', '~> 0.3.1'
+gem 'sinatra', '~> 2.0'
+gem 'sinatra-cross_origin', '~> 0.3.1'
 
-# gem 'warden', '~> 1.2'
+gem 'warden', '~> 1.2'
 
 # ------------------------------------------------------------------------------
 # Gem needed for J1 logger based on log4r (middleware)

data/lib/starter_web/_config.yml

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
 # ~/_config.yml
-# Site specific configuration for J1 Template
+# Development configuration for J1 Template
 #
 # Product/Info:
 # https://jekyll.one
@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2020.0.19
+version:                                2020.0.25
 
 # version
 # ------------------------------------------------------------------------------
@@ -61,7 +61,6 @@ version:                                2020.0.19
 #
 copyright:                              J1 · Copyright © 2020
 
-
 # ==============================================================================
 # 2. THEME configuration
 #
@@ -75,7 +74,7 @@ copyright:                              J1 · Copyright © 2020
 # components are available public at RubyGems.org.
 #
 #
-# theme
+# theme (NOT set for development system)
 # ------------------------------------------------------------------------------
 #   Sets the name of the (gem-based) theme used for Jekyll
 #   serve and build
@@ -348,7 +347,7 @@ base_path:                              ""
 #
 protocol:                               http
 host:                                   localhost
-port:                                   4000
+port:                                   4444
 timezone:                               Europe/Berlin
 encoding:                               UTF-8
 
@@ -364,7 +363,7 @@ show_dir_listing:                       false
 #   source:                             .
 #   destination:                        _site
 #
-source:                                 .
+source:   .
 destination:                            _site
 plugins_dir:                            _plugins
 layouts_dir:                            _layouts
@@ -429,7 +428,6 @@ sass:
 #unpublished:                           false
 #limit_posts:                           10
 
-
 # ------------------------------------------------------------------------------
 # LIQUID template engine
 #
@@ -558,6 +556,31 @@ autopages:
     enabled:                            false
     layouts:                            [ paginator/autopage_collection.html ]
 
+# ------------------------------------------------------------------------------
+# COLLECTION settings
+# See: https://jekyllrb.com/docs/collections/#collections
+#
+collections:
+
+  # ----------------------------------------------------------------------------
+  # Featured articles
+  #
+  featured:
+    output:                             true
+    permalink:                          /collections/:collection/:name/
+
+  # ----------------------------------------------------------------------------
+  # Book shelf
+  #
+  biography:
+    output:                             true
+    permalink:                          /collections/public/:collection/:name/
+  fantasy:
+    output:                             true
+    permalink:                          /collections/public/:collection/:name/
+  romance:
+    output:                             true
+    permalink:                          /collections/public/:collection/:name/
 
 # ------------------------------------------------------------------------------
 # FRONTMATTER defaults
@@ -585,13 +608,18 @@ defaults:
     values:
       layout:                           page
       author:                           J1 Team
+
       toc:                              true
-      resources:                        toccer
+      fam:                              true
+      fam_menu_id:                      page_ctrl
+      scrollbar:                        false
+      flowtext:                         true                                    # TODO: check what this property is doing
+
       analytics:                        false
       advertising:                      false
       comments:                         false
-      scrollbar:                        false
-      indexed:                          true
+      indexed:                          true                                    # TODO: check what property
+      exclude_from_search:              false                                   # controls the (lunr) indexer
 
       robots:
         index:                          true
@@ -622,13 +650,19 @@ defaults:
 
     values:
       layout:                           post
-      scrollbar:                        false
       author:                           J1 Team
+
       toc:                              true
-      resources:                        toccer
+      fam:                              true
+      fam_menu_id:                      open_toc
+      scrollbar:                        false
+      flowtext:                         false                                   # TODO: check what this property is doing
+
       analytics:                        false
       advertising:                      false
-      comments:                         true
+      comments:                         false
+      indexed:                          true                                    # TODO: check what property
+      exclude_from_search:              false                                   # controls the (lunr) indexer
 
       robots:
         index:                          true
@@ -657,13 +691,19 @@ defaults:
 
     values:
       layout:                           post
-      scrollbar:                        false
       author:                           J1 Team
+
       toc:                              true
-      resources:                        toccer
+      fam:                              true
+      fam_menu_id:                      open_toc
+      scrollbar:                        false
+      flowtext:                         false                                   # TODO: check what this property is doing
+
       analytics:                        false
       advertising:                      false
-      comments:                         true
+      comments:                         false
+      indexed:                          true                                    # TODO: check what property
+      exclude_from_search:              false                                   # controls the (lunr) indexer
 
       robots:
         index:                          true
@@ -679,7 +719,6 @@ defaults:
 #       category-image:                 img26.jpg
         dir:                            /assets/images/collections/blog/series
 
-
   # ----------------------------------------------------------------------------
   # PUBLIC - WIKIPEDIA
   #
@@ -689,14 +728,19 @@ defaults:
 
     values:
       layout:                           post
-      scrollbar:                        false
-      author:                           Wikipedia
-      resources:                        toccer
+      author:                           J1 Team
+
       toc:                              true
-      resources:                        toccer
+      fam:                              true
+      fam_menu_id:                      open_toc
+      scrollbar:                        false
+      flowtext:                         false                                   # TODO: check what this property is doing
+
       analytics:                        false
       advertising:                      false
-      comments:                         false
+      comments:                         true
+      indexed:                          true                                    # TODO: check what property
+      exclude_from_search:              false                                   # controls the (lunr) indexer
 
       robots:
         index:                          false
@@ -712,6 +756,102 @@ defaults:
         category-image:
         dir:                            /assets/images/collections/blog/wikipedia
 
+  # ----------------------------------------------------------------------------
+  # Collections
+  #
+
+  # ----------------------------------------------------------------------------
+  # Featured Articles
+  #
+  - scope:
+      type:                             featured
+      path:                             collections/_featured
+
+    values:
+      layout:                           page
+      author:                           J1 Team
+
+      toc:                              false
+      fam:                              false
+      fam_menu_id:                      open_toc
+      scrollbar:                        false
+      flowtext:                         false                                   # TODO: check what this property is doing
+
+      analytics:                        false
+      advertising:                      false
+      comments:                         false
+      indexed:                          true                                    # TODO: check what property
+      exclude_from_search:              false                                   # controls the (lunr) indexer
+
+  # ----------------------------------------------------------------------------
+  # Biography (Book Shelf)
+  #
+  - scope:
+      type:                             biography
+      path:                             collections/_biography
+
+    values:
+      layout:                           page
+      author:                           J1 Team
+
+      toc:                              false
+      fam:                              false
+      fam_menu_id:                      open_toc
+      scrollbar:                        false
+      flowtext:                         false                                   # TODO: check what this property is doing
+
+      analytics:                        false
+      advertising:                      false
+      comments:                         false
+      indexed:                          false                                   # TODO: check what property
+      exclude_from_search:              true                                    # controls the (lunr) indexer
+
+  # ----------------------------------------------------------------------------
+  # Fantasy (Book Shelf)
+  #
+  - scope:
+      type:                             fantasy
+      path:                             collections/_fantasy
+
+    values:
+      layout:                           page
+      author:                           J1 Team
+
+      toc:                              false
+      fam:                              false
+      fam_menu_id:                      open_toc
+      scrollbar:                        false
+      flowtext:                         false                                   # TODO: check what this property is doing
+
+      analytics:                        false
+      advertising:                      false
+      comments:                         false
+      indexed:                          false                                   # TODO: check what property
+      exclude_from_search:              true                                    # controls the (lunr) indexer
+
+  # ----------------------------------------------------------------------------
+  # Romance (Book Shelf)
+  #
+  - scope:
+      type:                             romance
+      path:                             collections/_romance
+
+    values:
+      layout:                           page
+      author:                           J1 Team
+
+      toc:                              false
+      fam:                              false
+      fam_menu_id:                      open_toc
+      scrollbar:                        false
+      flowtext:                         false                                   # TODO: check what this property is doing
+
+      analytics:                        false
+      advertising:                      false
+      comments:                         false
+      indexed:                          false                                   # TODO: check what property
+      exclude_from_search:              true                                    # controls the (lunr) indexer
+
 # ==============================================================================
 # 6. LAYOUT configuration
 #

data/lib/starter_web/_data/apps/carousel.yml

@@ -382,7 +382,7 @@ settings:
 
         text:                           [
                                           "<big>Jekyll One Template</big>         </br> <i>Clean, responsive and fully featured Template made for Jekyll</i>",
-                                          "<big>Jekyll meets Bootstrap</big>      </br> <i>Best of open source and commercial software for the Web</i>",
+                                          "<big>Jekyll meets Bootstrap</big>      </br> <i>Best of OpenSource and commercial software for the Web</i>",
                                           "<big>J1 is Open Source</big>           </br> <i>No pain for private or professional use</i>",
                                           "<big>Explore this site</big>           </br> <i>Learn what's possible if you go the Jekyll Way</i>",
                                           "<big>Create modern static sites</big>  </br> <i>Secure, powerful and fast<i>"
@@ -406,11 +406,11 @@ settings:
         css_classes:                    img-fluid
 
         text:                           [
-                                           "<big>Jekyll One Template</big>         </br> <i>Clean, responsive and fully featured Template made for Jekyll</i>",
-                                            "<big>Jekyll meets Bootstrap</big>      </br> <i>Best of open source and commercial software for the Web</i>",
-                                            "<big>J1 is Open Source</big>           </br> <i>No pain for private or professional use</i>",
-                                            "<big>Explore this site</big>           </br> <i>Learn what's possible if you go the Jekyll Way</i>",
-                                            "<big>Create modern static sites</big>  </br> <i>Secure, powerful and fast<i>"
+                                          "<big>Jekyll One Template</big>         </br> <i>Clean, responsive and fully featured Template made for Jekyll</i>",
+                                          "<big>Jekyll meets Bootstrap</big>      </br> <i>Best of OpenSource and commercial software for the Web</i>",
+                                          "<big>J1 is Open Source</big>           </br> <i>No pain for private or professional use</i>",
+                                          "<big>Explore this site</big>           </br> <i>Learn what's possible if you go the Jekyll Way</i>",
+                                          "<big>Create modern static sites</big>  </br> <i>Secure, powerful and fast<i>"
                                         ]
         options:
           autoPlay:                     5000
@@ -440,10 +440,10 @@ settings:
                                           "#", "#"
                                         ]
         lb_caption:                     [
-                                          You see cat no 1,
-                                          You see cat no 2,
-                                          You see cat no 3,
-                                          You see cat no 4
+                                          "You see cat #1",
+                                          "You see cat #2",
+                                          "You see cat #3",
+                                          "You see cat #4"
                                         ]
         options:
           navigation:                   false

data/lib/starter_web/_data/apps/justified_gallery.yml

@@ -90,6 +90,40 @@ settings:
     # Image Galleries
     #
 
+    # --------------------------------------------------------------------------
+    # Example gallery
+    #
+    - gallery:
+        enabled:                        true
+        type:                           image
+        id:                             jg_example
+        title:                          Example of a Justified Gallery
+        show_delay:                     250
+        css_classes:                    mb-5
+        images_path:                    /assets/images/pages/roundtrip/100_present_images
+        thumb_path:                     /assets/images/pages/roundtrip/100_present_images
+        images:                         [
+                                          lightbox-image-1.jpg,
+                                          lightbox-image-2.jpg,
+                                          lightbox-image-3.jpg
+                                        ]
+        captions_gallery:               [
+                                          Golden Gate Bridge with San Francisco in distance,
+                                          Forest with mountains behind,
+                                          Bicyclist looking out over hill at ocean
+                                        ]
+        captions_lightbox:              []
+
+        gallery_options:
+          rowHeight:                    300
+          margins:                      1
+
+        lightbox_options:
+          lightbox:                     lg
+          mode:                         lg-fade
+          cssEasing:                    cubic-bezier(0.25, 0, 0.25, 1)
+
+
     # --------------------------------------------------------------------------
     # Gallery Customizer (Mega Cities)
     #
@@ -99,7 +133,7 @@ settings:
         id:                             jg_customizer
   #     title:                          Masonry grid layout of Justified Gallery
         show_delay:                     250
-        css_classes:                    mb-3
+        css_classes:                    mb-5
         images_path:                    /assets/images/modules/gallery/mega_cities
         thumb_path:                     /assets/images/modules/gallery/mega_cities
         images:                         [
@@ -132,7 +166,7 @@ settings:
                                           Lotte World Tower Seoul - South Korea,
                                           New York City, United States
                                         ]
-        captions_lightbox:
+        captions_lightbox:              []
 
         gallery_options:
           rowHeight:                    150
@@ -157,7 +191,7 @@ settings:
         id:                             jg_video_html5
         show_delay:                     300
         title:                          false                                   # HTML5 Video Gallery
-        css_classes:                    mb-3
+        css_classes:
         video_path:                     https://github.com/jekyll-one-org/jekyll-one-lfs/raw/master/videos
         image_path:                     /assets/videos/gallery
         thumb_path:                     /assets/videos/gallery
@@ -197,7 +231,7 @@ settings:
         id:                             jg_video_online_youtube
         show_delay:                     300
         title:                          false                                   # YouTube Video Gallery
-        css_classes:                    mb-3
+        css_classes:
         image_path:                     /assets/videos/gallery
         thumb_path:                     /assets/videos/gallery
         videos:                         [
@@ -213,10 +247,10 @@ settings:
                                           "Carpool Karaoke - First Lady Michelle Obama"
                                         ]
         captions_lightbox:              [
-                                          "<p>Carpool Karaoke by James Corden - Lady Gaga <br/> Lady Gaga joins James for a drive through Los Angeles singing her classics and tracks from her new album</p>",
-                                          "<p>Carpool Karaoke by James Corden - Adele <br/> James Corden is about the holidays in London and gets his girlfriend Adele off for a ride through the city. <br/> On the way they sing some of their biggest hits and Adele raps Nicki Minaj's <b>monster</b></p>",
-                                          "<p>Carpool Karaoke by James Corden - Gwen Stefani <br/> Gwen Stefani, Julia Roberts, George Clooney and James Corden singing Holla back girl, there's nothing left to see</p>",
-                                          "<p>Carpool Karaoke by James Corden - First Lady Michelle Obama <br/> James Corden's White House tour takes an unthinkable turn when First Lady Michelle Obama joins him for a drive around the grounds singing Stevie Wonder and Beyonce</p>"
+                                          "<p>Lady Gaga joins James for a drive through Los Angeles singing her classics and tracks from her new album</p>",
+                                          "<p>James Corden is about the holidays in London and gets Adele off for a ride through the city. On the way they sing some of their biggest hits and Adele raps Nicki Minaj's <b>monster</b></p>",
+                                          "<p>Gwen Stefani, Julia Roberts, George Clooney and James Corden singing Holla back girl, there's nothing left to see</p>",
+                                          "<p>James Corden's White House tour takes an unthinkable turn when First Lady Michelle Obama joins him for a drive around the grounds singing Stevie Wonder and Beyonce</p>"
                                         ]
         poster:                         [
                                           video_gaga-poster.jpg, video_adele-poster.jpg,
@@ -246,7 +280,7 @@ settings:
         thumb_spacing:                  5
         thumb_bordered:                 true
         thumb_animate:                  true
-        css_classes:                    mb-3
+        css_classes:
         image_path:                     /assets/videos/gallery
         thumb_path:                     /assets/videos/gallery
         videos:                         [
@@ -281,7 +315,7 @@ settings:
         id:                             jg_video_intro
         show_delay:                     300
         title:                          false                                   # Introduction Videos
-        css_classes:                    mb-3
+        css_classes:
         video_path:                     /assets/videos/tutorials
         image_path:                     /assets/videos/tutorials
         thumb_path:                     /assets/videos/tutorials