j1_template_mde 2018.4.31 → 2018.4.32

data/lib/starter_web/_data/j1_config.yml

@@ -70,6 +70,14 @@ tags_path:                              /builder/tags
 #atom_path:                             /atom.xml
 #rss_path:                              /rss.xml
 
+
+# -------------------------------------------------------------------------
+# Common site URLs
+#
+user_info_url:                          /pages/public/about/you/
+theme_author_url:                       https://jekyll.one
+
+
 # -------------------------------------------------------------------------
 # HTML Pretty Print
 #
@@ -112,63 +120,57 @@ body:
 #
 # ------------------------------------------------------------------------------
 
-# -------------------------------------------------------------------------
-# COMMENT connector settings
+# ------------------------------------------------------------------------------
+# COMMENTS connector settings
 #
-# Set 'provider' to the comment provider you want to use.
-# Set 'provider' to false to turn commenting off globally.
+# Set 'enabled' to false to turn commenting off globally
+# Set 'provider' to the comment provider you want to use
+# ------------------------------------------------------------------------------
+# disqus
 #
-#   short_name:                     your-disqus-short-name (w/o disqus.com)
+#   short_name: your-disqus-short-name (w/o disqus.com)
 #
-comment:
-  active_feeds:                         true
+# ------------------------------------------------------------------------------
+comments:
+  enabled:                              true
   provider:                             disqus
-  disqus:
+  disqus:    
     short_name:                         jekyll-one
-    flicker_timeout:                    200
-  livefyre:
-    site_id:                            123
-  intensedebate:
-    account:                            123abc
-  facebook:
-    appid:                              123
-    num_posts:                          5
-    width:                              580
-    colorscheme:                        light
-
+# facebook:
+#   appid:                              123
+#   num_posts:                          5
+#   width:                              580
+#   colorscheme:                        light
+# custom:    
+#   custom_data:
 
 # -------------------------------------------------------------------------
 # ANALYTICS connector settings
 #
-# Set 'provider' to the analytics provider you want to use.
-# Set 'provider' to false to turn analytics off globally.
+# Set 'enabled' to false to turn analytics off globally
+# Set 'provider' to the analytics provider you want to use
 #
 analytics:
-  enabled:                              false
-  provider:                             false
+  enabled:                              true
+  provider:                             google
   google:
-    tracking_id:                        'UA-***'
-  googleUA:
-    tracking_id:                        'UA-***'
-    property_name:                      'PROPERTY NAME'
-  getclicky:
-    site_id:
-  mixpanel:
-    token:                              '_MIXPANEL_TOKEN_'
-  piwik:
-    baseURL:                            'myserver.tld/piwik' # Piwik installation address (without protocol)
-    idsite:                             '1'
+    tracking_id:                        'UA-138160879-1'
+  custom:    
+    custom_data:
 
 # -------------------------------------------------------------------------
 # ADVERTISING connector settings
 #
-# Set 'provider' to the analytics provider you want to use.
-# Set 'provider' to false to turn analytics off globally.
+# Set 'enabled' to false to turn advertising off globally
+# Set 'provider' to the analytics provider you want to use
 #
 advertising:
-  adsense:
-    enabled:                            true
-    data_ad_client:                     ca-pub-6537273267695855
+  enabled:                              true
+  provider:                             google
+  google:    
+    publisher_id:                       ca-pub-6537273267695855
+  custom:    
+    custom_data:
 
 # -------------------------------------------------------------------------
 # SHARING connector settings
@@ -177,24 +179,12 @@ advertising:
 # like, reddit buttons etc. Set 'provider' to the sharing provider you
 # want to use. Set 'provider' to false to turn sharing off globally.
 #
-sharing:
-  provider:                             false
-
-
-# -------------------------------------------------------------------------
-# OTHER connector settings
-#
-# Settings for all other include helpers can be defined by creating
-# a hash with key named for the given helper. ex:
-#
-#   pages_list :
-#     provider : "custom"
-#
-# Setting any helper's provider to 'custom' will bypass the helper code
-# and include your custom code. Your custom file must be defined at:
-#   ./_includes/custom/[HELPER]
-# where [HELPER] is the name of the helper you are overriding.
+# Set 'enabled' to false to turn sharing off globally
+# Set 'provider' to the sharing provider you want to use
 #
+# sharing:
+#   enabled:                              false
+#   provider:
 
 
 # ==============================================================================

data/lib/starter_web/_data/j1_resources.yml

@@ -382,13 +382,13 @@ resources:
                                         ]
         files:                          [
                                            core/js/adapter/template.js,
-                                           core/js/adapter/back2top.js,
-                                           core/js/adapter/cookiebar.js,
+                                           core/js/adapter/back2top.js,                                           
                                            core/js/adapter/logger.js,
                                            core/js/adapter/scroller.js,
                                            core/js/adapter/searcher.js,
                                            core/js/adapter/switcher.js,
-                                           core/js/adapter/stickybits.js
+                                           core/js/adapter/stickybits.js,
+                                           core/js/adapter/cookie_consent.js
                                         ]
         js:                             [
                                           {
@@ -399,12 +399,12 @@ resources:
         init_function:                  [
                                           j1.init,
                                           j1.Back2Top.init,
-                                          j1.CookieBar.init,
                                           j1.Logger.init,
                                           j1.Scroller.init,
                                           j1.Searcher.init,
                                           j1.Switcher.init,
-                                          j1.Stickybits.init
+                                          j1.Stickybits.init,
+                                          j1.cookieConsent.init
                                         ]
 
   # ----------------------------------------------------------------------------
@@ -670,3 +670,23 @@ resources:
                                           }
                                         ]
 
+  # ----------------------------------------------------------------------------
+  # J1 Cookiebar
+  #
+  - resource:
+      enabled:                          false
+      id:                               cookiebar
+      comment:                          Resources used by Cookiebar
+      region:                           head
+      layout:                           [ home, page, post, collection ]
+      required:                         always
+      script_load:                      sync
+      data:
+        files:                          [
+                                          extensions/cookiebar/js/cookiebar.js,
+                                          extensions/cookiebar/js/j1cookiebar.js
+                                        ]
+        init_function:                  j1.Cookiebar.init
+
+
+  

data/lib/starter_web/_data/layouts/default.yml

@@ -113,6 +113,16 @@ lanes:
       path:                             layouts
       file:                             layout_metadata_generator.html
 
+  # ------------------------------------------------------------------
+  # CONNECTORS (Google Ads)
+  - lane:
+      enabled:                          true
+      region:                           head
+      type:                             sync
+      base:                             _includes/themes/j1
+      path:                             modules/connectors
+      file:                             analytics
+
   # ------------------------------------------------------------------
   # CONNECTORS (Google Ads)
   - lane:

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

@@ -0,0 +1,120 @@
+# ------------------------------------------------------------------------------
+#  ~/_data/modules/j1_cookie_consent.yml
+#  Default configuration for J1 Cookie Consent module
+#
+#  Product/Info:
+#  https://jekyll-one.com
+#
+#  Copyright (C) 2019 Juergen Adams
+#
+#  J1 Template is licensed under the MIT License.
+#  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# Cookie Consent default settings
+#
+defaults:
+  update_user_state:                    false
+  modal_html_data_path:                 /assets/data/cookie_consent/index.html
+  modal_type:                           full
+  modal_position:                       top
+  stop_scrolling:                       true
+  consent_modal_id:                     cookie_consent_modals
+  consent_modals_title:                 Cookie Consent
+  whitelisted_pages:                    [
+                                          /, 
+                                          /pages/public/about/you/, 
+                                          /pages/public/legal/en/impress/,
+                                          /pages/public/legal/en/privacy/,
+                                          /pages/public/legal/en/license_agreement/,
+                                          /pages/public/about/become_a_patron/
+                                        ]
+
+  categories:
+    enabled:                            true
+    category_title:                     Cookie usage by category
+    category_description:               Usage Information
+    category_description_text:          By category, cookies may used for content pages if marked by <i class="fa md-green fa-check ml-1"></i>
+    category_session:                   Session Cookies
+    category_persistent:                Persistent Cookies
+    category_first_party:               First-party Cookies
+    category_second_party:              Second-party Cookies
+
+  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
+
+
+# ------------------------------------------------------------------------------
+# Consent settings
+#
+consent:
+  enabled:                              true
+  update_user_state:                    false
+
+  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.

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

@@ -69,30 +69,32 @@ logger:
 
   # ----------------------------------------------------------------------------
   # ADAPTER CHILD logger (j1.adapter)
-  - log:
-      type:                         child
-      name:                         adapter
-      appender:                     [ consoleAppender ]
-      level:
-        production:                 warn
-        development:                debug
+  # - log:
+  #     type:                         child
+  #     name:                         adapter
+  #     appender:                     [ consoleAppender ]
+  #     level:
+  #       production:                 warn
+  #       development:                debug
 
   # ----------------------------------------------------------------------------
   # LOADER CHILD logger (j1.loader)
-  - log:
-      type:                         child
-      name:                         loader
-      appender:                     [ consoleAppender ]
-      level:
-        production:                 warn
-        development:                debug
-
+  # - log:
+  #     type:                         child
+  #     name:                         loader
+  #     appender:                     [ consoleAppender ]
+  #     level:
+  #       production:                 warn
+  #       development:                debug
+  
   # ----------------------------------------------------------------------------
   # MODULE CHILD logger (j1.module)
-  - log:
-      type:                         child
-      name:                         module
-      appender:                     [ consoleAppender ]
-      level:
-        production:                 warn
-        development:                debug
+  # - log:
+  #     type:                         child
+  #     name:                         module
+  #     appender:                     [ consoleAppender ]
+  #     level:
+  #       production:                 warn
+  #       development:                debug
+
+

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

@@ -67,25 +67,29 @@ defaults:
     dropdown_background_color_active:   md_bluegrey_100
 
   nav_quicklinks:
-    enabled:                            false 
+    enabled:                            false
     icon_family:                        Material Design Icons
     icon_color:                         rgba_lighten
     icon_color_hover:                   rgba_lighten_900
     icon_size:                          larger
-    signin_client:                      enabled
     sidebar:                            enabled
+    sidebar_icon:                       dots-vertical
     topsearch:                          enabled
     top_search_icon:                    magnify
-    sidebar_icon:                       dots-vertical
-    facebook_icon:                      facebook
-    facebook_url:                       none
+    cookies:                            enabled
+    cookies_icon:                       cookie
+    disqus_icon:                        disqus
+    disqus_url:                         none
     github_icon:                        github-circle
     github_url:                         none
-    google_plus_icon:                   google-plus
-    google_plus_url:                    none
+    patreon_icon:                       patreon
+    patreon_url:                        none
+    facebook_icon:                      facebook
+    facebook_url:                       none
     twitter_icon:                       twitter
-    twitter_url:                        none
-    signin:                             false                                
+    twitter_url:                        none  
+    signin:                             false
+    signin_client:                      enabled
     signin_icon:                        login
     signout_icon:                       logout
 
@@ -114,7 +118,7 @@ defaults:
     background_color:                   md_grey_900
 
   nav_authclient:
-    enabled:                            false
+    hide_on_cookies_declined:           true
     icon_family:                        Material Design Icons
     signin_icon:                        login
     signout_icon:                       logout
@@ -147,56 +151,57 @@ nav_topsearch:
 # 5. J1 Auth CLIENT settings
 #
 nav_authclient:
-  enabled:                              true
+  hide_on_cookies_declined:             false
+  
 
   auth_signin_modal:                        
     title:                              SignIn
     body_text: >
-                                        In order to get <b>signed in</b>, check one of the options below
-                                        and mark a provider for authentication.
-                                        You'll be <b>redirected</b> to authenticate with the provider
-                                        <b>selected</b>. If signed in <b>successfully</b>, you get back
-                                        to this site for the page requested.
-                                        </br></br>
-                                        <b>NOTE:</b> To access protected pages of this site,
-                                        authentication is needed only once.
-                                        </br></br>
+                                        In order to get *signed in*, check one of the options below
+                                        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
     text: >                             
-                                        SignIn to Disqus. Get access to all <b>PRIVATE</b> content pages.
+                                        SignIn to Disqus. Get access to all *PROTECTED* content pages of this site.
   auth_facebook:
     id:                                 2
     title:                              Facebook
     text: >                             
-                                        SignIn to Facebook. Get access to all <b>PRIVATE</b> content pages.
+                                        SignIn to Facebook. Get access to all *PROTECTED* content pages of this site.
   auth_github:
     id:                                 3
     title:                              Github
     text: >
-                                        SignIn to Github. Get access to all <b>PRIVATE</b> content pages.
+                                        SignIn to Github. Get access to all *PROTECTED* content pages of this site.
   auth_patreon:
     id:                                 4
     title:                              Patreon
     text: >
-                                        SignIn to Patreon. Get access to all <b>PREMIUM</b> and <b>PRIVATE</b> content pages.
+                                        SignIn to Patreon. Get access to all *PROTECTED* and *PRIVATE* content pages of this site.
   auth_twitter:
     id:                                 5
-    home_url:                           "https://twitter.com"
     title:                              Twitter
     text: >                             
-                                        SignIn to Twitter. Get access to all <b>PRIVATE</b> content pages. 
+                                        SignIn to Twitter. Get access to all *PROTECTED* content pages of this site. 
                            
   auth_signout_modal:                        
     title:                              SignOut
     body_text: >
-                                        In order to <b>signing out completely</b>, check the switch
-                                        below <b>to on</b>.
-                                        After signing out from this site, you'll be <b>redirected</b>
-                                        to the provider you're currently authenticated. From your
-                                        home page at the provider, you can sign out completely.    
+                                        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*. 
 
 # ------------------------------------------------------------------------------
 # 6. Navigation sidebar settings
@@ -214,28 +219,34 @@ nav_sidebar:
           - title:                      Provider
             value:                      ??provider-name
             href:                       ??provider-url
-            target:                     blank
+            target:                     _blank
             icon:                       domain
           - title:                      User
             value:                      ??user-name
-            href:                       "#"
-            target:                     blank
+            href:                       ??user-info-url#user-data
+            target:                     _blank
             icon:                       account
-          - title:                      State
-            value:                      ??user-state
-            href:                       "##"
-            target:                     blank
-            icon:                       account-alert
+#         User state currently disabled
+#         - title:                      State
+#           value:                      ??user-state
+#           href:                       ??user-info-url
+#           target:                     _blank
+#           icon:                       account-alert
           - title:                      Permisions
             value:                      ??provider-permissions
-            href:                       "#"
-            target:                     blank
+            href:                       ??user-info-url
+            target:                     _blank
             icon:                       account-check
           - title:                      Membership
             value:                      ??provider-membership
-            href:                       ??provider-member-url
-            target:                     blank
+            href:                       ??user-info-url
+            target:                     _blank
             icon:                       account-settings
+          - title:                      Cookies
+            value:                      ??cookie-state
+            href:                       ??user-info-url
+            target:                     ""
+            icon:                       cookie
 
     - box:
         enabled:                        true
@@ -245,17 +256,17 @@ nav_sidebar:
           - title:                      Theme
             value:                      ??theme-name
             href:                       /pages/public/previewer/theme/
-            target:                     blank
+            target:                     _blank
             icon:                       face
           - title:                      Author
-            value:                      Jekyll-One
-            href:                       https://support.jekyll-one.com/
-            target:                     blank
+            value:                      ??theme-author
+            href:                       ??theme-author-url
+            target:                     _blank
             icon:                       grease-pencil
           - title:                      Version
-            value:                      V4
-            href:                       http://getbootstrap.com/
-            target:                     blank
+            value:                      ??theme-version
+            href:                       /pages/public/previewer/theme/
+            target:                     _blank
             icon:                       numeric
 
     - box: