j1_template_mde 2018.4.11 → 2018.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cedf483b5a2ea9542b1312a17a2e2c9b048b01c
-  data.tar.gz: 65aac60bfbe578d948e22eb770f794f3cf5b47d7
+  metadata.gz: be02837752a8b04d0c291d2c3052bcf07145de23
+  data.tar.gz: edac419b9bcff1dbe6c5a3d997d01753c5b904df
 SHA512:
-  metadata.gz: d11ec2f444b239c20634caaf900dab63542291d8b5350f0c687009fdcba438b0c61d404a8b7ea7ee65675e272029c020dc1531155fe455e9f40001d55ffaf39b
-  data.tar.gz: f4a681abc2f81768d8bddc3011dd039cdba7a0ef0e301f05bf8c8bf8d6aeb9f0a7c1fa2efe4c2c8aafd69e7bc637eaad41f9a3122e9844e8893fdc7cbe163919
+  metadata.gz: 77a7f3a33021dda305d3140256c3d6479e59a8dfdb6fcb40de370186829cdb4fa6c0468b6b513b13e9a8ec3dfd1acd45b7c10ac5d1ccf8ec5297faf041e96a99
+  data.tar.gz: ba0aac46409a59aec907db65b37158f9cdb1aa1f0abdfcec663dec7a21bb6dde146f3cb23797c8245a3b0469b6a44e5b453b23a29cff17b6a13453065291e982

data/_includes/themes/j1/layouts/content_generator_blog_archive.html

@@ -13,20 +13,24 @@
  #
  # -----------------------------------------------------------------------------
  # Test data:
- #  liquid_var:  {{ liquid_var | debug }}
+ #  liquid_var:      {{ liquid_var | debug }}
+ #  page_path:       {{ page_path | debug }}
+ #  page_url:        {{ page.url | remove_first:'page2/index.html' | debug }}
+ #  navigator_path:  {{ navigator_path | debug }}
  #
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
+{% capture get_page_path %}themes/{{site.template.name}}/procedures/global/get_page_path.proc{% endcapture %}
 {% capture collate_list %}themes/{{site.template.name}}/procedures/posts/collate_list.proc{% endcapture %}
 {% capture collate_calendar %}themes/{{site.template.name}}/procedures/posts/collate_calendar.proc{% endcapture %}
 {% capture collate_timeline %}themes/{{site.template.name}}/procedures/posts/collate_timeline.proc{% endcapture %}
 {% capture create_navigator %}themes/{{site.template.name}}/procedures/posts/create_navigator.proc{% endcapture %}
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign view_config_article_navigator = site.data.builder.blog_navigator.article_navigator %}
 {% assign article_navigator_description = view_config_article_navigator.description %}
 {% assign view_config_article_previewer = site.data.builder.blog_navigator.article_previewer %}
@@ -39,7 +43,7 @@
 {% assign page_rtext_size               = page.rtext_size %}
 
 {% comment %} rtext|size detection
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% if rtext %}
   {% assign rtext_size = site.data.j1_config.typography.rtext_size %}
 {% else %}
@@ -48,127 +52,130 @@
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
   <!-- split page to place a sidebar e.g. the document TOC -->
   <div class="container mb-5">
     <div class="row">
 
       <section class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content">
 
-          {% comment %} Blog Navigator
-          ----------------------------------------------------- {% endcomment %}
-          <!-- Content placed by blog_archive_content.html -->
-          <div id="blog_navigator" class="row">
-            <div class="col-md-12" role="main">
-
-              <div id="article_navigator">
-
-                {% assign navigator_base_path = "/pages/blog/navigator" %}
-
-                {% capture archive_path %}{{navigator_base_path}}/archive{% endcapture %}
-                {% capture date_view %}{{archive_path}}/dateview/{% endcapture %}
-                {% capture category_view %}{{archive_path}}/categoryview/{% endcapture %}
-                {% capture tag_view %}{{archive_path}}/tagview/{% endcapture %}
-                {% capture all_view %}{{archive_path}}/{% endcapture %}
-
-                {% comment %} https://stackoverflow.com/questions/22763180/assign-an-array-literal-to-a-variable-in-liquid-template {% endcomment %}
-                {% assign my_array = "one|two|three" | split: "|" %}
-
-                <div class="navigator-headline">
-                  <div id="navigator" class="post-headline">
-                    <h2 id="post-headline" class="mt-4">Article Navigator</h2>
-                  </div>
-
-                  <nav class="paginator">
-                    <ul class="pagination raised-z0">
-
-                      <li class="page-item"><a class="page-link" href="{{category_view | prepend: site.baseurl}}" title="View by Category">By Category</a></li>
-                      <li class="page-item"><a class="page-link" href="{{date_view | prepend: site.baseurl}}" title="View by Date">By Date</a></li>
-                      <li class="page-item"><a class="page-link" href="{{tag_view | prepend: site.baseurl}}" title="View by Tag">By Tag</a></li>
-                      <li class="page-item"><a class="page-link" href="{{all_view | prepend: site.baseurl}}" title="View All">All Posts</a></li>
-
-                    </ul>
-                  </nav> <!-- end paginator -->
-
-                  <div class="view-description ml-3 mb-3">
-                    {{article_navigator_description}}
-                  </div>
-                 </div> <!-- end navigator headline -->
-
-              </div> <!-- end blog navigator -->
-              {% comment %} End Blog Navigator
-              ------------------------------------------------- {% endcomment %}
-
-              {% comment %} Article Previewer
-              ------------------------------------------------- {% endcomment %}
-              <!-- Add Article Previewer if paginator is enabled -->
-              {% if paginate %}
-              <div id="article_previewer">
-
-                <div class="previewer-headline">
-
-                  <div class="post-headline">
-                    <h2 id="previewer" class="mt-4">Article Previews</h2>
-                  </div>
-
-                  {% comment %} Display pagination links if any
-                  --------------------------------------------- {% endcomment %}
-                  {% if paginator.total_pages > 1 %}
-                  <nav class="paginator">
-                    <ul class="pagination raised-z0">
-                      {% if paginator.previous_page %}
-                        {% if paginator.previous_page > 1 %}
-                          {% capture page_link %}{{paginator.previous_page_path}}#previewer{% endcapture %}
-                          <li class="page-item"><a class="page-link" href="{{page_link | prepend: site.baseurl}}" title="Previous page">Previous</a></li>
-                        {% else %}
-                          {% capture page_link %}{{navigator_base_path}}/#previewer{% endcapture %}
-                          <li class="page-item"><a class="page-link" href="{{page_link | prepend: site.baseurl}}" title="First page">Previous</a></li>
-                        {% endif %}
-                      {% else %}
-                          <li class="page-item disabled"><a class="page-link">First</a></li>
-                      {% endif %}
+        {% comment %} Blog Navigator
+        ---------------------------------------------------------------------- {% endcomment %}
+        <!-- Content placed by blog_archive_content.html -->
+        <div id="blog_navigator" class="row">
+          <div class="col-md-12" role="main">
 
-                      {% if paginator.next_page %}
-                          {% capture page_link %}{{paginator.next_page_path}}#previewer{% endcapture %}
-                          <li class="page-item"><a class="page-link" href="{{page_link | prepend: site.baseurl}}" title="Next page">Next</a></li>
-                      {% else %}
-                          <li class="page-item disabled"><a class="page-link">Last</a>
-                      {% endif %}
-                    </ul>
-                  </nav>
-                  {% endif %}
+            <div id="article_navigator">
 
-                  <div class="view-description ml-3 mb-3">
-                    {{article_previewer_description}}
-                  </div>
+              {% include {{get_page_path}} mode='absolute' %} 
+              {% capture navigator_path%}{{page_path}}/navigator{% endcapture %}
 
+              {% capture archive_path %}{{navigator_path}}/archive{% endcapture %}
+              {% capture date_view %}{{archive_path}}/dateview/{% endcapture %}
+              {% capture category_view %}{{archive_path}}/categoryview/{% endcapture %}
+              {% capture tag_view %}{{archive_path}}/tagview/{% endcapture %}
+              {% capture all_view %}{{archive_path}}/{% endcapture %}
+
+              {% comment %} https://stackoverflow.com/questions/22763180/assign-an-array-literal-to-a-variable-in-liquid-template {% endcomment %}
+              {% assign my_array = "one|two|three" | split: "|" %}
+
+              <div class="navigator-headline">
+                <div id="navigator" class="post-headline">
+                  <h2 id="post-headline" class="mt-4">Article Navigator</h2>
                 </div>
 
-                <div id="article_preview">
-                  <!-- Previewer selected of type: {{previewer}}-->
-                  <div id="preview_content">
-                    {% assign posts_collate = paginator.posts %}
-                    {% case previewer %}
-                      {% when 'list' %}
-                        {% include {{collate_list}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
-                      {% when 'calendar' %}
-                          {% include {{collate_calendar}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
-                      {% when 'timeline' %}
-                        {% include {{collate_timeline}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
+                <nav class="paginator">
+                  <ul class="pagination raised-z0">
+
+                    <li class="page-item"><a class="page-link" href="{{category_view | prepend: site.baseurl}}" title="View by Category">By Category</a></li>
+                    <li class="page-item"><a class="page-link" href="{{date_view | prepend: site.baseurl}}" title="View by Date">By Date</a></li>
+                    <li class="page-item"><a class="page-link" href="{{tag_view | prepend: site.baseurl}}" title="View by Tag">By Tag</a></li>
+                    <li class="page-item"><a class="page-link" href="{{all_view | prepend: site.baseurl}}" title="View All">All Posts</a></li>
+
+                  </ul>
+                </nav> <!-- end paginator -->
+
+                <div class="view-description ml-3 mb-3">
+                  {{article_navigator_description}}
+                </div>
+               </div> <!-- end navigator headline -->
+
+            </div> <!-- end blog navigator -->
+            {% comment %} End Blog Navigator
+            ------------------------------------------------------------------ {% endcomment %}
+
+            {% comment %} Article Previewer
+            ------------------------------------------------------------------ {% endcomment %}
+            <!-- Add Article Previewer if paginator is enabled -->
+            {% if paginate %}
+            <div id="article_previewer">
+
+              <div class="previewer-headline">
+
+                <div class="post-headline">
+                  <h2 id="previewer" class="mt-4">Article Previews</h2>
+                </div>            
+
+                {% comment %} Display pagination links if any
+                -------------------------------------------------------------- {% endcomment %}
+                {% if paginator.total_pages > 1 %}
+                <nav class="paginator">
+                  <ul class="pagination raised-z0">
+                    {% if paginator.previous_page %}
+                      {% if paginator.previous_page > 1 %}
+                        {% capture page_link %}{{paginator.previous_page_path}}#previewer{% endcapture %}
+                        <li class="page-item"><a class="page-link" href="{{page_link | prepend: site.baseurl}}" title="Previous page">Previous</a></li>
                       {% else %}
-                        {% include {{collate_list}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
-                    {% endcase %}
-                  </div>
+                        {% comment %} Back to FIRST page {% endcomment %}
+                        {% assign navigator = page.url | remove_first:'page2/index.html' %}
+                        {% capture page_link %}{{navigator}}#previewer{% endcapture %}
+                        <li class="page-item"><a class="page-link" href="{{page_link | prepend: site.baseurl}}" title="First page">Previous</a></li>
+                      {% endif %}
+                    {% else %}
+                        <li class="page-item disabled"><a class="page-link">First</a></li>
+                    {% endif %}
+
+                    {% if paginator.next_page %}
+                        {% capture page_link %}{{paginator.next_page_path}}#previewer{% endcapture %}
+                        <li class="page-item"><a class="page-link" href="{{page_link | prepend: site.baseurl}}" title="Next page">Next</a></li>
+                    {% else %}
+                        <li class="page-item disabled"><a class="page-link">Last</a>
+                    {% endif %}
+                  </ul>
+                </nav>
+                {% endif %}
+
+                <div class="view-description ml-3 mb-3">
+                  {{article_previewer_description}}
                 </div>
 
               </div>
-              <!-- end article previewer -->
-              {% endif %}
-              {% comment %} End Article Previewer
-              ------------------------------------------------- {% endcomment %}
 
-            </div> <!-- end col-md-12 -->
-          </div> <!-- end row blog_navigator -->
+              <div id="article_preview">
+                <!-- Previewer selected of type: {{previewer}}-->
+                <div id="preview_content">
+                  {% assign posts_collate = paginator.posts %}
+                  {% case previewer %}
+                    {% when 'list' %}
+                      {% include {{collate_list}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
+                    {% when 'calendar' %}
+                        {% include {{collate_calendar}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
+                    {% when 'timeline' %}
+                      {% include {{collate_timeline}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
+                    {% else %}
+                      {% include {{collate_list}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
+                  {% endcase %}
+                </div>
+              </div>
+
+            </div>
+            <!-- end article previewer -->
+            {% endif %}
+            {% comment %} End Article Previewer
+            ------------------------------------------------------------------ {% endcomment %}
+
+          </div> <!-- end col-md-12 -->
+        </div> <!-- end row blog_navigator -->
 
         <!-- End Content placed by blog_archive_content.html -->
         </section> <!-- end section for split page -->
@@ -181,7 +188,7 @@
       </aside> <!-- end ASIDE for split page -->
 
       {% comment %} Calc|Write the Back URL
-      --------------------------------------------------------- {% endcomment %}
+      -------------------------------------------------------------------------- {% endcomment %}
       {% if site.permalink == 'none' %}
         {% capture browser_page_url %}{{page.url | prepend: site.baseurl}}.html {% endcapture %}
       {% else %}

data/_includes/themes/j1/modules/navigator/generator.html

@@ -1,4 +1,4 @@
-{% comment %} 
+{% comment %}
  # -----------------------------------------------------------------------------
  #  ~/_includes/themes/j1/modules/navigator/generator.html
  #  Liquid HTML template to create the Navigation System for J1 Template
@@ -30,7 +30,7 @@
 
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
-
+ 
   {% comment %} Set global settings
   ------------------------------------------------------------------------------ {% endcomment %}
   {% assign nav_id                    = "navigator_nav" %}

data/_includes/themes/j1/modules/navigator/procedures/sidebar.proc

@@ -39,8 +39,9 @@
 
   {% comment %} Set sidebar properties
   ------------------------------------------------------------------------------ {% endcomment %}
-  {% assign display_theme   = sidebar_options.display_theme %}
-  {% assign close_icon      = sidebar_options.close_icon %}
+  {% assign display_user_info = sidebar_options.display_user_info %}
+  {% assign display_theme     = sidebar_options.display_theme %}
+  {% assign close_icon        = sidebar_options.close_icon %}
 
   {% if sidebar_options.icon_family == 'FontAwesome' or sidebar_options.icon_family == 'FontAwesome4' or sidebar_options.icon_family == 'FontAwesome5' %}
     {% assign icon_family = 'fa' %}
@@ -64,12 +65,79 @@
 <div id="mod_sidebar" class="side">
   <a href="#" class="close-side"><i class="{{icon_family}} {{icon_family}}-{{close_icon}} {{icon_size}}" {{icon_color}}></i></a>
 
+  {% if display_user_info %}
+
+    <!-- [INFO   ] [j1.modules.navigator.sidebar.proc   ] [theme manager detected: collect|add user details from /info endpoint] -->
+    <script>
+      $(document).ready(function() {
+        var logger;
+        var user_data   = {};
+        var dataSet     = [];
+        var logText;
+
+        logger = log4javascript.getLogger('j1.SideBar');
+
+        // Set|Detect J1 App status
+        if ( j1.existsCookie( 'j1.web.session' ) ) {
+          // Call middleware info endpoint to return current user state
+          function load_user_details() {      
+            return $.ajax({
+              url:      '/status',
+              success:  function (data) {
+                if (typeof data == 'string') {
+                  JSON.parse(data)
+                }
+                if (typeof data == 'object') {
+                  data
+                }
+              }
+            })
+          };
+          // Add|Place data when collected
+          $.when( load_user_details() ).done (
+            function( response ) {        
+              var json_data   = JSON.stringify(response);
+              var user_state  = JSON.parse(json_data);
+              var user        = user_state.user;
+              var state       = user_state.status;
+              var provider    = user_state.provider;
+              var permissions = user_state.permissions;
+              
+              logger.info('JSON data: ' + json_data);
+
+              $("#display_user_details").find('.details-user').text('User: ' + user);            
+              $("#display_user_details").find('.details-provider').text('Provider: ' + provider);
+              $("#display_user_details").find('.details-state').text('State: ' + state);
+              $("#display_user_details").find('.details-permissions').text('Permissions: ' + permissions);              
+            }); // end load_user_data
+        } else {
+          logger.info('Site detected in state: web');
+          $("#display_user_details").find('.details-user').text('User: n/a');
+          $("#display_user_details").find('.details-provider').text('Provider: n/a');
+          $("#display_user_details").find('.details-state').text('State: n/a');          
+          $("#display_user_details").find('.details-permissions').text('Permissions: n/a'); 
+        }
+      });
+    </script>
+
+    <div class="widget">
+      <h4 class="heading">User Info</h4>
+      <ul id="display_user_details" class="link">
+        <li><a class="details-user" href="#">User: n/a</a></li>        
+        <li><a class="details-provider" href="#">Provider: n/a</a></li>
+        <li><a class="details-state" href="#">State: n/a</a></li>
+        <li><a class="details-permissions" href="#">Profile: n/a</a></li>        
+      </ul>
+    </div>
+
+  {% endif %}
+
   {% if display_theme %}
     <div class="widget">
       <h4 class="heading">Theme Info</h4>
       <ul id="display_theme_details" class="link">
-        <li><a href="#" >Author: Jekyll-One</a></li>
-        <li><a href="http://getbootstrap.com/" target="blank">Version: 4-beta2</a></li>
+        <li><a href="#">Author: Jekyll-One</a></li>
+        <li><a href="http://getbootstrap.com/" target="_blank">Version: 4</a></li>
       </ul>
     </div>
 
@@ -77,15 +145,26 @@
     {% if theme_switcher.enabled %}
       <!-- [INFO   ] [j1.modules.navigator.sidebar.proc   ] [theme manager detected: add add bootstrap theme from cookie] -->
       <script>
-        // [INFO   ] [j1.modules.navigator.sidebar.proc   ] [no theme manager: load previously selected theme from cookie]
-        var themeName     = Cookies.get('{{theme_switcher.cookieThemeName}}');
-        var themeNameItem = '<li><a href="{{theme_switcher.previewPage}}">Theme: <i id="theme_name">' + themeName + '</i></a></li>';
+        var j1_user_state = {};
+        var user_state_detected;
+        var themeName;
+        var themeNameHeadline;
+
+        // Read J1 UserState cookie
+        user_state_detected = j1.existsCookie ( 'j1.user.state' );
+        if ( user_state_detected ) {
+          j1_user_state     = j1.getUserStateCookie();
+          themeName         = j1_user_state.theme_name;
+        } else {
+          themeName         = 'J1 Default';
+        }
+        var themeNameItem = '<li id="theme_name"><a href="{{theme_switcher.previewPage}}">Theme: ' + themeName + '</a></li>';
         $("#display_theme_details").prepend(themeNameItem);
       </script>
     {% else %}
       <script>
-        // [INFO   ] [j1.modules.navigator.sidebar.proc   ] [no theme manager: add bootstrap theme statically]
-        var themeNameItem = '<li><a href="{{theme_switcher.previewPage}}">Theme: <i id="theme_name">Default</i></a></li>';
+        <!-- [INFO   ] [j1.modules.navigator.sidebar.proc   ] [no theme manager detected: add bootstrap theme statically]
+        var themeNameItem = '<li id="theme_name"><a href="{{theme_switcher.previewPage}}">Theme: Default</a></li>';
         $("#display_theme_details").prepend(themeNameItem);
       </script>
     {% endif %}

data/_includes/themes/j1/procedures/collections/create_collection_article_preview.proc

@@ -33,20 +33,21 @@
 {% endcomment %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 
 {% comment %} Variables
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign articles = include.collection %}
 
-
 {% comment %} articles:  {{ articles | debug }} {% endcomment %}
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% for article in articles %}
 
+ {% comment %} article_url:  {{ article.url | debug }} {% endcomment %}
+
  <div class="article-overview clearfix mb-5">
    <div class="article-overview-heading">