chore: sync template from mainstream

Author: sparanoid

3.1-billion-in-a-day.html

@@ -35,3 +35,6 @@ bower_components
 # Project specified
 _site
 _app/assets/css
+
+# Uncomment the following if you want to gitignore current user config
+# _config.yml

404.html

@@ -11,7 +11,6 @@ module.exports = (grunt) ->
   grunt.initConfig
     config:
       cfg: grunt.file.readYAML("_config.yml")
-      var: grunt.file.readYAML("./_app/_data/var.yml")
       pkg: grunt.file.readJSON("package.json")
       app: "<%= config.cfg.source %>"
       dist: "<%= config.cfg.destination %>"
@@ -105,6 +104,7 @@ module.exports = (grunt) ->
           removeCommentsFromCDATA: true
           removeCDATASectionsFromCDATA: true
           collapseWhitespace: true
+          conservativeCollapse: true
           collapseBooleanAttributes: true
           removeAttributeQuotes: false
           removeRedundantAttributes: true
@@ -198,19 +198,19 @@ module.exports = (grunt) ->
         stdout: true
 
       server:
-        command: "jekyll serve --watch --future"
+        command: "jekyll serve --watch --future --drafts --config _config.yml,_config.dev.yml"
 
       dist:
         command: "jekyll build"
 
       archive:
-        command: "jekyll build -d <%= config.cfg.destination %><%= config.var.base %>/"
+        command: "jekyll build -d <%= config.cfg.destination %><%= config.cfg.base %>/"
 
       sync:
-        command: "rsync -avz --delete --progress <%= config.var.ignore_files %> <%= config.dist %>/ <%= config.var.remote_host %>:<%= config.var.remote_dir %> > rsync.log"
+        command: "rsync -avz --delete --progress <%= config.cfg.ignore_files %> <%= config.dist %>/ <%= config.cfg.remote_host %>:<%= config.cfg.remote_dir %> > rsync.log"
 
       s3:
-        command: "s3cmd sync -rP --guess-mime-type --delete-removed --no-preserve --cf-invalidate --exclude '.DS_Store' <%= config.var.static_files %> <%= config.var.s3_bucket %>"
+        command: "s3cmd sync -rP --guess-mime-type --delete-removed --no-preserve --cf-invalidate --exclude '.DS_Store' <%= config.cfg.static_files %> <%= config.cfg.s3_bucket %>"
 
     concurrent:
       options:
@@ -233,7 +233,6 @@ module.exports = (grunt) ->
       dist:
         src: [
           ".tmp"
-          "<%= config.dist %>"
         ]
 
       postDist:
@@ -246,39 +245,56 @@ module.exports = (grunt) ->
       dist:
         src: ["<%= config.dist %>/**/*"]
 
-  # Fire up a server on local machine for development
-  grunt.registerTask "serve", [
+    replace:
+      availability:
+        src: ["<%= config.app %>/_data/availability.yml"]
+        dest: "<%= config.app %>/_data/availability.yml"
+        replacements: [
+          {
+            from: /(free:)(.+)/g
+            to: "$1 true"
+          }
+        ]
+
+  grunt.registerTask "reset", "Reset user availability", (target) ->
+    grunt.config.set "replace.availability.replacements.0.to", "$1 true"
+    grunt.task.run [
+      "replace"
+    ]
+
+  grunt.registerTask "serve", "Fire up a server on local machine for development", [
     "clean"
     "less:server"
     "concurrent:server"
   ]
 
-  # Test task
-  grunt.registerTask "test", [
+  grunt.registerTask "test", "Build test task", [
     "build"
     # "csslint"
     "validation"
   ]
 
-  # Build site with `jekyll`
-  grunt.registerTask "build", [
-    "clean"
-    "coffeelint"
-    "useminPrepare"
-    "less:dist"
-    "autoprefixer"
-    "csscomb"
-    "shell:dist"
-    "rev"
-    "usemin"
-    "concurrent:dist"
-    "smoosher"
-    "usebanner"
-    "clean:postDist"
-  ]
-
-  # Archive old version with specific URL prefix, all old versions goes to http://sparanoid.com/lab/version/
-  grunt.registerTask "archive", [
+  grunt.registerTask "build", "Build site with `jekyll`, use `--busy` to set availability to false", (target) ->
+    grunt.config.set "replace.availability.replacements.0.to", "$1 false" if grunt.option("busy")
+    grunt.task.run [
+      "replace"
+      "clean"
+      "coffeelint"
+      "useminPrepare"
+      "less:dist"
+      "autoprefixer"
+      "csscomb"
+      "shell:dist"
+      "rev"
+      "usemin"
+      "concurrent:dist"
+      "smoosher"
+      "usebanner"
+      "clean:postDist"
+      "reset"
+    ]
+
+  grunt.registerTask "archive", "Archive old version with specific URL prefix, all old versions goes to http://sparanoid.com/lab/version/", [
     "clean"
     "less:dist"
     "autoprefixer"
@@ -287,14 +303,15 @@ module.exports = (grunt) ->
     "concurrent:dist"
   ]
 
-  # Build site + rsync static files to remote server
-  grunt.registerTask "sync", [
+  grunt.registerTask "sync", "Build site + rsync static files to remote server", [
     "build"
     "shell:sync"
   ]
 
-  # Sync image assets with `s3cmd`
-  grunt.registerTask "s3", ["shell:s3"]
+  grunt.registerTask "s3", "Sync image assets with `s3cmd`", [
+    "shell:s3"
+  ]
 
-  # Default task aka. build task
-  grunt.registerTask "default", ["build"]
+  grunt.registerTask "default", "Default task aka. build task", [
+    "build"
+  ]

7-zip-portable.html

@@ -7,25 +7,24 @@
 
 **Table of Contents**
 
-- [Features](#c1)
-- [Setup](#c2)
-- [Managing Media](#c3)
-- [Upgrading](#c4)
-- [Tips](#c5)
-- [Avaiable Styles](#c6)
-  - [`.note`, `.store`, and `.download`](#c6-1)
-  - [`.browser`](#c6-2)
-  - [`.largetype`](#c6-3)
-- [Avaiable Settings](#c7)
-- [Demo](#c8)
-- [GitHub Pages Setup Guide](#c9)
-  - [The Problem](#c9-1)
-  - [The Solution](#c9-2)
+- [Features](#features)
+- [Setup](#setup)
+- [Managing Media](#managing-media)
+- [Upgrading](#upgrading)
+- [Tips](#tips)
+- [Avaiable Styles](#avaiable-styles)
+  - [`.note`, `.store`, and `.download`](#note-store-and-download)
+  - [`.browser`](#browser)
+  - [`.largetype`](#largetype)
+- [Avaiable Settings](#avaiable-settings)
+- [Demo](#demo)
+- [GitHub Pages Setup Guide](#github-pages-setup-guide)
+  - [The Problem](#the-problem)
+  - [The Solution](#the-solution)
 - [Donate](#donate)
 - [Author](#author)
 - [Licenses](#licenses)
 
-<a name="c1"></a>
 ## Features
 
 - **Almace Scaffolding** ships a sleek responsive theme, a variant of [sparanoid.com](http://sparanoid.com/), looking great on any mordern browsers
@@ -50,7 +49,6 @@
 
 *: Well, only when your posts don’t have fancy sliders or other external media files.
 
-<a name="c2"></a>
 ## Setup
 
 1. [Fork](https://github.com/sparanoid/almace-scaffolding/fork) this project, checkout to your local machine.
@@ -60,7 +58,6 @@
 
 Still can't get things working? Why not try my [video tutorials](http://www.youtube.com/watch?v=5NV6Rdv1a3I).
 
-<a name="c3"></a>
 ## Managing Media
 
 Media files are located in `./assets/` and grouped by different formats:
@@ -72,12 +69,10 @@ Media files are located in `./assets/` and grouped by different formats:
 - `./js/`: JavaScript files, put all needed sctipts in this directoy will just work fine. I don't expect to have many scripts so no complex `vender`, `lib`, or other fancy structures used for this project.
 - `./svg/`: The same as `./img/`.
 
-<a name="c4"></a>
 ## Upgrading
 
 Upgrading templates is hard, it will be easy if you are're a casual blogger and keep every template file untouched. Just copy and paste all template files in `_assets`, `_includes`, and `_layouts`. If you change the templates directly, you have to compare them side to side.
 
-<a name="c5"></a>
 ## Tips
 
 - Additional variables are stored in [`./_app/_data/`](/_app/_data) directory. They can be accessed by Jekyll. ([More info](http://jekyllrb.com/docs/datafiles/))
@@ -88,12 +83,10 @@ Upgrading templates is hard, it will be easy if you are're a casual blogger and
 - Customize your site using `custom.less`.
 - Some tasks in `Gruntfile.coffee` are not used in this project, they're copied from my own [website](https://github.com/sparanoid/sparanoid.com), I'll keep them untouched in case you need these.
 
-<a name="c6"></a>
 ## Avaiable Styles
 
 I've written some useful CSS classes for you, see below:
 
-<a name="c6-1"></a>
 ### `.note`, `.store`, and `.download`
 
 A paragraph block with a thin border line.
@@ -110,7 +103,6 @@ Usage:
 </p>
 ```
 
-<a name="c6-2"></a>
 ### `.browser`
 
 A simple browser frame using pure CSS.
@@ -123,7 +115,6 @@ Usage:
 </p>
 ```
 
-<a name="c6-3"></a>
 ### `.largetype`
 
 Make normal paragraph text large enough.
@@ -136,22 +127,18 @@ Usage:
 </p>
 ```
 
-<a name="c7"></a>
 ## Avaiable Settings
 
 All custom settings can be configured at [`_app/_data/var.yml`](_app/_data/var.yml), it's well commented so you should really check it out.
 
-<a name="c8"></a>
 ## Demo
 
 Live demo available at [amsf.github.io](http://amsf.github.io/)
 
 You can also see a more complex live demo using this framework at [my site](http://sparanoid.com/).
 
-<a name="c9"></a>
 ## GitHub Pages Setup Guide
 
-<a name="c9-1"></a>
 ### The Problem
 
 Unfortunately this project doesn't work with GitHub Pages or GitHub Pages for projects. There're some factors that prevent it from generating pages:
@@ -160,7 +147,6 @@ Unfortunately this project doesn't work with GitHub Pages or GitHub Pages for pr
 - Almace Scaffolding uses the latest pre-release Jekyll, so not all features are supported by GitHub Pages renderers.
 - GItHub Pages build server [overwrites the `source` settings](https://help.github.com/articles/pages-don-t-build-unable-to-run-jekyll#source-setting). This prevent it generating pages from current file structure.
 
-<a name="c9-2"></a>
 ### The Solution
 
 I know this can be tricky and more verbose than uploading your Jekyll site directly to your repository. However GitHub Pages support static HTML pages, a workaround solution for using Almace Scaffolding on GitHub Pages is treating your Jekyll site as static pages:
@@ -176,20 +162,17 @@ If you'd like to keep all things under Git control, you can try the following fi
 
 You can see this [live demo](http://github.com/amsf/amsf.github.io/) how to make them friends.
 
-<a name="donate"></a>
 ## Donate
 
 Wanna buy me a cup of coffee? [Great](http://sparanoid.com/donate/).
 
-<a name="author"></a>
 ## Author
 
 **Tunghsiao Liu**
 
 - Twitter: @[tunghsiao](http://twitter.com/tunghsiao)
 - GitHub: @[sparanoid](http://github.com/sparanoid)
 
-<a name="licenses"></a>
 ## Licenses
 
 Following files, directories and their contents are copyright Tunghsiao Liu and licensed under a [CC BY-NC-ND 3.0](http://creativecommons.org/licenses/by-nc-nd/3.0/). You may not reuse anything therein without permission: