j1_template 2019.4.4 → 2019.4.5

data/lib/starter_web/assets/data/font_sizes.json

@@ -2,7 +2,7 @@
 regenerate:                             false
 ---
 
-{% capture j1_cache %}
+{% capture cache %}
 
 {% comment %}
  # -----------------------------------------------------------------------------
@@ -24,19 +24,20 @@ regenerate:                             false
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
-{% assign j1_font_sizes = site.data.j1_font_sizes %}
+{% assign font_sizes = site.data.font_sizes %}
+
 {
-{% for font_size in j1_font_sizes %}
+  {% for font_size in font_sizes %}
 
-  {% if forloop.last %}
-  "{{font_size[0]}}": "{{font_size[1]}}"
-  {% else %}
-  "{{font_size[0]}}": "{{font_size[1]}}",
-  {% endif %}
+    {% if forloop.last %}
+    "{{font_size[0]}}": "{{font_size[1]}}"
+    {% else %}
+    "{{font_size[0]}}": "{{font_size[1]}}",
+    {% endif %}
 
-{% endfor %}
+  {% endfor %}
 }
 {% endcapture %}
 
-{{ j1_cache | strip_empty_lines }}
-{% assign j1_cache = nil %}
+{{ cache | strip_empty_lines }}
+{% assign cache = nil %}

data/lib/starter_web/assets/data/galleries.json

@@ -42,8 +42,25 @@ regenerate:                             false
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
-  {% assign jg_config = site.data.apps.j1_justified_gallery %}
-  {% assign bg_config = site.data.apps.j1_bootstrap_gallery %}
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign apps              = site.data.apps %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign bg_config_defaults  = apps.defaults.bootstrap_gallery.defaults %}
+{% assign bg_config_settings  = apps.bootstrap_gallery.settings %}
+{% assign jg_config_defaults  = apps.defaults.justified_gallery.defaults %}
+{% assign jg_config_settings  = apps.justified_gallery.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign bg_config           = bg_config_defaults | merge: bg_config_settings %}
+{% assign jg_config           = jg_config_defaults | merge: jg_config_settings %}
+
 
   {
   {% for item in jg_config.galleries %}

data/lib/starter_web/assets/data/messages.yml

@@ -0,0 +1,130 @@
+---
+regenerate:                             true
+---
+
+{% capture j1_cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/data/messages.json
+ # Conains ALL messages used by ALL modules for logging
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2019 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ # Be carefull change the Liquid code. If the code is changed, check the
+ # interity of the JSON data created. Invalid JSON data will cause modules
+ # to fail and no valid log messages could be generated.
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #   {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+# ------------------------------------------------------------------------------
+# DEBUG messages
+#
+debug:
+
+  - dataFound:                           
+      short_code:                       D0000
+      message:
+        text:                           "Found "
+        cookie:                         "cookie"
+        cookie_user_state:              "User state"
+        data:                           "data"
+
+
+# ------------------------------------------------------------------------------
+# INFO messages
+#
+info:
+
+  - moduleInitialization:     
+      short_code:                       I0000
+      message:
+        text:                           "Initialization "
+        started:                        "is being started"
+        finished:                       "finished successfully"
+
+  - moduleState:                           
+      short_code:                       I0001
+      message:
+        text:                           "Module state detected as "
+        enabled:                        "enabled"
+
+  - getData:                           
+      short_code:                       I0002
+      message:
+        text:                           "Data for "
+        message_catalog:                "message catalog "
+        finished:                       "loaded successfully"
+
+  - getState:                           
+      short_code:                       I0003
+      message:
+        text:                           "Data for "
+        data_objects:                   "data objects "
+        finished:                       "loaded successfully"
+
+  - setState:                           
+      short_code:                       I0004
+      message:
+        text:                           "State: "
+        started:                        "started"
+        running:                        "running"
+
+# ------------------------------------------------------------------------------
+# WARNING messages
+#
+warn:
+
+  - moduleState:                           
+      short_code:                       W0000
+      message:
+        text:                           "Module state detected as "
+        disabled:                       "disabled"
+        failed:                         "failed"
+
+  - deleteData:     
+      short_code:                       W0001
+      message:
+        text:                           "Delete all "
+        cookies:                        "Cookies"
+        files:                          "Files"
+
+# ------------------------------------------------------------------------------
+# ERROR messages
+#
+error:
+
+  - internalError:                           
+      short_code:                       E0000
+      message:
+        text:                           "Internal error. "
+        stopped:                        "Cannot continue"
+        
+
+  - getData:     
+      short_code:                       E0001
+      message:
+        text:                           "Failed to get data "
+        xhr:                            "from XHR request"
+
+  - missingRequired:     
+      short_code:                       E0002
+      message:
+        text:                           "Missing required "
+        parameters:                     "parameters"
+        options:                        "options"
+
+
+{% endcapture %}
+{{ j1_cache | strip_empty_lines }}
+{% assign j1_cache = nil %}

data/lib/starter_web/assets/data/panel.html

@@ -176,17 +176,29 @@ regenerate:                             true
                     {% assign card_animate = '' %}
                   {% endif %}
 
+                  {% comment %} extract link for card icon
+                  -------------------------------------------------------------- {% endcomment %}
+                  {% for items in card_buttons %} {% for item in items %}
+                    {% if item[0] == 'button' %}
+                      {% for elm in item[1] %}
+                        {% assign key   = elm[0] %}
+                        {% assign value = elm[1] %}
+                        {% if key == 'href' %} {% assign card_href = value %} {% endif %}
+                      {% endfor %} 
+                    {% endif %}
+                  {% endfor %} {% endfor %}
+
                   {% comment %} TODO: Style should be configurable
                   -------------------------------------------------------------- {% endcomment %}
                   {% assign card_style  = 'flat' %}
 
                   {% if card_type == 'text' and card_enabled and card_style == 'flat' %}
                     {% assign card_raised = 'raised-z0' %}
-                    <div class="col-md-{{card_width_md}} col-sm-{{card_width_md}} col-xs-12">
-                      <div class="card card-profile mb-4 {{card_raised}}">
 
+                    <div class="col-md-{{card_width_md}} col-sm-{{card_width_md}} col-xs-12">
+                      <div class="card card-profile mb-4 {{card_raised}}">                      
                         <div class="card-icon">
-                          <a href="#">
+                          <a href="{{card_href}}">
                             <i class="card-icon-rectangle {{card_raised}} {{icon_family}} {{icon_family}}-{{card_icon}} {{icon_family}}-{{card_icon_size}} {{icon_family}}-{{card_icon_color}} card-icon-background-no-color card-icon-{{icon_family}}"></i>
                           </a>
                         </div>
@@ -279,9 +291,7 @@ regenerate:                             true
 
                     <div class="content">
                       <h6 class="notoc category text-gray">{{card_title}}</h6>
-                      <a href="{{card_href}}">
-                        <h4 class="notoc card-title">{{card_tagline}}</h4>
-                      </a>
+                      <h4 class="notoc card-title">{{card_tagline}}</h4>
                       <p class="card-description">{{card_text}}</p>
 
                       <div class="card-footer">
@@ -437,9 +447,15 @@ regenerate:                             true
                               <h2 id="{{100000 | rand}}" class="card-title">{{post.title}}</h2>
                               <h6 class="card-subtitle text-muted mb-2">{{post.tagline}}</h6>
                               <div class="card-text"><p>{{post.excerpt}}</p></div>
+
                               <div class="card-footer">
-                                <a class="card-link" href="{{post.url}}#readmore" target="blank">Read more ..</a>
+                                <a href="{{post.url}}" target="blank" 
+                                  class="btn btn-primary btn-raised btn-flex">
+                                  <i class="mdi mdi-eye mdi-lg mdi-md-grey-50 mr-1"></i> 
+                                  Read More 
+                                </a>
                               </div>
+
                             </div>
                           </div>
                         {% endif %}                        
@@ -477,13 +493,20 @@ regenerate:                             true
                           {% if posts_written == posts_max %} {% assign last_post_written = true %} {% break %}{% endif %}
                           <div class="card {{card_style}} mb-2">
                             <div class="card-body">
+
                               <span class="post-meta">{{post.date|date:"%Y %B, %e"}}</span>
                               <h2 id="{{100000 | rand}}" class="card-title">{{post.title}}</h2>
                               <h6 class="card-subtitle text-muted mb-2">{{post.tagline}}</h6>
-                                <div class="card-text"><p>{{post.excerpt | truncatewords: 20}}</p></div>
+                              <div class="card-text"><p>{{post.excerpt | truncatewords: 100}}</p></div>
+
                               <div class="card-footer">
-                                <a class="card-link" href="{{post.url}}#readmore" target="blank">Read more ..</a>
+                                <a href="{{post.url}}" target="blank" 
+                                  class="btn btn-primary btn-raised btn-flex">
+                                  <i class="mdi mdi-eye mdi-lg mdi-md-grey-50 mr-1"></i> 
+                                  Read More 
+                                </a>
                               </div>
+
                             </div>
                           </div>
                         </div> <!-- end list-element -->

data/lib/starter_web/assets/data/quicklinks.html

@@ -1,26 +1,25 @@
 ---
-regenerate:                             true 
+regenerate:                             true
 ---
 
 {% capture cache %}
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/quicklinks.html
- #  Liquid PROCEDURE template to create the HTML portion of the quicklink bar
- #  NOTE: Loaded dynamically by J1 NAV Manager module (AJAX)
+ # ~/assets/data/quicklinks.html
+ # Liquid PROCEDURE template to create the HTML portion of the quicklink bar
+ # NOTE: Loaded dynamically by J1 NAV Manager module (AJAX)
  #
- #  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
  # -----------------------------------------------------------------------------
- #  Test data:
- #   liquid_var: {{ liquid_var | debug }}
- #
+ # Test data:
+ #  liquid_var: {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
@@ -32,17 +31,19 @@ regenerate:                             true
 
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign modules                 = site.data.modules %}
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign navigator_defaults      = modules.defaults.navigator.defaults %}
+{% assign navigator_settings      = modules.navigator.settings %}
+{% assign consent_defaults        = modules.defaults.cookie_consent.defaults %}
+{% assign consent_settings        = modules.cookie_consent.settings %}
+{% assign quick_search_defaults   = modules.defaults.jekyll_search.defaults %}
+{% assign quick_search_settings   = modules.jekyll_search.settings %}
+
 {% assign auth_manager_config     = site.j1_auth %}
-{% assign auth_client_config      = site.data.modules.defaults.auth_client.defaults %}
-{% assign navigator_defaults      = site.data.modules.defaults.navigator.defaults %}
-{% assign navigator_settings      = site.data.modules.navigator.settings %}
-{% assign consent_defaults        = site.data.modules.defaults.cookie_consent.defaults %}
-{% assign consent_settings        = site.data.modules.cookie_consent.settings %}
-{% assign quick_search_defaults   = site.data.modules.defaults.jekyll_search.defaults %}
-{% assign quick_search_settings   = site.data.modules.jekyll_search.settings %}
+{% assign auth_client_config      = navigator_defaults.nav_authclient %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -82,6 +83,8 @@ regenerate:                             true
 
 {% assign signin_modal_id         = auth_client_config.signin_modal_id %}
 
+
+
 {% comment %} Show|Hide Quicksearch icon
 ------------------------------------------------------------------------------ {% endcomment %}
 {% if quick_search_options.enabled %}
@@ -116,16 +119,16 @@ regenerate:                             true
 
 {% comment %} Show|Hide CookieConsent icon
 ------------------------------------------------------------------------------ {% endcomment %}
-{% if consent_options.enabled %}           
-  {% assign consent_enabled = true %} 
+{% if consent_options.enabled %}
+  {% assign consent_enabled = true %}
 {% else %}
-  {% assign consent_enabled = false %} 
+  {% assign consent_enabled = false %}
 {% endif %}
 
-{% if consent_options.show_consent_icon %} 
-  {% assign consent_icon_enabled  = true %} 
+{% if consent_options.show_consent_icon %}
+  {% assign consent_icon_enabled  = true %}
 {% else %}
-  {% assign consent_icon_enabled = false %} 
+  {% assign consent_icon_enabled = false %}
 {% endif %}
 
 {% if consent_enabled and consent_icon_enabled %}
@@ -150,7 +153,7 @@ regenerate:                             true
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-<!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [AuthManager detected as: {{ show_auth_manager_icon }}] --> 
+<!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [AuthManager detected as: {{ show_auth_manager_icon }}] -->
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [CookieConsent detected as: {{ consent_enabled }}] -->
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Show CookieConsent icon detected as: {{ show_cookie_consent_icon }}] -->
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Show ControlCenter icon detected as: {{ show_control_center_icon }}] -->
@@ -165,7 +168,7 @@ regenerate:                             true
   {% if show_auth_manager_icon %}<li id="quickLinksSignInOutButton" class="nav-item" style="display: none;"><a class="nav-icon" id="navLinkSignInOut" href="#" data-toggle="modal" data-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_cookie_consent_icon %}<li id="quickLinksCookieButton" class="nav-item" style="display: none;"><a id="cookie-state" class="nav-icon" href="#" data-toggle="modal" data-target="#cookieRevokeCentralDanger"><i class="{{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_quick_search_icon %}<li id="quickLinksSearchButton" class="nav-item search"><a class="nav-icon" href="#"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_control_center_icon %}<li id="quickLinksControlCenterButton" class="nav-item control-center" style="display: none;"><a class="nav-icon" href="{{control_center_url}}"><i class="{{icon_family}} {{icon_family}}-{{control_center_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_control_center_icon %}<li id="quickLinksControlCenterButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="{{control_center_url}}"><i class="{{icon_family}} {{icon_family}}-{{control_center_icon}} {{icon_size}}"></i></a></li>{% endif %}
   {% if show_sidebar_icon %}<li id="quickLinksSideBarButton" class="nav-item side-menu"><a class="nav-icon" href="#"><i class="{{icon_family}} {{icon_family}}-{{sidebar_icon}} {{icon_size}}"></i></a></li>{% endif %}
 </ul>
 
@@ -173,4 +176,3 @@ regenerate:                             true
 
 {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
 {% assign cache = nil %}
-

data/lib/starter_web/assets/data/themes.json

@@ -6,17 +6,17 @@ regenerate:                             false
 
 {% comment %}
  # -----------------------------------------------------------------------------
- #  ~/assets/data/themes.json
- #  The Liquid template themes.json is used by the Theme Switcher to locate
- #  the CSS files to be loaded on a switch for a specific theme
+ # ~/assets/data/themes.json
+ # The Liquid template themes.json is used by the Theme Switcher to locate
+ # the CSS files to be loaded on a switch for a specific theme
  #
- #  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.
+ # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
  # NOTE:
  # Be carefull change the Liquid code. If the code is changed, check the
@@ -24,14 +24,14 @@ regenerate:                             false
  # Javascript portion of the Theme Switcher to fail and no valid CSS will
  # be available to provide the needed styles to properly render your pages.
  # -----------------------------------------------------------------------------
- #  Test data:
+ # Test data:
  #   {{ liquid_var | debug }}
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
 {% assign environment         = site.environment %}
-{% assign  asset_path         = site.data.j1_config.asset_path %}
-{% assign custom_theme_config = site.data.j1_config.custom_theme %}
+{% assign  asset_path         = site.data.template_settings.asset_path %}
+{% assign custom_theme_config = site.data.template_settings.custom_theme %}
 {% assign custom_scss         = custom_theme_config.custom_scss %}
 {% capture theme_path %}{{asset_path}}/modules/bs_theme_switcher/themes{% endcapture %}
 

data/lib/starter_web/assets/data/{web_hook.html → webhook.html}

@@ -60,7 +60,7 @@ regenerate:                             true
     <div class="modal-content">
       <!--Header-->
       <div class="modal-header">
-        <p class="lead">WebHooks - Recent commit</p>
+        <p class="lead">WebHook</p>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <i class="mdi mdi-close mdi-dark mdi-48px"></i>
         </button>
@@ -102,7 +102,7 @@ regenerate:                             true
     <div class="modal-content">
       <!--Header-->
       <div class="modal-header">
-        <p class="lead">Git Command succeeded</p>
+        <p class="lead">Git</p>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <i class="mdi mdi-close mdi-dark mdi-48px"></i>
         </button>
@@ -133,7 +133,7 @@ regenerate:                             true
     <div class="modal-content">
       <!--Header-->
       <div class="modal-header">
-        <p class="lead">NPM Script succeeded</p>
+        <p class="lead">NPM</p>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <i class="mdi mdi-close mdi-dark mdi-48px"></i>
         </button>
@@ -176,7 +176,7 @@ regenerate:                             true
       </div>
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
-        <a type="button" id="failedOkButton" class="btn btn-outline-secondary-modal" data-dismiss="modal">Ok, thanks</a>
+        <a type="button" id="requestFailedOkButton" class="btn btn-outline-secondary-modal" data-dismiss="modal">Ok, thanks</a>
       </div>
     </div>
     <!-- END Content -->