classic-jekyll-theme 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e130386a4b59daeb06fdff06e7d34b5b46c3b59
-  data.tar.gz: f041a4ec4dc3322e8ff66e957ffbdd1be9a82c05
+  metadata.gz: 563de332f91ec382d8a30e4d65166f0d0105616a
+  data.tar.gz: eb4872f6c0c0daf0406b8c7aa721e126e85adf61
 SHA512:
-  metadata.gz: b7208c2eb8e0c7e1e23cbbb017a4cd1fa23009757ff909a2edcd33fe6f99ef54cea54640c9d3c411fe5cd2b7f18b246b256eb63b254730db5d6e5dc282b12e42
-  data.tar.gz: a6c28389ba17eac261c3323c318701fe03378e021b36e9ef406e4d49ad2b9ec8770c5e27e1255d9441df3c5d220560cae08f48d2ded6b3fbc36d6a90318cfa07
+  metadata.gz: 0f741d01eb3e392c28e8527ca4997ecc6cf3056696aee44cba608ff4bb5e2e76247867e416b9cae2d3f74f6b1d93f2479c3768dea1d688357f5fcbd5ca590558
+  data.tar.gz: 145245cdf593762e921f4e4c30a2a041ccbba354fd130dc0dcc2b27f0a09b0f8b431c22b558c0d25ae8bd37602eb7f52be998602dcdd81d0a107beaff9efd98b

data/README.md

@@ -1,4 +1,4 @@
-# Classic-Jekyll-Theme v2.2.0
+# Classic-Jekyll-Theme v2.3.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:
 
@@ -80,9 +80,10 @@ Please see [http://balancingrock.github.io/classic-jekyll-theme](http://balancin
 
 ## History
 
-Release 2.0.0 (2017-12-19)
-[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/2017/12/22/release-2-2-0.html)
+- Release 2.0.0 (2017-12-19)
+- [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)
 
 ## Suport & Feedback
 

data/_data/text-for.yml

@@ -47,4 +47,7 @@ tOlderPosts: Older Posts
 
 # Month names for Older Posts widget output
 # Note: Must start with 'None' because of index starting at 0
-tMonths: [None, January, February, March, April, May, June, July, August, September, October, November, December]
+tMonths: [None, January, February, March, April, May, June, July, August, September, October, November, December]
+
+# Text to be displayed for articles that will be published in the future.
+tFutureRelease: This article is scheduled for release in the near future.

data/_includes/menubar.html

@@ -8,9 +8,19 @@
 	
 	{%- comment -%}<!-- Create a list of top menu item titles -->{%- 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 -%}
+	
 	{%- assign topTitles = "" | split: "" -%}
-	{%- assign sortedPages = site.pages | where:'menuInclude', true | where_exp:'item', 'item.menuTopTitle != nil' | sort: 'menuTopIndex', 'last' -%}
-	{%- for ape in sortedPages -%}{%- assign topTitles = topTitles | push: ape.menuTopTitle -%}{%- endfor -%}
+	{%- assign sortedPages = pagesForPublishing | where:'menuInclude', true | where_exp:'item', 'item.menuTopTitle != nil' | sort: 'menuTopIndex', 'last' -%}
+	{%- for ape in sortedPages -%}{%- assign topTitles = topTitles | push: ape.menuTopTitle -%}{%- endfor -%}	
 	{%- assign topTitles = topTitles | uniq -%}
 
 	{%- comment -%}<!-- Home page -->{%- endcomment -%}
@@ -384,7 +394,7 @@
 	
 	{%- if jekyll.environment != 'production' and site.data.setup.fast-content-build -%}{%- else -%}
 		{%- if site.data.setup.generate-categories-menu -%}
-			{%- assign cats = site.pages | where:'layout', 'category-page' | sort:'title' -%}
+			{%- assign cats = pagesForPublishing | where:'layout', 'category-page' | sort:'title' -%}
 			{%- if cats.size > 0 -%}
 				{%- assign categories = 'Categories' -%}
 				{%- if site.data.text-for.tCategories -%}{%- assign categories = site.data.text-for.tCategories -%}{%- endif %}

data/_includes/vertical-menu.html

@@ -18,7 +18,17 @@
 
 	{%- comment -%}<!-- Find all pages that belong to the menuTopTitle of this page -->{%- endcomment -%}
 	
-	{%- assign topTitlePages = site.pages | where:'menuInclude', true | where:'menuTopTitle', topTitle -%}
+	{%- 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 topTitlePages = pagesForPublishing | where:'menuInclude', true | where:'menuTopTitle', topTitle -%}
 			
 	{%- comment -%}<!-- note: these html comment tags are for editor coloring support
 			

data/_includes/widgets/categories.html

@@ -1,12 +1,23 @@
 
 <!-- include categories.html -->
 {%- if jekyll.environment != 'production' and site.data.setup.fast-content-build -%}{%- else %}
+
+	{%- 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 -%}
+
 <div class="categories">
 	{%- assign categories = 'Categories' -%}
 	{%- if site.data.text-for.tCategories -%}{%- assign categories = site.data.text-for.tCategories -%}{%- endif %}
 	<input type="checkbox" id={{ "category-checkbox" | append: include.label-modifier }}>
 	<label for={{ "category-checkbox" | append: include.label-modifier }}><h1>{{ categories }}</h1></label>
-	{%- assign cats = site.pages | where:'layout', 'category-page' | sort:'title' -%}
+	{%- assign cats = pagesForPublishing | where:'layout', 'category-page' | sort:'title' -%}
 	{%- if cats.size > 0 -%}
 		{%- for cat in cats %}
 	<div class="text"><a href="{{ cat.url | relative_url }}"><p>{{ cat.title | capitalize }}</p></a></div>

data/_layouts/page.html

@@ -7,10 +7,21 @@ layout: default
 		<p class="page-meta">{%- if page.date -%}<time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%F" }}</time>{%- endif -%}{%- if page.author -%} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{%- endif -%}</p>
 	</header>
 	<div class="page-content" itemprop="articleBody">
-  
+
+{%- assign buildTimeInSecondsSinceEpoch = site.time | date: "%s" | plus: 0 -%}	
+{%- assign pageInSecondsSindsEpoch = page.date | date:"%s" | plus: 0 -%}
+
+{%- if pageInSecondsSindsEpoch < buildTimeInSecondsSinceEpoch %}
 <!-- Page content -->
    {{ content }}
 <!-- End of page content -->
+{% else -%}
+	{%- assign future-release = 'This article is scheduled for release in the near future.' -%}
+	{%- if site.data.text-for.tFutureRelease -%}
+		{%- assign future-release = site.data.text-for.tFutureRelease -%}
+	{%- endif -%}
+	<p>{{ future-release }}</p>
+{% endif -%}
 
 	</div>
 {%- if site.disqus.shortname -%}

data/pages/classic/01-features.md

@@ -21,10 +21,10 @@ The main features of this theme are as follows:
 - Page by page override of layout and secondary/tertiary column content
 - Extensive configuration of visible elements (font, color, background, padding, size etc)
 - Banner & menubar may be fixed to the top of the browser window
+- Release date for pages
 - Includes several widgets:
 	- Recent posts
 	- Older posts
-	- Youtube viewer
 	- Categories
 - Includes cookies warning (can be disabled)
 - Includes disqus & google analytics

data/pages/classic/03-pages-and-posts.md

@@ -18,4 +18,8 @@ Additional YAML front matter:
 - __tertiary-column__: This is an override setting of the general parameter in `site.data.setup.tertiary-column`. Set to either _none_ or _present_ to affect placing of the tertiary column for this page/post only.
 - __secondary-column-content__: By default the content for the secondary column is taken from _\_includes/secondary-column.html_. Assigning it a different file here will override this default for this page/post only. However if the vertical menu is used (i.e. `site.data.setup.drop-down-menu` is set to _no_), it will remain visible at the top of the content of the secondary column.
 - __tertiary-column-content__: By default the content for the tertiary column is taken from _\_includes/tertiary-column.html_. Assigning it a different file here will override this default for this page/post only.
-- __banner-position__: The position of the banner area. Use _top_ to place the banner across all three columns, _main_ to place the banner only above the primary column and _top-fixed_ to have the banner pinned at the top of the browser window. This setting is fro this page only.
+- __banner-position__: The position of the banner area. Use _top_ to place the banner across all three columns, _main_ to place the banner only above the primary column and _top-fixed_ to have the banner pinned at the top of the browser window. This setting is fro this page only.
+
+## For Pages
+
+- __date__: When present, the page will only be included in the website if this date is earlier than the build time. 

data/pages/jekyll/04-cron-job.md

@@ -0,0 +1,171 @@
+---
+layout: page
+title: "Cron jobs: create websites periodically"
+date: 2018-02-05
+menuInclude: yes
+menuTopTitle: Jekyll
+menuSubs:
+- title: Ruby environment
+  index: 3
+tertiary-column: none
+excerpt: How to set up the daily creation of a website with jekyll and git...
+---
+When maintaining a website it is common to want to add posts and pages on a regular basis to stimulate regular visits of users. A static website generator makes this harder, but with a little extra effort it is possible to show a new post or page on predefined dates. (Note that the classic-jekyll-theme is needed to have this feature apply to pages as well as posts. Standard Jekyll wil only do dated posts releases)
+
+This is the workflow this example aims for:
+
+- Create a page or post on a local machine.
+- Verify that the layout of the site (on the local machine) is as desired.
+- Check in the changes on the local machine into the local git repository.
+- Push the local git to the git-server.
+
+And have the website on the next day reflect the changes that were made. If changes were made for a future release date, they should only appear on and after the date for which they were written.
+
+## Before we start
+
+The method described here only works if we have control of the server.
+
+It does not work for github hosted sites, though it should be possible to achieve the same result with Github if the cron job does not kick-off the jekyll-build process, but a git-push of an automatically generated file (to github).
+
+The example is given for macOS, but should be easy to replicate for other platforms.
+
+## The setup
+
+The setup is simple: the machine that hosts the website has Jekyll and git-server installed on it. It can be the same machine that is used to create the content, but that is not necessary. One of the side benefits of this approach is that it is easy to update the website from anywhere in the world. Keep in mind though that it is important to use the same version of Jekyll and the ruby environment on all machines.
+
+What we will do:
+
+1. Create a git-server repository on the server that contains the (file for the) website.
+1. Create a git working repository on the server that is used to generate the actual website.
+1. Create a job on the server that checks out the website from the git-server repository into the working repository, compiles the website with Jekyll and then copies the content of `_site` to the website directory used by the server.
+
+And that is all there is to it. Once this is done, we can update the website from any place that has `push` rights to the git-server repository.
+
+To be clear, there are three website directories involved:
+
+1. The server website directory. This is the directory that the webserver uses to serve the incoming HTTP requests.
+1. The git-server website, this is a directory that contains all the files to build the website. It is identical in structure to the directory that is created by `jekyll new`.
+1. And lastly a working directory (with git repository) that is used to create the files to be copied to the server website directory. This directory will be synchronised with the git-server directory when the website files are build.
+
+## The steps
+
+### Create git-server repository
+
+I use macOS Xcode-Server to create a git-server repository.
+
+Start 'Server' and select 'Xcode', then choose the 'Repositories' tab and create the repository.
+
+If you don't have macOS-Server and Xcode-Server installed, please google "git server macOS" for hints about how to setup a git server on the mac.
+
+For this example I will assume a site called 'mysite' and that the git-server repository has the same name.
+
+### Create a directory to use as a working directory for the cron script
+
+Any location will work, this example uses: `/Users/rien/Documents/Websites/mysite`. Of course your user name and site name will be different.
+
+Goto the `/Websites` directory and create the git repository that will be used by the script.
+
+~~~~~
+    git clone <<path-to-repo>>
+~~~~~
+
+The <<path-to-repo>> should be the path to the git-server repository and end in 'mysite' or 'mysite.git'
+
+This command also creates the directory `/mysite`
+
+### Create the update script
+
+This script is located at the user level (in this case: `Users/rien`) and lets call it `mysite-daily-update.script`.
+
+~~~~~
+    #! /bin/bash
+    echo "$(date) start"
+    cd /Users/rien/Documents/Websites/mysite
+    echo "git pull"
+    git pull origin
+    echo "bundle exec jekyll build"
+    rm Gemfile.lock
+    JEKYLL_ENV=production /Users/rien/.rbenv/shims/bundle exec jekyll build
+    echo "sync site"
+    rsync -av _site/ /Library/Server/Web/Data/Sites/mysite
+    echo "$(date) ready"
+~~~~~
+
+What happens:
+
+- The bash shell is used
+- The start time is logged to a console
+- The working directory is changed to the directory where the cloned repository is
+- The working repository is updated from the main site repository
+- The Gemfile.lock is removed (I believe this is not really necessary, a leftover from experimenting)
+- Jekyll compiles the site (the full path to `bundle` must be specified because the regular login profile is not executed in a cron job)
+- The site is copied to the directory where the server expects it.
+- The end time is logged to a console
+
+The path in the `rsync` command must of course be the path to the directory where the website is hosted.
+
+Note that when the website is being used the users may experience an inconsistent website for a very short time. For the type of updates that are targeted with this approach (page & post updates) this should not pose a problem. But when a website is completely redesigned it may be unacceptable. In that case a proper shutdown of the server is necessary before the rsync command is issued and a restart of the server afterwards.
+
+Important: Make the script executable!
+
+    chmod +x mysite-daily-update.script`
+
+### Create the cron job specification
+
+In the directory `~/Library/LaunchAgents` create a file with the name `com.mysite.plist`. Of course a different reverse-url notation will be needed for a different site.
+
+This file should contain the following:
+
+~~~~~
+    <?xml version="1.0" encoding="UTF-8"?>
+	<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+	<plist version="1.0">
+	<dict>
+	    <key>Label</key>
+	    <string>com.mysite.daily-update</string>
+	    <key>StandardOutPath</key>
+	    <string>/Users/rien/mysite-daily-update.log</string>
+	    <key>StandardErrorPath</key>
+	    <string>/Users/rien/mysite-daily-update.error.log</string>
+	    <key>Program</key>
+	    <string>/Users/rien/mysite-daily-update.script</string>
+	    <key>StartCalendarInterval</key>
+	    <dict>
+	        <key>Hour</key>
+	        <integer>00</integer>
+	        <key>Minute</key>
+	        <integer>01</integer>
+	    </dict>
+	</dict>
+	</plist>
+~~~~~
+
+One thing to notice is that this specification also tells the OS to create an error and a log file. These files are written to the users root directory and can be examined for error messages.
+
+The `Hour` and `Minute` keys and their values specify the time when the script should be executed. Take note of this because when you are in the habit of switching off the server at certain times, this may result in missing the site-generation for that day.
+
+Btw, a good resource for the capabilities and configuration of the launchd can be found at: [http://www.launchd.info](http://www.launchd.info).
+
+### Load the cron job (manually)
+
+The job will be loaded automatically at startup. But right now you will need to load the job by hand:
+
+~~~~~
+    launchctl load ~/Library/LaunchAgents/com.mysite.plist
+~~~~~
+
+Most likely you will also want to test the script, that can be done with:
+
+~~~~~
+    launchctl start com.mysite.daily-update
+~~~~~
+
+The first couple of times, make sure to check for an error log in the `StandardErrorPath`. (Which in this example is the user home directory)
+
+For completion, there are also the `unload` and `stop` options for `launchctl`. Only when the plist file is changed does one need to unload it.
+
+## In closing
+
+With the above information it should be possible to set up a daily re-generation of the site, and to automatically upload it to the appropriate server directory.
+
+If a dedicated server is used and the git-server directory is accessable from outside, this is also a very convenient method to create pages and posts from outside your local domain. I.e. when travelling. It is even possible to use this to contribute to the site by multiple authors.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classic-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Rien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -202,6 +202,7 @@ files:
 - pages/jekyll/01-jekyll.md
 - pages/jekyll/02-speed.md
 - pages/jekyll/03-ruby.md
+- pages/jekyll/04-cron-job.md
 - pages/layouts/banner-main.md
 - pages/layouts/blocks.md
 - pages/layouts/landing-page.md