j1-template 2020.0.12 → 2020.0.17

data/lib/starter_web/Gemfile

@@ -40,18 +40,25 @@ ruby RUBY_VERSION
 # NOTE: J1 Template is using Jekyll v3.8 and above
 #
 
-# Support for Ruby version 2.7 (DEC 2019)
+# ------------------------------------------------------------------------------
+# Use Jekyll version from GH master
 #
+# Support for Ruby version 2.7 (DEC 2019)
 # See: https://github.com/jekyll/jekyll/issues/8049
-# gem "jekyll", github: "jekyll/jekyll"
+# gem 'jekyll', github: 'jekyll/jekyll'
 
-# Latest stable Jekyll version
+# ------------------------------------------------------------------------------
+# Use Jekyll version from RubyGems
 #
 gem 'jekyll', '~> 4.0'
 
-# Theme Rubies, default: J1 Template
+# 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
 #
-gem 'j1-template', '~> 2020.0.12'
+gem 'j1-template', '~> 2020.0.17' , '= 2020.0.17'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -78,7 +85,7 @@ gem 'htmlbeautifier', '>= 1.2.1'
 gem 'middleman-core', '~> 4.2', '>= 4.2.1'
 
 # ------------------------------------------------------------------------------
-# Timezone support
+# Timezone support (multi-platform)
 #
 gem 'tzinfo', '>= 1.2.2'
 
@@ -86,15 +93,15 @@ gem 'tzinfo', '>= 1.2.2'
 # Platform specific Gem
 #
 
-#   Windows does not include zoneinfo files, so bundle the
-#   tzinfo-data gem
+# Windows does not include zoneinfo files (timezone support).
+# To provide zoneinfo, tzinfo-data gem is bundled on win platforms
 #
-gem "tzinfo-data"                                                               # if Gem.win_platform?
+gem 'tzinfo-data' if Gem.win_platform?
 
-#  Windows Directory Monitor (WDM) monitor directories
-#  for changes
+# Windows Directory Monitor (WDM) monitor directories
+# for changes
 #
-gem 'wdm', '>= 0.1.1'                                                           # if Gem.win_platform?
+gem 'wdm', '>= 0.1.1' if Gem.win_platform?
 
 # ------------------------------------------------------------------------------
 # Jekyll Plugins
@@ -178,7 +185,7 @@ gem "puma", '>= 4.3.1'
 # authentication. For default, the Omniauth (authentication) strategies
 # for Github, Twitter, Facebook and Patreon are implemented.
 #
-# gem 'rack', '>= 2.2.3'
+# gem 'rack', '~> 2.2', '>= 2.2.3'
 # gem 'rack-protection', '~> 2.0'
 # gem 'rack-ssl-enforcer', '~> 0.2'
 # gem 'rest-client', '~> 2.0'

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2020.0.12
+version:                                2020.0.17
 
 # version
 # ------------------------------------------------------------------------------
@@ -314,7 +314,7 @@ permalink:                              pretty
 # site.url will be set to the value of host, port. This defaults to
 # url: http://localhost:4000.
 #
-url:                                    ""
+url:                                    "http://localhost:44440/"
 
 # The subpath of your site, e.g. /blog/. Used in conjunction with
 # site.url (see above) when you want a link to something with the

data/lib/starter_web/_data/blocks/banner.yml

@@ -299,8 +299,8 @@ settings:
               cite_text_size:             300%
               cite_text_quotes:           false
               cite_text: >
-                                          Making is like Wanting,
-                                          <br> but even <span style="color:red">Better</span>
+                                          <span style="color: #87aade">Making is</span> like Wanting,
+                                          <br> but even <span style="color: #87aade">Better</span>
               cite_size:                  200%
 #             cite:                       J1 Team
               text_color:                 rgba_lighten_900

data/lib/starter_web/_data/blocks/panel.yml

@@ -53,7 +53,7 @@ settings:
         style:                          flat
         raised:
         lane_span:                      fixed
-        helper_classes:
+        helper_classes:                 mt-2
 
         cards:
 
@@ -88,7 +88,7 @@ settings:
             card:
               enabled:                  true
               type:                     text
-              title:                    HTML5 · CSS3 · JS
+              title:                    HTML · CSS · JS
               tagline:                  J1 Template
               icon:                     language-html5
               icon_family:              MDI
@@ -154,7 +154,7 @@ settings:
         icon_family:                    MDI
         style:                          flat
         lane_span:                      fixed
-        helper_classes:
+        helper_classes:                 mt-2
 
         header:
           enabled:                      true
@@ -193,7 +193,7 @@ settings:
               enabled:                  true
               type:                     service
               icon:                     bullseye
-              icon_size:                8x
+              icon_size:                mdi-6x
               icon_color:               md-grey-800
               href:                     /pages/public/panel/service_panel/core
               title:                    J1 Template
@@ -226,7 +226,7 @@ settings:
               enabled:                  true
               type:                     service
               icon:                     locker-multiple
-              icon_size:                8x
+              icon_size:                mdi-6x
               icon_color:               md-grey-800
               href:                     /pages/public/panel/service_panel/components/
               title:                    J1 Template
@@ -259,7 +259,7 @@ settings:
               enabled:                  true
               type:                     service
               icon:                     language-javascript
-              icon_size:                8x
+              icon_size:                mdi-6x
               icon_color:               md-grey-800
               href:                     /pages/public/panel/service_panel/modules/
               title:                    J1 Template
@@ -303,12 +303,12 @@ settings:
         animate:
         title:                          Creators Blog
         tagline:                        latest news
-        helper_classes:
+        helper_classes:                 mt-2
         description: >
                                         Explore the blog and find some interesting articles around Jekyll and
                                         website creation processes in general. And this blog is an excellent
                                         example how J1 and Jekyll can be used for blogging.
-                                        <br/><br/>
+                                        <br/>
                                         Have fun!
 
         cards:

data/lib/starter_web/_data/modules/{cookie_consent.yml → back2top.yml}

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
-# ~/_data/modules/cookie_consent.yml
-# User configuration settings for J1 Cookie Consent module
+# ~/_data/modules/back2top.yml
+# User configuration settings for J1 Back2Top module
 #
 # Product/Info:
 # https://jekyll.one
@@ -8,17 +8,17 @@
 # Copyright (C) 2020 Juergen Adams
 #
 # J1 Template is licensed under the MIT License.
-# See: https://github.com/jekyll-one/J1 Template/blob/master/LICENSE
+# See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
-# Description (used for J1 CC only)
+# About this configuration (used for J1 CC only)
 #
-description:
+about_config:
 
-  title:                                Cookie Consent
+  title:                                Back2Top
   scope:                                User settings
-  location:                             _data/modules/cookie_consent.yml
+  location:                             _data/modules/back2top.yml
 
 # ------------------------------------------------------------------------------
 # User configuration settings
@@ -26,11 +26,5 @@ description:
 settings:
   enabled:                              true
 
-  modal_type:                           full
-  modal_position:                       top
-  stop_scrolling:                       true
-  consent_modals_title:                 Privacy
-  whitelisted_pages:                    []
-
-# ------------------------------------------------------------------------------
 # END config
+# ------------------------------------------------------------------------------

data/lib/starter_web/_data/modules/cookiebar.yml

@@ -26,7 +26,7 @@ description:
 settings:
 
   enabled:                            true
+  show_cookie_icon:                   true
 
-
+# ------------------------------------------------------------------------------
 # END config
-# ------------------------------------------------------------------------------

data/lib/starter_web/_data/modules/defaults/attics.yml

@@ -59,8 +59,11 @@ defaults:
   tagline_animate:                      fadeInRight
   tagline_align:                        left
 
-  background_color_1:                   "#546E7A"                               # md_bluegrey_600
-  background_color_2:                   "#78909C"                               # md_bluegrey_400
+  # background_color_1:                   "#546E7A"                               # md_bluegrey_600
+  # background_color_2:                   "#78909C"                               # md_bluegrey_400
+
+  background_color_1:                   "#384d68"                                # blue
+  background_color_2:                   "#b9c5cc"                               # grey
 
   action_enabled:                       false
   action_url:                           "#"

data/lib/starter_web/_data/modules/defaults/authentication.yml

@@ -70,7 +70,6 @@ defaults:
   # ----------------------------------------------------------------------------
   j1_auth:
     enabled:                            false
-
     ssl:                                false
 
     content:
@@ -102,7 +101,7 @@ defaults:
       #       users:
       #         whitelist:                [ all ]
       #         blacklist:                []
-      # 
+      #
       # github:
       #   provider_url:                   https://github.com
       #   strategy:                       member
@@ -216,11 +215,11 @@ defaults:
     #                                     and mark a provider for authentication. You'll be *redirected*
     #                                     to authenticate with the provider *selected*. If signed in
     #                                     *successfully*, you get back to this site for the page requested.
-    # 
-    # 
+    #
+    #
     #                                     NOTE: To get access to secured pages of this site,
     #                                     authentication with a provider is needed only *once*.
-    # 
+    #
     # auth_disqus:
     #   id:                               1
     #   title:                            Disqus
@@ -246,18 +245,18 @@ defaults:
     #   title:                            Twitter
     #   text: >
     #                                     SignIn to Twitter. Get access to all *PROTECTED* content pages of this site.
-    # 
+    #
     # auth_signout_modal:
     #   title:                            SignOut
     #   body_text: >
     #                                     After signing out from this site, you'll be *redirected*
     #                                     to the *provider* you're currently authenticated. From your
     #                                     home page at the *provider*, you can *sign out* completely.
-    # 
-    # 
+    #
+    #
     #                                     NOTE: In order to signing out *completely*, check the switch
     #                                     below to *on*.
 
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/defaults/back2top.yml

@@ -0,0 +1,146 @@
+# ------------------------------------------------------------------------------
+# ~/_data/modules/defaults/back2top.yml
+# Default configuration settings for J1 Back2Top module
+#
+# Product/Info:
+# https://jekyll.one
+#
+# Copyright (C) 2020 Juergen Adams
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# About this configuration (used for J1 CC only)
+#
+about_config:
+
+  title:                                Back2Top
+  scope:                                Default settings
+  location:                             _data/modules/defaults/back2top.yml
+
+# ------------------------------------------------------------------------------
+# Back2Top settings
+# If enabled, a Back2Top button at the bottom of every page is displayed
+#
+#   enabled
+#   ----------------------------------------------------------------------------
+#   Enables|Disables the use of Back2Top (button)
+#
+#   values:                         boolean (true|false)
+#   default:                        true
+#
+#   color
+#   ----------------------------------------------------------------------------
+#   Set the color of the Back2Top icon for an hover event. Possible
+#   values are the RGB code like "#204a87" or a color name taken from
+#   file ~/_data/modules/j1_colors.yml
+#
+#   values:                         string
+#   default:                        j1_darkblue
+#
+#   icon
+#   ----------------------------------------------------------------------------
+#   Set the font icon used with the Back2Top button. Possible values
+#   depend on the icon family defined by "icon_family". Use the
+#   respective hex value for the icon to be used
+#
+#   values:                         string
+#   default:                        "f102"
+#
+#   icon_family
+#   ----------------------------------------------------------------------------
+#   Set the icon familiy from what the icon should be taken from. Be
+#   aware that the CSS file for the font icon set needs to be
+#   included as a resource.
+#
+#   values:                         string (FontAwesome|Glyphicons Halflings)
+#   default:                        FontAwesome
+#
+#   startline
+#   ----------------------------------------------------------------------------
+#   Number of pixels from top of doc scrollbar is scrolled before
+#   showing control.
+#
+#   values:                         integer (px)
+#   default:                        100
+#
+#   scrollto
+#   ----------------------------------------------------------------------------
+#   Integer or "Scroll_to_Element_ID". Specifies how far to scroll
+#   a page up when control is clicked on (0=top).
+#   showing control.
+#
+#   values:                         integer (px)
+#   default:                        0
+#
+#   scrollduration
+#   ----------------------------------------------------------------------------
+#   Time (Duration) measured in msec to scroll the whole page
+#
+#   values:                         integer (msec)
+#   default:                        1000
+#
+#   fadeduration
+#   ----------------------------------------------------------------------------
+#   Fade effect (durationd) measured in msec to show|hide
+#   the control button
+#
+#   values:                         integer (msec)
+#   default:                        500
+#
+#   controlHTML
+#   ----------------------------------------------------------------------------
+#   HTML code for the control button which is AUTO wrapped in an
+#   DIV element tha is automatically placed (ID = #topcontrol).
+#   the control button
+#
+#   values:                         string (HTML)
+#   default:                        '<img src="assets/img/up.png" style="width:51px; height:42px'
+#
+#   controlattrs
+#   ----------------------------------------------------------------------------
+#   Offset measured in pixels to place the control (button) relative
+#   to right|bottom of the window corner.
+#
+#   values:                         array (integer|px)
+#   default:                        [5, 5]
+#
+#   anchorkeyword
+#   ----------------------------------------------------------------------------
+#   Anchor|href value of HTML anchors on the page that should be
+#   used for a "Scroll Up" link.
+#
+#   values:                         string (ID)
+#   default:                        "#top"
+#
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# Default configuration settings
+#
+defaults:
+  enabled:                              false
+
+  active_color:                         "#0D47A1"                               # md-blue-900
+  background_color:                     "#212121"                               # md-grey-900
+
+  icon:                                 "f05d"
+  icon_family:                          Material Design Icons
+  icon_position:                        absolute
+
+  startline:                            100
+  scrollto:                             0
+
+  scrollduration:                       1000
+  fadeduration:
+    fadeIn:                             500
+    fadeOut:                            500
+
+  controlattrs:
+    offsetx:                            5
+    offsety:                            5
+
+# ------------------------------------------------------------------------------
+# END config

data/lib/starter_web/_data/modules/defaults/cookiebar.yml

@@ -24,56 +24,107 @@ about_config:
 #
 defaults:
 
-  enabled:                            false
-  load:                               sync
-  autoEnable:                         true
-  background_color:                   '#354A60'
-  text_color:                         '#EEEEEE'
-
-  message: >
-                                      </br>
-                                        <p>
-                                        Some of these pages use so-called Cookies,
-                                        which serve the content of this site to be
-                                        user-friendly, more effective and safer.
-                                        </p>
-                                      </br>
-
-  message_de: >
-                                      </br>
-                                        <p>Diese Internetseiten verwenden zum Teil so genannte
-                                        Cookies, die dazu dienen das Angebot nutzerfreundlicher,
-                                        effektiver und sicherer zu machen.</p>
-                                      </br>
-
-  acceptButton:                       true
-  stopScrolling:                      true
-  acceptText:                         I understand and agree
-  acceptText_de:                      Ich habe den Hinweis verstanden und stimme zu
-  acceptFunction:                     null
-  declineButton:                      false
-  declineText:                        Disable Cookies
-  declineFunction:                    null
-  policyButton:                       true
-  policyText:                         Privacy
-  policyText_de:                      Datenschutzbestimmungen
-  policyURL:                          /pages/public/legal/en/privacy/
-  policyURL_de:                       /pages/public/legal/de/privacy/
-  acceptOnContinue:                   false
-  acceptOnScroll:                     false
-  acceptAnyClick:                     false
-  expireDays:                         3650
-  renewOnVisit:                       false
-  forceShow:                          false
-  effect:                             slide
-  element:                            "#no_flicker"  #body #nav
-  append:                             false
-  fixed:                              false
-  bottom:                             false
-  zindex:
-  domain:                             www.example.com
-  referrer:                           www.example.com
+  enabled:                              false
 
+  xhr_container_id:                     cookiebar_modals
+  xhr_data_path:                        /assets/data/cookiebar/index.html
+
+  modal_type:                           full
+  modal_position:                       top
+  consent_modal_id:                     cookiebar_consent_modals
+  consent_modals_title:                 Privacy
+
+  show_cookie_icon:                     false
+  expireDays:                           365
+  renewOnVisit:                         false
+  forceShow:                            false
+  referrer:                             www.example.com
+
+  strict:                               false                                   # all pages requires a consent (currently NOT supported)
+  show_consent_icon:                    true                                    # show the consent icon (in quicklinks)
+  show_consent_on_pending:              false                                   # on first visit, whitelisted pages does NOT require a consent (overloaded by strict)
+  delete_cookies_on_decline:            false                                   # currently NOT supported
+  whitelisted_pages:                    []
+
+  categories:
+    enabled:                            true
+    category_title:                     Cookie usage by category
+    category_description:               Usage Information
+    category_description_text:          Cookies are used for content pages if marked
+    category_session:                   Session
+    category_persistent:                Persistent
+    category_first_party:               1st Party
+    category_second_party:              2nd Party
+
+  buttons:
+    policy_button:                      true
+    policy_button_text:                 Cookie Policy
+    accept_button:                      true
+    accept_button_text:                 Yes, I accept cookies
+    decline_button:                     true
+    decline_button_text:                No, I refuse cookies
+
+  policy_about: >
+                                        This website uses cookies to ensure vistors get the best experience
+                                        on our content, presented user-friendly, more effective and safer.
+
+  cookie_policy_title:                  Cookie Policy
+  cookie_policy_tagline: >
+                                        Based on EU legislation on cookies.
+                                        See
+                                        http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32009L0136:EN:NOT[Directive 2009/136/EC, window="_blank"] (ePrivacy Directive),
+                                        https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:32018R1725[Regulation (EU) 2018/1725, window="_blank"] (Data protection)
+                                        for more details
+
+  cookie_policy_text: >
+                                        The operators of this website take protection of your personal data extremely
+                                        seriously. We treat your personal data as confidential and comply with the
+                                        data protection legislation and this privacy policy.
+
+
+                                        A cookie is a commonly used automated data collection tool. Cookies are
+                                        small text files that are placed on your computer or device by websites
+                                        that you visit in order to make websites work, or work more efficiently.
+
+
+                                        NOTE: If you do not wish to receive cookies you may be able to refuse them by
+                                        adjusting your browser settings to reject cookies. If you do so, we may be
+                                        unable to offer you some of our functionalities, services or support.
+                                        If you have previously visited our websites, you may also have to delete
+                                        any existing cookies from your browser.
+
+
+                                        We, may our partners, make use of cookies, web beacons, pixel tags,
+                                        scripts or other similar technologies on our websites to improve the
+                                        browsing experience of our pages. We use different kinds of cookies.
+
+
+                                        Cookies are classified by its *lifespan* and the *domain* to which it
+                                        belongs.
+
+
+                                        Session Cookie::
+                                        Classified by *lifespan*. Necessary to provide you with services and
+                                        features available through our websites. Without these cookies, services
+                                        you may need, such as shopping carts or e-billing, cannot be provided.
+
+
+                                        Persistent Cookie::
+                                        Classified by *lifespan*. Necessary to provide you with services and
+                                        features available through our websites. Without these cookies, services
+                                        you may need, such as shopping carts or e-billing, cannot be provided.
+
+
+                                        First-party Cookie::
+                                        Classified by the *domain*. Collect information that is either used in
+                                        aggregate form to help us understand how the website is being used or how
+                                        effective our marketing campaigns are, or to help us customize the website
+                                        for you.
+
+
+                                        Second-party Cookie::
+                                        Classified by the *domain*. Used to make advertising messages more
+                                        relevant to you.
 
 # ------------------------------------------------------------------------------
-# END config
+# END config