j1_template_mde 2018.4.29 → 2018.4.30

data/lib/starter_web/Gemfile

@@ -46,7 +46,7 @@ gem 'jekyll', '~> 3.8.5'
 # Theme Rubies
 # Default: J1 Template
 #
-gem 'j1_template_mde', '~> 2018.4.29'
+gem 'j1_template_mde', '~> 2018.4.30'
 
 # --------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -60,7 +60,7 @@ environment:                            development
 #   anything here because version information is bumped-in by
 #   the build process
 #
-version:                                2018.4.29
+version:                                2018.4.30
 
 
 # ==============================================================================

data/lib/starter_web/_data/j1_resources.yml

@@ -387,7 +387,8 @@ resources:
                                            core/js/adapter/logger.js,
                                            core/js/adapter/scroller.js,
                                            core/js/adapter/searcher.js,
-                                           core/js/adapter/switcher.js
+                                           core/js/adapter/switcher.js,
+                                           core/js/adapter/stickybits.js
                                         ]
         js:                             [
                                           {
@@ -402,7 +403,8 @@ resources:
                                           j1.Logger.init,
                                           j1.Scroller.init,
                                           j1.Searcher.init,
-                                          j1.Switcher.init
+                                          j1.Switcher.init,
+                                          j1.Stickybits.init
                                         ]
 
   # ----------------------------------------------------------------------------
@@ -518,7 +520,7 @@ resources:
   # Stickyfill (CSS polyfill, https://github.com/wilddeer/stickyfill)
   #
   - resource:
-      enabled:                          true
+      enabled:                          false
       id:                               stickyfill
       comment:                          Polyfill for CSS position sticky
       region:                           head

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

@@ -136,7 +136,6 @@ nav_menu:
 #
 nav_quicklinks:
   enabled:                              true
-  signin:                               true 
 
 # ------------------------------------------------------------------------------
 # 4. Navigation topsearch settings

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

@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#  ~/_data/modules/j1_stickybits.yml
+#  Default configuration for J1 Stickybits 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
+# ------------------------------------------------------------------------------
+default:
+  enabled:                              true
+  selector:                             .sticky
+  offset:                               0
+  useFixed:                             false
+  useStickyClasses:                     true                                    # default: false
+  verticalPosition:                     bottom

data/lib/starter_web/_rack/nginx.conf

@@ -0,0 +1,85 @@
+# ------------------------------------------------------------------------------
+#  j1_quickstart: ~/nginx/conf/nginx.conf
+#  nginx.conf: Nginx Web-Server configuration (Passenger)
+#
+#  Product/Info:
+#  https://jekyll-one.com
+#  http://nginx.org/
+#
+#  Copyright (C) 2019 Juergen Adams
+#  Copyright (C) 2002-2019 Igor Sysoev
+#  Copyright (C) 2011-2019 Nginx, Inc.
+#
+#  J1 Template is licensed under the MIT License.
+#  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+#  NginX is licensed under the BSD license.
+#  For details, see http://nginx.org/LICENSE
+# ------------------------------------------------------------------------------
+
+# Load modules dynamically
+#
+load_module                             modules/ngx_http_passenger_module.so;
+
+worker_processes                        1;
+pid                                     /home/jadams/j1_quickstart/nginx/var/nginx.pid;
+
+events {
+  worker_connections                    16;
+}
+
+http {
+
+    include                             mime.types;
+
+    passenger_root                      /home/jadams/j1_quickstart/ruby/lib/ruby/gems/2.3.0/gems/passenger-6.0.2;
+    passenger_abort_on_startup_error    on;
+    passenger_user_switching            off;
+    passenger_log_level                 3;
+
+    default_type                        application/octet-stream;
+    types_hash_max_size                 2048;
+    server_names_hash_bucket_size       64;
+    client_max_body_size                1024m;
+    access_log                          off;
+    keepalive_timeout                   60;
+    underscores_in_headers              on;
+
+    gzip                                on;
+    gzip_comp_level                     3;
+    gzip_min_length                     150;
+    gzip_proxied                        any;
+    gzip_types                          text/plain text/css text/json text/javascript
+                                        application/javascript application/x-javascript application/json
+                                        application/rss+xml application/vnd.ms-fontobject application/x-font-ttf
+                                        application/xml font/opentype image/svg+xml text/xml;
+
+    # --------------------------------------------------------------------------
+    #   J1 Webs
+    # --------------------------------------------------------------------------
+
+
+    # --------------------------------------------------------------------------
+    #   J1 Apps
+    # --------------------------------------------------------------------------
+
+    # J1 Starter App
+    #
+    server {
+        server_name                     _;
+        listen                          0.0.0.0:35000;
+        root                            /home/jadams/j1webs/starter/public;
+
+        passenger_enabled               on;
+        passenger_app_env               production;
+        passenger_app_type              rack;
+        passenger_spawn_method          smart;
+        passenger_app_root              /home/jadams/j1webs/starter;                                
+        passenger_startup_file          /home/jadams/j1webs/starter/config.ru;
+        passenger_load_shell_envvars    off;
+
+    }
+    
+    passenger_pre_start                 http://0.0.0.0:35000/;
+
+}

data/lib/starter_web/assets/images/pages/roundtrip/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "web",
-  "version": "2018.4.29",
+  "version": "2018.4.30",
   "description": "Web/Content sources for J1 Starter",
   "main": "_config.yml",
   "config": {

data/lib/starter_web/assets/themes/j1/core/js/adapter/algolia.js

@@ -7,7 +7,7 @@ regenerate:                             true
 {% comment %}
  # -----------------------------------------------------------------------------
  #  ~/assets/themes/j1/core/js/adapter/algolia.js
- #  Liquid template to create the Template Adapter for Algolia 
+ #  Liquid template to create the Template Adapter for Algolia
  #
  #  Product/Info:
  #  https://jekyll.one
@@ -82,14 +82,14 @@ j1.Algolia = (function (j1, window) {
         apiKey:     algoliaConfig.search_only_api_key,
         indexName:  algoliaConfig.index_name,
         routing:    true
-      });  
+      });
 
       var hitTemplate = function(hit) {
         // state = 'start search';
         // logger.info('state: ' + state);
         // var re = new RegExp("^\/posts");
         // var re = new RegExp("^\/pages");
-        var re = new RegExp("^\/pages|^\/posts|^\/collections");    
+        var re = new RegExp("^\/pages|^\/posts|^\/collections");
         if ( re.test(hit.url) ) {
           let date = '';
           if (hit.date) {
@@ -166,7 +166,7 @@ j1.Algolia = (function (j1, window) {
           instantsearch.widgets.searchBox({
             container:            '#search-searchbar',
             placeholder:          'Search this site ..',
-            autofocus:            true,          
+            autofocus:            true,
             reset:                true,
             loadingIndicator:     false,
             poweredBy:            true // This is required if you're on the free Community plan

data/lib/starter_web/assets/themes/j1/core/js/adapter/navigator.js

@@ -30,7 +30,7 @@ regenerate:                             true
 {% assign debug                    = navigator_config.debug %}
 {% assign brand_image_height       = site.brand.image_height %}
 
-{% assign auth_config_provider     = site.j1_auth.providers %}
+{% assign auth_config              = site.j1_auth %}
 {% assign navigator_config         = site.data.modules.j1_navigator %}
 {% assign nav_defaults             = navigator_config.defaults %}
 {% assign nav_bar_config           = navigator_config.nav_bar %}
@@ -95,6 +95,9 @@ j1.Navigator = (function (j1, window) {
     // -------------------------------------------------------------------------
     init: function ( options ) {
 
+      // Configuration setting objects
+      var authConfig            = {};
+
       // Module setting objects
       var navDefaults           = {};
       var navBarConfig          = {};
@@ -109,7 +112,6 @@ j1.Navigator = (function (j1, window) {
       var navTopsearchOptions   = {};
       var navSidebarOptions     = {};
       var navAuthClientOptions  = {};
-      var navAuthClientProvider = {};
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
@@ -130,7 +132,8 @@ j1.Navigator = (function (j1, window) {
       navTopsearchConfig    = $.extend({}, {{nav_topsearch_config | replace: '=>', ':' }});
       navSidebarConfig      = $.extend({}, {{nav_sidebar_config | replace: '=>', ':' }});
       navAuthClientConfig   = $.extend({}, {{nav_authclient_config | replace: '=>', ':' }});
-      navAuthClientProvider = $.extend({}, {{auth_config_provider | replace: '=>', ':' }});
+      
+      authConfig            = $.extend({}, {{auth_config | replace: '=>', ':' }});
 
       // Merge|Overload  module CONFIG by DEFAULTS
       navBarOptions         = j1.mergeData( navDefaults.nav_bar, navBarConfig );
@@ -148,29 +151,29 @@ j1.Navigator = (function (j1, window) {
         function load_color_data() {
           // Returns the j1_colors object
           return $.ajax({
-              url:      colors_data_path,
-              success:  function (data) {
-                if (typeof data == 'string') {
-                  j1_colors = JSON.parse(data);
-                }
-                if (typeof data == 'object') {
-                  j1_colors = data;
-                }
+            url:      colors_data_path,
+            success:  function (data) {
+              if (typeof data == 'string') {
+                j1_colors = JSON.parse(data);
+              }
+              if (typeof data == 'object') {
+                j1_colors = data;
               }
+            }
           });
         };
         function load_font_sizes() {
           // Returns the j1_font_sizes object
           return $.ajax({
-              url:      font_size_data_path,
-              success:  function (data) {
-                if (typeof data == 'string') {
-                  j1_font_sizes = JSON.parse(data);
-                }
-                if (typeof data == 'object') {
-                  j1_font_sizes = data;
-                }
+            url:      font_size_data_path,
+            success:  function (data) {
+              if (typeof data == 'string') {
+                j1_font_sizes = JSON.parse(data);
+              }
+              if (typeof data == 'object') {
+                j1_font_sizes = data;
               }
+            }
           });
         };
 
@@ -182,7 +185,7 @@ j1.Navigator = (function (j1, window) {
         function( load_color_data_response, load_font_sizes_response ) {
           // Run initializer functions
           j1.Navigator.loadMenuBar( navMenuOptions );
-          j1.Navigator.loadAuthClientModals( navAuthClientOptions, navAuthClientProvider );
+          j1.Navigator.loadAuthClientModals( authConfig );
           j1.Navigator.setCss( navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions, navSidebarOptions );
           // Set|Log status
           state = 'initialized';
@@ -190,52 +193,27 @@ j1.Navigator = (function (j1, window) {
           logger.info("J1 Navigator initialized successfully");
       });
 
-      /*
-      // jadams, 2017-10-18: Unclear if workaround is needed.
-      // For oversized menu bar, overflow set to hidden is set
-      // as a dynamic style - see setCss below
-      //
-      // jadams: WORKAROUND - Change width of the NavBar (to window size) if needed
-      */
-      /*
-      $(window).on("resize", function(){
-        var navID       = "#navigator_nav";
-        var getWindow   = $(window).width();
-        var getNavWidth = $( navID ).width();
-        var diff        = getNavWidth - getWindow;
-
-        if ( diff ) {
-          // change width of the NavBar ( to window width)
-          $( navID ).width(getWindow);
-          var logText = "NavBar ID #j1_main_nav resized to: " +getNavWidth+ " (" +getWindow+ ")";
-          //logger.debug(logText);
-          logger.info(logText);
-        }
-      });
-      */
-
       // Reset on resize
       $(window).on("resize", function(){
-
-          j1nav.manageDropdownMenu();
-
-          $(".top-search").slideUp();
-          setTimeout(function(){
-            j1nav.navbarSticky();
-          }, 500);
-
-          // Toggle Bars
-          //$(".navbar-toggle").each(function(){
-          $('button.navigator.navbar-toggler').each(function(){
-            //$('button.navigator.navbar-toggler.animated').removeClass('rotateIn');
-            //$('button.navigator.navbar-toggler.animated').addClass('fadeIn')
-            $(".mdi", this).removeClass("mdi-close");
-            $(".mdi", this).addClass("mdi-menu");
-            $(this).removeClass("fixed");
-          });
-          $(".navbar-collapse").removeClass("in");
-          $(".navbar-collapse").removeClass("on");
-          $(".navbar-collapse").removeClass("bounceIn");
+        j1nav.manageDropdownMenu();
+
+        $(".top-search").slideUp();
+        setTimeout(function(){
+          j1nav.navbarSticky();
+        }, 500);
+
+        // Toggle Bars
+        //$(".navbar-toggle").each(function(){
+        $('button.navigator.navbar-toggler').each(function(){
+          //$('button.navigator.navbar-toggler.animated').removeClass('rotateIn');
+          //$('button.navigator.navbar-toggler.animated').addClass('fadeIn')
+          $(".mdi", this).removeClass("mdi-close");
+          $(".mdi", this).addClass("mdi-menu");
+          $(this).removeClass("fixed");
+        });
+        $(".navbar-collapse").removeClass("in");
+        $(".navbar-collapse").removeClass("on");
+        $(".navbar-collapse").removeClass("bounceIn");
       });
     }, // end init
 
@@ -243,8 +221,6 @@ j1.Navigator = (function (j1, window) {
     // load the Menu bar
     // -------------------------------------------------------------------------
     loadMenuBar: function ( navMenuOptions ) {
-      //logger = log4javascript.getLogger("j1.Navigator.loadMenuBar");
-
       // closure to pass additional data (e.g. div #id)
       // to AJAX load callback (id)
       // See: http://stackoverflow.com/questions/939032/jquery-pass-more-parameters-into-callback
@@ -254,13 +230,15 @@ j1.Navigator = (function (j1, window) {
             j1nav.initialize( navMenuOptions );
             var logText = "MenuBar on ID " +id+ " loaded successfully"
             logger.info(logText);
+            // Set processing to 'finished' to display page
+            state = 'finished';
+            logger.info('state: ' + state); // Set|Log status
 
             // Initialize theme selectors for J1Theme Switcher
             $('#ThemeList').bootstrapThemeSwitcher({localFeed: ''});            // Load from Bootswatch API
             $('#ThemeSelect').bootstrapThemeSwitcher();                         // Load from localFeed
             var logText = "ThemeSwitcher Feeds on ID " +id+ " loaded successfully"
             logger.info(logText);
-            //j1.Navigator.delayMenushow();
           }
           if ( statusTxt == "error" ) {
             state = 'failed';
@@ -273,34 +251,25 @@ j1.Navigator = (function (j1, window) {
 
       var id = "#" + nav_menu_id;
       var selector = $(id);
+
       if ( selector.length ) {
         var menu_data_path = nav_menu_data_path + " " + id + " > *";
-
-        // Set the return URL (user by news pager) for the News Banner
         selector.load( menu_data_path, cb_load_closure( id, navMenuOptions ) );
       }
 
     }, // end loadMenuBar
 
     // -------------------------------------------------------------------------
-    // load the Modals used by J1AuthClient
+    // load the modals used by J1AuthClient
     // -------------------------------------------------------------------------
-    loadAuthClientModals: function ( authClientOptions, authClientProvider ) {
-      //logger = log4javascript.getLogger("j1.Navigator.loadAuthClientModals");
-
-      // closure to pass additional data (e.g. div #id)
-      // to AJAX load callback (id)
-      // See: http://stackoverflow.com/questions/939032/jquery-pass-more-parameters-into-callback
-      var cb_load_closure = function(id, authClientOptions) {
+    loadAuthClientModals: function ( authConfig ) {
+      // closure to pass additional data (#id)
+      var cb_load_closure = function( id ) {
         return function ( responseTxt, statusTxt, xhr ) {
           if ( statusTxt == "success" ) {
-            //j1nav.initialize( authClientOptions );
             var logText = "Modals on ID " +id+ " loaded successfully"
-
-            j1.Navigator.initAuthClient( authClientProvider );
-
+            j1.Navigator.initAuthClient( authConfig );
             logger.info(logText);
-            // Set|Log status
             state = 'finished';
             logger.info('state: ' + state);
           }
@@ -315,20 +284,23 @@ j1.Navigator = (function (j1, window) {
 
       var id = "#" + authclient_modals_id;
       var selector = $(id);
-      if ( selector.length ) {
-        var modals_data_path = authclient_modals_data_path + " > *";
 
-        // Set the return URL (user by news pager) for the News Banner
-        selector.load( modals_data_path, cb_load_closure( id, authClientOptions ) );
+      if ( selector.length ) {
+        var modals_data_path = authclient_modals_data_path + " > *";        
+        selector.load( modals_data_path, cb_load_closure( id ) );
+      } else {
+        var logText = "AuthClient Modals not loaded"
+        logger.info(logText);
+        // Set processing to 'finished' to display page
+        state = 'finished';
+        logger.info('state: ' + state);
       }
-
     }, // end loadAuthClientModals
 
     // -------------------------------------------------------------------------
     // Initialize JS portion for the dialogs (modals) used by J1AuthClient
     // -------------------------------------------------------------------------
-    initAuthClient: function( authClientOptions ) {
-
+    initAuthClient: function( authConfig  ) {
       var logger;
       var logText;
       var route;
@@ -337,27 +309,26 @@ j1.Navigator = (function (j1, window) {
       var web_session_data  = j1.getWebSessionCookie();
 
       var signIn = {
-        provider:         authClientOptions["activated"][0],
-        user:             authClientOptions[authClientOptions["activated"][0]]["users"],
+        provider:         authConfig.providers.activated[0],
+        users:            authConfig.providers[authConfig.providers["activated"][0]]["users"],
         do:               false
       }
 
       var signOut = {
-        provider:         authClientOptions["activated"][0],
+        provider:         authConfig.providers.activated[0],
         providerSignOut:  false,
         do:               false
       }
 
-      // Set|Log status
       logger = log4javascript.getLogger('j1.AuthClient');
       state = 'initialize';
       logger.info('state: ' + state);
 
       $('ul.nav-pills > li').click(function (e) {
-          e.preventDefault();
-          signIn.provider       = $(this).text().trim();
-          signIn.provider       = signIn.provider.toLowerCase();
-          signIn.allowed_users  = signIn.user[signIn.provider];
+        e.preventDefault();
+        signIn.provider       = $(this).text().trim();
+        signIn.provider       = signIn.provider.toLowerCase();
+        signIn.allowed_users  = signIn.users[signIn.provider];
       });
 
       $("a.btn").click(function() {
@@ -432,7 +403,7 @@ j1.Navigator = (function (j1, window) {
         }
       }); // end modalSignOut
 
-      if ( web_session_data != null ) {
+      if ( web_session_data != null  && authConfig.enabled === true ) {
         // Toggle/Set SignIn/SignOut icon|link in QuickLinks
         // See: https://stackoverflow.com/questions/13524107/how-to-set-data-attributes-in-html-elements
         if ( web_session_data.authenticated == 'true') {
@@ -520,15 +491,6 @@ j1.Navigator = (function (j1, window) {
       logger.info('state: ' + state); // Set|Log status
     }, // end initAuthClient
 
-    // -------------------------------------------------------------------------
-    // Initialize JS portion for the dialogs (modals) used by J1AuthClient
-    // -------------------------------------------------------------------------
-    toggleAuthClient : function() {
-
-      // code for toggle the AuthClient SignIn|SignOut
-
-    }, // end toggleAuthClient
-
     // -------------------------------------------------------------------------
     // Set dynamic CSS styles
     // -------------------------------------------------------------------------
@@ -668,7 +630,6 @@ j1.Navigator = (function (j1, window) {
       -------------------------------------------------------------------------- {% endcomment %}
       $('head').append("<style>.side { background-color: " +navSidebarOptions.background_color+ "; }</style>");
 
-
     }, // end setCss
 
     // -------------------------------------------------------------------------