classic-jekyll-theme 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c211ddb03c8c8cd4897ea18c9cef5706cddaf4b9
-  data.tar.gz: 03e7ac9afe4204600bf0978262c4ad65865d93ee
+  metadata.gz: 9a74c09ff42b77a154bb68070ae3769272335ead
+  data.tar.gz: b3065096bbc0ab68446f708ee1ca09e4d27b2df8
 SHA512:
-  metadata.gz: 2a0334e7f1f6dbcd97774103aae5dfbf345e4c3d1f29ad79e9af392a212b061ff82b574728cd6660203d2d564cb86bb41b1ca2941e0bbfeecdbbedf2546967ad
-  data.tar.gz: 475b5e93472c808baa1873d1152810b1b9a0e8b5a4c3bfed0cefd85d3bdee1322c01d84d116c5b8e004a2ad36108c19b9d5c44093e1a5f6e146d5502f40bc4e7
+  metadata.gz: 7b28e79f5fbbec9ee6131f268a3468668fe27baa75dfc9d5535dcaace04962592a2b7ccba8022a87ff7d4647bce7748230b0e71750df5a1774963d88ea1e88f4
+  data.tar.gz: e1ca018f9e1889d58499823b8b8638eba072c62cde0460986e67931291ca904868cf27d800da48707f67b061adab06e7f6a18b47569037358e6998e32201132c

data/README.md

@@ -1,4 +1,4 @@
-# Classic-Jekyll-Theme v1.6.0
+# Classic-Jekyll-Theme v1.7.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: wide, medium and narrow. It is probably best shown in an example:
 
@@ -24,10 +24,12 @@ 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 visit a site using this theme: [365posts.com](http://www.365posts.com) or [Balancing Rock](http://www.balancingrock.nl)
 
 Other features:
 
+- __Secondary and Tertiary Columns__ can be specified by default and on a page by page basis for presence, location and content.
+
 - __Navigation bar__ 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.
 
 - __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.
@@ -120,17 +122,17 @@ The default `main.scss` file has been emptied. Hence all CSS configuration is do
 
 The following values are configurable:
 
-- secondary_column:
+- secondary-column:
 
-	Controls the placing of the secondary column on either the `left` side, the `right` side or `none` at all.
+	Controls the default placing of the secondary column on either the `left` side, the `right` side or `none` at all. Note that the YAML front matter variable `secondary-column` can be used to override this value on a per-page basis.
 
-	When the secondary column is present its contents is taken from the file: `_includes/secondary-column.html`
+	When the secondary column is present its contents is taken from the file: `_includes/secondary-column.html`. Note that this can be overriden by the YAML front matter variable `secondary-column-content`.
 
-- tertiary_column:
+- tertiary-column:
 
-	Controls the presence of the tertiary column, either `present` or `none`.
+	Controls the default presence of the tertiary column, either `present` or `none`. Note that the YAML front matter variable `tertiary-column` can be used to override this value on a per-page basis.
 
-	When the tertiary column is present its contents is taken from the file: `_includes/tertiary-column.html`
+	When the tertiary column is present its contents is taken from the file: `_includes/tertiary-column.html`.  Note that this can be overriden by the YAML front matter variable `tertiary-column-content`.
 
 - number-of-posts-on-home-page:
 
@@ -233,6 +235,22 @@ To create a page that must be included in the menu bar, add the following front
 
 For a consistent user experience in the narrow layout, it is recommened not to link pages to top level menu items if these menu items have a drop-down submenu.
 
+##Creating pages with custom second and tertiary columns
+
+There are 4 YAML tags that control the custom placement and content of the secondary and tertiary columns:
+    
+    ---
+    ...
+    secondary-column: <'left'|'right'|'none'>
+    secondary-column-content: <include-file>
+    tertiary-column: <'present'|'none'>
+    tertiary-column-content: <include-file>
+    ---
+
+These YAML variables can be used to override the default settings and provide custom content for the columns.
+
+Notice that these settings take effect by their presence. Example: if a `secondary-column` YAML variable is present, it will prevent the global setting in the _data/seup.yml fro taking any effect.
+
 ## Specifying html header description meta tag content for pages
 
 The "description" meta tag is possibly the most important SEO information that we can put in our pages. It shows up as the "description" for a link in search engines. Jekyll does support this as the "excerpt" tag in YAML front matter. And if the "excerpt" is not defined, Jekyll will grab the first part of the post as its description. However, for pages there was no such support. As of verion 1.5.2 this theme adds a limited form of this support. If a page defines an excerpt in its YAML front matter, that excerpt information will be used as the information in a description meta tag.
@@ -345,6 +363,10 @@ Release 1.6.0
 
 - Added support for content blocks. The new include and support definitions make it easy to create a 'blocked' layout. Whole or partially. To see the example, download the theme from github and run it with "bundle exec jekyll serve". Then select the menu item "Other -> Content blocks". Or visit [http://balancingrock.nl](http://balancingrock.nl) which uses this theme and has the blocked layout on the home page.
 
+Release 1.7.0
+
+- Added support for custom column settings & content on a page by page basis.
+
 ## Upgrade information
 
 ### from 0.2.6 to 1.0.0
@@ -489,6 +511,13 @@ The index for a menu item. If not present, the menu ordering is undetermined. If
 - Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
 - The file `_sass/_support.html` was updated.
 
+### from 1.6.0 to 1.7.0
+
+- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
+- The files `_layouts/default.html`, `_data/setup.yml` have been updated.
+	- Note that the global variable _secondary_column_ has been changed to _secondary-column_.
+	- And _tertiary_column_ has been changed to _tertiary-column_.
+
 ## Feedback
 
 Comments, bug reports, feature requests and improvements are eagerly anticipated via email: rien@balancingrock.nl.

data/_data/setup.yml

@@ -8,10 +8,10 @@
 # If the tertiary column is used, the secondary column *must* also be used.
 
 # Possible values: 'left', 'right' or 'none', other values are illegal.
-secondary_column: left
+secondary-column: left
 
 # Possible values: 'present' or 'none', other values are illegal.
-tertiary_column: present
+tertiary-column: present
 
 # For the number of posts visible on the home page. Must be > 0.
 number-of-posts-on-home-page: 5

data/_layouts/default.html

@@ -1,4 +1,8 @@
 <!DOCTYPE html>
+{% if page.secondary-column %}{% if page.secondary-column == 'left' %}{% assign secondary-column = 'left' %}{% endif %}{% if page.secondary-column == 'right' %}{% assign secondary-column = 'right' %}{% endif %}{% else %}{% if site.data.setup.secondary-column == 'left' %}{% assign secondary-column = 'left' %}{% endif %}{% if site.data.setup.secondary-column == 'right' %}{% assign secondary-column = 'right' %}{% endif %}{% endif %}
+{% if page.secondary-column-content %}{% assign secondary-column-content = {{ page.secondary-column-content }} %}{% else %}{% assign secondary-column-content = 'secondary-column.html' %}{% endif %}
+{% if page.tertiary-column %}{% if page.tertiary-column == 'present' %}{% assign tertiary-column = 'present' %}{% endif %}{% else %}{% if site.data.setup.tertiary-column == 'present' %}{% assign tertiary-column = 'present' %}{% endif %}{% endif %}
+{% if page.tertiary-column-content %}{% assign tertiary-column-content = page.tertiary-column-content %}{% else %}{% assign tertiary-column-content = 'tertiary-column.html' %}{% endif %}
 <html>
 
 	{% include head.html %}
@@ -9,16 +13,16 @@
 
 		<div class="column-panel">
 
-			{% if site.data.setup.secondary_column == 'left' %}
+			{% if secondary-column == 'left' %}
 			<div class="secondary-column">
 				<div class="secondary-column-content">{% include secondary-column.html %}</div>
-				{% if site.data.setup.tertiary_column == 'present' %}	
+				{% if tertiary-column == 'present' %}	
 					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>
 				{% endif %}
 			</div>
 			<div class="secondary-divider"></div>
 			{% else %}
-				{% if site.data.setup.tertiary_column == 'present' %}
+				{% if tertiary-column == 'present' %}
 				<div class="tertiary-column">
 					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>
 				</div>
@@ -32,16 +36,16 @@
 			</div>
 			
 			
-			{% if site.data.setup.secondary_column == 'right' %}
+			{% if secondary-column == 'right' %}
 			<div class="secondary-divider"></div>			
 			<div class="secondary-column">
 				<div class="secondary-column-content">{% include secondary-column.html %}</div>
-				{% if site.data.setup.tertiary_column == 'present' %}	
+				{% if tertiary-column == 'present' %}	
 					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>
 				{% endif %}
 			</div>
 			{% else %}
-			   {% if site.data.setup.tertiary_column == 'present' %}
+			   {% if tertiary-column == 'present' %}
 				<div class="tertiary-divider"></div>
 				<div class="tertiary-column">
 					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>

data/pages/contact/contact.md

@@ -5,6 +5,7 @@ menuInclude: true
 menuTopTitle: Contact
 menuTopIndex: 99
 excerpt: Contact information for this site.
+tertiary-column: none
 ---
 
 Publish your contact information on this page.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classic-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Rien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-feed