classic-jekyll-theme 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 563de332f91ec382d8a30e4d65166f0d0105616a
-  data.tar.gz: eb4872f6c0c0daf0406b8c7aa721e126e85adf61
+  metadata.gz: '026331531369ab57c53c0cbde7a55b910eeed4f2'
+  data.tar.gz: f551d41260ca4a3738cbbb51bd103d5e28f6e85a
 SHA512:
-  metadata.gz: 0f741d01eb3e392c28e8527ca4997ecc6cf3056696aee44cba608ff4bb5e2e76247867e416b9cae2d3f74f6b1d93f2479c3768dea1d688357f5fcbd5ca590558
-  data.tar.gz: 145245cdf593762e921f4e4c30a2a041ccbba354fd130dc0dcc2b27f0a09b0f8b431c22b558c0d25ae8bd37602eb7f52be998602dcdd81d0a107beaff9efd98b
+  metadata.gz: d915b8ab52b1c0553f5e8599b20a7274215bcf364a2859e6e048c653d83c40076e0c795128d79d07a5914b842d5038d324ccbb811e075c6e5275cacf64736a68
+  data.tar.gz: ba2a4369d471e88d8f4bcba36780c8ed25b5308a0cebd13e333a0370bb71115d1d4d983d8ffbe1a4f7b6d58da95ae22847bf1ee12ae7f00271cfd5f554663148

data/README.md

@@ -1,4 +1,4 @@
-# Classic-Jekyll-Theme v2.3.0
+# Classic-Jekyll-Theme v2.4.0
 
 Welcome to Classic-Jekyll-Theme. This theme centers around one of the most used website structures on the web. A banner, navigation menu (dropdown), (up to) three columns and a footer. The design is fully responsive for three different screen widths: widest, medium and narrow. It is probably best shown in an example:
 
@@ -24,7 +24,7 @@ An example screenshot:
 
 ![example](http://balancingrock.nl/assets/img/classic-jekyll-theme-screenshot-half.png)
 
-Or visit a site using this theme: [365posts.com](http://www.365posts.com) or [Balancing Rock](http://www.balancingrock.nl)
+Or visit a site using this theme like [Balancing Rock](http://www.balancingrock.nl)
 
 Other features:
 
@@ -32,6 +32,8 @@ Other features:
 
 - __Navigation bar with drop-down menu__ is created automatically from the available pages when these have the proper YAML frontmatter. The navigation bar contains the top level menu items, while the submenu items show up as a drop-down menu when the cursor hovers over the corresponding menu item. Hovering over submenu item brings up the sub-submenu items.
 
+- __Create the menu__ from either Posts and/or Pages.
+
 - __Category pages__ are created semi-automatically; the web designer has to identify the categories for inclusion, but the menu entry and category pages are created automatically.
 
 - __Cookies policy__ for european users is included by default. It can be easily disabled for non-european websites.
@@ -84,6 +86,7 @@ Please see [http://balancingrock.github.io/classic-jekyll-theme](http://balancin
 - [Release 2.1.1 (2018-01-22)](http://balancingrock.github.io/classic-jekyll-theme/classic/2017/12/22/bugfix-2-1.html)
 - [Release 2.2.0 (2018-02-02)](http://balancingrock.github.io/classic-jekyll-theme/classic/2018/02/02/release-2-2-0.html)
 - [Release 2.3.0 (2018-02-05)](http://balancingrock.github.io/classic-jekyll-theme/classic/2018/02/05/release-2-3-0.html)
+- [Release 2.4.0 (2019-01-15)](http://balancingrock.github.io/classic-jekyll-theme/classic/2019/01/15/release-2-4-0.html)
 
 ## Suport & Feedback
 

data/_data/setup.yml

@@ -114,7 +114,22 @@ generate-categories-menu: no
 # Note 2: When a separate navbanner file is used the menubar will not be able to highlight the active page.
 #
 # Hint: Keep this option set to 'yes' during content creation or site development (when jekyll auto regeneration is used). Then switch it back to 'no' for the version that is published.
-
+#
 use-separate-banner-menubar-file: no
 
+# Exclude pages from the menu structure. Note that this uses negative logic for backwards compatibility.
+# Values: yes | no
+# - yes: Pages will not be included in any menu structure
+# - no: Pages will be included in all menu structures
+#
+exclude-pages-from-menus: no
+
+# Included posts in any menu structure.
+# Values: yes | no
+# - yes: Posts will be scanned for inclusion in all menu structures.
+# - no: Posts will be excluded from the menu structures.
+#
+include-posts-in-menus: yes
+
+
 # End of file

data/_includes/menubar.html

@@ -10,13 +10,20 @@
 	
 	{%- assign buildTimeInSecondsSinceEpoch = site.time | date: "%s" | plus: 0 -%}
 	
-	{%- assign pagesForPublishing = "" | split: "" -%}
-	{%- for ape in site.pages -%}
-		{%- assign pageInSecondsSindsEpoch = ape.date | date:"%s" | plus: 0 -%}
-		{%- if pageInSecondsSindsEpoch < buildTimeInSecondsSinceEpoch -%}
-		    {%- assign pagesForPublishing = pagesForPublishing | push: ape -%}
-		{%- endif -%}
-    {%- endfor -%}
+    {%- assign pagesForPublishing = "" | split: "" -%}
+
+	{%- if site.data.setup.exclude-pages-from-menus -%}{%- else -%}
+	    {%- for ape in site.pages -%}
+		    {%- assign pageInSecondsSindsEpoch = ape.date | date:"%s" | plus: 0 -%}
+		    {%- if pageInSecondsSindsEpoch < buildTimeInSecondsSinceEpoch -%}
+		        {%- assign pagesForPublishing = pagesForPublishing | push: ape -%}
+		    {%- endif -%}
+        {%- endfor -%}
+    {%- endif -%}
+	
+	{%- if site.data.setup.include-posts-in-menus -%}
+		{%- assign pagesForPublishing = pagesForPublishing | concat: site.posts -%}
+	{%- endif -%}
 	
 	{%- assign topTitles = "" | split: "" -%}
 	{%- assign sortedPages = pagesForPublishing | where:'menuInclude', true | where_exp:'item', 'item.menuTopTitle != nil' | sort: 'menuTopIndex', 'last' -%}
@@ -170,7 +177,11 @@
 				{%- if ape.menuLink == false %}
 				<p class="paddingAsLink">{{ topTitle }}</p>
 				{%- else %}
+				    {%- if ape.url contains "http" -%}
+				<a href="{{ ape.url }}"><p>{{ topTitle }}</p></a>
+					{%- else -%}
 				<a href="{{ ape.url | relative_url }}"><p>{{ topTitle }}</p></a>
+				    {%- endif -%}
 				{%- endif -%}
 				{%- assign pageFound = true -%}
 				{%- break -%}
@@ -182,7 +193,11 @@
 					{%- if ape.menuLink == false %}
 				<p class="paddingAsLink">{{ topTitle }}</p>
 					{%- else %}
+					    {%- if ape.url contains "http" -%}
+				<a href="{{ ape.url }}"><p>{{ topTitle }}</p></a>
+				        {%- else -%}
 				<a href="{{ ape.url | relative_url }}"><p>{{ topTitle }}</p></a>
+				        {%- endif -%}
 					{%- endif -%}
 					{%- assign pageFound = true -%}
 					{%- break -%}
@@ -322,7 +337,11 @@
 						{%- endif %}
 					</label>
 					<div class="text">
+						{%- if sortedSubMenuUrls[forloop.index0] contains "http" -%}
+						<a href="{{ sortedSubMenuUrls[forloop.index0] }}"><p>{{ subMenuTitle }}</p></a>
+						{%- else -%}
 						<a href="{{ sortedSubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subMenuTitle }}</p></a>
+						{%- endif -%}
 					</div>
 				</div>
 					{%- else -%}
@@ -367,7 +386,11 @@
 						<div class="title">
 							<div class="symbol"><p></p></div>
 							<div class="text">
+							    {%- if sortedSubsubMenuUrls[forloop.index0] contains "http" -%}
+								<a href="{{ sortedSubsubMenuUrls[forloop.index0] }}"><p>{{ subsubMenuTitle }}</p></a>
+								{%- else -%}
 								<a href="{{ sortedSubsubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subsubMenuTitle }}</p></a>
+								{%- endif -%}
 							</div>
 						</div>
 							{%- else %}
@@ -439,7 +462,11 @@
 				<div class="title">
 					<div class="symbol"></div>
 					<div class="text">
+					{%- if cat.url contains "http" -%}
+						<a href="{{ cat.url }}"><p>{{ cat.title | capitalize }}</p></a>
+					{%- else -%}
 						<a href="{{ cat.url | relative_url }}"><p>{{ cat.title | capitalize }}</p></a>
+					{%- endif -%}
 					</div>
 				</div>
 			</div>

data/_includes/vertical-menu.html

@@ -16,17 +16,23 @@
 	<div class="topTitle"><h1>{{ topTitle }}</h1></div>
 	<div class="vmenu">
 
-	{%- comment -%}<!-- Find all pages that belong to the menuTopTitle of this page -->{%- endcomment -%}
+	{%- comment -%}<!-- Find all entries that belong to the menuTopTitle of this document -->{%- endcomment -%}
 	
 	{%- assign buildTimeInSecondsSinceEpoch = site.time | date: "%s" | plus: 0 -%}
 	
-	{%- assign pagesForPublishing = "" | split: "" -%}
-	{%- for ape in site.pages -%}
-		{%- assign pageInSecondsSindsEpoch = ape.date | date:"%s" | plus: 0 -%}
-		{%- if pageInSecondsSindsEpoch < buildTimeInSecondsSinceEpoch -%}
-		    {%- assign pagesForPublishing = pagesForPublishing | push: ape -%}
-		{%- endif -%}
-    {%- endfor -%}
+	{%- if site.data.setup.exclude-pages-from-menus -%}{%- else -%}
+	    {%- for ape in site.pages -%}
+		    {%- assign pageInSecondsSindsEpoch = ape.date | date:"%s" | plus: 0 -%}
+		    {%- if pageInSecondsSindsEpoch < buildTimeInSecondsSinceEpoch -%}
+		        {%- assign pagesForPublishing = pagesForPublishing | push: ape -%}
+		    {%- endif -%}
+        {%- endfor -%}
+    {%- endif -%}
+	
+	{%- if site.data.setup.include-posts-in-menus -%}
+		{%- assign pagesForPublishing = pagesForPublishing | concat: site.posts -%}
+	{%- endif -%}
+
 
 	{%- assign topTitlePages = pagesForPublishing | where:'menuInclude', true | where:'menuTopTitle', topTitle -%}
 			
@@ -224,7 +230,11 @@
 			<div class="sub-isActivePage">
 				<div class="disclosure"><p></p></div>
 				<div class="title">
+					{%- if sortedSubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubMenuUrls[forloop.index0] }}"><p>{{ subMenuTitle }}</p></a>
+					{%- else -%}
 					<a href="{{ sortedSubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subMenuTitle }}</p></a>
+					{%- endif -%}
 				</div>
 			</div>
 				{%- else %}
@@ -236,14 +246,22 @@
 			<div class="sub-isActivePage">
 				<div class="disclosure"><p></p></div>
 				<div class="title">
+						{%- if sortedSubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubMenuUrls[forloop.index0] }}"><p>{{ subMenuTitle }}</p></a>
+						{%- else -%}
 					<a href="{{ sortedSubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subMenuTitle }}</p></a>
+						{%- endif -%}
 				</div>
 			</div>
 					{%- else %}
 			<div class="sub-hasLink">
 				<div class="disclosure"><p></p></div>
 				<div class="title">
+						{%- if sortedSubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubMenuUrls[forloop.index0] }}"><p>{{ subMenuTitle }}</p></a>
+						{%- else -%}
 					<a href="{{ sortedSubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subMenuTitle }}</p></a>
+						{%- endif -%}
 				</div>
 			</div>
 					{%- endif -%}
@@ -263,7 +281,11 @@
 					<p class="symbol"><!-- will be filled by disclosure indicator --></p>
 				</label>
 				<div class="title">
+					{%- if sortedSubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubMenuUrls[forloop.index0] }}"><p>{{ subMenuTitle }}</p></a>
+					{%- else -%}
 					<a href="{{ sortedSubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subMenuTitle }}</p></a>
+					{%- endif -%}
 				</div>
 			</div>
 				{%- else %}
@@ -278,7 +300,11 @@
 					<p class="symbol"><!-- will be filled by disclosure indicator --></p>
 				</label>
 				<div class="title">
+						{%- if sortedSubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubMenuUrls[forloop.index0] }}"><p>{{ subMenuTitle }}</p></a>
+						{%- else -%}
 					<a href="{{ sortedSubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subMenuTitle }}</p></a>
+						{%- endif -%}
 				</div>
 			</div>
 					{%- else %}
@@ -288,7 +314,11 @@
 					<p class="symbol"><!-- will be filled by disclosure indicator --></p>
 				</label>
 				<div class="title">
+						{%- if sortedSubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubMenuUrls[forloop.index0] }}"><p>{{ subMenuTitle }}</p></a>
+						{%- else -%}
 					<a href="{{ sortedSubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subMenuTitle }}</p></a>
+						{%- endif -%}
 				</div>
 			</div>
 					{%- endif -%}
@@ -311,14 +341,22 @@
 			<div class="subsub-isActivePage">
 				<div class="disclosure"><p></p></div>
 				<div class="title">
+						{%- if sortedSubsubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubsubMenuUrls[forloop.index0] }}"><p>{{ subsubTitle }}</p></a>
+						{%- else -%}
 					<a href="{{ sortedSubsubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subsubTitle }}</p></a>
+						{%- endif -%}
 				</div>
     		</div>
 					{%- else %}
 			<div class="subsub-hasLink">
 				<div class="disclosure"><p></p></div>
 				<div class="title">
+						{%- if sortedSubsubMenuUrls[forloop.index0] contains "http" -%}
+					<a href="{{ sortedSubsubMenuUrls[forloop.index0] }}"><p>{{ subsubTitle }}</p></a>
+						{%- else -%}
 					<a href="{{ sortedSubsubMenuUrls[forloop.index0] | relative_url }}"><p>{{ subsubTitle }}</p></a>
+						{%- endif -%}
 				</div>
     		</div>
 					{% endif -%}

data/_sass/classic/_banner-area.scss

@@ -125,17 +125,21 @@
 			@include narrow-layout { height: $banner-icon-height-narrow; }
 			@include medium-layout { height: $banner-icon-height-medium; }
 			@include widest-layout { height: $banner-icon-height-widest; }
-				
-			// Content (icon image)
-			@include narrow-layout { content: $banner-icon-url-narrow; }
-			@include medium-layout { content: $banner-icon-url-medium; }
-			@include widest-layout { content: $banner-icon-url-widest; }
-				
+							
 			// Background
 			@include narrow-layout { background: $banner-icon-background-narrow; }
 			@include medium-layout { background: $banner-icon-background-medium; }
 			@include widest-layout { background: $banner-icon-background-widest; }			
 		}
+		
+		// Content (icon image)
+		// Note: Firefox needs the 'after' attribute to display the icon. Other browsers seem fine without it.
+		// Issue no 19.
+		.banner-icon::after {
+			@include narrow-layout { content: $banner-icon-url-narrow; }
+			@include medium-layout { content: $banner-icon-url-medium; }
+			@include widest-layout { content: $banner-icon-url-widest; }
+		}
 	}
 		
 	.title-area-container {

data/_sass/classic/_menubar.scss

@@ -236,17 +236,23 @@
 			@include medium-layout {
 				width: $menubar-icon-width-medium;
 				height: $menubar-icon-height-medium;
-				content: $menubar-icon-url-medium;
 				padding: $menubar-icon-padding-medium;
 			}
 			@include widest-layout {
 				width: $menubar-icon-width-widest;
 				height: $menubar-icon-height-widest;
-				content: $menubar-icon-url-widest;
 				padding: $menubar-icon-padding-widest;
 			}
 		}
 
+		// Content (icon image)
+		// Note: Firefox needs the 'after' attribute to display the icon. Other browsers seem fine without it.
+		// Issue no 19.
+		.menubar-icon:after {
+			@include medium-layout { content: $menubar-icon-url-medium; }
+			@include widest-layout { content: $menubar-icon-url-widest; }
+		}
+
 		.item-separator {
 	
 			@include medium-layout {
@@ -506,4 +512,4 @@
 			@include widest-layout { background: $menubar-item-background-selected-widest; }
 		}
 	}
-}
+}

data/pages/classic/05-menus.md

@@ -53,8 +53,6 @@ After the initiation use a `-` symbol to start a new sub menu item like this:
 	---
 
 This example is discussed below.
-
-__Important limitation__: each menuSubs-title can only be defined in 1 page. Attempting to define them in more than 1 page will lead to duplication in the menu itself.
 	
 #### menuTopTitle
 
@@ -118,5 +116,3 @@ Sub-sub-menu items are created in the same way the sub-items are created, but us
 This will create two sub-sub menu items under the _cattle_ entry.
 
 For the sub-sub menu entries the same tags as for the sub-menus can be used. (`link`, `index`, `url` and `anchorId`)
-
-__Attention__: Sub-sub menu entries can only be defined in a single page!

data/pages/jekyll/01-jekyll.md

@@ -21,15 +21,15 @@ The static pages were replaced by scripting languages and database backends. Nee
 
 However as good as Wordpress (and others) might be, they do not simplify the underlying structure. They merely hide it from the site-developper. Add plugins to this, and instability of the platform becomes a real possibility. I know, I lost entire websites -more than once!- because of this.
 
-After the initial embrace of dynamic this and dynamic that, many people started to rediscover the old way of creating websites. Static websites are -as it turns out- more than enough for many small sites or blogs! Certainly with the new wave of "comments" providers as disqus.
+After the initial embrace of dynamic this and dynamic that, many people started to rediscover the old way of creating websites. Static websites are -as it turns out- more than enough for many small sites or blogs! Certainly with the new wave of "comment" providers like disqus.
 
 Creating a simple website using a comments provider is still a bit of work though.
 
 Enter the static website generator.
 
-Static websites generators take a lot of pain out of traditional web design. And when using a theme (like this!) this becomes even simpler.
+Static websites generators take a lot of pain out of traditional web design. And when using a theme (like this!) this becomes even easier.
 
-Creating content now is simply a matter of writing the content in a (plain) text editor, then compiling the website and uploading it (or only the changes) to the hosting provider.
+Creating content is now just a matter of writing the content in a (plain) text editor, then compiling the website and uploading it (or only the changes) to the hosting provider.
 
 Simple, neat.
 

data/pages/menus/external-url.md

@@ -0,0 +1,28 @@
+---
+layout: page
+menuInclude: yes
+menuLink: yes
+menuTopTitle: Menus
+menuSubs:
+- title: External link
+  index: 5
+  sub:
+  - title: Balancingrock
+    url: http://www.balancingrock.nl/picture.html
+excerpt: "An excerpt is used as the page description and can be up to 160 characters long..."
+---
+### External Link
+
+Menu's can also link to external pages. Just prepend the URL with the proper domain like below. To test this, select the sub-sub menu `Balancingrock` from this entry.
+
+    ---
+    layout: page
+    menuInclude: yes
+    menuTopTitle: Menus
+    menuSubs:
+    - title: External link
+      index: 5
+      sub:
+      - title: Balancingrock
+        url: http://www.balancingrock.nl/picture.html
+    ---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classic-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Rien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -211,6 +211,7 @@ files:
 - pages/layouts/sec-left-ter-right.md
 - pages/layouts/sec-right-no-ter.md
 - pages/layouts/sec-right-ter-left.md
+- pages/menus/external-url.md
 - pages/menus/landing-page.md
 - pages/menus/submenu-subsections.md
 - pages/menus/submenu1.md
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A responsive 1, 2 or 3 column theme for wide, medium and narrow displays