j1-template 2020.0.13 → 2020.0.18

data/_layouts/home.html

@@ -83,7 +83,7 @@ debug:                                  false
   {% comment %} Collect the BODY-MAIN region
   ------------------------------------------------------------------------------ {% endcomment %}
   <!-- [INFO   ] [j1.layout.home.html                   ] [ call content_writer for region: 'body-main' ] -->
-  <main class="container-fluid no-padding r-text-{{rtext_size}}">
+  <main id="content" class="container-fluid no-padding r-text-{{rtext_size}}">
       {% include  {{content_writer}} region='body-main' items=lanes_collate %}
   </main>
   <!-- [INFO   ] [j1.layout.home.html                   ] [ end processing content_writer for region: 'body-main' ] -->

data/_layouts/page.html

@@ -3,7 +3,7 @@ layout:                                 default
 debug:                                  false
 ---
 
-{% comment %} 
+{% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_layouts/page.html
  #  Liquid layout template for all pages of content-type PAGE
@@ -62,7 +62,7 @@ debug:                                  false
   {% comment %} Collect the BODY-CONTENT region
   ------------------------------------------------------------------------------ {% endcomment %}
   <!-- [INFO   ] [j1.layout.page.html                    ] [ call content_writer for region: 'body-main' ] -->
-  <div class="container-fluid">
+  <div id="content" class="container-fluid">
     {% include  {{content_writer}} region='body-main' items=lanes_collate %}
   </div>
   <!-- [INFO   ] [j1.layout.page.html                    ] [ end content_writer processing for region: 'body-main' ] -->

data/_layouts/post.html

@@ -1,9 +1,9 @@
 ---
 layout:                                 default
-debug:                                  false 
+debug:                                  false
 ---
 
-{% comment %} 
+{% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_layouts/post.html
  #  Liquid layout template for all pages of content-type POST
@@ -62,7 +62,7 @@ debug:                                  false
   {% comment %} Collect the BODY-MAIN region
   ------------------------------------------------------------------------------ {% endcomment %}
   <!-- [INFO   ] [j1.layout.post.html                ] [ call content_writer for region: 'body-main' ] -->
-  <div class="container-fluid">
+  <div id="content" class="container-fluid">
     {% include  {{content_writer}} region='body-main' items=lanes_collate %}
   </div>
   <!-- [INFO   ] [j1.layout.post.html                ] [ end content_writer processing for region: 'body-main' ] -->

data/apps/public/cc/cc.yml

@@ -1644,7 +1644,5 @@ collections:
                       - { label: response success,  name: response_success, widget: string, hint: Response send if built script finishes successfully }
                       - { label: response failed,   name: response_failed, widget: string, hint: Response send if Built script failed }
 
-
-
 # ------------------------------------------------------------------------------
 # END config

data/apps/public/cc/index.adoc

@@ -71,7 +71,7 @@ resource_options:
   var bg_primary                = j1.getStyleValue('bg-primary', 'background-color');
 
   // $('head').append('<style>div#nc-root { background-color: ' +bg_primary+ ' !important; }</style>');
-  
+
   if (!user_state.cc_authenticated) {
     // Remove GitHub credentials to enforce explicit login
     localStorage.removeItem('netlify-cms-user');
@@ -101,7 +101,3 @@ resource_options:
 
 </script>
 ++++
-
-
-
-

data/assets/data/authclient.html

@@ -58,7 +58,7 @@ regenerate: true
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% assign production = '' %}
+{% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
 {% endif %}
@@ -139,8 +139,12 @@ regenerate: true
 {% comment %} Modal SignIn
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.authclient.html                    ] [START: Modal signin|signup] -->
-<div class="modal fade" id="modalOmniSignIn" tabindex="-1" role="dialog" aria-labelledby="modalOmniSignIn" aria-hidden="true">
-  <div class="modal-dialog modal-lg modal-notify modal-info" role="document">
+<div id="modalOmniSignIn"
+    class="modal fade"
+    role="dialog"
+    tabindex="-1"
+    aria-labelledby="modalOmniSignIn" aria-hidden="true">
+  <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
 
     <!-- Content -->
     <div class="modal-content">
@@ -148,7 +152,7 @@ regenerate: true
       <!--Header-->
       <div class="modal-header">
         <p class="lead">
-          <i class="mdi mdi-2x mdi-account mdi-dark"></i>
+          <!-- i class="mdi mdi-2x mdi-account mdi-md-grey-100"></i -->
           {{signin_modal_title}}
         </p>
       </div>
@@ -248,12 +252,12 @@ regenerate: true
 
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
-        <a type="button" id="signInButton" class="btn btn btn-raised btn-flex btn-md btn-info g-mr-5" data-dismiss="modal">
-          <i class="mdi mdi-18px mdi-dark mdi-login"></i>
+        <a type="button" id="signInButton" class="btn btn btn-raised btn-flex btn-md btn-info mr-3" data-dismiss="modal">
+          <i class="mdi mdi-18px mdi-login mr-1"></i>
           Yes, please
         </a>
         <a type="button" id="exitButton" class="btn btn btn-raised btn-flex btn-md btn-secondary" data-dismiss="modal">
-          <i class="mdi mdi-18px mdi-dark mdi-close"></i>
+          <i class="mdi mdi-18px mdi-close mr-1"></i>
           No, thanks
         </a>
       </div>
@@ -267,18 +271,21 @@ regenerate: true
 {% comment %} Modal SignOut
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.authclient.html                    ] [START: Modal signout] -->
-<div class="modal fade top" id="modalOmniSignOut" tabindex="-1" role="dialog" aria-labelledby="modalOmniSignOut" aria-hidden="true" data-backdrop="false">
-  <div class="modal-dialog modal-lg modal-notify modal-warning" role="document">
+<div id="modalOmniSignOut"
+    class="modal fade top"
+    role="dialog" tabindex="-1"
+    aria-labelledby="modalOmniSignOut" aria-hidden="true" data-backdrop="false">
+  <div class="modal-dialog modal-frame modal-top modal-notify modal-danger" role="document">
     <!-- Content -->
     <div class="modal-content">
 
-      <!--Header-->
+      <!-- Header -->
       <div class="modal-header">
         <p class="lead">
-          <i class="mdi mdi-2x mdi-dark mdi-account"></i>
+          <!-- i class="mdi mdi-2x mdi-account"></i -->
           {{signout_modal_title}}
         </p>
-      </div>
+      </div> <!-- END Header -->
 
       <!-- Body -->
       <div class="modal-body mr-5 ml-5 mb-0">
@@ -287,8 +294,12 @@ regenerate: true
           <h4 class="user-info">You are signed in to provider: </h4>
         </div>
 
-        <p style="text-align: justify;">{{signout_modal_body_text | asciidocify}}</p>
+        <!-- p style="text-align: justify;">
+              {{signout_modal_body_text | asciidocify}}
+        </p -->
+        <div>{{signout_modal_body_text | asciidocify}}</div>
 
+        <!-- Options DISABLED for now
         <h5 class="mt-1 mb-3 notoc">Available options</h5>
         <form id="authclient-form" class="form-horizontal">
           <div class="mdc-list-group">
@@ -305,24 +316,24 @@ regenerate: true
             </div>
           </div>
         </form>
-
-      </div>
+        -->
+      </div> <!-- END Body -->
 
       <!-- Footer -->
       <div class="modal-footer">
-        <a type="button" id="signOutButton" class="btn btn btn-raised btn-flex btn-md btn-warning g-mr-5" data-dismiss="modal">
-          <i class="mdi mdi-18px mdi-dark mdi-logout"></i>
+        <a type="button" id="signOutButton" class="btn btn btn-raised btn-flex btn-md btn-danger mr-3" data-dismiss="modal">
+          <i class="mdi mdi-18px mdi-logout mr-1"></i>
           Yes, please
         </a>
         <a type="button" id="exitButton" class="btn btn btn-raised btn-flex btn-md btn-secondary" data-dismiss="modal">
-          <i class="mdi mdi-18px mdi-dark mdi-close"></i>
+          <i class="mdi mdi-18px mdi-close mr-1"></i>
           No, thanks
         </a>
-      </div>
+      </div> <!-- END Footer -->
 
-    </div> <!-- END Content -->
-  </div>
-</div> <!-- Modal SignOut -->
+    </div> <!-- END Modal content -->
+  </div> <!-- END Modal dialog -->
+</div> <!-- END Modal SignOut -->
 
 {% comment %} Modal UserStateInfo
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -331,9 +342,9 @@ regenerate: true
   <div class="modal-dialog modal-side modal-top-right modal-notify modal-success" role="document">
     <!-- Content -->
     <div class="modal-content">
-      <!--Header-->
+      <!-- Header -->
       <div class="modal-header">
-        <i class="mdi mdi-2x mdi-account mdi-dark"></i>
+        <i class="mdi mdi-2x mdi-account mdi-md-grey-100"></i>
         <p class="lead">Info</p>
       </div>
       <!-- Body -->

data/assets/data/banner.html

@@ -59,7 +59,7 @@ regenerate: true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture banner_config_file_name %}~/_data/blocks/banner.yml{% endcapture %}
 
-{% assign production = '' %}
+{% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
 {% endif %}
@@ -192,9 +192,9 @@ regenerate: true
             <!-- Heading -->
             <div class="row">
               <div class="{{animate}}">
-                <h1 class="g-font-weight-500 g-mb-0">{{card_title}}</h1>
-                <p class="tagline">{{card_tagline}}</p>
-                <div class="d-inline-block g-width-50 g-height-2 g-bg-primary g-mb-5"></div>
+                <h1 class="g-font-weight-500 mb-0">{{card_title}}</h1>
+                <p class="tagline mb-0">{{card_tagline}}</p>
+                <div class="d-inline-block g-width-50 g-height-2 uno-bg-primary mb-1"></div>
               </div>
             </div>
             <!-- End Heading -->

data/assets/data/{cookie_consent.html → cookiebar.html}

@@ -6,9 +6,9 @@ regenerate: true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/data/cookie_consent.html
+ # ~/assets/data/cookiebar_modals.html
  # Liquid PROCEDURE to generate the HTML (data) portion of all modals used
- # by J1 Cookie Consent module
+ # by J1 Cookiebar module
  #
  # Product/Info:
  # https://jekyll.one
@@ -26,37 +26,44 @@ regenerate: true
 
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture select_color     %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
-{% capture select_icon_size %}themes/{{site.template.name}}/procedures/global/select_icon_size.proc{% endcapture %}
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment                   = site.environment %}
+{% assign environment     = site.environment %}
 
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign modules         = site.data.modules %}
 
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign consent_defaults              = site.data.modules.defaults.cookie_consent.defaults %}
-{% assign consent_settings              = site.data.modules.cookie_consent.settings %}
+{% assign cookie_defaults = modules.defaults.cookiebar.defaults %}
+{% assign cookie_settings = modules.cookiebar.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign consent_options               = consent_defaults | merge: consent_settings %}
+{% assign cookie_options  = cookie_defaults | merge: cookie_settings %}
 
-{% assign production = '' %}
+{% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
 {% endif %}
 
+
 {% comment %} Main
 ================================================================================ {% endcomment %}
 
 {% comment %} Modal cookie consent dialog
 -------------------------------------------------------------------------------- {% endcomment %}
-<div class="modal fade top" id="topFullCookieConsent" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="false" style="display: none;">
+<div id="topFullCookieConsent" class="modal fade top"
+  tabindex="-1"
+  role="dialog"
+  data-backdrop="false"
+  aria-labelledby="myModalLabel"
+  aria-hidden="true">
   <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
 
     <!-- Content -->
@@ -64,7 +71,7 @@ regenerate: true
 
       <!--Header-->
       <div class="modal-header">
-        <p class="lead">{{consent_options.consent_modals_title}}</p>
+        <p class="lead">{{cookie_options.consent_modals_title}}</p>
       </div>
 
       <!-- Body -->
@@ -72,40 +79,48 @@ regenerate: true
 
         <!-- About cookies -->
         <div class="px-2">
-          <p class="pt-1 pr-2">{{consent_options.policy_about}}</p>
+          <p class="pt-1 pr-2">{{cookie_options.policy_about}}</p>
         </div>
       </div> <!-- END Body -->
 
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
-        {% if consent_options.buttons.policy_button %}
-        <a type="button" id="policyButton" class="btn btn-raised btn-flex btn-secondary g-mr-5 mb-3"> <i class="mdi mdi-18px mdi-dark mdi-read"></i>
-          {{consent_options.buttons.policy_button_text}}
+        {% if cookie_options.buttons.policy_button %}
+        <a id="policyButton" type="button"
+           class="btn btn-raised btn-flex btn-secondary mr-3">
+           <i class="mdi mdi-18px mdi-dark mdi-read mr-2"></i>
+           {{cookie_options.buttons.policy_button_text}}
         </a>
         {% endif %}
-        <a type="button" id="acceptButton" class="btn btn-raised btn-flex btn-info g-mr-5 mb-3" data-dismiss="modal"> <i class="mdi mdi-18px mdi-dark mdi-check"></i>
-          {{consent_options.buttons.accept_button_text}}
+        <a id="acceptButton" type="button"
+           class="btn btn-raised btn-flex btn-info mr-3"
+           data-dismiss="modal">
+           <i class="mdi mdi-18px mdi-dark mdi-check mr-2"></i>
+           {{cookie_options.buttons.accept_button_text}}
         </a>
-        {% if consent_options.buttons.decline_button %}
-        <a type="button" id="declineButton" class="btn btn-raised btn-flex btn-secondary g-mr-5 mb-3" data-dismiss="modal"> <i class="mdi mdi-18px mdi-dark mdi-close"></i>
-          {{consent_options.buttons.decline_button_text}}
+        {% if cookie_options.buttons.decline_button %}
+        <a id="declineButton" type="button"
+           class="btn btn-raised btn-flex btn-secondary"
+           data-dismiss="modal">
+           <i class="mdi mdi-18px mdi-dark mdi-close mr-2"></i>
+           {{cookie_options.buttons.decline_button_text}}
         </a>
         {% endif %}
       </div> <!-- END Footer -->
 
       <!-- Hidden Content -->
       <div class="cookie-policy">
-        {% if consent_options.buttons.policy_button_text %}
+        {% if cookie_options.buttons.policy_button_text %}
         <div id="modal-footer" class="modal-footer-hidden">
           <div id="cookiePolicyInfo" class="card card-flat" style="display: none">
             <div class="content">
-              <h4 class="notoc card-title">{{consent_options.cookie_policy_title}}</h4>
-              <h6 class="notoc category text-gray">{{consent_options.cookie_policy_tagline | asciidocify}}</h6>
+              <h4 class="notoc card-title">{{cookie_options.cookie_policy_title}}</h4>
+              <h6 class="notoc category text-gray">{{cookie_options.cookie_policy_tagline | asciidocify}}</h6>
 
               <!-- Cookie categories -->
-              {% if consent_options.categories.enabled %}
+              {% if cookie_options.categories.enabled %}
               <div class="px-2">
-                <h6 class="card-subtitle text-muted mb-2">{{consent_options.categories.category_title}}</h6>
+                <h6 class="card-subtitle text-muted mb-2">{{cookie_options.categories.category_title}}</h6>
                 <table class="tableblock frame-all grid-all stretch table-responsive-stacked-lg">
                   <colgroup>
                     <col style="width: 33.3333%;">
@@ -122,53 +137,53 @@ regenerate: true
                   <tbody>
                     <tr>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_session}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_session}}</p>
                       </td>
                       <td class="tableblock halign-left valign-top">
                         <div class="content"><i class="fa md-green fa-check"></i></div>
                       </td>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_description_text}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_description_text}}</p>
                       </td>
                     </tr>
                     <tr>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_persistent}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_persistent}}</p>
                       </td>
                       <td class="tableblock halign-left valign-top">
                         <div class="content"><i class="fa md-green fa-check"></i></div>
                       </td>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_description_text}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_description_text}}</p>
                       </td>
                     </tr>
                     <tr>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_first_party}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_first_party}}</p>
                       </td>
                       <td class="tableblock halign-left valign-top">
                         <div class="content"><i class="fa md-green fa-check"></i></div>
                       </td>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_description_text}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_description_text}}</p>
                       </td>
                     </tr>
                     <tr>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_second_party}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_second_party}}</p>
                       </td>
                       <td class="tableblock halign-left valign-top">
                         <div class="content"><i class="fa md-green fa-check"></i></div>
                       </td>
                       <td class="tableblock halign-left valign-top">
-                        <p class="tableblock">{{consent_options.categories.category_description_text}}</p>
+                        <p class="tableblock">{{cookie_options.categories.category_description_text}}</p>
                       </td>
                     </tr>
                   </tbody>
                 </table>
               </div>
               {% endif %}
-              <div class="card-description">{{ consent_options.cookie_policy_text | asciidocify}}</div>
+              <div class="card-description">{{ cookie_options.cookie_policy_text | asciidocify}}</div>
             </div>
           </div>
         </div>
@@ -182,16 +197,21 @@ regenerate: true
 
 {% comment %} Modal revoke cookies dialog
 -------------------------------------------------------------------------------- {% endcomment %}
-<div class="modal fade" id="cookieRevokeCentralDanger" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-notify modal-danger" role="document">
-      <!-- Content -->
-      <div class="modal-content">
-
+<div id="cookieRevokeCentralDanger"
+     class="modal fade top"
+     tabindex="-1"
+     role="dialog"
+     data-backdrop="false"
+     aria-modal="true"
+     aria-labelledby="RevokeCookieConsent">
+  <div class="modal-dialog modal-frame modal-top modal-notify modal-danger" role="document">
+    <!-- Content -->
+    <div class="modal-content">
       <!--Header-->
       <div class="modal-header">
         <p class="lead">Revoke Cookie Consent</p>
-      </div> <!--END Header-->
-
+      </div>
+      <!--END Header-->
       <!-- Body -->
       <div class="modal-body">
         <div class="text-left">
@@ -226,17 +246,23 @@ regenerate: true
                 <strong>functionalities</strong>, <strong>services</strong> or <strong>support</strong>.
               </p>
             </div>
+          </div>
         </div>
+        <!-- END Body -->
+        <!-- Footer -->
+        <div class="modal-footer justify-content-center">
+          <a id="revokeCookies" type="button"
+             class="btn btn-raised btn-flex btn-danger mr-3"
+             data-dismiss="modal">Yes, please revoke cookie consent
+          </a>
+          <a id="remainCookies" type="button"
+             class="btn btn-raised btn-flex btn-secondary mr-3"
+             data-dismiss="modal">No, please do nothing
+          </a>
+        </div> <!-- END Footer -->
       </div> <!-- END Body -->
-
-      <!-- Footer -->
-      <div class="modal-footer justify-content-center">
-        <a type="button" id="revokeCookies" class="btn btn-raised btn-flex btn-md btn-red g-mr-5 mb-3" data-dismiss="modal">Yes, please revoke cookie consent</a>
-        <a type="button" id="remainCookies" class="btn btn-raised btn-flex btn-md btn-secondary mb-3" data-dismiss="modal">No, please do nothing</a>
-      </div>
-    </div> <!-- END Footer -->
-
-  </div> <!-- END Content -->
+    </div> <!-- END Content -->
+  </div>
 </div> <!-- END Modal -->
 {% comment %} END Modal revoke cookies dialog
 -------------------------------------------------------------------------------- {% endcomment %}