j1_template 2019.4.8 → 2019.4.10

data/_layouts/default.html

@@ -6,50 +6,54 @@ layout:                                 compress
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/_layouts/default.html
- #  Liquid (default) layout template for all content-pages
+ # ~/_layouts/default.html
+ # Liquid (default) layout template for all content-pages
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2019 Juergen Adams
+ # Copyright (C) 2019 Juergen Adams
  #
- #  J1 Template is licensed under the MIT License.
- #  See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
  #
  # -----------------------------------------------------------------------------
- #  NOTE:
- #    This is the DEFAULT layout for ALL pages|layouts used by J1 Template.
+ # NOTE:
+ #   This is the DEFAULT layout for ALL pages|layouts used by J1 Template.
  # -----------------------------------------------------------------------------
- #  NOTE:
- #    Depending on the site configuration, the HTML code generated by
- #    BASE layout will be compressed as a final processing step.
+ # NOTE:
+ #   Depending on the site configuration, the HTML code generated by
+ #   BASE layout will be compressed as a final processing step.
  # -----------------------------------------------------------------------------
- #  NOTE:
- #    Do NOT add any CONTENT here. If needed, go for a "next level" layout
- #    that extents the layout BASE by additional data for your specific
- #    needs based on YAML configuration data files.
+ # NOTE:
+ #   Do NOT add any CONTENT here. If needed, go for a "next level" layout
+ #   that extents the layout BASE by additional data for your specific
+ #   needs based on YAML configuration data files.
  # -----------------------------------------------------------------------------
  # Test data:
  #  {{ lanes_collate | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
-{% comment %} Liquid procedures
+{% comment %} global variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% include themes/{{site.template.name}}/procedures/global/set_base_vars_folders.proc %}
+
+{% comment %} liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture default_writer %}themes/{{site.template.name}}/procedures/layouts/default_writer.proc{% endcapture %}
 
-{% comment %} Set global settings
+{% comment %} initialize global settings
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment     = site.environment %}
 {% assign compress        = site.compress_html.enabled %}
 {% assign prettify        = site.data.template_settings.prettify %}
 
 
-{% comment %} Process YML config data
+{% comment %} process YML config data
 ================================================================================ {% endcomment %}
 
-{% comment %} Set config files
+{% comment %} set config files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign lanes_collate   = site.data.layouts.default.lanes %}
 {% assign logon_client    = site.data.modules.j1_sign_in_up %}
@@ -63,7 +67,7 @@ layout:                                 compress
   {% assign environment   = jekyll.environment | strip %}
 {% endif %}
 
-{% comment %} Set config options
+{% comment %} set config options
 --------------------------------------------------------------------------------
 {% assign body_scrollbar_defaults   = site.data.template_settings.body.scrollbar %}
 {% assign body_scrollbar_config     = page.scrollbar %}
@@ -72,12 +76,12 @@ layout:                                 compress
 {% endcomment %}
 
 
-{% comment %} Main
+{% comment %} main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!DOCTYPE {{ site.doctype }}>
 <html lang="{{ site.language }}">
 
-{% comment %} Additional debug data
+{% comment %} additional debug data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if page.debug %}
 <!-- [DEBUG  ] [j1.layout.default.html                ] [ layout data to be loaded: {{lanes_collate}} ] -->
@@ -85,7 +89,8 @@ layout:                                 compress
 
 <!-- [INFO   ] [j1.layout.default.html                ] [ page generated: {{site.time}} ] -->
 <!-- [INFO   ] [j1.layout.default.html                ] [ environment detected as: {{environment}} ] -->
-  {% comment %} Collect the head section (region head)
+
+  {% comment %} collect the head section (region head)
   ------------------------------------------------------------------------------ {% endcomment %}
   <head>
     <!-- link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-LRlmVvLKVApDVGuspQFnRQJjkv0P7/YFrw84YYQtmYG4nK8c+M+NlmYDCv0rKWpG" crossorigin="anonymous" -->
@@ -94,7 +99,7 @@ layout:                                 compress
     <!-- [INFO   ] [j1.layout.default.html                ] [ end default_writer for region: 'head' ] -->
   </head>
 
-  {% comment %} Collect the body section (region body-*)
+  {% comment %} collect the body section (region body-*)
   ------------------------------------------------------------------------------
   {% if body_scrollbar %}
     <body>
@@ -106,7 +111,7 @@ layout:                                 compress
 
   <body>
 
-  {% comment %} Master Wrapper to prevent "DOM flicker"
+  {% comment %} wrapper to prevent "DOM flicker"
   ------------------------------------------------------------------------------ {% endcomment %}
     <!-- [INFO   ] [j1.layout.default.html                ] [ start page processing for region: 'body' ] -->
     <!-- [INFO   ] [j1.layout.default.html                ] [ place wrapper to prevent "DOM flicker" ] -->
@@ -118,19 +123,19 @@ layout:                                 compress
         $("#no_flicker").css("display", "none");
       </script>
 
-      {% comment %} Collect the BODY-NAVIGATION region
+      {% comment %} collect the BODY-NAVIGATION region
       -------------------------------------------------------------------------- {% endcomment %}
       <!-- [INFO   ] [j1.layout.default.html                ] [ call default_writer for region: 'body-navigation' ] -->
       {% include  {{default_writer}} region='body-navigation' items=lanes_collate %}
       <!-- [INFO   ] [j1.layout.default.html                ] [ end processing default_writer for region: 'body-navigation' ] -->
 
-      {% comment %} Inherited CONTENT from other LAYOUTS
+      {% comment %} inherit CONTENT from other LAYOUTS
       -------------------------------------------------------------------------- {% endcomment %}
       <!-- [INFO   ] [j1.layout.default.html                ] [ place content inherited by layout: {{ page.layout}} ] -->
       {{ content }}
       <!-- [INFO   ] [j1.layout.default.html                ] [ end content inherited by layout: {{ page.layout}} ] -->
 
-      {% comment %} Collect the BODY-FOOTER region
+      {% comment %} collect the BODY-FOOTER region
       -------------------------------------------------------------------------- {% endcomment %}
       <!-- [INFO   ] [j1.layout.default.html                ] [ call default_writer for region: 'body-footer' ] -->
       {% include  {{default_writer}} region='body-footer' items=lanes_collate %}
@@ -179,4 +184,4 @@ layout:                                 compress
   {% else %}
     {{ j1_cache | remove: '<p>excerpt__end</p>'| strip_empty_lines  }}
 
-{% endcase %}
+{% endcase %}

data/lib/j1/templates/posts/0000-00-00-welcome-to-j1-template.adoc.erb

@@ -1,11 +1,11 @@
 ---
-title:                                  Welcome to J1 Template
-tagline:                                Create Your Blog
-description:                            Auto-generated Welcome Article
+title:                                  Welcome
+tagline:                                jekyll to everyone
+description:                            Auto-generated welcome post
 
 date:                                   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S %z') %>
 series:
-image:                                  /assets/images/blog/featured/jekyll.1200x400.png
+image:                                  /assets/images/attics/welcome-1920x1280-bw.png
 
 tags:                                   [ Example, Post ]
 index:                                  []
@@ -16,6 +16,13 @@ regenerate:                             false
 
 resources:                              []
 resource_options:
+  - attic:
+      padding_top:                      350
+      padding_bottom:                   50
+      opacity:                          0.5
+      slides:
+        - url:                          /assets/images/attics/welcome-1920x1280-bw.png
+          alt:                          welcome-1920x1280-bw
 ---
 
 // TODO:  For POSTS, currently the include:: macro does NOT work.
@@ -28,6 +35,7 @@ resource_options:
 
 // Additional Asciidoc page attributes goes here
 // -----------------------------------------------------------------------------
+// :page-imagesdir: {{page.images.dir}}
 
 
 // NOTE: Place an excerpt at the most top position
@@ -52,7 +60,8 @@ excerpt__end
 == Add new posts
 
 [role="mb-3"]
-image::/assets/images/blog/featured/jekyll.1200x400.png[{{page.title}}, 800]
+// image::{{page.image}}[{{page.title}}]
+// image::/assets/images/attics/runner-1920x1200-bw.png[{{page.title}}, 800]
 
 To add new posts, simply add a file in the directory 
 `/collections/posts/public/featured/_posts` that follows the convention 

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2019.4.8'
+  VERSION = '2019.4.10'
 end

data/lib/j1_app/j1_auth_manager/_unused/auth_manager.before_merge_added.rb

@@ -1239,7 +1239,7 @@ module J1App
       @modal_agreed_text      = "Yes, please"
       @modal_disagreed_text   = "No, thanks"
       @modal_title            = "SignIn"
-      @modal_image            = "/assets/images/master_header/admin-dashboard-bootstrap-1280x600.png"
+      @modal_image            = "/assets/images/attics/admin-dashboard-bootstrap-1280x600.png"
       @modal_description      = "The page <b>#{page}</b> you requested belongs to <b>#{category}</b> content. You'll be redirected to authenticate with the provider <b>#{provider}</b>. If signed in successfully, you get access to all <b>#{category} pages</b>."
 
       erb :auth_manager_ui

data/lib/j1_app/j1_auth_manager/_unused/auth_manager.new.rb

@@ -1055,7 +1055,7 @@ module J1App
       @modal_agreed_text    = "Yes, please"
       @modal_disagreed_text = "No, thanks"
       @modal_title          = "SignIn"
-      @modal_image          = "/assets/images/master_header/admin-dashboard-bootstrap-1280x600.png"
+      @modal_image          = "/assets/images/attics/admin-dashboard-bootstrap-1280x600.png"
       @modal_description    = "The page <b>#{requested_page}</b> you requested belongs to <b>#{category}</b> content. You'll be redirected to authenticate with the provider <b>#{provider}</b>. If signed in successfully, you get access to all <b>#{category} pages</b>."
 
       erb :auth_manager_ui

data/lib/j1_app/j1_auth_manager/_unused/auth_manager.no_cookie.mgmt.rb

@@ -1064,7 +1064,7 @@ module J1App
       @modal_agreed_text    = "Yes, please"
       @modal_disagreed_text = "No, thanks"
       @modal_title          = "SignIn"
-      @modal_image          = "/assets/images/master_header/admin-dashboard-bootstrap-1280x600.png"
+      @modal_image          = "/assets/images/attics/admin-dashboard-bootstrap-1280x600.png"
       @modal_description    = "The page <b>#{requested_page}</b> you requested belongs to <b>#{category}</b> content. You'll be redirected to authenticate with the provider <b>#{provider}</b>. If signed in successfully, you get access to all <b>#{category} pages</b>."
 
       erb :auth_manager_ui

data/lib/j1_app/j1_auth_manager/_unused/auth_manager.ok.rb

@@ -1064,7 +1064,7 @@ module J1App
       @modal_agreed_text    = "Yes, please"
       @modal_disagreed_text = "No, thanks"
       @modal_title          = "SignIn"
-      @modal_image          = "/assets/images/master_header/admin-dashboard-bootstrap-1280x600.png"
+      @modal_image          = "/assets/images/attics/admin-dashboard-bootstrap-1280x600.png"
       @modal_description    = "The page <b>#{requested_page}</b> you requested belongs to <b>#{category}</b> content. You'll be redirected to authenticate with the provider <b>#{provider}</b>. If signed in successfully, you get access to all <b>#{category} pages</b>."
 
       erb :auth_manager_ui

data/lib/j1_app/j1_auth_manager/_unused/auth_manager.org.2.rb

@@ -1055,7 +1055,7 @@ module J1App
       @modal_agreed_text      = "Yes, please"
       @modal_disagreed_text   = "No, thanks"
       @modal_title            = "SignIn"
-      @modal_image            = "/assets/images/master_header/admin-dashboard-bootstrap-1280x600.png"
+      @modal_image            = "/assets/images/attics/admin-dashboard-bootstrap-1280x600.png"
       @modal_description      = "The page <b>#{requested_page}</b> you requested belongs to <b>#{category}</b> content. You'll be redirected to authenticate with the provider <b>#{provider}</b>. If signed in successfully, you get access to all <b>#{category} pages</b>."
 
       erb :auth_manager_ui

data/lib/j1_app/j1_auth_manager/_unused/auth_manager.org.rb

@@ -1260,7 +1260,7 @@ module J1App
       @modal_agreed_text      = "Yes, please"
       @modal_disagreed_text   = "No, thanks"
       @modal_title            = "SignIn"
-      @modal_image            = "/assets/images/master_header/admin-dashboard-bootstrap-1280x600.png"
+      @modal_image            = "/assets/images/attics/admin-dashboard-bootstrap-1280x600.png"
       @modal_description      = "The page <b>#{page}</b> you requested belongs to <b>#{category}</b> content. You'll be redirected to authenticate with the provider <b>#{provider}</b>. If signed in successfully, you get access to all <b>#{category} pages</b>."
 
       erb :auth_manager_ui

data/lib/j1_app/j1_auth_manager/_unused/auth_manager.update.web_cookie.rb

@@ -1305,7 +1305,7 @@ module J1App
       @modal_agreed_text      = "Yes, please"
       @modal_disagreed_text   = "No, thanks"
       @modal_title            = "SignIn"
-      @modal_image            = "/assets/images/master_header/admin-dashboard-bootstrap-1280x600.png"
+      @modal_image            = "/assets/images/attics/admin-dashboard-bootstrap-1280x600.png"
       @modal_description      = "The page <b>#{page}</b> you requested belongs to <b>#{category}</b> content. You'll be redirected to authenticate with the provider <b>#{provider}</b>. If signed in successfully, you get access to all <b>#{category} pages</b>."
 
       erb :auth_manager_ui

data/lib/j1_app/j1_auth_manager/_views/auth_manager_ui.erb

@@ -0,0 +1,234 @@
+<!doctype html>
+<html lang="en">
+
+  <head>
+    <meta charset="utf-8">
+    <title>AuthManager</title>
+    <meta name="description" content="J1 Template">
+    <meta name="author" content="jelyll-one">
+
+    <link rel="stylesheet" type="text/css" href="/assets/themes/j1/core/css/uno.css">
+    <link rel="stylesheet" type="text/css" href="/assets/themes/j1/core/css/vendor.css">
+    <script src="/assets/themes/j1/core/js/j1.js"></script>
+  </head>
+
+  <body class="r-text-300">
+
+    <!-- Modal Central Success -->
+    <div id="centralModalInfo" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-notify modal-<%= @info_type %>" role="document">
+        <!-- Content -->
+        <div class="modal-content">
+          <!--Header-->
+          <div class="modal-header">
+            <p class="lead">
+              <i class="mdi mdi-2x mdi-dark mdi-<%= @modal_icon %>"></i>
+              <%= @modal_title %></p>
+            <!-- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <i class="mdi mdi-dark mdi-48px mdi-close"></i>
+            </button> -->
+          </div>
+          <!-- Body -->
+          <div class="modal-body">
+            <div class="text-center">
+              <p style="text-align: justify"><%= @modal_description %></p>
+            </div>
+          </div>
+          <!-- Footer -->
+          <div class="modal-footer justify-content-center">
+            <a type="button" id="okButton" class="btn btn-primary-modal mr-2" data-dismiss="modal"><%= @modal_ok_text %></a>
+          </div>
+        </div>
+        <!-- END Content -->
+      </div>
+    </div>
+    <!-- END Central Success -->
+
+    <!-- Modal TopInfo -->
+    <div id="topInfo" class="modal fade top" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="false">
+      <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
+        <!-- Content -->
+        <div class="modal-content">
+
+          <!-- Body -->
+          <div class="modal-body">
+            <div class="row px-4">
+              <p class="pt-1 pr-2"><%= @modal_description %></p>
+            </div>
+            <div class="row px-4">
+              <a type="button" id="okButton" class="btn btn-primary-modal mr-2" data-dismiss="modal"><%= @modal_ok_text %></a>
+            </div>
+          </div> <!-- END Body -->
+
+        </div>
+        <!-- END Content -->
+      </div>
+    </div>
+    <!-- END Modal TopInfo -->
+
+    <!-- Modal SignInProtectedContent -->
+    <div id="signInProtectedContent" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-lg modal-notify modal-info" role="document">
+        <!-- Content -->
+        <div class="modal-content">
+
+          <!--Header-->
+          <div class="modal-header">
+            <p class="lead">
+              <i class="mdi mdi-2x mdi-dark mdi-account"></i>
+              <%= @modal_title %>
+            </p>
+            <!-- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <i class="mdi mdi-dark mdi-48px mdi-close"></i>
+            </button> -->
+          </div>
+
+          <!-- Body -->
+          <div class="modal-body">
+            <div class="text-center">
+              <p style="text-align: justify"><%= @modal_description %></p>
+            </div>
+            <img src="<%= @modal_image %>" alt="<%= @modal_title %>" class="img-fluid">
+          </div>
+
+          <!-- Footer -->
+          <div class="modal-footer justify-content-center">
+            <a type="button" id="signInButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
+              <i class="mdi mdi-18px mdi-dark mdi-login"></i>
+              <%= @modal_agreed_text %>
+            </a>
+            <a type="button" id="exitButton" class="btn btn-outline-modal" data-dismiss="modal">
+              <i class="mdi mdi-18px mdi-dark mdi-close"></i>
+              <%= @modal_disagreed_text %>
+            </a>
+          </div>
+
+        </div> <!-- END Content -->
+      </div>
+    </div>
+    <!-- END Modal SignInProtectedContent -->
+
+  </body>
+
+  <!--
+  # Loaded J1|JS resources late to not conflict with the IFFE J1 Adapter
+  # that creates the j1 object (window)
+  ------------------------------------------------------------------------------ -->
+  <script src="/assets/themes/j1/core/js/template.js"></script>
+
+  <!--
+  # Dialog (modal) management
+  ------------------------------------------------------------------------------ -->
+  <script>
+    var cookie_names             = j1.getCookieNames();
+    const user_state_cookie_name = cookie_names.user_session;
+    var user_state               = j1.readCookie(user_state_cookie_name);
+    var route                    = user_state.requested_page;
+    var provider;
+    var providerPermissions;
+    var categoryAllowed;
+    var user_state;
+    var logger;
+
+    // Collect $.selectors for all dialog (modal) buttons
+    // -------------------------------------------------------------------------
+    var allModalButtons = document.querySelectorAll('a.btn');
+
+    // -------------------------------------------------------------------------
+    // Initialize ACTION objects ALL modals
+    // -------------------------------------------------------------------------
+    var signIn = {
+      provider: "<%= @provider %>",
+      do:       "na"
+    }
+
+    // Present dialog (modal)
+    // -------------------------------------------------------------------------
+    $(window).on('load', function() {
+      $("#<%= @modal %>").modal("show")
+    });
+
+    // -------------------------------------------------------------------------
+    // eventHandler ALL modals
+    // -------------------------------------------------------------------------
+
+    // Manage PRE SHOW events
+    // -------------------------------------------------------------------------
+    $(document).on('show.bs.modal','#<%= @modal %>', function () {
+      console.log('J1AuthManager: entered modal SHOW from <%= @modal %>');
+    });
+
+    // Manage POST SHOW events (button click events)
+    // -------------------------------------------------------------------------
+    $(document).on('shown.bs.modal','#<%= @modal %>', function () {
+      console.log('J1AuthManager: entered modal SHOWN from <%= @modal %>');
+
+      allModalButtons.forEach(function(button, index) {
+        button.addEventListener('click', function() {
+
+          // Modal topInfo|centralModalInfo
+          // -------------------------------------------------------------------
+          if (this.id === "okButton") {
+              console.log('J1AuthManager: clicked OK button on modal: <%= @modal %>');
+              route = user_state.current_page;
+              return;
+          }
+
+          // Modal SignInProtectedContent
+          // -------------------------------------------------------------------
+          if (this.id === "signInButton") {
+            console.log('J1AuthManager: clicked signInButton button on modal: <%= @modal %>');
+            signIn.do = true;
+            return;
+          } else {
+            signIn.do = false;
+            return;
+          }
+
+        });
+      });
+
+      return;
+    });
+
+    // -------------------------------------------------------------------------
+    // actionHandler ALL modals (HIDDEN event)
+    // process action objects
+    // -------------------------------------------------------------------------
+    // $(document).on('hide.bs.modal','#<%= @modal %>', function () {
+    $(document).on('hidden.bs.modal','#<%= @modal %>', function () {
+      console.log('J1AuthManager: entered modal HIDDEN from <%= @modal %>');
+      user_state = j1.readCookie(user_state_cookie_name);
+
+      // Manage SignIn actions
+      // -----------------------------------------------------------------------
+      if (signIn.do == true) {
+        // pass to authentication
+        route = "<%= @route %>"
+      } else if (signIn.do == false) {
+        // pass to (unchanged) current page
+        route = user_state.current_page;
+      } else {
+        route = user_state.current_page;
+      }
+
+      // Redirect detected route
+      // -----------------------------------------------------------------------
+      providerPermissions = user_state.provider_permissions;
+      providerPermissions.push('public');
+      categoryAllowed = providerPermissions.includes(user_state.page_permission);
+
+      // Make sure that protected pages are ALWAYS checked for permissions
+      // except on signIn
+      // -------------------------------------------------------------------
+      if (!categoryAllowed && !signIn.do) {
+        // pass to home page
+        route = '/';
+      }
+      console.log('J1AuthManager: pass to ' + route);
+      window.location.href = route;
+
+    });
+  </script>
+
+</html>