_layouts/default.html in j1_template-2019.4.1 vs _layouts/default.html in j1_template-2019.4.4
- old
+ new
@@ -33,60 +33,70 @@
# Test data:
# {{ lanes_collate | debug }}
# -----------------------------------------------------------------------------
{% endcomment %}
-{% comment %} Additional debug data
--------------------------------------------------------------------------------- {% endcomment %}
-{% if page.debug %}
-<!-- [DEBUG ] [j1.layout.default.html ] [layout data to be loaded: {{lanes_collate}}] -->
-{% endif %}
-
{% comment %} Liquid procedures
-------------------------------------------------------------------------------- {% endcomment %}
{% capture default_writer %}themes/{{site.template.name}}/procedures/layouts/default_writer.proc{% endcapture %}
-
-{% comment %} Variables
+{% comment %} Set global settings
-------------------------------------------------------------------------------- {% endcomment %}
-{% assign lanes_collate = site.data.layouts.default.lanes %}
{% assign environment = site.environment %}
{% assign compress = site.compress_html.enabled %}
{% assign prettify = site.data.j1_config.prettify %}
+
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign lanes_collate = site.data.layouts.default.lanes %}
{% assign logon_client = site.data.modules.j1_sign_in_up %}
{% assign body_scrollbar = site.data.j1_config.body.scrollbar %}
+{% if page.scrollbar %}
+{% assign body_scrollbar = body_scrollbar | merge: page.scrollbar %}
+{% endif %}
{% if jekyll.environment != 'development' %}
- {% assign environment = jekyll.environment | strip %}
+ {% assign environment = jekyll.environment | strip %}
{% endif %}
{% comment %} Set config options
--------------------------------------------------------------------------------
{% assign body_scrollbar_defaults = site.data.j1_config.body.scrollbar %}
{% assign body_scrollbar_config = page.scrollbar %}
{% assign body_scrollbar = body_scrollbar_defaults | merge: body_scrollbar_config %}
--------------------------------------------------------------------------------
{% endcomment %}
+
{% comment %} Main
-------------------------------------------------------------------------------- {% endcomment %}
<!DOCTYPE {{ site.doctype }}>
<html lang="{{ site.language }}">
-<!-- [INFO ] [j1.layout.default.html ] [Page generated: {{site.time}}] -->
-<!-- [INFO ] [j1.layout.default.html ] [Environment detected as: {{environment}}] -->
+{% comment %} Additional debug data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if page.debug %}
+<!-- [DEBUG ] [j1.layout.default.html ] [ layout data to be loaded: {{lanes_collate}} ] -->
+{% endif %}
+
+<!-- [INFO ] [j1.layout.default.html ] [ page generated: {{site.time}} ] -->
+<!-- [INFO ] [j1.layout.default.html ] [ environment detected as: {{environment}} ] -->
{% comment %} Collect the head section (region head)
------------------------------------------------------------------------------ {% endcomment %}
<head>
<!-- link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-LRlmVvLKVApDVGuspQFnRQJjkv0P7/YFrw84YYQtmYG4nK8c+M+NlmYDCv0rKWpG" crossorigin="anonymous" -->
- <!-- [INFO ] [j1.layout.default.html ] [Start|Run default_writer for region: 'head'] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ call default_writer for region: 'head' ] -->
{% include {{default_writer}} region='head' items=lanes_collate %}
- <!-- [INFO ] [j1.layout.default.html ] [End|Run default_writer for region: 'head'] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ end default_writer for region: 'head' ] -->
</head>
- {% comment %} Collect the body section (region body-*)
+ {% comment %} Collect the body section (region body-*)
------------------------------------------------------------------------------
{% if body_scrollbar %}
<body>
{% else %}
<body class="hide-scrollbar">
@@ -96,41 +106,41 @@
<body>
{% comment %} Master Wrapper to prevent "DOM flicker"
------------------------------------------------------------------------------ {% endcomment %}
- <!-- [INFO ] [j1.layout.default.html ] [Start page processing|content creation] -->
- <!-- [INFO ] [j1.layout.default.html ] [Place wrapper to prevent "DOM flicker" ] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ start page processing for region: 'body' ] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ place wrapper to prevent "DOM flicker" ] -->
<div id="no_flicker" class="nojs" >
- <!-- [INFO ] [j1.layout.default.html ] [Make page hidden] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ make page hidden ] -->
+
<script>
$("#no_flicker").css("display", "none");
</script>
{% comment %} Collect the BODY-NAVIGATION region
-------------------------------------------------------------------------- {% endcomment %}
- <!-- [INFO ] [j1.layout.default.html ] [Start|Run default_writer for region: 'body-navigation'] -->
- {% include {{default_writer}} region='body-navigation' items=lanes_collate %}
- <!-- [INFO ] [j1.layout.default.html ] [End|Run default_writer for region: 'body-navigation'] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ call default_writer for region: 'body-navigation' ] -->
+ {% include {{default_writer}} region='body-navigation' items=lanes_collate %}
+ <!-- [INFO ] [j1.layout.default.html ] [ end processing default_writer for region: 'body-navigation' ] -->
- {% comment %} Inherited CONTENT from other LAYOUTS
+ {% comment %} Inherited CONTENT from other LAYOUTS
-------------------------------------------------------------------------- {% endcomment %}
- <!-- [INFO ] [j1.layout.default.html ] [Start|Load content inherited by layout: {{ page.layout}}] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ place content inherited by layout: {{ page.layout}} ] -->
{{ content }}
- <!-- [INFO ] [j1.layout.default.html ] [End|Load: content inherited by layout: {{ page.layout}}] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ end content inherited by layout: {{ page.layout}} ] -->
{% comment %} Collect the BODY-FOOTER region
-------------------------------------------------------------------------- {% endcomment %}
- <!-- [INFO ] [j1.layout.default.html ] [Start|Run default_writer for region: 'body-footer'] -->
- {% include {{default_writer}} region='body-footer' items=lanes_collate %}
- <!-- [INFO ] [j1.layout.default.html ] [End|Run default_writer for region: 'body-footer'] -->
+ <!-- [INFO ] [j1.layout.default.html ] [ call default_writer for region: 'body-footer' ] -->
+ {% include {{default_writer}} region='body-footer' items=lanes_collate %}
+ <!-- [INFO ] [j1.layout.default.html ] [ end content_writer default_writer for region: 'body-footer' ] -->
</div>
- <!-- [INFO ] [j1.layout.default.html ] [End page processing: content creation] -->
- <!-- [INFO ] [j1.layout.default.html ] [End|Processing default writer] -->
-
+ <!-- [INFO ] [j1.layout.default.html ] [ end default writer] -->
</body>
+ <!-- [INFO ] [j1.layout.default.html ] [ end page processing ] -->
</html>
{% endcapture %}