diff --git a/build.js b/build.js index e4ff353..500bb4e 100644 --- a/build.js +++ b/build.js @@ -101,17 +101,17 @@ var metalsmith = Metalsmith(__dirname) reverse: true, refer: true, metadata: { - layout: './../src/layouts/article.hbs' // default is /layouts + layout: './../src/layouts/docs.hbs' // default is /layouts } }, - article: { - pattern: 'article/**/*', + blog: { + pattern: 'blog/**/*', sortBy: 'date', reverse: true, refer: true, limit: 50, metadata: { - layout: './../src/layouts/article.hbs' + layout: './../src/layouts/blog.hbs' } }, tutorials: { @@ -120,6 +120,9 @@ var metalsmith = Metalsmith(__dirname) reverse: true, refer: true, limit: 50, + metadata: { + layout: './../src/layouts/tutorials.hbs' + } }, boxes: { pattern: 'boxes/**/*', @@ -127,13 +130,16 @@ var metalsmith = Metalsmith(__dirname) reverse: true, refer: true, limit: 50, + metadata: { + layout: './../src/layouts/boxes.hbs' + } } })) .use(markdownPrecompiler({ // convert {{> navmain}} in header.html engine: "handlebars", pattern: /\.md$/, // regex; no idea why .md works, check discoverPartials above partialsPath: './../partials', - partials: ['navmain', 'navsub', 'footer', 'header', 'meta', 'pagelist'] + partials: ['navmain', 'navsub', 'footer', 'header', 'meta', 'pagelist', 'pagelist-docs'] })) .use(markdown()) // convert markdown .use(permalinks({ // generate permalinks @@ -173,8 +179,8 @@ metalsmith hostname: siteMeta.domain + (siteMeta.rootpath || ''), omitIndex: true // replace any paths ending in index.html with ''. Useful when you're using metalsmith-permalinks. })) - .use(rssfeed({ // generate RSS feed for articles - collection: 'article', + .use(rssfeed({ // generate RSS feed for articles (update: now blog) + collection: 'blog', site_url: siteMeta.domain + (siteMeta.rootpath || ''), title: siteMeta.name, description: siteMeta.desc diff --git a/src/html/docs/blockman.md b/src/html/docs/blockman.md index 6487265..07f38a9 100644 --- a/src/html/docs/blockman.md +++ b/src/html/docs/blockman.md @@ -1,7 +1,8 @@ --- title: blockman +description: WIP from the cloud on wheels priority: 0.7 --- -WIP from the cloud on wheels \ No newline at end of file +WIP from the cloud on wheels \ No newline at end of file diff --git a/src/html/docs/dashbox.md b/src/html/docs/dashbox.md index aab2b67..e072b32 100644 --- a/src/html/docs/dashbox.md +++ b/src/html/docs/dashbox.md @@ -1,5 +1,6 @@ --- title: dashbox +description: Simple development framework for Dash Platform priority: 0.8 --- diff --git a/src/layouts/blog.hbs b/src/layouts/blog.hbs new file mode 100644 index 0000000..b275bc7 --- /dev/null +++ b/src/layouts/blog.hbs @@ -0,0 +1,65 @@ + + + + + {{> meta }} + + + + + {{> header }} + + + +
+ + {{> navsub }} + +
+ +

{{ title }}

+ + {{#if isPage}} + {{else}} + +

Published {{ dateFormat }}, {{ wordCount }} words, {{ readingTime }}-minute read

+ + {{/if}} + + {{{ contents }}} + + {{#if isPage}} + + {{> pagelist }} + + {{else}} + + + + {{/if}} + +
+ + {{> footer template='article' }} + +
+ + + + + + \ No newline at end of file diff --git a/src/layouts/boxes.hbs b/src/layouts/boxes.hbs new file mode 100644 index 0000000..73b0d21 --- /dev/null +++ b/src/layouts/boxes.hbs @@ -0,0 +1,51 @@ + + + + + {{> meta }} + + + + + {{> header }} + + {{!-- --}} +
+ +
+ + {{!-- {{> navsub }} --}} + +
+ +

{{ title }}

+ + {{#if isPage}} + {{else}} + +

Published {{ dateFormat }}, {{ wordCount }} words, {{ readingTime }}-minute read

+ + {{/if}} + + {{{ contents }}} + + {{#if isPage}} + + {{> pagelist }} + + {{else}} + + + {{/if}} + +
+ + {{> footer template='article' }} + +
+ +
+ + + + \ No newline at end of file diff --git a/src/layouts/docs.hbs b/src/layouts/docs.hbs new file mode 100644 index 0000000..bacf842 --- /dev/null +++ b/src/layouts/docs.hbs @@ -0,0 +1,65 @@ + + + + + {{> meta }} + + + + + {{> header }} + + + +
+ + {{> navsub }} + +
+ +

{{ title }}

+ + {{#if isPage}} + {{else}} + +

+ + {{/if}} + + {{{ contents }}} + + {{#if isPage}} + + {{> pagelist-docs }} + + {{else}} + + + + {{/if}} + +
+ + {{> footer template='article' }} + +
+ + + + + + \ No newline at end of file diff --git a/src/layouts/tutorials.hbs b/src/layouts/tutorials.hbs new file mode 100644 index 0000000..b275bc7 --- /dev/null +++ b/src/layouts/tutorials.hbs @@ -0,0 +1,65 @@ + + + + + {{> meta }} + + + + + {{> header }} + + + +
+ + {{> navsub }} + +
+ +

{{ title }}

+ + {{#if isPage}} + {{else}} + +

Published {{ dateFormat }}, {{ wordCount }} words, {{ readingTime }}-minute read

+ + {{/if}} + + {{{ contents }}} + + {{#if isPage}} + + {{> pagelist }} + + {{else}} + + + + {{/if}} + +
+ + {{> footer template='article' }} + +
+ + + + + + \ No newline at end of file diff --git a/src/partials/pagelist-docs.html b/src/partials/pagelist-docs.html new file mode 100644 index 0000000..7c39691 --- /dev/null +++ b/src/partials/pagelist-docs.html @@ -0,0 +1,18 @@ +{{#if navsub}} + +{{/if}} \ No newline at end of file