j1_template_mde 2018.4.19 → 2018.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cc08a222c67c2fa2c2a707821f5c071a154e293
-  data.tar.gz: 654f49546f043ab52de64dfbc18372afd40ff92a
+  metadata.gz: fd20c69aa6082c5df52673c9ef5609efda6e49cc
+  data.tar.gz: 273e77e8727c4adee82f5524a839d4a418c775e2
 SHA512:
-  metadata.gz: e93e65766a2c5ab3067142f05cbc296725ebdaee77b0be2e9dcfb79737cfcdccc659237f37f8877a894ec06741374078bd7e043c7c4a08327d41f20e7beeccfb
-  data.tar.gz: 390dbba1ded4939d54e9380f8eb9c463b16725d6bf2b24764f2f877b34cd9e927a9a2d88ebb9471934c2282c99c71eb3a27819298ae43530cc704bf513843162
+  metadata.gz: 4e22541ecee1b8f502c0737a3e39db26beb47eea7f406ac139bbcc1dbc4e596af7e44f81a6b0a376397e5005be2c0bdb74411b9a85958eb6c6a30fd81eab7059
+  data.tar.gz: 5b12eb1447ba9c1fdc1bbbde440f14615ddeaf2f2a00c9892ad0ee5188b5b7c776a138289394172a3b4c600e341df5b81142f638932b15c6faf1ab3101738cfe

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

@@ -60,7 +60,7 @@
       <section class="col-md-9 col-xs-12 r-text-{{rtext_size}} js-toc-content">
 
         {% comment %} Blog Navigator
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         <!-- Content placed by blog_archive_content.html -->
         <div id="blog_navigator" class="row">
           <div class="col-md-12" role="main">
@@ -80,11 +80,11 @@
               {% 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="navigator" class="post-headline">
+                  <h2 id="post-headline" class="mt-4">Navigator</h2>
+                </div> -->
 
-                <nav class="paginator">
+                <nav class="paginator ml-3">
                   <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>
@@ -95,17 +95,17 @@
                   </ul>
                 </nav> <!-- end paginator -->
 
-                <div class="view-description ml-3 mb-3">
+                <!-- <div class="view-description ml-3 mb-3">
                   {{article_navigator_description}}
-                </div>
+                </div> -->
                </div> <!-- end navigator headline -->
 
             </div> <!-- end blog navigator -->
             {% comment %} End Blog Navigator
-            ------------------------------------------------------------------ {% endcomment %}
+            -------------------------------------------------------------------- {% endcomment %}
 
             {% comment %} Article Previewer
-            ------------------------------------------------------------------ {% endcomment %}
+            -------------------------------------------------------------------- {% endcomment %}
             <!-- Add Article Previewer if paginator is enabled -->
             {% if paginate %}
             <div id="article_previewer">
@@ -113,13 +113,13 @@
               <div class="previewer-headline">
 
                 <div class="post-headline">
-                  <h2 id="previewer" class="mt-4">Article Previews</h2>
+                  <h2 id="previewer" class="mt-4">Preview</h2>
                 </div>            
 
                 {% comment %} Display pagination links if any
-                -------------------------------------------------------------- {% endcomment %}
+                ---------------------------------------------------------------- {% endcomment %}
                 {% if paginator.total_pages > 1 %}
-                <nav class="paginator">
+                <nav class="paginator ml-3">
                   <ul class="pagination raised-z0">
                     {% if paginator.previous_page %}
                       {% if paginator.previous_page > 1 %}
@@ -161,18 +161,18 @@
                     {% 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 %}
+                      {% include {{collate_timeline}} items=posts_collate limit_excerpt=50 %} 
                     {% else %}
                       {% include {{collate_list}} header_title=page.header_title header_tagline=page.header_tagline items=posts_collate %}
                   {% endcase %}
                 </div>
-              </div>
+              </div> 
 
             </div>
             <!-- end article previewer -->
             {% endif %}
             {% comment %} End Article Previewer
-            ------------------------------------------------------------------ {% endcomment %}
+            -------------------------------------------------------------------- {% endcomment %}
 
           </div> <!-- end col-md-12 -->
         </div> <!-- end row blog_navigator -->

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

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

@@ -40,44 +40,33 @@
 
 
 {% comment %} Variables
-   ------------------------------------------------------------ {% endcomment %}
-
-{% assign word_list   = include.word_list %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign source      = include.source %}
-{% assign skip_words  = include.skip_words | remove: ' ' %}
-
-{% assign skip_word_array = skip_words | split:',' | sort %}
-{% assign word_array      = word_list  | split:',' | sort %}
+{% assign word_list   = include.word_list %}
+{% assign word_array  = word_list  | split:',' | sort %}
 
 {% if source == 'categories' %}
   {% assign categories = site.categories | sort %}
 {% endif %}
 
-{% assign skip = false %}
-
 
 {% comment %} Liquid procedures
-   ------------------------------------------------------------ {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 
 {% comment %} Main
-   ------------------------------------------------------------ {% endcomment %}
-
-  <div id="word-cloud" class="row ml-2 mr-3">
-    <div class="card tagbox raised-z5 mt-0 mb-5">
-      <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>
-        {% else  %}
-          <ul class="content">
-            {% if source == 'categories' %}
-            {% for tag in word_array %}
-              {% for skip_word in skip_word_array %}
-                {% if tag == skip_word %} {% assign skip = true %} {% else %} {% assign skip = false %} {% endif %}
-              {% endfor %}
-              {% if skip %} {% continue %} {% endif %}
+-------------------------------------------------------------------------------- {% endcomment %}
+<div id="word-cloud" class="row ml-2 mr-3">
+  <div class="card tagbox raised-z0 mt-0 mb-2">
+    <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>
+      {% else  %}
+        <ul class="content">
+          {% if source == 'categories' %}
+            {% for tag in word_array %}            
               <li>
                 <a class="toc-link" href="#{{tag|slugify}}">
                   {{ tag | capitalize }}
@@ -85,35 +74,22 @@
                 </a>
               </li>
             {% endfor %}
-            {% elsif source == 'tags' %}
-              {% for tag in word_array %}
-
-                {% for skip_word in skip_word_array %}
-                  {% if skip_word contains tag %} {% assign skip = true %} {% else %} {% assign skip = false %} {% endif %}
-                  {% if skip %} {% break %} {% endif %}
-                {% endfor %}
-
-                {% comment %}
-                {% assign category = tag|first %}
-                {% if category contains 'posts' %} {% assign skip = true %} {% break %} {% else %} {% assign skip = false %} {% endif %}
-                {% endcomment %}
-
-                {% if skip %} {% continue %} {% endif %}
-
-                <li>
-                  <a class="toc-link" href="#{{ tag | replace: '+','_' | replace: ' ','_' | downcase }}">
-                    {{ tag }}
-                    <span>{{ site.tags[tag] | size }}</span>
-                  </a>
-                </li>
-              {% endfor %}
-            {% else %}
-              {% unless source %} {% assign source = 'wrong parameter or missing' %} {% endunless %}
-              <b>Cannot create word cloud. <span class="color-red">Unknown SOURCE of word cloud specified: <i>{{source}}</i></span></b>
-            {% endif %}
-          </ul>
-        {% endunless %}
-
-      </div> <!-- end tag-cloud -->
-    </div><!-- end card -->
-  </div><!-- end row -->
+          {% elsif source == 'tags' %}
+            {% for tag in word_array %}
+              <li>
+                <a class="toc-link" href="#{{ tag | replace: '+','_' | replace: ' ','_' | downcase }}">
+                  {{ tag }}
+                  <span>{{ site.tags[tag] | size }}</span>
+                </a>
+              </li>
+            {% endfor %}
+          {% else %}
+            {% unless source %} {% assign source = 'wrong parameter or missing' %} {% endunless %}
+            <b>Cannot create word cloud. <span class="color-red">Unknown SOURCE of word cloud specified: <i>{{source}}</i></span></b>
+          {% endif %}
+        </ul>
+      {% endunless %}
+
+    </div> <!-- end tag-cloud -->
+  </div><!-- end card -->
+</div><!-- end row -->

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

@@ -28,6 +28,12 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% comment %} TODO: For POSTS, cuurently the ASCIIDOC macro include:: does NOT work.
+Path calculation needes to be fixed. Seems Jekyll is using different flavours
+for page_path (post|pages). 
+-------------------------------------------------------------------------------- {% endcomment %}
+
+
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
 {% capture get_page_path %}themes/{{site.template.name}}/procedures/global/get_page_path.proc{% endcapture %}

data/_includes/themes/j1/procedures/posts/collate_timeline.proc

@@ -48,6 +48,7 @@
 {% assign header_title    = false %}
 {% assign header_tagline  = false %}
 {% assign posts_collate   = include.items %}
+{% assign limit_excerpt   = include.limit_excerpt %}
 
 
 {% comment %} Main
@@ -137,17 +138,20 @@
             <!-- place_icon: {{icon_name}} -->
             <div class="timeline-body">
               <div class="timeline-tagline">
-                <i>{{ post.tagline }}</i>
+                <p class="card-subtitle text-muted">{{ post.tagline }}</p>
               </div>
-              <div class="timeline-excerpt">
+              <div class="timeline-excerpt mb-4">
+                {% assign excerpt = post.excerpt | truncatewords: 50 | strip_html | strip_newlines | strip %}
                 <i class="timeline-icon {{icon_family}} {{icon_family}}-{{icon_name}} {{icon_family}}-{{icon_size}} {{icon_family}}-{{icon_color}}"></i>
-                {{ post.excerpt }}
+                {{ excerpt }}
+              </div>
+              <div class="card-footer">
+                <a href="{{post.url}}#readmore"
+                   class="btn btn-primary btn-raised mb-0">
+                   <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
+                   </i> Read More
+                </a>
               </div>
-              <a href="{{post.url}}#readmore"
-                 class="btn btn-info btn-raised btn-round mb-3">
-                 <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
-                 </i> Read More
-              </a>
             </div>
           {% elsif place_image %}
             <!-- place_image: "{{image}}" -->
@@ -156,31 +160,37 @@
             </div>
             <div class="timeline-body">
               <div class="timeline-tagline">
-                <i>{{ post.tagline }}</i>
+                <p class="card-subtitle text-muted">{{ post.tagline }}</p>
+              </div>
+              <div class="timeline-excerpt mb-4">
+                {% assign excerpt = post.excerpt | truncatewords: 50 | strip_html | strip_newlines | strip %}
+                {{ excerpt }}
               </div>
-              <div class="timeline-excerpt">
-                {{ post.excerpt }}
+              <div class="card-footer">
+                <a href="{{post.url}}#readmore"
+                   class="btn btn-primary btn-raised mb-0">
+                   <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
+                   </i> Read More
+                </a>
               </div>
-              <a href="{{post.url}}#readmore"
-                 class="btn btn-info btn-raised btn-round mb-3">
-                 <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
-                 </i> Read More
-              </a>
             </div>
           {% else %}
             <!-- !place_icon && !place_image -->
             <div class="timeline-body">
               <div class="timeline-tagline">
-                <i>{{ post.tagline }}</i>
+                <p class="card-subtitle text-muted">{{ post.tagline }}</p>
+              </div>
+              <div class="timeline-excerpt mb-4">
+                {% assign excerpt = post.excerpt | truncatewords: 50 | strip_html | strip_newlines | strip %}
+                {{ excerpt }}
               </div>
-              <div class="timeline-excerpt">
-                {{ post.excerpt }}
+              <div class="card-footer">
+                <a href="{{post.url}}#readmore"
+                   class="btn btn-primary btn-raised mb-0">
+                   <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
+                   </i> Read More
+                </a>
               </div>
-              <a href="{{post.url}}#readmore"
-                 class="btn btn-info btn-raised btn-round mb-3">
-                 <i class="fa fa-eye fa-lg" style="color:#FFFFFF;">
-                 </i> Read More
-              </a>
             </div>
           {% endif %}
 

data/_layouts/blog_archive.html

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

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2018.4.19'
+  VERSION = '2018.4.20'
 end

data/lib/starter_web/Gemfile

@@ -46,7 +46,7 @@ gem 'jekyll', '~> 3.8.5'
 # Theme Rubies
 # Default: J1 Template
 #
-gem 'j1_template_mde', '~> 2018.4.19'
+gem 'j1_template_mde', '~> 2018.4.20'
 
 # --------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -60,7 +60,7 @@ environment:                            development
 #   anything here because version information is bumped-in by
 #   the build process
 #
-version:                                2018.4.19
+version:                                2018.4.20
 
 
 # ==============================================================================

data/lib/starter_web/_data/modules/j1_navigator_menu.yml

@@ -59,19 +59,19 @@
 
 - item:                                 Blog
   sublevel:
-    - title:                            Article Navigator
+    - title:                            Blog Navigator
       href:                             /pages/public/blog/navigator/
       icon:                             navigation
-    - title:                            Category Viewer
+    - title:                            Category View
       href:                             /pages/public/blog/navigator/archive/categoryview/
       icon:                             pin
-    - title:                            Date Viewer
+    - title:                            Date View
       href:                             /pages/public/blog/navigator/archive/dateview/
       icon:                             calendar
     - title:                            Tag Viewer
       href:                             /pages/public/blog/navigator/archive/tagview/
       icon:                             tag
-    - title:                            All Posts
+    - title:                            View all Posts
       href:                             /pages/public/blog/navigator/archive/
       icon:                             archive
 

data/lib/starter_web/assets/data/panel.html

@@ -302,7 +302,7 @@ regenerate:                             true
 
             {% if card_type == "service" and card_enabled %}
               <div class="col-md-{{card_width_md}} col-sm-{{card_width_md}} col-xs-12">
-                <div class="card card-flat card-profile mb-4 raised-z0">
+                <div class="card card-flat card-profile mb-0 raised-z0">
 
                   <div class="card-icon">
                     <!-- a href="{{site.url}}{{card_href}}" -->

data/lib/starter_web/assets/themes/j1/core/css/theme_extensions.css

@@ -471,9 +471,7 @@ h2.accordion-box:after {
   padding: 15px 30px; }
 
 .banner-divider {
-  margin-top: 3.5rem !important;
   margin-right: 5rem !important;
-  margin-bottom: 3.5rem !important;
   margin-left: 5rem !important;
   border-bottom: solid 1px #E0E0E0; }
 
@@ -741,6 +739,9 @@ h2.accordion-box:after {
 .card .card-title {
   color: #616161; }
 
+a.card-title:hover {
+  text-decoration: none; }
+
 .card h1.card-title,
 .card h2.card-title,
 .card h3.card-title,
@@ -1682,7 +1683,6 @@ h2.timeline-header-box:after {
   font-weight: 400;
   margin: 0 0 -1px 0;
   padding-bottom: 5px;
-  padding-left: 10px;
   display: inline-block;
   border-bottom: 1px dotted #3465a4; }
 
@@ -1797,7 +1797,7 @@ a.timeline-list-unstyled:hover {
   width: 10px;
   height: 10px;
   position: absolute;
-  background: #3465A4;
+  background: #3F51B5;
   margin: 0 0 0 -5px;
   box-shadow: 0 0 0 4px #E5E5E5;
   -webkit-font-smoothing: antialiased; }
@@ -2785,7 +2785,7 @@ ul.service-list > li > a:hover {
 
 .post-search-results .link-news li {
   /* padding: 12px 0px; */
-  border-top: solid 1px #353535; }
+  /* border-top: solid 1px #353535; */ }
 
 .post-search-results .link-news li:first-child {
   padding-top: 0;
@@ -3555,61 +3555,6 @@ ul.posts li a:hover {
 .related-posts li a:hover small {
   color: inherit; }
 
-/* jadams, 2017-11-21: disabled pagination styles */
-/*
-.pagination {
-    overflow: hidden;
-    margin-left: -1rem;
-    margin-right: -1rem;
-    font-family: "PT Sans", Helvetica, Arial, sans-serif;
-    color: #ccc;
-    text-align: center
-}
-
-.pagination-item {
-    display: block;
-    padding: 1rem;
-    border: 1px solid #eee
-}
-
-.pagination-item:first-child {
-    margin-bottom: -1px
-}
-
-a.pagination-item:hover {
-    background-color: #f5f5f5
-}
-
-@media (min-width: 30em) {
-    .pagination {
-        margin:3rem 0
-    }
-
-    .pagination-item {
-        float: left;
-        width: 50%
-    }
-
-    .pagination-item:first-child {
-        margin-bottom: 0;
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px
-    }
-
-    .pagination-item:last-child {
-        margin-left: -1px;
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px
-    }
-}
-*/
-/*
-.tags > h1, h2 {
-    font-size: 5rem !important;
-    margin-top: 2rem !important;
-    margin-bottom: 1rem !important;
-}
-*/
 /*  Tag Cloud classes
     Inspired by Justin James.
     See: http://digitaldrummerj.me/,
@@ -3641,31 +3586,25 @@ a.pagination-item:hover {
 .tag-cloud ul li a {
   position: relative;
   display: inline-block;
-  /* max-width: 250px; */
-  /* height: 40px; */
-  line-height: 28px;
+  line-height: 1.75rem;
   padding: 0 2em 0 1em;
-  background-color: #E91E63;
-  /* border: 1px solid #aaa; */
+  background-color: #3F51B5;
   border-radius: 3px;
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
-  color: #fff;
-  font-size: 1.5rem !important;
+  color: #FAFAFA;
+  font-size: 1rem !important;
   font-weight: 400;
   text-decoration: none;
   -webkit-transition: .2s;
   transition: .2s; }
 
 .tag-cloud ul li a:hover {
-  background-color: #3498db;
-  /* border: 1px solid #3498db; */
-  color: #fff; }
+  background-color: #1A237E; }
 
 .tag-cloud ul li a:hover span {
-  background-color: #fff;
-  color: #3498db; }
+  color: #1A237E; }
 
 .tag-cloud ul li span {
   position: absolute;