j1-template 2020.0.15 → 2020.0.20

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/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 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

@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-# ~/admin/config/config.yml
+# ~/apps/public/cc/cc.yml
 # Netlify CMS configuration for J1 Template
 #
 # Product/Info:
@@ -9,54 +9,54 @@
 #
 # J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
-#
+# ------------------------------------------------------------------------------
+# NOTE: If 'localhost' is used, the base_url (external OAuth Client)
+#       in the backend settings could be set to an 'empty string'
 # ------------------------------------------------------------------------------
 
 # ==============================================================================
-# Global settings
+# global settings
 #
 
 # ------------------------------------------------------------------------------
-# Backend settings (Repo|OAuth Client)
+# backend settings (Repo)
 #
 # publish_mode:                         editorial_workflow
 #
 backend:
   # git-gateway
   name:                                 github
-  # path to your GitHub repository (w/o https://github.com/)
-  repo:                                 your-repo
+  # path to your 'GitHub' repository (w/o https://github.com/)
+  repo:                                 jekyll-one-org/J1 Template
   # e.g master | develop
-  branch:                               your-repo-branch
-  # url of 'external' oauth client (e.g. j1 utility server at: http://localhost:44444)
+  branch:                               master
+  # url of 'external' oauth client (e.g. j1 utility server at: http://localhost:44444)  
   # base_url:                           http://localhost:44444                  # web
   # base_url:                           http://localhost:5000                   # app
-  # base_url:                           http:/your.domain:port                  # app
-  # NOTE: for domain localhost, baseurl could be set to EMPTY
   base_url:
 
 # ------------------------------------------------------------------------------
-# Site (production) settings
+# site (production) settings
 #
-# logo_url:                             your-logo-url
-# site_url:                             your-site-url
-# display_url:                          your-display-url
+# logo_url:                             http://localhost:5000/assets/images/icons/j1/scalable/j1.svg
+# site_url:                             http://localhost:5000/
+# display_url:                          http://localhost:5000/
 #
 show_preview_links:                     false
 
 # ------------------------------------------------------------------------------
-# Media (asset) settings
+# media (asset) settings
 #
 # media_library:
 #   name: uploadcare
 #   config:
 #     publicKey: demopublickey
 #
-media_folder:                           /assets/images/public
-public_folder:                          /assets/uploads/
+media_folder:                           packages/300_template_src/assets/images/public
+public_folder:                          packages/300_template_src/assets/uploads/
 
 # ------------------------------------------------------------------------------
-# File (name) settings
+# file (name) settings
 #
 # The slug option allows you to change how filenames for entries are
 # created and sanitized. For modifying the actual data in a slug, see
@@ -68,29 +68,28 @@ slug:
   sanitize_replacement:                 "_"
 
 
-
 # ==============================================================================
-# Collection (files and folders) settings
+# collection (files and folders) settings
 #
 collections:
 
   # ----------------------------------------------------------------------------
-  # Site Configuration
+  # site configuration
   #
   - label: Site Configuration
-    name:  site_config
+    name:  site_config                                                          # Used in routes, e.g., /admin/collections/blog
     files:
 
       # ------------------------------------------------------------------------
-      # Global Site Configuration
+      # global site configuration
       #
       - label: Global Settings
         name:  global_site_config
-        file:  _cc_test_data/_config.yml
+        file:  packages/400_template_site/_cc_test_data/_config.yml
         fields:
 
           # --------------------------------------------------------------------
-          # About this configuration (used for J1 CC only)
+          # about (used for J1 CC only)
           #
           - label:  about
             name:   about_config
@@ -527,7 +526,7 @@ collections:
       #
       - label: Resource Settings
         name:  site_resource_settings
-        file:  _cc_test_data/_data/resources.yml
+        file:  packages/400_template_site/_cc_test_data/_data/resources.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -614,7 +613,7 @@ collections:
       #
       - label: Banner Settings
         name:  banner_settings
-        file:  _cc_test_data/_data/blocks/banner.yml
+        file:  packages/400_template_site/_cc_test_data/_data/blocks/banner.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -818,7 +817,7 @@ collections:
       #
       - label: Panel Settings
         name:  panel_settings
-        file:  _cc_test_data/_data/blocks/panel.yml
+        file:  packages/400_template_site/_cc_test_data/_data/blocks/panel.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1016,7 +1015,7 @@ collections:
       #
       - label: Footer Settings
         name:  footer_settings
-        file:  _cc_test_data/_data/blocks/footer.yml
+        file:  packages/400_template_site/_cc_test_data/_data/blocks/footer.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1197,7 +1196,7 @@ collections:
       #
       - label:      J1 Cookie Consent
         name:       config_cookie_consent
-        file:       _cc_test_data/_data/modules/cookie_consent.yml
+        file:       packages/400_template_site/_cc_test_data/_data/modules/cookie_consent.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1262,7 +1261,7 @@ collections:
       #
       - label:      J1 Jekyll Search
         name:       config_jekyll_search
-        file:       _cc_test_data/_data/modules/jekyll_search.yml
+        file:       packages/400_template_site/_cc_test_data/_data/modules/jekyll_search.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1302,7 +1301,7 @@ collections:
       #
       - label:      J1 Navigation
         name:       config_navigation
-        file:       _cc_test_data/_data/modules/navigator.yml
+        file:       packages/400_template_site/_cc_test_data/_data/modules/navigator.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1490,7 +1489,7 @@ collections:
       #
       - label:      J1 Back2Top
         name:       config_back2top
-        file:       _cc_test_data/_data/modules/back2top.yml
+        file:       packages/400_template_site/_cc_test_data/_data/modules/back2top.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1540,7 +1539,7 @@ collections:
       #
       - label:      J1 WebHook
         name:       config_webhook
-        file:       _cc_test_data/_data/modules/webhook.yml
+        file:       packages/400_template_site/_cc_test_data/_data/modules/webhook.yml
         fields:
 
           # --------------------------------------------------------------------

data/apps/public/cc/index.adoc

@@ -21,7 +21,7 @@ resource_options:
       padding_bottom:                   50
       opacity:                          0.5
       slides:
-        - url:                          /assets/images/modules/attics/banner/admin-dashboard-bootstrap-1280x800-bw.webp
+        - url:                          /assets/images/modules/attics/banner/admin-dashboard-bootstrap-1280x800-bw.jpg
           alt:                          admin-dashboard-bootstrap-1280x800-bw
 ---
 

data/assets/data/authclient.html

@@ -139,8 +139,12 @@ regenerate: true
 {% comment %} Modal SignIn
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.authclient.html                    ] [START: Modal signin|signup] -->
-<div class="modal fade partial" 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-primary" 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-primary 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 partial" 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,35 +316,35 @@ 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 %}
 <!-- [INFO   ] [j1.authclient.html                    ] [START: Modal SIDE INFO signed in] -->
-<div class="modal fade right partial" id="sideModalAlreadySigneIn" tabindex="-1" role="dialog" aria-labelledby="sideModalAlreadySigneIn" aria-hidden="true" data-backdrop="false">
+<div class="modal fade right" id="sideModalAlreadySigneIn" tabindex="-1" role="dialog" aria-labelledby="sideModalAlreadySigneIn" aria-hidden="true" data-backdrop="false">
   <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 -->
@@ -344,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 -->
@@ -355,15 +366,15 @@ regenerate: true
 {% comment %} Modal TOP INFO signed in
 --------------------------------------------------------------------------------
 <!-- [INFO   ] [j1.authclient.html                    ] [START: Modal TOP INFO signed in] -->
-<div class="modal fade top partial" 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 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-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

@@ -192,23 +192,23 @@ 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 g-bg-primary g-mb-5"></div>
+                <div class="d-inline-block g-width-50 g-height-2 uno-bg-primary mb-1"></div>
               </div>
             </div>
             <!-- End Heading -->
 
             <!-- Card -->
             <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>{{card_description}}</div>
+            </div>
+            <div class="row mt-2" style="margin-left:-30px">
+              <div class="col-md-{{card_width_md}} col-sm-{{card_width_md}} col-xs-{{card_width_md}}">
+                {% for button_hash in card_buttons %}
+                  {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
+                  {{bs_button_html}}
+                {% endfor %}
               </div>
             </div>
             <!-- End Card -->