classic-jekyll-theme 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e349d97787e87baf0b215a400ad409efa670ac2f
-  data.tar.gz: d082daa61cc7af8e2a02a06336157d8f1820fef8
+  metadata.gz: 4740375dbd332a0c6cebc64ba6593e7c36a59b54
+  data.tar.gz: 2456e1de193797b1c8a1a34a5615de22dff7bc96
 SHA512:
-  metadata.gz: 5376facb95de295d71cc5fd5b17a671eb4749a6c6c9cef305f37e0c668eff0893ed6f1c0fc30fd2190c1a09f78d2946e90246b000ff4aceb34b3a1a6cda4b211
-  data.tar.gz: 390eb699e81f43f5d820e412180b52e6dea0257b59e3021f25915073a6fe8805fc8c172b1fe1068195bc8eec7cad2bf03e33e83486c350653b08552e8f69504c
+  metadata.gz: '086689359df8d7486b7b58eb7b1000c87e6ba9f82f90a4fcd73dc48bfe2cbc06127a93fc90ca89d039415f1c5b04177734faee84e3f270479dead4c5bc5ac71e'
+  data.tar.gz: 91748fe02212d80a9679085b608c38f969375366541d8486213c87af85b2dcaf418f4977f5cbf4ca9c6c5390367ce916b2b862029bc5c64d09b8ab27fe838712

data/README.md

@@ -1,4 +1,4 @@
-# Classic-Jekyll-Theme v1.9.1
+# Classic-Jekyll-Theme v1.9.2
 
 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:
 
@@ -56,9 +56,9 @@ Other features:
 
 - __Enable/disable banner__ The banner at the top of the page can be disabled.
 
-- __Move banner/menu to main column__ The banner & navigation can be moved to within the main column only. The secondary and tertiary columns will ten run right up to the top of the screen.
+- __Move banner/menu to main column__ The banner & navigation can be moved to within the main column only. The secondary and tertiary columns will then run right up to the top of the screen.
 
-- __Split files for the menu's__ It is possible to generate the menu file separate from the content file. While this may slow down the loading of the site a little, it is a huge speed up for site generation under Jekyll.
+- __Split files for the menus__ It is possible to generate the menu file separate from the content file. While this may slow down the loading of the site a little, it is a huge speed up for site generation under Jekyll.
 
 You can download it from [github](https://github.com/Balancingrock/classic-jekyll-theme) or install it with [rubygems](https://rubygems.org/gems/classic-jekyll-theme).
 
@@ -72,7 +72,7 @@ Suggested donation for commercial sites is the price of a good meal: $20
 
 ## Installation & setup
 
-On MacOS the gems are located in: `Library/Ruby/Gems/<version>/gems/classic-jekyll-theme-<version>`. Replace the version's with the appropriate numbers (note: these are two different unrelated version numbers). These pages not only contain examples, but also some information about using the theme. Some of the steps below need the path to the gem, so make sure you know it.
+On MacOS the gems are located in: `Library/Ruby/Gems/<version>/gems/classic-jekyll-theme-<version>`. Replace the versions with the appropriate numbers (note: these are two different unrelated version numbers). These pages not only contain examples, but also some information about using the theme. Some of the steps below need the path to the gem, so make sure you know it (do 'bundle show classic-jekyll-theme').
 
 Install the theme:
 
@@ -90,7 +90,7 @@ Change in the Gemfile:
 
 	From `gem "minima", "~> 2.0"` to `gem "classic-jekyll-theme"`
 
-Change in the _config.yml:
+Change in the `_config.yml`:
 
 	From `theme: minima` to `theme: classic-jekyll-theme`
 	Add `jekyll-data` to the gems.
@@ -147,7 +147,7 @@ The following values are configurable:
 	The number of posts (titles) that will appear in the "Recent" widget.
 
 - enable-cookies-policy:
- 
+
 	`yes` to enable the cookies warning, `no` to disable. The cookies warning is from [Silktide](http://silktide.com/cookieconsent), distributed under the MIT license.
 
 - navbanner-position:
@@ -194,7 +194,7 @@ Some of the text elements in the theme can be translated with the following defi
 
 ## Recommendation
 
-Typically you will need to copy some files from the gem iteself to the project (web site) directory. The most common files are:
+Typically you will need to copy some files from the gem itself to the project (web site) directory. The most common files are:
 
 - `_sass/classic-jekyll-theme.scss` for configuration.
 - `_sass/classic/_normalize-override.scss` if site wide updates must be made to `_normalize.scss`.
@@ -204,7 +204,7 @@ Typically you will need to copy some files from the gem iteself to the project (
 - `_includes/tertiary-column.html` for the tertiary column contents.
 - `navbanner.md` for the navigation bar menu. This is mandatory if the `useSeparateNavBanner` setting is used, optional when not. Hence its easier to always copy this file.
 
-These files can be found in the gem directory. On macOS this directory is located at: `Library/Ruby/Gems/<version>/gems/classic-jekyll-theme-<version>`. When you copy these files, make sure they are in the same relative directory as in the gem itself.
+These files can be found in the gem directory. Try the command `bundle show classic-jekyll-theme` to see where the theme is located. When you copy these files, make sure they are in the same relative directory as in the gem itself.
 
 Besides the above mentioned files you should avoid making changes to the files provided in the gem. The more changes you make, the more difficult it will become to upgrade. Instead of changing a file, include a new file that contains the stuff you want and include that file.
 
@@ -243,17 +243,17 @@ To create a page that must be included in the menu bar, add the following front
 
 - menuInclude: Set to "yes" to consider this page for a navigation bar menu item.
 - menuLink: Set to 'no' to disable a link creation from the navigation bar to this page. However the menu title or subtitle will be included. This allows the ordering of menu items that do not have an associated page. The default behaviour assumes 'yes'. So not including this tag will create a link. Note: This allows ordering of top level menu items. For submenu items this probably only makes sense if some kind of "divider" must be shown. Otherwise showing a submenu item without a link will probably confuse users.
-- menuTopTitle: The title of the menu item in the navigation bar. When used in conjunction with a menuSubTitle, this will be the title of the menu item to which this submenu item will be added in the drop down menu. 
+- menuTopTitle: The title of the menu item in the navigation bar. When used in conjunction with a menuSubTitle, this will be the title of the menu item to which this submenu item will be added in the drop down menu.
 - menuTopIndex: The place of the title within the menu bar. Lower numbers will be to the left of higher numbers. Be aware that the "Home" menu item will always be first and the "Categories" will always be last.
 - menuSubTitle: The title of the submenu item in the drop down menu.
 - menuSubIndex: The place of the submenu item within the dropdown menu. Lower numbers will go above higher numbers. This theme only sorts on menuIndex numbers, not on other properties.
 
-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.
+For a consistent user experience in the narrow layout, it is recommended 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
+## 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'>
@@ -264,7 +264,7 @@ There are 4 YAML tags that control the custom placement and content of the secon
 
 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.
+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/setup.yml` from having any effect.
 
 ## Specifying html header description meta tag content for pages
 
@@ -279,117 +279,12 @@ Note that the "excerpt_separator" does *not* work on pages, only posts.
 
 ## Editing the secondary and tertiary columns
 
-The prime column is populated by the 'normal' pages and posts. The secondary and tertairy columns have a fixed content that is created by directly editing the `_include/secondary-column.html` and `_include/tertiary-column.html`. These files must be copied from the gem dictionary to the directory with the jekyll files for the website at the path `_include`.
+The prime column is populated by the 'normal' pages and posts. The secondary and tertiary columns have a fixed content that is created by directly editing the `_include/secondary-column.html` and `_include/tertiary-column.html`. These files must be copied from the gem dictionary to the directory with the jekyll files for the website at the path `_include`.
 
 Documentation for the widgets is included in the widget files themselves. The are located in the gem directory at `_includes/widgets/`.
 
 ## History
 
-Release 0.2.6
-
-- Inital version (before this I was only getting acquainted with the gem-publishing mechanism)
-
-Release 1.0.0
-
-- Fixed a problem with navigation menu generation. (Insufficient control over menu item placement)
-
-Release 1.0.1
-
-- Fixed some info in this readme file and in the example pages.
-
-Release 1.1.0
-
-- Added language customization for default theme elements in the `_config.yml` file
-
-Release 1.1.1
-
-- Added clarification to upgrade information.
-
-Release 1.2.0
-
-- Added facilities for background images.
-- Added option for an icon on the top-left side of the site.
-- Fixed a problem where the tertiary column divider was not removed for medium layout.
-
-Release 1.2.1
-
-- Fixed problem with Icon placement.
-
-Release 1.2.2
-
-- Fixed problem with site title shifting when a background was used.
-- Now allows absolute fixing of banner height.
-
-Release 1.2.3
-
-- Faster generation of site
-- Menu item 'Categories' will only be included if categorie pages are requested by the designer.
-- Categories pages submenu is now alphabetical.
-
-Release 1.3.0
-
-- Removed theme specific configuration from the `_config.yml` file into `_data/setup.yml` and `_data/text-for.yml`.
-
-Release 1.3.1
-
-- Quick fix for problem introduced in 1.3.0
-
-Release 1.3.2
-
-- Update of this README file.
-
-Release 1.3.3
-
-- Added the `jekyll-data` gem to simplify initial configuration/setup.
-
-Release 1.4.0
-
-- Added `youtube-player` widget.
-- Improved placement control of the site icon
-
-Release 1.4.1
-
-- Added `_support.scss` with commonly used layout stuff for articles/posts like:
-	- Centered text
-	- Centered image
-	- Floating images
-	- Floating text boxes
-	
-	To be used in the markdown files as class definitions. Example is given in `_support.scss`
-
-Release 1.5.0
-
-- Fixed a problem where the menu button (medium and narrow layouts) was not usable in some browsers
-- Fixed a problem with the menu generation where additional, but empty, submenu items could be created
-- Rebased the CSS system to `normalized.css` (as `_sass/classic/_normalize.scss`). Though Jekyll 3.3.1 has made this update as well (for base.scss) it is now no longer necessary to wait for Jekyll releases to adopt the latest `normalize.css`. This can now be done manually by simply renaming & replacing the latest `normalize.css` to `_sass/classic/_normalize.scss` in the gem. (Note a link to the source is also found in the `_normalize.scss` file itself)
-- Fixed the missing banner height setting.
-
-Release 1.5.1
-
-- Removed some non-ascii characters in the comments of `_sass/classic-jekyll-theme`.
-
-Release 1.5.2
-
-- Added excerpt for pages. YAML only, no support for excerpts generated from the main content.
-
-Release 1.6.0
-
-- Added max width settings for CSS components _image-centered_ (80%), _image-float-center_ (40%), _image-float-right_ (50%) and _image-float-left_ (50%). These settings were updated in the file _/\_sass/classic/\_support.scss_
-
-- 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.
-
-Release 1.7.1
-
-- Fixed a problem in the `_includes/widgets/recent-posts.html`.
-
-Release 1.7.2
-
-- Fixed a bug in the blocked-layout.
-
 Release 1.8.0
 
 - Allow banner area to be removed.
@@ -417,192 +312,13 @@ Release 1.9.1
 
 - Bugfix: Added navbanner.md to the gemspec (file was missing)
 
-## Upgrade information
-
-### from 0.2.6 to 1.0.0
-
-#### Page creation
-
-The page creation YAML matter has changed. The old tags did not give full control over the menu buildup, the new tags do.
-
-	Old: menuInclude
-	New: menuInclude
-
-No changes, works as before.<br><br>
-
-	Old: -
-	New: menuLink true|false
-
-A new option that controls if a menu title has a link to a page. The default value is 'true' so when this tag is not included, a link to the page will be created. If set to 'false', then the menu item will show up in the specified place, but will not be linked to a page. Use this to order menu items that have a drop-down menu but do not have a page by itself.<br><br>
-
-	Old: menuTitle
-	New: menuTopTitle
-	New: menuSubTitle
+Release 1.9.2
 
-Specifies the string to be used for the menu item.<br><br>
+- Bugfix: David Crossley fixed a bug where the filename of the column content was not properly used.
+- Removed pre v1.8.0 notes and update instructions to shorten the readme.
 
-	Old: subMenuFrom
-	New: menuTopTitle
-
-Specifies the menu item from which this is a submenu item.<br><br>
-
-	Old: menuIndex
-	New: menuTopIndex
-	New: menuSubIndex
-	
-The index for a menu item. If not present, the menu ordering is undetermined. If only a part of the pages have this item then the menu items of the pages that do not have this item specified will be included first. If multiple specifications exist, then the highest number overrides the lower numbers. Like before, a lower number goes to the left -or on top- of the higher number.
-
-### from 1.0.0 (and later) to 1.1.1
-
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.1.1 to 1.2.0
-
-- If changes were made to `_sass/classic-jekyll-theme.scss` then this file must be replaced with the new version that comes with this release and the changes must be re-applied. Note that background color setting has changed slightly.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.2.0 to 1.2.1
-
-- Replace the 'initial' values in `_sass/classic-jekyll-theme.scss` for the backgrounds with 'none'.
-- The icon size (width and height) values are no longer used and can be removed.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.2.1 to 1.2.2
-
-- The banner height settings in `_sass/classic-jekyll-theme.scss` are no longer "minimum" specifications but absolute specifications and therefore have been renamed from `<layout-size>-minimum-banner-height` to `<layout-size>-banner-height`.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.2.2 to 1.2.3
-
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.2.3 to 1.3.0
-
-- Copy the `_data` directory from the gem to the website directory as per installation instructions in this document.
-- Remove the classic-jekyll-theme configurations from the `_config.yml` file, and reapply any changes made to either `_data/setup.yml` and/or `_data/text-for.yml` as required.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.3.0 to 1.3.2
-
-- If not done yet, copy the `_data` directory from the gem to the website directory as per installation instructions in this document.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.3.2 to 1.3.3
-
-- It is no longer necessary to copy the `_data` folder content to the site directory.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.3.3 to 1.4.0
-
-- Add to `classic-jekyll-theme.scss` the import of `classic/widget-support` (at end of file)
-- Add the following definitions to the existing `classic-jekyll-theme.scss` in your project:
-^
-
-~~~~~~
-     $wide-icon-vposition:    center;
-     $wide-icon-hposition:    left;
-     $wide-icon-voffset:      0px;
-     $wide-icon-hoffset:      0px;
-     $medium-icon-vposition:  center;
-     $medium-icon-hposition:  left;
-     $medium-icon-voffset:    0px;
-     $medium-icon-hoffset:    0px;
-     $narrow-icon-vposition:  center;
-     $narrow-icon-hposition:  left;
-     $narrow-icon-voffset:    0px;
-     $narrow-icon-hoffset:    0px;
-~~~~~~
-
-- Alternatively copy the new `classic-jekyll-theme.scss` to your project and re-apply the changes you made.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.4.0 to 1.4.1
-
-- Add to `classic-jekyll-theme.scss` the import of `classic/support` (at end of file)
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.4.1 to 1.5.0
-
-- Since `normalized.css` is now used instead of `base.scss` it is quite possible that the layout of your sites changes a little. Be sure to check the site after generation. If necessary, make any adjustments to `_sass/_normalize-override.scss` and leave the `_normalize.scss` as it is. This way it is very easy to upgrade to new versions of `normalize.css`.
-- Update the `classic-jekyll-theme.scss` imports as follows:
-^
-
-~~~~~
-    // Import partials.
-    @import
-      "classic/normalize",
-      "classic/normalize-override",
-      "classic/syntax-highlighting",
-      "classic/layout",
-      "classic/formatting",
-      "classic/post",
-      "classic/page",
-      "classic/support",
-      "classic/widget-support"
-    ;
-~~~~~
-- The `$brand-color:` definition in `classic-jekyll-theme.scss` is no longer used and can be removed.
-- Other files that have changed: `_includes/navbanner.html`, `_sass/classic/_formatting.scss` and `_sass/classic/_syntax-highlighting.scss`. The file `_sass/classic/_base.scss` has been deleted.
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-
-### from 1.5.0 to 1.5.1
-
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-- Remove the ≡ , ⇨ and ⇩ characters from the `_sass/classic-jekyll-theme.scss` file to prevent future problems. (If you had problems, you have already removed them...)
-
-### from 1.5.1 to 1.5.2
-
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-- If the (undocumented) 'description' YAML tag was used, it must be changed to 'excerpt'.
-- The file `_includes/header.html` was updated.
-
-### from 1.5.2 to 1.6.0
-
-- 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_.
-
-### from 1.7.0 to 1.7.1
-
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-- The file `_includes/widgets/recent-posts.html` has been updated.
-
-### from 1.7.1 to 1.7.2
-
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-- The file `_sass/classic/_support.scss` has been updated.
-
-### from 1.7.2 to 1.8.0
-
-- Update the version number in the `Gemfile` & delete the `Gemfile.lock` file.
-- In file `_data/setup.yml` added some documentation and a new setting: `navbanner-position`. This setting is described in that file.
-- Added the following new parameters in `_sass/classic-jekyll-theme.scss`:
-
-~~~~
-    $column-divider-top-spacing
-	$column-divider-bottom-spacing
-	
-	$navbanner-menu-dividers-thickness
-    $navbanner-menu-top-divider-disable
-
-    $navbanner-include-banner
-~~~~
-
-
-- In addition the following files have been changed:
+## Upgrade information
 
-~~~~
-	_layouts/default.html
-	_sass/classic/_formatting.scss
-	_sass/classic/_layout.scss
-~~~~
-    
 ### from 1.8.0 to 1.8.1
 
 - The file `_includes/navbanner.html` was changed.
@@ -641,9 +357,13 @@ The index for a menu item. If not present, the menu ordering is undetermined. If
 
 No changes needed.
 
+### from 1.9.1 to 1.9.2
+
+The file `_layouts/default.html` was updated.
+
 ## Feedback
 
-Comments, bug reports, feature requests and improvements are eagerly anticipated via email: rien@balancingrock.nl.
+Comments, bug reports, feature requests and improvements are eagerly anticipated via email: rien@balancingrock.nl or via [github](https://github.com/Balancingrock/classic-jekyll-theme).
 
 ## License
 

data/_layouts/default.html

@@ -22,16 +22,16 @@
 
 			{% if secondary-column == 'left' %}
 			<div class="secondary-column">
-				<div class="secondary-column-content">{% include secondary-column.html %}</div>
+				<div class="secondary-column-content">{% include {{ secondary-column-content }} %}</div>
 				{% if tertiary-column == 'present' %}	
-					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>
+					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
 				{% endif %}
 			</div>
 			<div class="secondary-divider"></div>
 			{% else %}
 				{% if tertiary-column == 'present' %}
 				<div class="tertiary-column">
-					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>
+					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
 				</div>
 				<div class="tertiary-divider"></div>
 				{% endif %}			
@@ -53,16 +53,16 @@
 			{% if secondary-column == 'right' %}
 			<div class="secondary-divider"></div>			
 			<div class="secondary-column">
-				<div class="secondary-column-content">{% include secondary-column.html %}</div>
+				<div class="secondary-column-content">{% include {{ secondary-column-content }} %}</div>
 				{% if tertiary-column == 'present' %}	
-					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>
+					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
 				{% endif %}
 			</div>
 			{% else %}
 			   {% if tertiary-column == 'present' %}
 				<div class="tertiary-divider"></div>
 				<div class="tertiary-column">
-					<div class="tertiary-column-content">{% include tertiary-column.html %}</div>
+					<div class="tertiary-column-content">{% include {{ tertiary-column-content }} %}</div>
 				</div>
 				{% endif %}
 			{% endif %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classic-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Rien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-feed