Skip to content

Commit

Permalink
Merge branch 'master' into justinph-master
Browse files Browse the repository at this point in the history
  • Loading branch information
doowb committed Sep 6, 2016
2 parents 8710e38 + 36989de commit 76e0603
Show file tree
Hide file tree
Showing 121 changed files with 25,935 additions and 50,844 deletions.
29 changes: 1 addition & 28 deletions test/actual/assets_base.html

Large diffs are not rendered by default.

29 changes: 1 addition & 28 deletions test/actual/assets_blank_path.html

Large diffs are not rendered by default.

29 changes: 1 addition & 28 deletions test/actual/assets_dot_slash.html

Large diffs are not rendered by default.

29 changes: 1 addition & 28 deletions test/actual/assets_nested.html

Large diffs are not rendered by default.

29 changes: 1 addition & 28 deletions test/actual/assets_trailing_slash.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/asc/alert.html

Large diffs are not rendered by default.

834 changes: 280 additions & 554 deletions test/actual/collections/asc/collections-categories.html

Large diffs are not rendered by default.

824 changes: 276 additions & 548 deletions test/actual/collections/asc/collections-pages.html

Large diffs are not rendered by default.

836 changes: 280 additions & 556 deletions test/actual/collections/asc/collections-tags.html

Large diffs are not rendered by default.

860 changes: 278 additions & 582 deletions test/actual/collections/asc/collections.html

Large diffs are not rendered by default.

816 changes: 278 additions & 538 deletions test/actual/collections/asc/complex.html

Large diffs are not rendered by default.

846 changes: 278 additions & 568 deletions test/actual/collections/asc/context.html

Large diffs are not rendered by default.

807 changes: 276 additions & 531 deletions test/actual/collections/asc/debug-helpers.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/asc/example.html

Large diffs are not rendered by default.

810 changes: 277 additions & 533 deletions test/actual/collections/asc/gist-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/asc/lodash.html

Large diffs are not rendered by default.

819 changes: 279 additions & 540 deletions test/actual/collections/asc/md-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/asc/no-yfm.html

Large diffs are not rendered by default.

814 changes: 278 additions & 536 deletions test/actual/collections/asc/yfm-context.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/asc/yfm.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/complex/alert.html

Large diffs are not rendered by default.

834 changes: 280 additions & 554 deletions test/actual/collections/complex/collections-categories.html

Large diffs are not rendered by default.

824 changes: 276 additions & 548 deletions test/actual/collections/complex/collections-pages.html

Large diffs are not rendered by default.

836 changes: 280 additions & 556 deletions test/actual/collections/complex/collections-tags.html

Large diffs are not rendered by default.

860 changes: 278 additions & 582 deletions test/actual/collections/complex/collections.html

Large diffs are not rendered by default.

816 changes: 278 additions & 538 deletions test/actual/collections/complex/complex.html

Large diffs are not rendered by default.

846 changes: 278 additions & 568 deletions test/actual/collections/complex/context.html

Large diffs are not rendered by default.

807 changes: 276 additions & 531 deletions test/actual/collections/complex/debug-helpers.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/complex/example.html

Large diffs are not rendered by default.

810 changes: 277 additions & 533 deletions test/actual/collections/complex/gist-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/complex/lodash.html

Large diffs are not rendered by default.

819 changes: 279 additions & 540 deletions test/actual/collections/complex/md-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/complex/no-yfm.html

Large diffs are not rendered by default.

814 changes: 278 additions & 536 deletions test/actual/collections/complex/yfm-context.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/complex/yfm.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/custom/alert.html

Large diffs are not rendered by default.

834 changes: 280 additions & 554 deletions test/actual/collections/custom/collections-categories.html

Large diffs are not rendered by default.

824 changes: 276 additions & 548 deletions test/actual/collections/custom/collections-pages.html

Large diffs are not rendered by default.

836 changes: 280 additions & 556 deletions test/actual/collections/custom/collections-tags.html

Large diffs are not rendered by default.

860 changes: 278 additions & 582 deletions test/actual/collections/custom/collections.html

Large diffs are not rendered by default.

816 changes: 278 additions & 538 deletions test/actual/collections/custom/complex.html

Large diffs are not rendered by default.

846 changes: 278 additions & 568 deletions test/actual/collections/custom/context.html

Large diffs are not rendered by default.

807 changes: 276 additions & 531 deletions test/actual/collections/custom/debug-helpers.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/custom/example.html

Large diffs are not rendered by default.

810 changes: 277 additions & 533 deletions test/actual/collections/custom/gist-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/custom/lodash.html

Large diffs are not rendered by default.

819 changes: 279 additions & 540 deletions test/actual/collections/custom/md-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/custom/no-yfm.html

Large diffs are not rendered by default.

814 changes: 278 additions & 536 deletions test/actual/collections/custom/yfm-context.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/custom/yfm.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/desc/alert.html

Large diffs are not rendered by default.

834 changes: 280 additions & 554 deletions test/actual/collections/desc/collections-categories.html

Large diffs are not rendered by default.

824 changes: 276 additions & 548 deletions test/actual/collections/desc/collections-pages.html

Large diffs are not rendered by default.

836 changes: 280 additions & 556 deletions test/actual/collections/desc/collections-tags.html

Large diffs are not rendered by default.

860 changes: 278 additions & 582 deletions test/actual/collections/desc/collections.html

Large diffs are not rendered by default.

816 changes: 278 additions & 538 deletions test/actual/collections/desc/complex.html

Large diffs are not rendered by default.

846 changes: 278 additions & 568 deletions test/actual/collections/desc/context.html

Large diffs are not rendered by default.

807 changes: 276 additions & 531 deletions test/actual/collections/desc/debug-helpers.html

Large diffs are not rendered by default.

813 changes: 277 additions & 536 deletions test/actual/collections/desc/example.html

Large diffs are not rendered by default.

810 changes: 277 additions & 533 deletions test/actual/collections/desc/gist-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/desc/lodash.html

Large diffs are not rendered by default.

819 changes: 279 additions & 540 deletions test/actual/collections/desc/md-helper.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/desc/no-yfm.html

Large diffs are not rendered by default.

814 changes: 278 additions & 536 deletions test/actual/collections/desc/yfm-context.html

Large diffs are not rendered by default.

806 changes: 276 additions & 530 deletions test/actual/collections/desc/yfm.html

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions test/actual/layout_ext/layoutext.html
Expand Up @@ -16,33 +16,25 @@
<!-- pagination -->
<ul class="pager">


<li class="previous disabled">
<a unselectable="on" class="unselectable">First</a>
</li>
<li class="previous disabled">
<a unselectable="on" class="unselectable">&larr; Previous</a>
</li>





<li class="active pager-middle">
<a href="layoutext.html">1</a>
</li>





<li class="next disabled">
<a unselectable="on" class="unselectable">Last</a>
</li>
<li class="next disabled">
<a unselectable="on" class="unselectable">Next &rarr;</a>
</li>


</ul><style>
.unselectable {
Expand Down
23 changes: 1 addition & 22 deletions test/actual/noyfm/no-yfm.html
Expand Up @@ -20,33 +20,25 @@ <h4><strong class="text-muted">test/fixtures/pages/no-yfm.hbs</strong> &#x2192;

<ul class="pager">


<li class="previous disabled">
<a unselectable="on" class="unselectable">First</a>
</li>
<li class="previous disabled">
<a unselectable="on" class="unselectable">&larr; Previous</a>
</li>





<li class="active pager-middle">
<a href="no-yfm.html">1</a>
</li>





<li class="next disabled">
<a unselectable="on" class="unselectable">Last</a>
</li>
<li class="next disabled">
<a unselectable="on" class="unselectable">Next &rarr;</a>
</li>


</ul><style>
.unselectable {
Expand All @@ -66,33 +58,25 @@ <h4><strong class="text-muted">test/fixtures/pages/no-yfm.hbs</strong> &#x2192;
<!-- pagination -->
<ul class="nav nav-pills nav-stacked">


<li class="prev disabled">
<a unselectable="on" class="unselectable">First</a>
</li>
<li class="prev disabled">
<a unselectable="on" class="unselectable">&larr; Previous</a>
</li>





<li class="active">
<a href="no-yfm.html">1</a>
</li>





<li class="next disabled">
<a unselectable="on" class="unselectable">Next &rarr;</a>
</li>
<li class="next disabled">
<a unselectable="on" class="unselectable">Last</a>
</li>


</ul>
</div>
Expand All @@ -113,10 +97,8 @@ <h4><strong>Page title:</strong> (no title defined)</h4>
<div class="row">
<div class="col-md-6">
<!-- Categories Collection -->

</div>
<div class="col-md-6">

</div>
</div>

Expand All @@ -134,9 +116,7 @@ <h4><strong>Page title:</strong> (no title defined)</h4>
<h1>Content</h1>
</div>
<ul>

<li><a href="no-yfm.html">no-yfm.html</a></li>

</ul>

<hr>
Expand Down Expand Up @@ -211,7 +191,6 @@ <h1>Each pages</h1>
basename: no-yfm
ext: .html
-->

</ul>

<h1>Debug Info</h1>
Expand Down Expand Up @@ -243,7 +222,7 @@ <h1>Debug Info</h1>
"last": true,
"middle": false,
"number": 1,
"page": "<!DOCTYPE html>\n <html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\">\n <title>Layout filename: '{{layout}}'</title>\n <link rel=\"stylesheet\" href=\"http://getbootstrap.com/dist/css/bootstrap.min.css\">\n <link rel=\"stylesheet\" href=\"{{assets}}/validation.css\">\n </head>\n <body style=\"padding-top: 60px;\">\n <div class=\"container\">\n\n <!-- validate assets path -->\n <section id=\"validate\"></section>\n <div class=\"docs-section\">\n <div class=\"docs-header\" id=\"content\">\n <h4><strong class=\"text-muted\">{{page.src}}</strong> &#x2192; <strong class=\"text-success\">{{page.dest}}</strong></h4>\n </div>\n <hr>\n </div>\n\n {{pager pagination}}\n <hr>\n\n <div class=\"row\">\n <!-- Column: sidebar -->\n <div class=\"col-md-3\">\n <div class=\"bs-sidebar hidden-print\" role=\"complementary\">\n <!-- pagination -->\n {{nav pagination}}\n </div>\n </div>\n <!-- Column: content -->\n <div class=\"col-md-9\" role=\"main\">\n <div class=\"docs-section\">\n <div class=\"docs-header\" id=\"content\">\n <h4><strong>Page layout:</strong> {{default originalLayout '(no layout defined)'}}</h4>\n <h4><strong>Page src:</strong> {{page.src}}</h4>\n <h4><strong>Page dest:</strong> {{page.dest}}</h4>\n <h4><strong>Dest filename:</strong> {{page.filename}}</h4>\n <h4><strong>Dest basename:</strong> {{page.basename}}</h4>\n <h4><strong>Page title:</strong> {{default title '(no title defined)'}}</h4>\n </div>\n\n <hr>\n <div class=\"row\">\n <div class=\"col-md-6\">\n <!-- Categories Collection -->\n {{#if categories}}\n {{> collections-categories }}\n {{/if}}\n </div>\n <div class=\"col-md-6\">\n {{#if tags}}\n {{> collections-tags }}\n {{/if}}\n </div>\n </div>\n\n <hr>\n\n There is no YAML front matter in this page.\n\n<div>{{noyfm.one}}</div>\n<div>{{noyfm.two}}</div>\n\n\n\n\n <div class=\"docs-header\" id=\"content\">\n <h1>Content</h1>\n </div>\n <ul>\n {{#each pages}}\n <li><a href=\"{{relativeLink}}\">{{filename}}</a></li>\n {{/each}}\n </ul>\n\n <hr>\n <div style=\"display: none\">\n\n <h1>Page</h1>\n <!--\n \"this\"\n ===============================\n this.src: {{this.src}}\n this.dest: {{this.dest}}\n this.layout: {{this.layout}}\n this.dirname: {{this.dirname}}\n this.filename: {{this.filename}}\n this.pagename: {{this.pagename}}\n this.basename: {{this.basename}}\n this.ext: {{this.ext}}\n\n \"page\"\n ===============================\n page.src: {{page.src}}\n page.dest: {{page.dest}}\n page.layout: {{page.layout}}\n page.dirname: {{page.dirname}}\n page.filename: {{page.filename}}\n page.pagename: {{page.pagename}}\n page.basename: {{page.basename}}\n page.ext: {{page.ext}}\n\n \"root\"\n ===============================\n src: {{src}}\n dest: {{dest}}\n layout: {{layout}}\n dirname: {{dirname}}\n filename: {{filename}}\n pagename: {{pagename}}\n basename: {{basename}}\n ext: {{ext}}\n -->\n <h1>Each pages</h1>\n <ul>\n {{#each pages}}<li><a href=\"{{relativeLink}}\">{{filename}}</a></li>\n <!--\n \"this\"\n ===============================\n this.src: {{this.src}}\n this.dest: {{this.dest}}\n this.dirname: {{this.dirname}}\n this.filename: {{this.filename}}\n this.pagename: {{this.pagename}}\n this.basename: {{this.basename}}\n this.ext: {{this.ext}}\n\n \"page\"\n ===============================\n page.src: {{../page.src}}\n page.dest: {{../page.dest}}\n page.dirname: {{../page.dirname}}\n page.filename: {{../page.filename}}\n page.pagename: {{../page.pagename}}\n page.basename: {{../page.basename}}\n page.ext: {{../page.ext}}\n\n \"root\"\n ===============================\n src: {{src}}\n dest: {{dest}}\n dirname: {{dirname}}\n filename: {{filename}}\n pagename: {{pagename}}\n basename: {{basename}}\n ext: {{ext}}\n -->\n {{/each}}\n </ul>\n\n <h1>Debug Info</h1>\n {{{inspect page 'json'}}}\n </div>\n </div>\n </div>\n </div>\n </div>\n <script src=\"{{assets}}/validation.js\"></script>\n </body>\n</html>\n",
"page": "<!DOCTYPE html>\n <html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\">\n <title>Layout filename: '{{layout}}'</title>\n <link rel=\"stylesheet\" href=\"http://getbootstrap.com/dist/css/bootstrap.min.css\">\n <link rel=\"stylesheet\" href=\"{{assets}}/validation.css\">\n </head>\n <body style=\"padding-top: 60px;\">\n <div class=\"container\">\n\n <!-- validate assets path -->\n <section id=\"validate\"></section>\n <div class=\"docs-section\">\n <div class=\"docs-header\" id=\"content\">\n <h4><strong class=\"text-muted\">{{page.src}}</strong> &#x2192; <strong class=\"text-success\">{{page.dest}}</strong></h4>\n </div>\n <hr>\n </div>\n\n {{pager pagination}}\n <hr>\n\n <div class=\"row\">\n <!-- Column: sidebar -->\n <div class=\"col-md-3\">\n <div class=\"bs-sidebar hidden-print\" role=\"complementary\">\n <!-- pagination -->\n {{nav pagination}}\n </div>\n </div>\n <!-- Column: content -->\n <div class=\"col-md-9\" role=\"main\">\n <div class=\"docs-section\">\n <div class=\"docs-header\" id=\"content\">\n <h4><strong>Page layout:</strong> {{default originalLayout '(no layout defined)'}}</h4>\n <h4><strong>Page src:</strong> {{page.src}}</h4>\n <h4><strong>Page dest:</strong> {{page.dest}}</h4>\n <h4><strong>Dest filename:</strong> {{page.filename}}</h4>\n <h4><strong>Dest basename:</strong> {{page.basename}}</h4>\n <h4><strong>Page title:</strong> {{default title '(no title defined)'}}</h4>\n </div>\n\n <hr>\n <div class=\"row\">\n <div class=\"col-md-6\">\n <!-- Categories Collection -->\n {{#if categories}}\n {{> collections-categories }}\n {{/if}}\n </div>\n <div class=\"col-md-6\">\n {{#if tags}}\n {{> collections-tags }}\n {{/if}}\n </div>\n </div>\n\n <hr>\n\n There is no YAML front matter in this page.\n\n<div>{{noyfm.one}}</div>\n<div>{{noyfm.two}}</div>\n\n\n\n\n <div class=\"docs-header\" id=\"content\">\n <h1>Content</h1>\n </div>\n <ul>\n {{#each pages}}\n <li><a href=\"{{relativeLink}}\">{{filename}}</a></li>\n {{/each}}\n </ul>\n\n <hr>\n <div style=\"display: none\">\n\n <h1>Page</h1>\n <!--\n \"this\"\n ===============================\n this.src: {{this.src}}\n this.dest: {{this.dest}}\n this.layout: {{this.layout}}\n this.dirname: {{this.dirname}}\n this.filename: {{this.filename}}\n this.pagename: {{this.pagename}}\n this.basename: {{this.basename}}\n this.ext: {{this.ext}}\n\n \"page\"\n ===============================\n page.src: {{page.src}}\n page.dest: {{page.dest}}\n page.layout: {{page.layout}}\n page.dirname: {{page.dirname}}\n page.filename: {{page.filename}}\n page.pagename: {{page.pagename}}\n page.basename: {{page.basename}}\n page.ext: {{page.ext}}\n\n \"root\"\n ===============================\n src: {{src}}\n dest: {{dest}}\n layout: {{layout}}\n dirname: {{dirname}}\n filename: {{filename}}\n pagename: {{pagename}}\n basename: {{basename}}\n ext: {{ext}}\n -->\n <h1>Each pages</h1>\n <ul>\n {{#each pages}}\n <li><a href=\"{{relativeLink}}\">{{filename}}</a></li>\n <!--\n \"this\"\n ===============================\n this.src: {{this.src}}\n this.dest: {{this.dest}}\n this.dirname: {{this.dirname}}\n this.filename: {{this.filename}}\n this.pagename: {{this.pagename}}\n this.basename: {{this.basename}}\n this.ext: {{this.ext}}\n\n \"page\"\n ===============================\n page.src: {{../page.src}}\n page.dest: {{../page.dest}}\n page.dirname: {{../page.dirname}}\n page.filename: {{../page.filename}}\n page.pagename: {{../page.pagename}}\n page.basename: {{../page.basename}}\n page.ext: {{../page.ext}}\n\n \"root\"\n ===============================\n src: {{src}}\n dest: {{dest}}\n dirname: {{dirname}}\n filename: {{filename}}\n pagename: {{pagename}}\n basename: {{basename}}\n ext: {{ext}}\n -->\n {{/each}}\n </ul>\n\n <h1>Debug Info</h1>\n {{{inspect page 'json'}}}\n </div>\n </div>\n </div>\n </div>\n </div>\n <script src=\"{{assets}}/validation.js\"></script>\n </body>\n</html>\n",
"pageName": "no-yfm.html",
"pagename": "no-yfm.html",
"src": "test/fixtures/pages/no-yfm.hbs"
Expand Down
42 changes: 6 additions & 36 deletions test/actual/pages_array/index.html
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<meta name="author" content="Jon Schlinkert">
<title>Layout name: 'test/fixtures/pages/blog/index.hbs' | Layout: </title>
<title>Layout name: 'test/fixtures/pages/blog/index.hbs' | Layout: false</title>
<link rel="stylesheet" href="http://getbootstrap.com/dist/css/bootstrap.min.css">
<link href="../../assets/validation.css" rel="stylesheet">
<link href="../../assets/gist.css" rel="stylesheet">
Expand All @@ -19,45 +19,34 @@
<!-- pagination -->
<ul class="pager">


<li class="previous disabled">
<a unselectable="on" class="unselectable">First</a>
</li>
<li class="previous disabled">
<a unselectable="on" class="unselectable">&larr; Previous</a>
</li>





<li class="active pager-middle">
<a href="index.html">1</a>
</li>

<li class="pager-middle">
<a href="post1.html">2</a>
</li>

<li class="pager-middle">
<a href="post2.html">3</a>
</li>

<li class="pager-middle">
<a href="post3.html">4</a>
</li>



<li class="next">
<a href="post3.html">Last</a>
</li>
<li class="next">
<a href="post1.html">Next &rarr;</a>
</li>




</ul><style>
.unselectable {
Expand All @@ -75,46 +64,27 @@
<div class="docs-section">
<div class="docs-header" id="content">
<h3>Template: test/fixtures/pages/blog/index.hbs</h3>
<h3>Layout: </h3>
<h3>Layout: false</h3>
</div>




<div class="docs-section">
<div class="docs-header" id="content">
<h1>Blog Post #1</h1>
</div>

<script src="https://gist.github.com/5898072.js"></script>

&lt;script src=&quot;https://gist.github.com/5898072.js&quot;&gt;&lt;/script&gt;
</div>



<div class="docs-section">
<div class="docs-header" id="content">
<h1>Blog Post #2</h1>
</div>

<script src="https://gist.github.com/5898077.js"></script>

<script src="https://gist.github.com/5898078.js"></script>

&lt;script src=&quot;https://gist.github.com/5898077.js&quot;&gt;&lt;/script&gt;
&lt;script src=&quot;https://gist.github.com/5898078.js&quot;&gt;&lt;/script&gt;
</div>



<div class="docs-section">
<div class="docs-header" id="content">
<h1>Blog Post #3</h1>
</div>

<script src="https://gist.github.com/5909393.js"></script>

&lt;script src=&quot;https://gist.github.com/5909393.js&quot;&gt;&lt;/script&gt;
</div>


</div>
</div>
</div>
Expand Down
15 changes: 1 addition & 14 deletions test/actual/pages_array/post1.html
Expand Up @@ -17,45 +17,34 @@
<!-- pagination -->
<ul class="pager">




<li class="previous">
<a href="index.html">First</a>
</li>
<li class="previous">
<a href="index.html">&larr; Previous</a>
</li>



<li class="pager-middle">
<a href="index.html">1</a>
</li>

<li class="active pager-middle">
<a href="post1.html">2</a>
</li>

<li class="pager-middle">
<a href="post2.html">3</a>
</li>

<li class="pager-middle">
<a href="post3.html">4</a>
</li>



<li class="next">
<a href="post3.html">Last</a>
</li>
<li class="next">
<a href="post2.html">Next &rarr;</a>
</li>




</ul><style>
.unselectable {
Expand All @@ -75,9 +64,7 @@
<h3>Layout: No layout was used.</h3>
<h3>Template: post1</h3>
</div>

<script src="https://gist.github.com/5898072.js"></script>

&lt;script src=&quot;https://gist.github.com/5898072.js&quot;&gt;&lt;/script&gt;
This "content" property is optional and would get passed into the `body` tag. But if you only need to pass the page"s metadata to the layout then the content property is unnecessary.
</div>
</div>
Expand Down

0 comments on commit 76e0603

Please sign in to comment.