j1-template 2020.0.20 → 2020.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eaf1a3bc7000eff87791c16377b6cc8d81c3f76d9f19ec33e22ef9644e5e5f5
-  data.tar.gz: d64495dc88b913b2c8201968d67760497cbc5a41080a8c2270e375de781f7af1
+  metadata.gz: 6b681224aa78c5feac1963cc0c68b8f6525d0a35a3d20706700d16ced3fd6d90
+  data.tar.gz: 77a63976580b15abb2d83b1d563334ded39a4ade3edd970e778c36e3cb7efb41
 SHA512:
-  metadata.gz: 98dcc7ac041e000ba75c3e84adac919445bd6373bc4bb815e945ab1849d6c6efabc061bc1d1e6ae9315ed3f487d7ad2c24a24e3e0118b900a660b5c018233b71
-  data.tar.gz: dc37799ae71afbc73176a03388da1583772d3a6e5c030978fd625e87156672e7f9ceb5425863f4162c95b15478b33d5a2682be0d81f85617d460fb6f46ff9d05
+  metadata.gz: 3c5fe2db9d6b14fd5c1d24fcda6c5ae54584568169d922313806565a3341bbefac37d80731204ddbcede2d468b010efd401126ca697dc5b8416979dbc4306a5b
+  data.tar.gz: 366f13212b8612f231de02c87d163a0821e847660f2e41a2a3d3e03e09693edb12e9d8b63d2a15598c7b9c91058ed3b0b7eaba5e8fc5b1326ab0ee5a86abe42e

data/_includes/themes/j1/blocks/footer/boxes/about_box.proc

@@ -33,7 +33,7 @@
 <!-- [INFO   ] [about_box.proc                     ] [ place about box ] -->
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
-  <h2 class="text-uppercase g-color-white-opacity-0_9 g-font-size-18 mb-0">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0">{{title}}</h2>
   <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>

data/_includes/themes/j1/blocks/footer/boxes/links_box.proc

@@ -32,18 +32,18 @@
 <!-- [INFO   ] [links_box.proc                     ] [ place links box ] -->
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
-  <h2 class="text-uppercase g-color-white-opacity-0_9 g-font-size-18 mb-0">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0">{{title}}</h2>
   <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>
   <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-1"></div>
 
-  <ul class="list-unstyled footer-link-list">
+  <ul class="list-unstyled link-news">
     {% for property in links %}
       {% comment %} <!-- proc - property.link: {{ property.link }} --> {% endcomment %}
       <li>
         <a href="{{property.link.href}}" target="_blank" rel="noopener noreferrer">{{property.link.title}}</a>
-        <div style="color: rgba(255, 255, 255, 0.4);"><small>{{property.link.tagline}}</small></div>
+        <div class="text-uppercase"><small>{{property.link.tagline}}</small></div>
       </li>
     {% endfor %}
   </ul>

data/_includes/themes/j1/blocks/footer/boxes/news_box.proc

@@ -39,7 +39,7 @@
 <!-- [INFO   ] [news_box.proc                      ] [ place news box ] -->
 <div class="col-md-{{footer_box_width_md}}">
   <!-- div class="heading-footer"><h2 class="notoc">{{title}}</h2></div -->
-  <h2 class="text-uppercase g-color-white-opacity-0_9 g-font-size-18 mb-0">{{title}}</h2>
+  <h2 class="text-uppercase g-color-white-opacity-0_6 g-font-size-18 mb-0">{{title}}</h2>
   <p class="tagline mb-0">
     <large>{{tagline}}</large>
   </p>

data/_includes/themes/j1/blocks/footer/generator.html

@@ -1,4 +1,4 @@
-{% comment %} 
+{% comment %}
  # -----------------------------------------------------------------------------
  # ~/_includes/templates/j1/blocks/footer/generator.html
  # Liquid TEMPLATE to create the footer for all pages

data/_includes/themes/j1/procedures/global/attributes_loader.proc

@@ -0,0 +1,117 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/_includes/themes/j1/procedures/global/attributes_loader.proc
+ #
+ # Liquid PROCEDURE to setup the Asciidoc attributes for an (entry)
+ # document. Initializes the all include paths for folders: images,
+ # documents and tables
+ #
+ # Copyright (C) 2020 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # Usage:
+ #  1)  capture the 'load_attributes' variable by full path
+ #  2)  include|configure the load_attributes procedure
+ #
+ # Example:
+ #  {% capture load_attributes %}themes/{{site.template.name}}/procedures/global/attributes_loader.proc{%endcapture%}
+ #  {% include {{load_attributes}} scope="global|local|all" %}
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #  Default:  scope="global"
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #  Include directive (include::)
+ #
+ #  The include directive looks like a >>block macro<< but it is a
+ #  >>preprocessor directive<< like ifdef and ifeval. It gets processed
+ #  before the lines are parsed into a document structure.
+ #
+ #  If the path relative, the processor resolves the path using the following
+ #  rules:
+ #
+ #    If the include directive is used in the main (top-level) document,
+ #    relative paths are resolved relative to the base directory. (The base
+ #    directory defaults to the directory of the main document and can be
+ #    overridden from the CLI or API).
+ #
+ #    If the include directive is used in a file that has >>itself<<
+ #    been included, the path is resolved relative to the including
+ #    (i.e. current) file.
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #  Calculation of Pathes
+ #
+ #  Web sources are loaded by the Web Server. The location imagesdir
+ #  is calculated relative to "_site" (web root). Asciidoc resources
+ #  are being collected by AsciiDoctor relative to "page_root".
+ # -----------------------------------------------------------------------------
+ # TODO:
+ #  For POSTS, currently the ASCIIDOC macro include:: does NOT work.
+ #  Path calculation needes to be fixed. Seems Jekyll is using different
+ #  flavours for page_path (for posts and pages).
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% capture get_page_path %}themes/{{site.template.name}}/procedures/global/get_page_path.proc{% endcapture %}
+{% include {{get_page_path}} %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign scope = include.scope %}
+{% assign path_elements = page.path|strip|split:'/' %}
+
+{% comment %} Source pathes
+-------------------------------------------------------------------------------- {% endcomment %}
+{% capture content_root %}path_elements[0]/..{% endcapture %}
+{% capture page_root %}{{page_path|strip|remove_first:'./'}}{% endcapture %}
+{% capture site_root %}{{page_path source_dir}}{% endcapture %}
+
+{% comment %} Set PATH attributes
+-------------------------------------------------------------------------------- {% endcomment %}
+:globalincludedir:                      {{content_root}}/includes
+:includedir:                            {{page_root}}/includes
+:documentdir:                           {includedir}/documents
+:imagedir:                              {includedir}/images
+:tabledir:                              {includedir}/tables
+
+// Load|Publish attributes from FILE|S
+// -----------------------------------------------------------------------------
+{% if scope == "global" %}
+include::{globalincludedir}/attributes.asciidoc[tag=urls]
+include::{globalincludedir}/attributes.asciidoc[tag=tags]
+include::{globalincludedir}/attributes.asciidoc[tag=data]
+include::{globalincludedir}/attributes.asciidoc[tag=images]
+include::{globalincludedir}/attributes.asciidoc[tag=products]
+include::{globalincludedir}/attributes.asciidoc[tag=authors]
+{% elsif scope == "local" %}
+include::{includedir}/attributes.asciidoc[tag=authors]
+include::{includedir}/attributes.asciidoc[tag=tags]
+include::{includedir}/attributes.asciidoc[tag=urls]
+include::{includedir}/attributes.asciidoc[tag=data]
+{% elsif scope == "all" %}
+include::{globalincludedir}/attributes.asciidoc[tag=urls]
+include::{globalincludedir}/attributes.asciidoc[tag=tags]
+include::{globalincludedir}/attributes.asciidoc[tag=data]
+include::{globalincludedir}/attributes.asciidoc[tag=images]
+include::{globalincludedir}/attributes.asciidoc[tag=products]
+include::{globalincludedir}/attributes.asciidoc[tag=authors]
+include::{includedir}/attributes.asciidoc[tag=authors]
+include::{includedir}/attributes.asciidoc[tag=tags]
+include::{includedir}/attributes.asciidoc[tag=urls]
+include::{includedir}/attributes.asciidoc[tag=data]
+{% else %}
+include::{globalincludedir}/attributes.asciidoc[tag=urls]
+include::{globalincludedir}/attributes.asciidoc[tag=tags]
+include::{globalincludedir}/attributes.asciidoc[tag=data]
+include::{globalincludedir}/attributes.asciidoc[tag=images]
+include::{globalincludedir}/attributes.asciidoc[tag=products]
+include::{globalincludedir}/attributes.asciidoc[tag=authors]
+{% endif %}

data/_includes/themes/j1/procedures/global/create_word_cloud.proc

@@ -38,6 +38,8 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -50,19 +52,19 @@
 {% endif %}
 
 
-{% comment %} Liquid procedures
--------------------------------------------------------------------------------- {% endcomment %}
-
-
 {% comment %} Main
+--------------------------------------------------------------------------------
+  jadams, 2020-07-24: style cart creates a unwanted border, removed
+                      card styles
+  jadams, 2020-07-24: class "cart" is NOT longer overloaded since CSS
+                      generation has changed
+                      <!-- div class="card tag__box raised-z0 mt-0 mb-2" -->
 -------------------------------------------------------------------------------- {% endcomment %}
+
 <div id="word-cloud" class="row ml-3 mr-3">
-  <!-- jadams, 2020-07-24: style cart creates a unwanted border, removed card styles -->
-  <!-- jadams, 2020-07-24: style cart is NOT longer overloaded since CSS generation has changed -->
-  <!-- div class="card tagbox raised-z0 mt-0 mb-2" -->
-  <div class="tagbox mt-0 mb-2">
+  <div class="tag__box mt-0 mb-2">
+    <div class="tag__cloud">
 
-    <div class="tag-cloud">
     {% unless word_list %}
       {% assign word_list = 'empty wordlist' %}
       <div class="content"><b>Cannot create word cloud. <span class="color-red">EMPTY or INVALID word cloud specified: <i>{{word_list}}</i></span></b></div>
@@ -92,7 +94,7 @@
         {% endif %}
       </ul>
     {% endunless %}
-    </div> <!-- end tag-cloud -->
 
-  </div><!-- end card -->
-</div><!-- end row -->
+    </div> <!-- end tag__cloud -->
+  </div> <!-- end tag__box -->
+</div> <!-- end row -->

data/_includes/themes/j1/procedures/global/get_documents_dir.proc

@@ -51,7 +51,7 @@
 {% capture web_root %}{{ page_path | remove_first: source_dir }}{% endcapture %}
 
 :includedir:                            {{page_root}}/000_includes
-:documentsdir:                          {includedir}/documents
+:documentdir:                          {includedir}/documents
 :tabledir:                              {includedir}/tables
 //:tabledir:                              ../tables
 

data/_includes/themes/j1/procedures/global/set_env_entry_document.proc

@@ -30,7 +30,7 @@
 
 {% comment %} TODO: For POSTS, currently the ASCIIDOC macro include:: does NOT work.
 Path calculation needes to be fixed. Seems Jekyll is using different flavours
-for page_path (post|pages). 
+for page_path (post|pages).
 -------------------------------------------------------------------------------- {% endcomment %}
 
 
@@ -70,17 +70,17 @@ for page_path (post|pages).
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if site.source.size %} {% assign source_dir = site.source %} {% else %} {% assign source_path = "." %} {% endif %}
-
 {% include {{get_page_path}} %}
 
 {% comment %} dot issue: Woraround - remove "./" from path if site.source = "."
               TODO: Improve Liquid scripts to manage the "dot issue"
 -------------------------------------------------------------------------------- {% endcomment %}
+
 {% capture page_root %}{{ page_path | strip | remove_first: './' }}{% endcapture %}
 {% capture web_root %}{{ page_path  source_dir }}{% endcapture %}
 
 :includedir:                            {{page_root}}/000_includes
-:documentsdir:                          {includedir}/documents
+:documentdir:                          {includedir}/documents
 :tabledir:                              {includedir}/tables
 
 {% comment %} Moved imagesdir setting to the document

data/apps/public/cc/cc.yml

@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-# ~/apps/public/cc/cc.yml
+# ~/admin/config/config.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)
+# Backend settings (Repo|OAuth Client)
 #
 # publish_mode:                         editorial_workflow
 #
 backend:
   # git-gateway
   name:                                 github
-  # path to your 'GitHub' repository (w/o https://github.com/)
-  repo:                                 jekyll-one-org/J1 Template
+  # path to your GitHub repository (w/o https://github.com/)
+  repo:                                 your-repo
   # e.g master | develop
-  branch:                               master
-  # url of 'external' oauth client (e.g. j1 utility server at: http://localhost:44444)  
+  branch:                               your-repo-branch
+  # 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:                             http://localhost:5000/assets/images/icons/j1/scalable/j1.svg
-# site_url:                             http://localhost:5000/
-# display_url:                          http://localhost:5000/
+# logo_url:                             your-logo-url
+# site_url:                             your-site-url
+# display_url:                          your-display-url
 #
 show_preview_links:                     false
 
 # ------------------------------------------------------------------------------
-# media (asset) settings
+# Media (asset) settings
 #
 # media_library:
 #   name: uploadcare
 #   config:
 #     publicKey: demopublickey
 #
-media_folder:                           packages/300_template_src/assets/images/public
-public_folder:                          packages/300_template_src/assets/uploads/
+media_folder:                           /assets/images/public
+public_folder:                          /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,28 +68,29 @@ slug:
   sanitize_replacement:                 "_"
 
 
+
 # ==============================================================================
-# collection (files and folders) settings
+# Collection (files and folders) settings
 #
 collections:
 
   # ----------------------------------------------------------------------------
-  # site configuration
+  # Site Configuration
   #
   - label: Site Configuration
-    name:  site_config                                                          # Used in routes, e.g., /admin/collections/blog
+    name:  site_config
     files:
 
       # ------------------------------------------------------------------------
-      # global site configuration
+      # Global Site Configuration
       #
       - label: Global Settings
         name:  global_site_config
-        file:  packages/400_template_site/_cc_test_data/_config.yml
+        file:  _cc_test_data/_config.yml
         fields:
 
           # --------------------------------------------------------------------
-          # about (used for J1 CC only)
+          # About this configuration (used for J1 CC only)
           #
           - label:  about
             name:   about_config
@@ -526,7 +527,7 @@ collections:
       #
       - label: Resource Settings
         name:  site_resource_settings
-        file:  packages/400_template_site/_cc_test_data/_data/resources.yml
+        file:  _cc_test_data/_data/resources.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -613,7 +614,7 @@ collections:
       #
       - label: Banner Settings
         name:  banner_settings
-        file:  packages/400_template_site/_cc_test_data/_data/blocks/banner.yml
+        file:  _cc_test_data/_data/blocks/banner.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -817,7 +818,7 @@ collections:
       #
       - label: Panel Settings
         name:  panel_settings
-        file:  packages/400_template_site/_cc_test_data/_data/blocks/panel.yml
+        file:  _cc_test_data/_data/blocks/panel.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1015,7 +1016,7 @@ collections:
       #
       - label: Footer Settings
         name:  footer_settings
-        file:  packages/400_template_site/_cc_test_data/_data/blocks/footer.yml
+        file:  _cc_test_data/_data/blocks/footer.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1196,7 +1197,7 @@ collections:
       #
       - label:      J1 Cookie Consent
         name:       config_cookie_consent
-        file:       packages/400_template_site/_cc_test_data/_data/modules/cookie_consent.yml
+        file:       _cc_test_data/_data/modules/cookie_consent.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1261,7 +1262,7 @@ collections:
       #
       - label:      J1 Jekyll Search
         name:       config_jekyll_search
-        file:       packages/400_template_site/_cc_test_data/_data/modules/jekyll_search.yml
+        file:       _cc_test_data/_data/modules/jekyll_search.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1301,7 +1302,7 @@ collections:
       #
       - label:      J1 Navigation
         name:       config_navigation
-        file:       packages/400_template_site/_cc_test_data/_data/modules/navigator.yml
+        file:       _cc_test_data/_data/modules/navigator.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1489,7 +1490,7 @@ collections:
       #
       - label:      J1 Back2Top
         name:       config_back2top
-        file:       packages/400_template_site/_cc_test_data/_data/modules/back2top.yml
+        file:       _cc_test_data/_data/modules/back2top.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1539,7 +1540,7 @@ collections:
       #
       - label:      J1 WebHook
         name:       config_webhook
-        file:       packages/400_template_site/_cc_test_data/_data/modules/webhook.yml
+        file:       _cc_test_data/_data/modules/webhook.yml
         fields:
 
           # --------------------------------------------------------------------
@@ -1643,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