j1-template 2021.1.2 → 2021.1.7

data/lib/starter_web/_data/private.yml

@@ -64,8 +64,8 @@ util_srv:
       strategy:                       members
       members:                        all
 
-    site_url:                         http://localhost:40010
-    site_redirect_url:                http://localhost:40010/auth/github/callback
+    site_url:                         http://localhost:41010
+    site_redirect_url:                http://localhost:41010/auth/github/callback
     client_scope:                     repo, user
     client_id:                        <your-client-id>
     client_secret:                    <your-client-secret>
@@ -91,8 +91,8 @@ middleware:
         name:                           <your-disqus-config-name>
         user:                           <your-disqus-user>
 
-      client_url:                       http://localhost:40010
-      client_redirect_url:              http://localhost:40010/auth/disqus/callback
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/disqus/callback
       client_id:                        <your-disqus-client-id>
       client_secret:                    <your-disqus-client-secret>
 
@@ -110,8 +110,8 @@ middleware:
         strategy:                       members
         members:                        all
 
-      client_url:                       http://localhost:40010
-      client_redirect_url:              http://localhost:40010/auth/github/callback
+      client_url:                       http://localhost:41010
+      client_redirect_url:              http://localhost:41010/auth/github/callback
       client_id:                        <your-gh-client-id>
       client_secret:                    <your-gh-client-secret>
 

data/lib/starter_web/_data/resources.yml

@@ -365,6 +365,8 @@ resources:
                                           modules/util/js/js.cookie.js,
                                           modules/util/js/lite-url.js,
                                           modules/util/js/platform.js,
+                                          modules/util/js/domready.js,
+                                          modules/util/js/gtag-opt-in.js,
                                           adapter/js/j1.js
                                         ]
         js:                             [
@@ -460,9 +462,9 @@ resources:
         init_function:                  [ j1.adapter.navigator.init ]
 
   # ----------------------------------------------------------------------------
-  # MMenu Light
+  # Mobile Menu (Light)
   #
-  - name:                               Mobile Menu
+  - name:                               MMenu
     resource:
       id:                               mmenu
       enabled:                          true
@@ -476,8 +478,8 @@ resources:
       pass_init_data:                   false
       data:
         css:                            [
-                                          modules/mmenuLight/css/mmenu,
-                                          modules/mmenuLight/css/theme/uno
+                                          modules/mmenuLight/css/mmenu-light,
+                                          modules/mmenuLight/css/theme/uno/mmenu
                                         ]
         files:                          [
                                           modules/mmenuLight/js/mmenu.js,
@@ -549,13 +551,13 @@ resources:
         init_function:                  [ j1.adapter.back2top.init ]
 
   # ----------------------------------------------------------------------------
-  # CookieBar
+  #  GDPR compatible Cookie Consent for J1 Template
   #
-  - name:                               CookieBar
+  - name:                               J1 CookieConsent
     resource:
-      id:                               cookiebar
+      id:                               cookieConsent
       enabled:                          true
-      comment:                          module cookiebar
+      comment:                          module cookieConsent
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -565,9 +567,9 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/cookiebar.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.cookiebar.init ]
+        files:                          [ adapter/js/cookieConsent.js ]
+        js:                             [ modules/cookieConsent/js/cookieConsent ]
+        init_function:                  [ j1.adapter.cookieConsent.init ]
 
   # ----------------------------------------------------------------------------
   # jqMouseWheel, jQuery plugin to add cross-browser mouse wheel support
@@ -676,7 +678,7 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            [ modules/rtable/css/theme/uno ]
+        css:                            [ modules/rtable/css/theme/uno/rtable ]
         files:                          [ adapter/js/rtable.js ]
         js:                             [ modules/rtable/js/rtable ]
         init_function:                  [ j1.adapter.rtable.init ]
@@ -1180,9 +1182,8 @@ resources:
       dependencies:                     false
       pass_init_data:                   true
       data:
-        css:                            []
+        css:                            [ modules/fam/css/theme/uno/fam ]             # styles for (J1) theme Uno]
         files:                          [
-                                          modules/fam/css/uno/fam.css,          # styles for (J1) theme Uno
 #                                         modules/cash/js/cash.js,              # current version|s of Cash NOT usable
                                           modules/materialize/js/cash.js,       # adapted|old (1.3.5) version from Materialize
                                           modules/fam/js/fam.js,                # modified version for J1 (former: button.js)

data/lib/starter_web/_includes/attributes.asciidoc

@@ -113,6 +113,9 @@ tag::urls[]
 
 :url-execjs--gh-repo:                             https://github.com/rails/execjs
 
+:url-facebook--privacy-policy-en:                 https://www.facebook.com/policy.php
+:url-facebook--privacy-policy-de:                 https://de-de.facebook.com/policy.php
+
 :url-filamentgroup--home:                         https://www.filamentgroup.com/
 
 :url-fontawesome--home:                           https://fontawesome.com/
@@ -137,6 +140,8 @@ tag::urls[]
 :url-gdpr-eu--home:                               https://gdpr.eu/
 
 :url-google-material-design-icons--gh-repo:       https://github.com/google/material-design-icons
+:url-google--deactivate-ga-en:                    http://tools.google.com/dlpage/gaoptout?hl=en
+:url-google--privacy-policy-en:                   https://www.google.de/intl/en/policies/privacy
 
 :url-heroku--home:                                https://www.heroku.com/home
 
@@ -145,6 +150,8 @@ tag::urls[]
 :url-iconify--medical-icons:                      https://iconify.design/icon-sets/medical-icon/
 :url-iconify--brand-icons:                        https://iconify.design/icon-sets/logos/
 
+:url-instagram--privacy-policy:                   http://instagram.com/about/legal/privacy/
+
 :url-iframe-resizer--gh-repo:                     https://github.com/davidjbradshaw/iframe-resizer
 
 :url-j1--home:                                    https://jekyll.one/
@@ -304,6 +311,8 @@ tag::urls[]
 
 :url-twitter-emoji--gh-repo:                      https://github.com/twitter/twemoji
 :url-twitter-emoji-picker--gh-repo:               https://github.com/xLs51/Twemoji-Picker
+:url-twitter--privacy-en:                         https://twitter.com/en/privacy
+:url-twitter--login:                              https://twitter.com/login
 
 :url-uglifier--gh-repo:                           https://github.com/lautis/uglifier
 
@@ -403,7 +412,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.1.2
+:j1--version:                                     2021.1.7
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -360,6 +360,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.1.2'
+    VERSION = '2021.1.7'
   end
 end

data/lib/starter_web/collections/posts/public/featured/_posts/0000-00-00-welcome-to-j1.adoc.erb

@@ -1,10 +1,10 @@
 ---
 title:                                  Welcome
 tagline:                                jekyll for everyone
-#date:                                  <%= Time.now.strftime('%Y-%m-%d') %> 00:00:00 +0200
+#date:                                  <%= Time.now.strftime('%Y-%m-%d') %> 00:00:00 +0100
 
-categories:                             [ Featured ]
-tags:                                   [ Example, Post ]
+categories:                             [ Featured, Post ]
+tags:                                   [ J1, Jekyll ]
 
 image:                                  /assets/images/modules/attics/katie-moum-1920x1280.jpg
 

data/lib/starter_web/collections/posts/public/featured/_posts/2020-01-01-about-cookies.adoc

@@ -2,10 +2,10 @@
 title:                                  Cookies
 tagline:                                good to know
 
-categories:                             [ Featured ]
-tags:                                   [ About, Cookies ]
+categories:                             [ Featured, Post ]
+tags:                                   [ Cookies ]
 
-image:                                  /assets/images/modules/attics/cookies-1920x1200-bw.jpg
+image:                                  /assets/images/modules/attics/cookies-1920x1200.jpg
 
 regenerate:                             false
 
@@ -16,7 +16,7 @@ resource_options:
       padding_bottom:                   50
       opacity:                          0.5
       slides:
-        - url:                          /assets/images/modules/attics/cookies-1920x1200-bw.jpg
+        - url:                          /assets/images/modules/attics/cookies-1920x1200.jpg
           alt:                          Photo by Miroslava on Unsplash
 #         caption:
 #           text:                       Photo by Miroslava on Unsplash

data/lib/starter_web/collections/posts/public/featured/_posts/2021-03-01-site-generators.adoc

@@ -2,17 +2,11 @@
 title:                                  Site Generators
 tagline:                                top open source tools
 
-categories:                             [ Featured ]
+categories:                             [ Featured, Post ]
 tags:                                   [ Jekyll, Generators ]
 
-series:                                 false
 image:                                  /assets/images/modules/attics/machine-generator-1920x1280.jpg
 
-adsense:                                false
-comments:                               false
-advertising:                            false
-toc:                                    true
-
 regenerate:                             false
 
 resources:                              [ lightbox ]

data/lib/starter_web/collections/posts/public/featured/_posts/2021-03-03-about-j1.adoc

@@ -2,17 +2,12 @@
 title:                                  J1 Template
 tagline:                                first version is out
 
-categories:                             [ Featured ]
-tags:                                   [ About, J1 ]
+categories:                             [ Featured, Post ]
+tags:                                   [ J1, Template ]
 
-series:                                 false
 image:                                  /assets/images/modules/attics/runner-1920x1200.jpg
 
-adsense:                                false
-comments:                               false
-advertising:                            false
 fam_menu_id:                            default
-toc:                                    false
 
 regenerate:                             false
 

data/lib/starter_web/dot.gitignore

@@ -14,7 +14,7 @@ Gemfile.lock
 
 Passengerfile.json
 
-google*.html
+/google*.html
 
 tmp/
 

data/lib/starter_web/index.html

@@ -26,7 +26,7 @@ fam_menu_id:                            default
 scrollbar:                              false
 toc:                                    false
 
-regenerate:                             false
+regenerate:                             true
 
 resources:                              []
 resource_options:

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.1.2",
+  "version": "2021.1.7",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/pages/public/blog/navigator/archive.html

@@ -112,7 +112,7 @@ resource_options:
             <div class="card-footer-text">
               <hr class="my-3">
               {% if post.date %}
-              <i class="mdi mdi-calendar-blank mdi-md-grey mr-1"></i> {{post.date | date: "%Y %B, %e"}}
+              <i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}
               {% endif %}
               {% if likes_count %}
               <span class="font-weight-bold"> · </span>
@@ -145,10 +145,11 @@ resource_options:
     var user_state                  = j1.readCookie(user_state_cookie_name);
     var user_state_last_page        = "{{browser_page_url}}";
     user_state.last_page            = user_state_last_page;
-//  j1.setUserState( {last_page:user_state_last_page} );
+
     j1.writeCookie({
       name: user_state_cookie_name,
-      data: user_state
+      data: user_state,
+      samesite: 'Strict'
     });
     logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
   }

data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html

@@ -15,7 +15,7 @@ pagination:
   enabled:                              false
   permalink:                            /page:num/
 
-regenerate:                             false
+regenerate:                             true
 
 resources:                              []
 resource_options:
@@ -47,6 +47,7 @@ resource_options:
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign view_config         = site.data.builder.blog_navigator.category_view %}
+{% assign truncate_words      = site.excerpt_truncate_words %}
 {% assign view_description    = view_config.description %}
 {% assign defaults            = site.data.builder.blog_navigator.defaults %}
 
@@ -77,12 +78,16 @@ resource_options:
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture skip_words %} Posts Public {% endcapture %}
 
+{% assign skip_categories = view_config.skip_categories | split: ", " | join: " " %}
+
+{% comment %} skip_categories:  {{skip_categories | debug}} {% endcomment %}
+
 {% capture site_category_word_list %}{% for category in site.categories %}{{category|first|capitalize|lstrip|rstrip}}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
 {% assign category_words = site_category_word_list|split:',' %}
 {% assign categories = category_words|uniq %}
 
 {% for category in categories %}
-  {% if skip_words contains category %} {% continue %} {% endif %}
+  {% if skip_categories contains category %} {% continue %} {% endif %}
   {% capture category_list %}{{category_list|append: category}}{% unless forloop.last %},{% endunless %}{% endcapture %}
 {% endfor %}
 
@@ -118,7 +123,7 @@ resource_options:
           {% include {{get_category_item}} category=category %}
           {% include {{select_icon_size}} family=icon_family size=icon_size %}
           {% assign icon_size = size %}
-          {% assign excerpt = post.excerpt|truncatewords:50|replace:'...',' ...'|strip_html|strip_newlines|strip %}
+          {% assign excerpt = post.excerpt|truncatewords: truncate_words|replace:'...',' ...'|strip_html|strip_newlines|strip %}
 
           <!-- Collect comment provider details -->
           {% for sharing in builder_config.sharing_provider %}
@@ -150,15 +155,15 @@ resource_options:
                   <div class="card-footer-text">
                     <hr class="my-3">
                     {% if post.date %}
-                    <i class="mdi mdi-calendar-blank mdi-md-grey mr-1"></i> {{post.date | date: "%Y %B, %e"}}
+                    <i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}
                     {% endif %}
                     {% if likes_count %}
                     <span class="font-weight-bold"> · </span>
-                    <i class="mdi mdi-heart mdi-md-grey mr-1"></i> {{likes_count}}
+                    <i class="mdi mdi-heart mr-1"></i> {{likes_count}}
                     {% endif %}
                     {% if comment_count %}
                     <span class="font-weight-bold"> · </span>
-                    <i class="mdi mdi-comment mdi-md-grey mr-1"></i> {{comment_count}}
+                    <i class="mdi mdi-comment mr-1"></i> {{comment_count}}
                     {% endif %}
                   </div>
                   <a class="card-link text-muted text-lowercase"
@@ -185,10 +190,11 @@ resource_options:
     var user_state                  = j1.readCookie(user_state_cookie_name);
     var user_state_last_page        = "{{browser_page_url}}";
     user_state.last_page            = user_state_last_page;
-//  j1.setUserState( {last_page:user_state_last_page} );
+
     j1.writeCookie({
       name: user_state_cookie_name,
-      data: user_state
+      data: user_state,
+      samesite: 'Strict'
     });
     logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
   }

data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html

@@ -15,7 +15,7 @@ pagination:
   enabled:                              false
   permalink:                            /page:num/
 
-regenerate:                             false
+regenerate:                             true
 
 resources:                              []
 resource_options:
@@ -87,13 +87,15 @@ resource_options:
     {% capture monthHead %}
       {% if month != nmonth %}
       {% if forloop.index != 1  %}{{closeList}}{%endif %}
-      <h3 id="{{100000|rand}}"
-        class="toc-link mt-5 mb-3">
+      <h3 id="{{100000|rand}}" class="toc-link mt-5 mb-3">
+        {% comment %}
+        ------------------------------------------------------------------------
         {% if year != nyear %}
         <a href="#" id="{{post.date|date:'%Y'}}">
         {% else %}
         <a href="#" id="{{post.date|date:'%Y-%m' }}">
         {% endif %}
+        ------------------------------------------------------------------------ {% endcomment %}
         <i class="mdi mdi-calendar-blank"></i>
         {{post.date|date:'%B %Y'}}
         </a>
@@ -135,15 +137,15 @@ resource_options:
                 <div class="card-footer-text">
                   <hr class="my-3">
                   {% if post.date %}
-                  <i class="mdi mdi-calendar-blank mdi-md-grey mr-1"></i> {{post.date | date: "%Y %B, %e"}}
+                  <i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}
                   {% endif %}
                   {% if likes_count %}
                   <span class="font-weight-bold"> · </span>
-                  <i class="mdi mdi-heart mdi-md-grey mr-1"></i> {{likes_count}}
+                  <i class="mdi mdi-heart mr-1"></i> {{likes_count}}
                   {% endif %}
                   {% if comment_count %}
                   <span class="font-weight-bold"> · </span>
-                  <i class="mdi mdi-comment mdi-md-grey mr-1"></i> {{comment_count}}
+                  <i class="mdi mdi-comment mr-1"></i> {{comment_count}}
                   {% endif %}
                 </div>
                 <a class="card-link text-muted text-lowercase"
@@ -175,10 +177,11 @@ resource_options:
     var user_state                  = j1.readCookie(user_state_cookie_name);
     var user_state_last_page        = "{{browser_page_url}}";
     user_state.last_page            = user_state_last_page;
-//  j1.setUserState( {last_page:user_state_last_page} );
+
     j1.writeCookie({
       name: user_state_cookie_name,
-      data: user_state
+      data: user_state,
+      samesite: 'Strict'
     });
     logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
   }

data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html

@@ -178,15 +178,15 @@ resource_options:
               <div class="card-footer-text">
                 <hr class="my-3">
                 {% if post.date %}
-                <i class="mdi mdi-calendar-blank mdi-md-grey mr-1"></i> {{post.date | date: "%Y %B, %e"}}
+                <i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}
                 {% endif %}
                 {% if likes_count %}
                 <span class="font-weight-bold"> · </span>
-                <i class="mdi mdi-heart mdi-md-grey mr-1"></i> {{likes_count}}
+                <i class="mdi mdi-heart mr-1"></i> {{likes_count}}
                 {% endif %}
                 {% if comment_count %}
                 <span class="font-weight-bold"> · </span>
-                <i class="mdi mdi-comment mdi-md-grey mr-1"></i> {{comment_count}}
+                <i class="mdi mdi-comment mr-1"></i> {{comment_count}}
                 {% endif %}
               </div>
               <a class="card-link text-muted text-lowercase"
@@ -211,10 +211,11 @@ resource_options:
     var user_state                  = j1.readCookie(user_state_cookie_name);
     var user_state_last_page        = "{{browser_page_url}}";
     user_state.last_page            = user_state_last_page;
-//  j1.setUserState( {last_page:user_state_last_page} );
+
     j1.writeCookie({
       name: user_state_cookie_name,
-      data: user_state
+      data: user_state,
+      samesite: 'Strict'
     });
     logger.info('Saved current Post Browser page to cookie: {{browser_page_url}}');
   }