j1-template 2020.0.17 → 2020.0.22

data/_layouts/blog_archive.html

@@ -2,7 +2,7 @@
 layout:                                 default
 ---
 
-{% comment %} 
+{% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_layouts/blog_archive.html
  #  Liquid layout template for all pages of content-type BLOG ARCHIVE
@@ -40,7 +40,7 @@ layout:                                 default
 {% assign lanes_collate = site.data.layouts.blog_archive.lanes %}
 
 
-{% comment %} Main 
+{% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
   {% comment %} Collect the BODY-BANNER region
@@ -54,7 +54,8 @@ layout:                                 default
   {% comment %} Collect the BODY-CONTENT region
   ------------------------------------------------------------------------------ {% endcomment %}
   <!-- [INFO   ] [j1.layout.blog_archive.html    ] [ call default_writer for region: 'body-content' ] -->
-  <div class="container-fluid">
+  <!-- [INFO   ] [j1.layout.blog_archive.html    ] [ padding-right set dynamically by core/js/ssm.js ] -->
+  <div id="content" class="container">
       {% include  {{content_writer}} region='body-main' items=lanes_collate %}
   </div>
   <!-- [INFO   ] [j1.layout.blog_archive.html    ] [ end processing default_writer for region: 'body-content' ] -->

data/_layouts/collection.html

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

data/_layouts/default.html

@@ -52,11 +52,11 @@ layout:                                 compress
 {% assign environment       = site.environment %}
 {% assign template_version  = site.version %}
 {% assign compress          = site.compress_html.enabled %}
-{% assign prettify          = data.template_settings.prettify %}
+{% assign prettify          = data.j1_config.prettify %}
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -84,7 +84,7 @@ layout:                                 compress
 
 {% assign lanes_collate     = data.layouts.default.lanes %}
 {% assign logon_client      = data.modules.j1_sign_in_up %}
-{% assign body_scrollbar    = data.template_settings.body.scrollbar %}
+{% assign body_scrollbar    = data.j1_config.body.scrollbar %}
 
 {% if page.scrollbar %}
   {% assign body_scrollbar = page.scrollbar %}

data/_layouts/home.html

@@ -54,7 +54,7 @@ debug:                                  false
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign lanes_collate       = site.data.layouts.home.lanes %}
-{% assign rtext               = site.data.template_settings.typography.rtext %}
+{% assign rtext               = site.data.j1_config.typography.rtext %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -65,7 +65,7 @@ debug:                                  false
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
   {% if rtext %}
-    {% assign rtext_size = site.data.template_settings.typography.rtext_size %}
+    {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
   {% else %}
     {% assign rtext_size = 0 %}
   {% endif %}
@@ -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 mb-5">
     {% 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">
     {% 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

@@ -681,7 +681,7 @@ collections:
                       - { label: background color 1,  name: background_color_1, widget: string,   hint: TBD }
                       - { label: background color 2,  name: background_color_2, widget: string,   hint: TBD }
                       - { label: lane span,           name: lane_span,          widget: select,   options: [ fixed, fluid ], hint: TBD }
-                      - { label: helper classes,      name: helper_classes,     widget: string,   hint: Unique resource ID }
+                      - { label: helper classes,      name: properties,     widget: string,   hint: Unique resource ID }
                       - label:    Cards
                         name:     cards
                         widget:   list
@@ -745,7 +745,7 @@ collections:
                       - { label: background color 1,  name: background_color_1, widget: string,   hint: TBD }
                       - { label: background color 2,  name: background_color_2, widget: string,   hint: TBD }
                       - { label: lane span,           name: lane_span,          widget: select,   options: [ fixed, fluid ], hint: TBD }
-                      - { label: helper classes,      name: helper_classes,     widget: string,   hint: Unique resource ID }
+                      - { label: helper classes,      name: properties,     widget: string,   hint: Unique resource ID }
                       - label:    Cards
                         name:     cards
                         widget:   list
@@ -789,7 +789,7 @@ collections:
                       - { label: background color 1,  name: background_color_1, widget: string,   hint: TBD }
                       - { label: background color 2,  name: background_color_2, widget: string,   hint: TBD }
                       - { label: lane span,           name: lane_span,          widget: select,   options: [ fixed, fluid ], hint: TBD }
-                      - { label: helper classes,      name: helper_classes,     widget: string,   hint: Unique resource ID }
+                      - { label: helper classes,      name: properties,     widget: string,   hint: Unique resource ID }
                       - label:    Cards
                         name:     cards
                         widget:   list
@@ -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/assets/data/authclient.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 {% capture cache %}
 
@@ -30,7 +30,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config         = site.data.template_settings %}
+{% assign template_config         = site.data.j1_config %}
 {% assign blocks                  = site.data.blocks %}
 {% assign modules                 = site.data.modules %}
 
@@ -144,7 +144,7 @@ regenerate: true
     role="dialog"
     tabindex="-1"
     aria-labelledby="modalOmniSignIn" aria-hidden="true">
-  <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
+  <div class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
 
     <!-- Content -->
     <div class="modal-content">
@@ -252,7 +252,7 @@ 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 mr-3" data-dismiss="modal">
+        <a type="button" id="signInButton" class="btn btn btn-raised btn-flex btn-md btn-primary mr-3" data-dismiss="modal">
           <i class="mdi mdi-18px mdi-login mr-1"></i>
           Yes, please
         </a>
@@ -355,7 +355,7 @@ regenerate: true
       </div>
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
-        <a type="button" class="btn btn btn-raised btn-flex btn-md btn-info" data-dismiss="modal">OK</a>
+        <a type="button" class="btn btn btn-raised btn-flex btn-md btn-primary" data-dismiss="modal">OK</a>
       </div>
     </div>
     <!-- END Content -->
@@ -367,14 +367,14 @@ regenerate: true
 --------------------------------------------------------------------------------
 <!-- [INFO   ] [j1.authclient.html                    ] [START: Modal TOP INFO signed in] -->
 <div class="modal fade top" id="modalTopInfoSignedIn" tabindex="-1" role="dialog" aria-labelledby="modalTopInfoSignedIn" aria-hidden="true" data-backdrop="false">
-  <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
+  <div class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
     <!-- Content -->
     <div class="modal-content">
       <!-- Body -->
       <div class="modal-body">
         <div class="row px-4">
           <p class="pt-1 pr-2">You're already signed in</p>
-          <a type="button" class="btn btn btn-raised btn-flex btn-md btn-info" data-dismiss="modal"OK</a>
+          <a type="button" class="btn btn btn-raised btn-flex btn-md btn-primary" data-dismiss="modal"OK</a>
         </div>
       </div>
     </div>

data/assets/data/banner.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 {% capture cache %}
 
@@ -32,8 +32,8 @@ regenerate: true
 
 {% comment %} Set global settings
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign environment             = site.environment %}
-{% assign debug                   = false %}
+{% assign environment               = site.environment %}
+{% assign debug                     = false %}
 
 
 {% comment %} Process YML config data
@@ -41,15 +41,17 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config         = site.data.template_settings %}
-{% assign blocks                  = site.data.blocks %}
-{% assign banner_config_defaults  = blocks.defaults.banner %}
-{% assign banner_config_settings  = blocks.banner %}
+{% assign template_config           = site.data.j1_config %}
+{% assign blocks                    = site.data.blocks %}
+{% assign banner_config_defaults    = blocks.defaults.banner %}
+{% assign banner_config_settings    = blocks.banner %}
+{% assign bs_config                 = template_config.bootstrap %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign banner_config_defaults = banner_config_defaults.defaults %}
-{% assign banner_config_settings = banner_config_settings.settings %}
+{% assign bs_card_deck            = bs_config.cards.card-deck %}
+{% assign banner_config_defaults  = banner_config_defaults.defaults %}
+{% assign banner_config_settings  = banner_config_settings.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -178,7 +180,7 @@ regenerate: true
             {% endif %}
 
             {% comment %} TODO: Add payment_url to config
-            ---------------------------------------------------------------- {% endcomment %}
+            -------------------------------------------------------------------- {% endcomment %}
             {% assign patreon_enabled     = true %}
             {% assign patreon_home        = 'https://www.patreon.com' %}
             {% assign pledge_url          = 'join' %}
@@ -192,31 +194,34 @@ regenerate: true
             <!-- Heading -->
             <div class="row">
               <div class="{{animate}}">
-                <h1 class="g-font-weight-500 g-mb-0">{{card_title}}</h1>
+                <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 g-mb-5"></div>
+                <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-2"></div>
               </div>
             </div>
             <!-- End Heading -->
 
-            <!-- Card -->
+            <!-- Body -->
             <div class="row {{animate}}">
-              <p class="">{{card_description}}</p>
-              <div class="row btn-row mt-4">
-                <div class="col-md-{{card_width_md}} col-md-offset-1 col-sm-{{card_width_md}} col-sm-offset-1 col-xs-{{card_width_md | plus:2}}">
-                  {% for button_hash in card_buttons %}
-                    {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
-                    {{bs_button_html}}
-                  {% endfor %}
-                </div>
-              </div>
+              <div>{{card_description}}</div>
+            </div>
+
+            {% if card_buttons %}
+            <!-- Footer -->
+            <div class="banner-footer">
+              {% for button_hash in card_buttons %}
+                {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
+                {{bs_button_html}}
+              {% endfor %}
             </div>
+            {% endif %}
+
             <!-- End Card -->
             {% endif %}
 
           {% endfor %}
           {% comment %} END cards
-          -------------------------------------------------------------------- {% endcomment %}
+          ---------------------------------------------------------------------- {% endcomment %}
           </div>
         </section> <!-- End banner {{ id }} -->
 
@@ -267,15 +272,15 @@ regenerate: true
             {% endif %}
           {% endfor %}
           {% comment %} END cards
-          -------------------------------------------------------------------- {% endcomment %}
+          ---------------------------------------------------------------------- {% endcomment %}
         </div> <!-- End banner {{ id }} -->
 
         {% comment %} Reset element variables (already processed)
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% assign banner_settings = nil %}
 
         {% comment %} END IMAGE banner
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
 
 
         {% comment %} Collect PARALLAX banner

data/assets/data/carousel.json

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}

data/assets/data/cookiebar.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -64,7 +64,7 @@ regenerate: true
   data-backdrop="false"
   aria-labelledby="myModalLabel"
   aria-hidden="true">
-  <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
+  <div class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
 
     <!-- Content -->
     <div class="modal-content">
@@ -87,22 +87,22 @@ regenerate: true
       <div class="modal-footer justify-content-center">
         {% 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>
+           class="btn btn-raised btn-flex btn-secondary mb-2 mr-2" style="width: 20rem">
+           <i class="mdi mdi-18px mdi-white mdi-read mr-2"></i>
            {{cookie_options.buttons.policy_button_text}}
         </a>
         {% endif %}
         <a id="acceptButton" type="button"
-           class="btn btn-raised btn-flex btn-info mr-3"
+           class="btn btn-raised btn-flex btn-primary mb-2 mr-2" style="width: 20rem"
            data-dismiss="modal">
-           <i class="mdi mdi-18px mdi-dark mdi-check mr-2"></i>
+           <i class="mdi mdi-18px mdi-white mdi-check mr-2"></i>
            {{cookie_options.buttons.accept_button_text}}
         </a>
         {% if cookie_options.buttons.decline_button %}
         <a id="declineButton" type="button"
-           class="btn btn-raised btn-flex btn-secondary"
+           class="btn btn-raised btn-flex btn-secondary mb-2 mr-2" style="width: 20rem"
            data-dismiss="modal">
-           <i class="mdi mdi-18px mdi-dark mdi-close mr-2"></i>
+           <i class="mdi mdi-18px mdi-white mdi-close mr-2"></i>
            {{cookie_options.buttons.decline_button_text}}
         </a>
         {% endif %}
@@ -120,7 +120,7 @@ regenerate: true
               <!-- Cookie categories -->
               {% if cookie_options.categories.enabled %}
               <div class="px-2">
-                <h6 class="card-subtitle text-muted mb-2">{{cookie_options.categories.category_title}}</h6>
+                <h6 class="card-subtitle text-muted mb-2 mr-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%;">
@@ -222,7 +222,7 @@ regenerate: true
                 them by adjusting your <strong>browser</strong> settings to <strong>reject on cookies</strong>.
               </p>
             </div>
-            <div class="admonitionblock caution">
+            <!-- div class="admonitionblock caution">
               <table>
                 <tbody>
                   <tr>
@@ -238,26 +238,30 @@ regenerate: true
                   </tr>
                 </tbody>
               </table>
-            </div>
-            <div class="paragraph">
+            </div -->
+            <!-- div class="paragraph">
               <p>
                 You are about to <strong>disagree</strong> on cookies used by this site.
                 If you do so, this site is <strong>unable</strong> to offer you any of our
                 <strong>functionalities</strong>, <strong>services</strong> or <strong>support</strong>.
               </p>
-            </div>
+            </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
+            class="btn btn-raised btn-flex btn-danger mb-2 mr-2" style="width: 25rem"
+            data-dismiss="modal">
+            <i class="mdi mdi-18px mdi-white mdi-check mr-2"></i>
+            {{cookie_options.buttons.revoke_button_text}}
           </a>
           <a id="remainCookies" type="button"
-             class="btn btn-raised btn-flex btn-secondary mr-3"
-             data-dismiss="modal">No, please do nothing
+            class="btn btn-raised btn-flex btn-secondary mb-2 mr-2" style="width: 25rem"
+            data-dismiss="modal">
+            <i class="mdi mdi-18px mdi-white mdi-close mr-2"></i>
+            {{cookie_options.buttons.do_nothing_button_text}}
           </a>
         </div> <!-- END Footer -->
       </div> <!-- END Body -->

data/assets/data/footer.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 {% capture cache %}