From 387642bfa079cfadadf0717a7031954c9f34c10c Mon Sep 17 00:00:00 2001 From: Jun Matsushita Date: Mon, 16 May 2016 12:52:25 +0200 Subject: [PATCH] Renamed repo. Changes folders. Fixed breadcrumbs --- _config.yml | 2 +- code/_layouts/blog_index.jade | 17 +++++++++-------- code/_layouts/foot.jade | 8 +++++--- code/_layouts/hero.jade | 4 ++-- code/_layouts/impact_report.jade | 46 ++++++++++++++++++++++++++++------------------ code/_layouts/includes/breadcrumbs.jade | 4 ++-- code/_layouts/index.jade | 6 ++++-- code/_layouts/navbar.jade | 6 +++--- code/public/css/site.css | 37 +++++++++++++++++++++++++++++-------- content/about.md | 20 +++++++++++--------- content/blog.md | 11 ++++++++++- content/impact/index.md | 8 ++++---- content/impact/reports/2015-08-27-iran_two_factor_phishing.md | 9 --------- content/impact/reports/events/iff/2016-03-05-facebook-account-hijacking.md | 13 ------------- content/impact/reports/events/iff/2016-03-05-google-account-hijacking.md | 13 ------------- content/impact/reports/events/iff/index.md | 4 ---- content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-facebook-account-hijacking.md | 14 ++++++++++++++ content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-google-account-hijacking.md | 13 +++++++++++++ content/impact/reports/events/internet-freedom-festival-2016/index.md | 3 +++ content/impact/reports/inbox/2015-08-27-iran-two-factor-phishing.md | 6 +++--- content/impact/reports/inbox/2016-03-01-hypothetical-email-malware.md | 6 +++--- content/index.md | 6 +++--- metalsmith.json | 92 ++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- package.json | 2 +- 24 files changed, 194 insertions(+), 156 deletions(-) delete mode 100644 content/impact/reports/2015-08-27-iran_two_factor_phishing.md delete mode 100644 content/impact/reports/events/iff/2016-03-05-facebook-account-hijacking.md delete mode 100644 content/impact/reports/events/iff/2016-03-05-google-account-hijacking.md delete mode 100644 content/impact/reports/events/iff/index.md create mode 100644 content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-facebook-account-hijacking.md create mode 100644 content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-google-account-hijacking.md create mode 100644 content/impact/reports/events/internet-freedom-festival-2016/index.md diff --git a/_config.yml b/_config.yml index a036d87..29ca425 100644 --- a/_config.yml +++ b/_config.yml @@ -33,7 +33,7 @@ redcarpet: code: current_branch: master base: 'https://code.iilab.org/openintegrity/' - repo: 'openintegrity.org' + repo: 'www' gems: - jekyll-sitemap - jekyll-gist diff --git a/code/_layouts/blog_index.jade b/code/_layouts/blog_index.jade index a30b2c5..b1cfd56 100644 --- a/code/_layouts/blog_index.jade +++ b/code/_layouts/blog_index.jade @@ -1,13 +1,14 @@ extends default block main + h1.docs-header Recent Blog Posts each post in site.posts.slice(0,10) .docs-section - h6.docs-header - a(href=site.baseurl+"/blog/" + post.datebasename)= post.title - // small= moment(post.date).format("%Y-%m-%j") - small= post.date - if post.children - != post.children[0] - else - != post.content \ No newline at end of file + h6.docs-header + a(href=site.baseurl+"/blog/" + post.datebasename)= post.title + // small= moment(post.date).format("%Y-%m-%j") + small= post.date + if post.children + != post.children[0] + else + != post.content diff --git a/code/_layouts/foot.jade b/code/_layouts/foot.jade index 8bbe793..a6d0495 100644 --- a/code/_layouts/foot.jade +++ b/code/_layouts/foot.jade @@ -3,7 +3,9 @@ hr .container h3.section-heading Want to join the initiative? p.section-description - | Open Integrity needs your help to provide the best and most up to date information. Get in touch to join the initiative ! + | Join us in providing information about software practices. + br + | Get in touch to join the initiative ! a.button.button-primary(href='mailto:contact@openintegrity.org') Get in touch .section.categories .container @@ -14,6 +16,6 @@ hr h4 Developed with ❤ by a(href="https://iilab.org"): img.u-max-full-width(src=site.baseurl+'/images/iilab_white.svg') h5 Information Innovation Lab - p Applied research and development of public interest technology. + p Applied research and development for public interest technology. .two.columns - |   \ No newline at end of file + |   diff --git a/code/_layouts/hero.jade b/code/_layouts/hero.jade index 1f4da3b..4806185 100644 --- a/code/_layouts/hero.jade +++ b/code/_layouts/hero.jade @@ -2,6 +2,6 @@ section.header h1.title Open Integrity Initiative h2.title Data Driven Security and Privacy .row - input(type="email",placeholder="your@email.com") + input(type="email",placeholder="your@email.com",style="text-align:center") .row - input.button(type="submit",value="Keep me updated") \ No newline at end of file + input.button(type="submit",value="Keep me updated") diff --git a/code/_layouts/impact_report.jade b/code/_layouts/impact_report.jade index b010925..623ae11 100644 --- a/code/_layouts/impact_report.jade +++ b/code/_layouts/impact_report.jade @@ -1,26 +1,36 @@ extends default --- -dl - dt Reference - dd: a(href=reference)= reference - | ( - |= reference_type - | ) +block main + dl + if (reference_url) + dt Reference + dd + a(href=reference_url)= reference_url + if (reference_type) + | ( + = reference_type + | ) - dt Source - dd: a(href=source)= source - | ( - |= source_type - | ) + if (source_url) + dt Source + dd + a(href=source_url)= source_url + if (source_type) + | ( + = source_type + | ) - dt Tool - dd= tool + if (tool) + dt Tool + dd= tool - dt Community - dd= community + if (community) + dt Community + dd= community - dt Pattern - dd= pattern + if (pattern) + dt Pattern + dd= pattern -!= content + != content diff --git a/code/_layouts/includes/breadcrumbs.jade b/code/_layouts/includes/breadcrumbs.jade index 862b35d..038f2f0 100644 --- a/code/_layouts/includes/breadcrumbs.jade +++ b/code/_layouts/includes/breadcrumbs.jade @@ -5,7 +5,7 @@ a(href=site.baseurl) Home | each crumb,i in crumbs - - var crumb_display = crumb.replace('-',' ').replace('.html', '') + - var crumb_display = crumb.replace(/-/g,' ').replace('.html', '') - crumbs_path = crumbs_path + "/" + crumb if i==crumbs.length -1 | / @@ -13,4 +13,4 @@ else | / a(href=site.baseurl+crumbs_path+'/')= capitalize(crumb_display) - | \ No newline at end of file + | diff --git a/code/_layouts/index.jade b/code/_layouts/index.jade index fbbe352..1df2c71 100644 --- a/code/_layouts/index.jade +++ b/code/_layouts/index.jade @@ -5,8 +5,10 @@ block main - var capitalize = function(text){ return text.toLowerCase().replace( /\b\w/g, function (m) { return m.toUpperCase(); }) }; if index each list in index - = capitalize(list.replace(/\//g, ' ')) + = capitalize(list.replace(/[\/-]/g, ' ')) ul + = list + = site each report in site[list] - var report_name = report.datebasename ? capitalize(report.datebasename.replace(/-/g,' ')) : report.path.split('/').pop() - li: a(href=site.baseurl+"/"+report.path)= report_name \ No newline at end of file + li: a(href=site.baseurl+"/"+report.path)= report_name diff --git a/code/_layouts/navbar.jade b/code/_layouts/navbar.jade index f9df44f..fa49f63 100644 --- a/code/_layouts/navbar.jade +++ b/code/_layouts/navbar.jade @@ -9,9 +9,9 @@ nav.navbar #codeNavAbout.popover ul.popover-list li.popover-item: a.popover-link(href=site.baseurl+"/about") Overview - li.popover-item: a.popover-link(href=site.baseurl+"/about#team") Team + //- li.popover-item: a.popover-link(href=site.baseurl+"/about#team") Team li.popover-item: a.popover-link(href=site.baseurl+"/about#partners") Partners - li.popover-item: a.popover-link(href=site.baseurl+"/about#board") Advisory Board + //- li.popover-item: a.popover-link(href=site.baseurl+"/about#board") Advisory Board li.navbar-item a.navbar-link(href="#",data-popover="#codeNavPopover") Approach #codeNavPopover.popover @@ -22,4 +22,4 @@ nav.navbar li.popover-item: a.popover-link(href="#") Metrics (soon) li.popover-item: a.popover-link(href="#") Scores (soon) li.navbar-item: a.navbar-link(href=site.baseurl+"/blog") Blog - li.navbar-item: a.navbar-link(href=site.baseurl+"/join") Join \ No newline at end of file + li.navbar-item: a.navbar-link(href=site.baseurl+"/join") Join diff --git a/code/public/css/site.css b/code/public/css/site.css index cc20668..6a198d7 100644 --- a/code/public/css/site.css +++ b/code/public/css/site.css @@ -11,6 +11,27 @@ h1, h2, h3, h4, h5, h6, nav a, .links small a, .links small { font-size: 80%; } +dl { + border: 2px double antiquewhite; + padding: 2rem; + margin: 4rem 0 1rem; + background-color: ghostwhite; +} +dt { + float: left; + clear: left; + width: 100px; + text-align: right; + font-weight: bold; +} +dt:after { + content: ":"; +} +dd { + margin: 0 0 0 110px; + padding: 0 0 0.5em 0; +} + h1, .space { margin-top: 4rem } @@ -92,7 +113,7 @@ blockquote p { background-size: cover; color: #fff; } -.categories .section-description { +.categories .section-description { margin-bottom: 4rem; } /* Bigger than 550 */ @@ -110,7 +131,7 @@ blockquote p { /* Bigger than 750 */ @media (min-width: 750px) { .section { - padding: 14rem 0 15rem; + padding: 10rem 0 9rem; } .section-description { max-width: 60%; @@ -118,14 +139,14 @@ blockquote p { margin-right: auto; } .categories { - padding: 15rem 0 8rem; + padding: 10rem 0 9rem; } } /* Bigger than 1000 */ @media (min-width: 1000px) { .section { - padding: 20rem 0 19rem; + padding: 10rem 0 9rem; } } /* Default Skeleton CSS @@ -183,7 +204,7 @@ blockquote p { white-space: pre; word-wrap: break-word } .example { - position: relative; + position: relative; margin-top: 4rem; } .example-header { font-weight: 600; @@ -215,7 +236,7 @@ blockquote p { /* Larger than phone */ @media (min-width: 550px) { .header { - margin-top: 9rem; + margin-top: 9rem; margin-bottom: 6rem; } .value-props { margin-top: 9rem; @@ -295,7 +316,7 @@ blockquote p { -webkit-filter: drop-shadow(0 0 6px rgba(0,0,0,.1)); -moz-filter: drop-shadow(0 0 6px rgba(0,0,0,.1)); filter: drop-shadow(0 0 6px rgba(0,0,0,.1)); } - .popover-item:first-child .popover-link:after, + .popover-item:first-child .popover-link:after, .popover-item:first-child .popover-link:before { bottom: 100%; left: 50%; @@ -345,4 +366,4 @@ blockquote p { .popover-link:hover, .popover-item:first-child .popover-link:hover:after { border-bottom-color: #33C3F0; } -} \ No newline at end of file +} diff --git a/content/about.md b/content/about.md index 59b91d1..d766520 100644 --- a/content/about.md +++ b/content/about.md @@ -4,19 +4,21 @@ header: values title: About --- -The [Open Integrity Initiative](https://openintegrity.org) raises the quality of software for security and privacy. +[Open Integrity](https://openintegrity.org) raises the quality of software for security and privacy. -At OII you find a growing list of software projects portrayed with a strong focus on digital security and end user privacy. The aggregated information is synthesized and compared against best practices and rated in aspects like security audits, usability reviews and terms of services. +Open Integrity maintains a list of software projects and provides information about their focus on digital security and end user privacy. Partnerships drive the development of automated measurement and expert review workflows. These metrics are a source of ground truth upon which evidence-backed scorecards can be developed for use by trainers, advocates, funders and policy makers working to improve end-user security and privacy. -It supports an ongoing consultation that feeds into a framework for the measurement of software project practices. The initiative leverages existing partnerships and works to build new ones to drive the development and deployment of automated measurement and peer-review workflows. At the online platform these measurements are aggregated, categorized within an open metrics taxonomy and made publicly available through an open data repository. +The aggregated information measures best practices adoption in practices such as security, usability and terms of services. These measurements are aggregated, categorized within an open metrics taxonomy and made publicly available through an open data repository. -These metrics are a source of ground truth upon which evidence-backed scorecards can be developed for use by trainers, advocates, funders and policy makers working to improve end-user security and privacy. By focusing on the impact of best practices, as they relate to at-risk groups, the Open Integrity Initiative will provide decision support for those who need it most, while also serving a growing audience of software users. +Open Integrity is also an ongoing consultation on impact that reflects on the measurement of software project practices. By focusing on the impact of best practices, as they relate to at-risk groups, the Open Integrity Initiative will provide decision support for those who need it most, while also serving a growing audience of software users. -In the first phase of the project we focus on creating a minimum viable platform to seek feedback from the community by sharing our development activities, methodologies and outputs using tools that enable free, open and asynchronous contribution. At the end of this phase, we will be in a position to evaluate both the success of our approach and its potential impact while soliciting additional sources of funding. - -## Team +In the first phase of the project we focus on developing a minimum viable platform to seek feedback from the community. We want our process to be open and to enable ongoing interactions about our activities, methodologies and outputs. +At the end of this phase, we will be in a position to evaluate both the success of our approach and its potential impact while soliciting additional sources of funding. + ## Partners @@ -35,6 +37,6 @@ The project receives a $104,500 grant from the Media Democracy Fund to boot the The Open Tech Fund has allocated funds to support the Data Phase of the project during which we will collect and review existing expert information across multiple disciplines about current development practices. This data will cover a range of tools and be kept up to date. It will provide an outlet for independent audits sourced by expert communities. A public website will be launched with an initial set of data in order to solicit feedback from the community. + diff --git a/content/blog.md b/content/blog.md index 04b82ee..13dc97c 100644 --- a/content/blog.md +++ b/content/blog.md @@ -1,4 +1,13 @@ --- -layout: blog_index +layout: default title: Blog --- + +# Recent Blog Posts + +
+{{#each site.posts}} +

{{ title }} {{ moment date "YYYY-MM-DD"}}

+

{{#if children }}{{ children.[0] }}{{/if}} More...

+{{/each}} +
diff --git a/content/impact/index.md b/content/impact/index.md index c7f82b6..1989d0f 100644 --- a/content/impact/index.md +++ b/content/impact/index.md @@ -1,12 +1,12 @@ --- layout: index -index: - - impact/reports/inbox - - impact/reports/events/iff +index: + - "impact/reports/inbox" + - "impact/reports/events/internet-freedom-festival-2016" --- :[](../framework/impact.md) # List of submitted reports -You can find below the list of reports submitted and pending review. \ No newline at end of file +You can find below the list of reports submitted and pending review. diff --git a/content/impact/reports/2015-08-27-iran_two_factor_phishing.md b/content/impact/reports/2015-08-27-iran_two_factor_phishing.md deleted file mode 100644 index 61cc4a8..0000000 --- a/content/impact/reports/2015-08-27-iran_two_factor_phishing.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -reference: https://citizenlab.org/2015/08/iran_two_factor_phishing/ -reference_type: report -source: https://citizenlab.org -source_type: academia -tool: gmail -community: iran -pattern: phishing ---- \ No newline at end of file diff --git a/content/impact/reports/events/iff/2016-03-05-facebook-account-hijacking.md b/content/impact/reports/events/iff/2016-03-05-facebook-account-hijacking.md deleted file mode 100644 index 1d9e90e..0000000 --- a/content/impact/reports/events/iff/2016-03-05-facebook-account-hijacking.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -reference: /blog/internet-freedom-festival -reference_type: event -source: ? -source_type: anonymous -tool: facebook -community: ? -pattern: hijacking ---- -# Impact -Facebook account hacked impersonification and misinformation spread, 2-step set up -# Tool -Mobile phone did not have password protection \ No newline at end of file diff --git a/content/impact/reports/events/iff/2016-03-05-google-account-hijacking.md b/content/impact/reports/events/iff/2016-03-05-google-account-hijacking.md deleted file mode 100644 index a474d40..0000000 --- a/content/impact/reports/events/iff/2016-03-05-google-account-hijacking.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -reference: /blog/internet-freedom-festival -reference_type: event -source: ? -source_type: anonymous -tool: facebook -community: ? -pattern: hijacking ---- -# Impact -Google account is hacked even though 2-step -# Tool -Laptop was confiscated account logged in for 30 days \ No newline at end of file diff --git a/content/impact/reports/events/iff/index.md b/content/impact/reports/events/iff/index.md deleted file mode 100644 index 1ab753a..0000000 --- a/content/impact/reports/events/iff/index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -layout: default ---- - diff --git a/content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-facebook-account-hijacking.md b/content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-facebook-account-hijacking.md new file mode 100644 index 0000000..00f9306 --- /dev/null +++ b/content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-facebook-account-hijacking.md @@ -0,0 +1,14 @@ +--- +reference_url: /blog/internet-freedom-festival +reference_type: event +source_url: +source_type: anonymous +tool: facebook +community: +pattern: hijacking +--- + +# Impact +Facebook account hacked impersonification and misinformation spread, 2-step set up +# Tool +Mobile phone did not have password protection diff --git a/content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-google-account-hijacking.md b/content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-google-account-hijacking.md new file mode 100644 index 0000000..93d3c5d --- /dev/null +++ b/content/impact/reports/events/internet-freedom-festival-2016/2016-03-05-google-account-hijacking.md @@ -0,0 +1,13 @@ +--- +reference_url: /blog/internet-freedom-festival +reference_type: event +source_url: +source_type: anonymous +tool: facebook +community: +pattern: hijacking +--- +# Impact +Google account is hacked even though 2-step +# Tool +Laptop was confiscated account logged in for 30 days diff --git a/content/impact/reports/events/internet-freedom-festival-2016/index.md b/content/impact/reports/events/internet-freedom-festival-2016/index.md new file mode 100644 index 0000000..0d6905d --- /dev/null +++ b/content/impact/reports/events/internet-freedom-festival-2016/index.md @@ -0,0 +1,3 @@ +--- +layout: default +--- diff --git a/content/impact/reports/inbox/2015-08-27-iran-two-factor-phishing.md b/content/impact/reports/inbox/2015-08-27-iran-two-factor-phishing.md index 61cc4a8..aba7225 100644 --- a/content/impact/reports/inbox/2015-08-27-iran-two-factor-phishing.md +++ b/content/impact/reports/inbox/2015-08-27-iran-two-factor-phishing.md @@ -1,9 +1,9 @@ --- -reference: https://citizenlab.org/2015/08/iran_two_factor_phishing/ +reference_url: https://citizenlab.org/2015/08/iran_two_factor_phishing/ reference_type: report -source: https://citizenlab.org +source_url: https://citizenlab.org source_type: academia tool: gmail community: iran pattern: phishing ---- \ No newline at end of file +--- diff --git a/content/impact/reports/inbox/2016-03-01-hypothetical-email-malware.md b/content/impact/reports/inbox/2016-03-01-hypothetical-email-malware.md index 25b95b3..5f06bbe 100644 --- a/content/impact/reports/inbox/2016-03-01-hypothetical-email-malware.md +++ b/content/impact/reports/inbox/2016-03-01-hypothetical-email-malware.md @@ -1,5 +1,5 @@ --- -source: http://www.tripwire.com/state-of-security/security-data-protection/cyber-security/attackers-using-rats-to-slave-victims-computers-sextort-children/ -category: +source_url: http://www.tripwire.com/state-of-security/security-data-protection/cyber-security/attackers-using-rats-to-slave-victims-computers-sextort-children/ +category: --- -Opening the attachement installed a RAT. \ No newline at end of file +Opening the attachement installed a RAT. diff --git a/content/index.md b/content/index.md index f6f439d..547c2dd 100644 --- a/content/index.md +++ b/content/index.md @@ -37,7 +37,7 @@ If you're collecting data or doing research on security and privacy then we'd li
#### Policy - [**Terms of Service**](# "Current Focus") -- Corporate Accountability +- Corporate Accountability - Transparency reporting
@@ -76,7 +76,7 @@ Take a peek into our current thinking on design: \ No newline at end of file + diff --git a/metalsmith.json b/metalsmith.json index c7ab308..81c2a39 100644 --- a/metalsmith.json +++ b/metalsmith.json @@ -4,12 +4,12 @@ "metadata": {}, "clean": true, "frontmatter": false, - "ignore": [ + "ignore": [ "LICENSE", "README.md" ], "plugins": [ - { + { "metalsmith-ignore": [ "**/.git/**", "design/mockup/**" @@ -19,31 +19,34 @@ "metalsmith-static": { "src": "_tmp/code/public", "dest": "." - } + } }, - { + { "metalsmith-ignore": [ "code/**" ] }, - { + { "metalsmith-congregate": { "files": [ "_config.yml", "code/404.html", "code/atom.xml" ], "output": "." } }, - { + { "metalsmith-metadata": { "site": "_config.yml" } }, - { + { "metalsmith-drafts": {} }, - { + { "metalsmith-matters": {} }, - { + { + "metalsmith-debug": {} + }, + { "metalsmith-paths": { "property": "paths", "directoryIndex": "index.html" @@ -51,23 +54,15 @@ }, { "metalsmith-metacopy": { - "file": [ + "file": [ { "src": "paths.href", "dest": "source" } ] } }, { - "metalsmith-many-more": { - "pattern": "**/*.html", - "separator": "", - "key": "children", - "trim": true - } - }, - { "metalsmith-collections": { "pages": { - "pattern": [ + "pattern": [ "**", "!blog/**", "!**/*.xml", @@ -87,8 +82,8 @@ "sortBy": "date", "reverse": true }, - "impact/reports/events/iff": { - "pattern": [ "impact/reports/events/iff/*.md" ], + "impact/reports/events/internet-freedom-festival-2016": { + "pattern": [ "impact/reports/events/internet-freedom-festival-2016/*.md" ], "sortBy": "date", "reverse": true } @@ -96,23 +91,23 @@ }, { "metalsmith-filemetadata": [ - {"pattern": "architecture/**/*.*", "metadata": {"subrepo": "architecture"}}, - {"pattern": "framework/**/*.*", "metadata": {"subrepo": "framework"}}, - {"pattern": "impact/**/*.*", "metadata": {"subrepo": "impact"}}, - {"pattern": "design/**/*.*", "metadata": {"subrepo": "design"}}, - {"pattern": "practices/**/*.*", "metadata": {"subrepo": "practices"}}, - {"pattern": "data/**/*.*", "metadata": {"subrepo": "data"}}, - {"pattern": "scores/**/*.*", "metadata": {"subrepo": "scores"}}, - {"pattern": "schema/**/*.*", "metadata": {"subrepo": "schema"}}, - {"pattern": "metrics/**/*.*", "metadata": {"subrepo": "metrics"}} + {"pattern": "architecture/**/*.*", "preserve": "true", "metadata": {"subrepo": "architecture"}}, + {"pattern": "framework/**/*.*", "preserve": "true", "metadata": {"subrepo": "framework"}}, + {"pattern": "impact/**/*.*", "preserve": "true", "metadata": {"subrepo": "impact", "layout": "impact_report"}}, + {"pattern": "design/**/*.*", "preserve": "true", "metadata": {"subrepo": "design"}}, + {"pattern": "practices/**/*.*", "preserve": "true", "metadata": {"subrepo": "practices"}}, + {"pattern": "data/**/*.*", "preserve": "true", "metadata": {"subrepo": "data"}}, + {"pattern": "scores/**/*.*", "preserve": "true", "metadata": {"subrepo": "scores"}}, + {"pattern": "schema/**/*.*", "preserve": "true", "metadata": {"subrepo": "schema"}}, + {"pattern": "metrics/**/*.*", "preserve": "true", "metadata": {"subrepo": "metrics"}} ] }, - { + { "metalsmith-build-date": true }, - { + { "metalsmith-metacopy": { - "file": [ + "file": [ { "src": "paths.href", "dest": "url" }, { "src": "paths.name", "dest": "basename" } ], @@ -126,19 +121,27 @@ "metalsmith-date-in-filename": { "override": true, "basename": "datebasename" - } - }, + } + }, { "metalsmith-register-helpers": { "directory": "code/_helpers" } }, { + "metalsmith-many-more": { + "pattern": "**/*.md", + "separator": "", + "key": "children", + "trim": true + } + }, + { "metalsmith-in-place": { "engine": "handlebars" } }, - { + { "metalsmith-pandoc": { "pattern": "**/*.md", "from": "markdown_github+definition_lists+raw_html+markdown_in_html_blocks+link_attributes" @@ -146,7 +149,7 @@ }, { "metalsmith-metacopy": { - "file": [ + "file": [ { "src": "contents", "dest": "content" }, { "src": "paths", "dest": "page" }, { "src": "url", "dest": "page.path" }, @@ -155,7 +158,7 @@ ] } }, - { + { "metalsmith-permalinks": { "pattern": ":title", "linksets": [{ @@ -164,15 +167,15 @@ }] } }, - { + { "metalsmith-paths": { "property": "paths", "directoryIndex": "index.html" } }, - { + { "metalsmith-metacopy": { - "file": [ + "file": [ { "src": "paths.href", "dest": "url" }, { "src": "paths.name", "dest": "basename" }, { "src": "paths", "dest": "page" }, @@ -186,7 +189,7 @@ ] } }, - { + { "metalsmith-layouts": { "engine": "jade", "directory": "code/_layouts", @@ -202,9 +205,6 @@ "allowRedirects":true, "warn": true } - }, - { - "metalsmith-debug": {} } ] -} \ No newline at end of file +} diff --git a/package.json b/package.json index 8086adb..995e238 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "metalsmith-layouts": "contentascode/metalsmith-layouts", "metalsmith-many-more": "iilab/metalsmith-many-more", "metalsmith-markdown": "^0.2.1", - "metalsmith-matters": "^1.1.0", + "metalsmith-matters": "^1.2.0", "metalsmith-metacopy": "contentascode/metalsmith-metacopy", "metalsmith-metadata": "contentascode/metalsmith-metadata", "metalsmith-navigation": "^0.2.9", -- libgit2 0.26.0