Merge pull request scala#679 from scala/pr/667

heathermiller · web-flow · commit 72f6b45db17d · 2017-07-13T10:35:10.000+02:00
Scala-lang redesign
diff --git a/_contribute_resources/1-documentation.md b/_contribute_resources/1-documentation.md
@@ -0,0 +1,6 @@
+---
+title: Documentation
+link: /contribute/documentation/
+icon: fa fa-file-text
+---
+[Scaladoc (API)](/contribute/scala-standard-library-api-documentation/),[docs.scala-lang.org](http://docs.scala-lang.org/contribute.html) and [scala-lang.org](https://github.com/scala/scala-lang).
diff --git a/_contribute_resources/2-bug-fixes.md b/_contribute_resources/2-bug-fixes.md
@@ -0,0 +1,6 @@
+---
+title: Bug fixes
+link: /contribute/guide/
+icon: fa fa-pencil
+---
+Issues with the tools, core libraries and compiler. Also you can help us by [reporting bugs](/contribute/bug-reporting-guide/).
diff --git a/_contribute_resources/3-code-reviews.md b/_contribute_resources/3-code-reviews.md
@@ -0,0 +1,8 @@
+---
+title: Code Reviews
+link: /contribute/codereviews/
+icon: fa fa-eye
+---
+Review pull requests against [scala/scala](https://github.com/scala/scala/pulls), 
+[scala/scala-lang](https://github.com/scala/scala-lang/pulls), 
+[scala/scala.github.com](https://github.com/scala/scala.github.com/pulls)and others.
diff --git a/_contribute_resources/4-core-libraries.md b/_contribute_resources/4-core-libraries.md
@@ -0,0 +1,6 @@
+---
+title: Core Libraries
+link: /contribute/corelibs/
+icon: fa fa-clipboard
+---
+Update and expand the capabilities of the core (and associated) Scala libraries.
diff --git a/_contribute_resources/5-ide-and-build-tools.md b/_contribute_resources/5-ide-and-build-tools.md
@@ -0,0 +1,6 @@
+---
+title: IDE and Build Tools
+link: /contribute/tools/
+icon: fa fa-terminal
+---
+Enhance the Scala tools with features for build tools, IDE plug-ins and other related projects.
diff --git a/_contribute_resources/6-compiler-language.md b/_contribute_resources/6-compiler-language.md
@@ -0,0 +1,6 @@
+---
+title: Compiler/Language
+link: /contribute/guide/#larger-changes-new-features
+icon: fa fa-gears
+---
+Larger language features and compiler enhancements including language specification and SIPs.
diff --git a/contribute/bug-reporting-guide.md b/contribute/bug-reporting-guide.md
@@ -1,6 +1,8 @@
 ---
-layout: page
 title: Bug Reporting
+layout: inner-page-no-masthead
+permalink: /contribute/bug-reporting-guide/
+includeTOC: true
 ---
 
 The Scala compiler and standard library bug tracker is located at [https://github.com/scala/bug](https://github.com/scala/bug). Before you submit a bug make sure that it is certainly a bug by following instructions in *Is it a Bug?*.
diff --git a/contribute/codereviews.md b/contribute/codereviews.md
@@ -1,10 +1,12 @@
 ---
-layout: page
 title: Code Review Contributions
+layout: inner-page-no-masthead
+permalink: /contribute/codereviews/
+includeTOC: true
 ---
 ## Code Review Contributions
 
-In addition to [bug fixing](./guide.html), you can help us review 
+In addition to [bug fixing](/contribute/guide/), you can help us review 
 [waiting pull requests](#pull-requests-awaiting-comment). 
 This is also a good (and recommended) way to get to know the feel of
 the bug-fixing and submissions process before jumping in with your
@@ -13,7 +15,7 @@ own pull requests.
  
 ### Review Guidelines
 
-[Code of Conduct reminder](../conduct.html)
+[Code of Conduct reminder](/conduct/)
 
 * Keep comments on-topic, concise and precise.
 * Attach comments to particular lines or regions they pertain to whenever possible.
@@ -49,4 +51,4 @@ own pull requests.
 </div>
 </div>
 
-Also note that the [Tools contributions](./tools.html) page has more projects that will generate pull requests.
+Also note that the [Tools contributions](/contribute/tools/) page has more projects that will generate pull requests.
diff --git a/contribute/corelibs.md b/contribute/corelibs.md
@@ -1,14 +1,16 @@
 ---
-layout: page
 title: Core Library Contributions
+layout: inner-page-no-masthead
+permalink: /contribute/corelibs/
+includeTOC: true
 ---
 ## Core Library Contributions
 
 There are several options for contributing to Scala's core libraries. You can:
 
-* Help with [Documentation](./scala-standard-library-api-documentation.html).
-* [Report Bugs or Issues](./bug-reporting-guide.html) against the core libraries.
-* [Fix Bugs or Issues](./guide.html) against the 
+* Help with [Documentation](/contribute/scala-standard-library-api-documentation/).
+* [Report Bugs or Issues](/contribute/bug-reporting-guide/) against the core libraries.
+* [Fix Bugs or Issues](/contribute/guide/) against the 
   [reported library bugs/issues](https://issues.scala-lang.org/issues/?filter=13001).
 * Contribute significant new functionality or a new API by submitting
   a Scala Library Improvement Process (SLIP) Document.
diff --git a/contribute/documentation.md b/contribute/documentation.md
@@ -1,6 +1,8 @@
 ---
-layout: page
 title: Documentation Contributions
+layout: inner-page-no-masthead
+permalink: /contribute/documentation/
+includeTOC: true
 ---
 ## Contributing Documentation to the Scala project
 
@@ -20,11 +22,11 @@ Thanks
 
 The Scala API documentation lives with the scala project source code. There are many ways you can help with improving Scaladoc, including:
 
-* [Log issues for missing scaladoc documentation](./scala-standard-library-api-documentation.html#contribute-api-documentation-bug-reports) - 
+* [Log issues for missing scaladoc documentation](/contribute/scala-standard-library-api-documentation/#contribute-api-documentation-bug-reports) - 
 Please *follow the issue submission process closely* to help prevent duplicate issues being created.
-* [Claim Scaladoc Issues and Provide Documentation](./scala-standard-library-api-documentation.html) - please claim issues prior to working on a specific scaladoc task to prevent duplication of effort. If you sit on an issue for too long without submitting a pull request, it will revert back to unassigned and you will need to re-claim it.
+* [Claim Scaladoc Issues and Provide Documentation](/contribute/scala-standard-library-api-documentation/) - please claim issues prior to working on a specific scaladoc task to prevent duplication of effort. If you sit on an issue for too long without submitting a pull request, it will revert back to unassigned and you will need to re-claim it.
 * You can also just 
-[submit new Scaladoc](./scala-standard-library-api-documentation.html) 
+[submit new Scaladoc](/contribute/scala-standard-library-api-documentation/) 
 without creating an issue, but please look to see if there is an issue already submitted for your task and claim it if there is. If not, please post your intention to work on a specific scaladoc task on scala-internals so that people know what you are doing. 
 
 ### The Main Scala Documentation Site
diff --git a/contribute/guide.md b/contribute/guide.md
@@ -1,6 +1,8 @@
 ---
-layout: page
 title: Contributing guide
+layout: inner-page-no-masthead
+permalink: /contribute/guide/
+includeTOC: true
 ---
 
 <div class="container">
@@ -10,7 +12,7 @@ title: Contributing guide
       <p>Get a peek into the inners of the Scala compiler.</p>
     </div>
     <div class="span4 doc-block">
-      <h3><a href="{{ site.baseurl }}/contribute/bug-reporting-guide.html">Report an issue</a></h3>
+      <h3><a href="{{ site.baseurl }}/contribute/bug-reporting-guide/">Report an issue</a></h3>
       <p>File a bug report or a feature request.</p>
     </div>
   </div>
@@ -21,7 +23,7 @@ title: Contributing guide
       <p>Get cracking on some easy to approach issues.</p>
     </div>
     <div class="span4 doc-block">
-      <h3><a href="{{ site.baseurl }}/contribute/hacker-guide.html">Hacker's guide</a></h3>
+      <h3><a href="{{ site.baseurl }}/contribute/hacker-guide/">Hacker's guide</a></h3>
       <p>Learn to write good code and improve your chances of contributing to the Scala galaxy.</p>
     </div>
   </div>
@@ -52,19 +54,19 @@ unencumbered by copyrights or patents.
 
 This is the impatient developer's checklist for the steps to submit a bug-fix pull request to the Scala project. For more information, description and justification for the steps, follow the links in that step. Further specific instructions for the release of Scala you are targeting can be found in the `CONTRIBUTING.md` file for that [github branch](https://github.com/scala/scala)
 
-1. [Select a bug to fix from JIRA](/contribute/index.html#community-tickets), or if you found the bug yourself and want to fix it, [create a JIRA issue](./bug-reporting-guide.html) (but please 
-[make sure it's not a duplicate](./bug-reporting-guide.html#reporting-confirmed-bugs-is-a-sin)).
-2. Optional ([but recommended](./scala-internals.html#why-its-a-good-idea)), announce your intention to work on the bug on [scala-internals](./scala-internals.html). After all, don't you want to work on a team with 
-[these friendly people](./hacker-guide.html#connect) - it's one of the perks of contributing.
-3. [Fork the Scala repository](./hacker-guide.html#fork) and clone your fork (if you haven't already).
-4. [Create a feature branch](./hacker-guide.html#branch) to work on: use the branch name `issue/NNNN` where NNNN is the JIRA issue number.
-5. [Fix the bug, or implement the new small feature](./hacker-guide.html#implement), include new tests (yes, for bug fixes too).
-6. [Test, rinse](./hacker-guide.html#test) and [test some more](./partest-guide.html) until [all the tests pass](./hacker-guide.html#verify).
-7. [Commit your changes](./hacker-guide.html#commit) to your feature branch in your fork. Please choose your commit message based on the [Git Hygiene](https://github.com/scala/scala#user-content-git-hygiene) section of the Scala project README.
+1. [Select a bug to fix from JIRA](/contribute/#community-tickets), or if you found the bug yourself and want to fix it, [create a JIRA issue](/contribute/bug-reporting-guide/) (but please 
+[make sure it's not a duplicate](/contribute/bug-reporting-guide/#reporting-confirmed-bugs-is-a-sin)).
+2. Optional ([but recommended](/contribute/scala-internals/#why-its-a-good-idea)), announce your intention to work on the bug on [scala-internals](/contribute/scala-internals/). After all, don't you want to work on a team with 
+[these friendly people](/contribute/hacker-guide/#connect) - it's one of the perks of contributing.
+3. [Fork the Scala repository](/contribute/hacker-guide/#fork) and clone your fork (if you haven't already).
+4. [Create a feature branch](/contribute/hacker-guide/#branch) to work on: use the branch name `issue/NNNN` where NNNN is the JIRA issue number.
+5. [Fix the bug, or implement the new small feature](/contribute/hacker-guide/#implement), include new tests (yes, for bug fixes too).
+6. [Test, rinse](/contribute/hacker-guide/#test) and [test some more](/contribute/partest-guide/) until [all the tests pass](/contribute/hacker-guide/#verify).
+7. [Commit your changes](/contribute/hacker-guide#commit) to your feature branch in your fork. Please choose your commit message based on the [Git Hygiene](https://github.com/scala/scala#user-content-git-hygiene) section of the Scala project README.
 8. If necessary [re-write git history](http://git-scm.com/book/en/Git-Branching-Rebasing) so that [commits are organized by major steps to the fix/feature](
 https://github.com/scala/scala#git-hygiene). For bug fixes, a single commit is requested, for features several commits may be desirable (but each separate commit must compile and pass all tests)
 9. [Submit a pull request](./hacker-guide.html#submit) following the [Scala project pull-request guidelines](http://docs.scala-lang.org/scala/pull-request-policy.html).
-10. [Work with a reviewer](https://github.com/scala/scala#reviewing) to [get your pull request merged in](./hacker-guide.html#review).
+10. [Work with a reviewer](https://github.com/scala/scala#reviewing) to [get your pull request merged in](/contribute/hacker-guide/#review).
 11. Celebrate!
 
 Need more information or a little more hand-holding for the first one? We got you covered: take a read through the entire [Hacker Guide](./hacker-guide.html) for an example of implementing a new feature (some of the steps can be skipped for bug fixes, this will be obvious from reading it, but many of the steps here will help with bug fixes too).
@@ -76,4 +78,4 @@ and on the implementation plan. Announce the change
 on the [scala-internals](http://groups.google.com/group/scala-internals) mailing list and get developer feedback. For really complex changes, a [Scala Improvement Process (SIP)](http://docs.scala-lang.org/sips/) document might be required, but the first step is always to discuss it on the mailing list and if a SIP is required, that will be discussed on the mailing list.
 
 Contributions, big or small, simple or complex, controversial or undisputed, need to materialize as patches against
-the Scala project source tree. The [hacker guide](hacker-guide.html) will explain how to materialize your idea into a full-fledged pull request against the Scala code base.
+the Scala project source tree. The [hacker guide](/contribute/hacker-guide/) will explain how to materialize your idea into a full-fledged pull request against the Scala code base.
diff --git a/contribute/hacker-guide.md b/contribute/hacker-guide.md
@@ -1,7 +1,9 @@
 ---
-layout: page
 title: Scala hacker guide
 by: Eugene Burmako
+layout: inner-page-no-masthead
+permalink: /contribute/hacker-guide/
+includeTOC: true
 ---
 <br>
 This guide is intended to help you get from an idea of fixing a bug or implementing a new feature into a nightly Scala build, and, ultimately, to a production release of Scala incorporating your idea.
diff --git a/contribute/index.md b/contribute/index.md
@@ -1,6 +1,8 @@
 ---
-layout: page
 title: Contribute
+layout: inner-page-no-masthead
+permalink: /contribute/
+includeTOC: true
 ---
 
 The Scala programming language is an open source project with a very
@@ -15,92 +17,22 @@ That depends on what you want to contribute. Below are some getting started reso
 
 ### Reporting bugs
 
-See our [bug reporting guide](./bug-reporting-guide.html) to learn
+See our [bug reporting guide](/contribute/bug-reporting-guide/) to learn
 how to efficiently report a bug.
 
 ### Contribute
 
 Coordination of contribution efforts takes place on the 
-[scala-internals Google group](./scala-internals.html).
-
-<div class="container">
-<div class="row">
-<div class="span4 doc-block">
-<h4><a href="./documentation.html">Documentation</a></h4>
-<p><a href="./scala-standard-library-api-documentation.html">Scaladoc (API)</a>,
-<a href="http://docs.scala-lang.org/contribute.html">docs.scala-lang.org</a> and 
-<a href="https://github.com/scala/scala-lang">scala-lang.org</a>.</p>
-</div>
-<div class="span4 doc-block">
-<h4><a href="./guide.html">Bug Fixes</a></h4>
-<p>Issues with the tools, core libraries and compiler. Also you can help us by <a href="./bug-reporting-guide.html">reporting bugs</a></p>
-</div>
-</div>
-
-<div class="row">
-<div class="span4 doc-block">
-<h4><a href="./codereviews.html">Code Reviews</a></h4>
-<p>Review pull requests against <a href="https://github.com/scala/scala/pulls">scala/scala</a>, 
-<a href="https://github.com/scala/scala-lang/pulls">scala/scala-lang</a>, 
-<a href="https://github.com/scala/scala.github.com/pulls">scala/scala.github.com</a> and others.</p>
-</div>
-<div class="span4 doc-block">
-<h4><a href="./corelibs.html">Core Libraries</a></h4>
-<p>Update and expand the capabilities of the core (and associated) Scala libraries.</p>
-</div>
-</div>
-
-<div class="row">
-<div class="span4 doc-block">
-<h4><a href="./tools.html">IDE and Build Tools</a></h4>
-<p>Enhance the Scala tools with features for build tools, IDE plug-ins and other related projects.</p>
-</div>
-<div class="span4 doc-block">
-<h4><a href="./guide.html#larger-changes-new-features">Compiler/Language</a></h4>
-<p>Larger language features and compiler enhancements including language specification and SIPs.</p>
-</div>
-</div>
-</div>
+[scala-internals Google group](/contribute/scala-internals/).
+
+{% include column-list-of-items.html collection=site.contribute_resources %}
 
 ### Community Tickets
 
 The following links provide starting points for
 various contributor activities:
 
-<div class="container">
-<div class="row">
-<div class="span4 doc-block">
-<h4><a href="https://issues.scala-lang.org/issues/?filter=13003">Documentation</a></h4>
-<p>Help augment or correct the documentation.</p>
-</div>
-<div class="span4 doc-block">
-<h4><a href="https://issues.scala-lang.org/issues/?filter=13001">Core Libraries</a></h4>
-<p>Community bugs and enhancements on the core libs.</p>
-</div>
-</div>
-
-<div class="row">
-<div class="span4 doc-block">
-<h4><a href="https://issues.scala-lang.org/issues/?filter=13002">Tools</a></h4>
-<p>Help with the Scala tool chain.</p>
-</div>
-<div class="span4 doc-block">
-<h4><a href="https://issues.scala-lang.org/issues/?filter=13000">Compiler</a></h4>
-<p>Ready for a challenge? Here's the compiler bugs.</p>
-</div>
-</div>
-
-<div class="row">
-<div class="span4 doc-block">
-<h4><a href="https://issues.scala-lang.org/issues/?filter=13004">Bugs</a></h4>
-<p>All bugs marked with the label <em>community</em>.</p>
-</div>
-<div class="span4 doc-block">
-<h4><a href="https://issues.scala-lang.org/issues/?filter=13009">All Issues</a></h4>
-<p>Bugs + Enhancements marked with the label <em>community</em>.</p>
-</div>
-</div>
-</div>
+{% include column-list-of-items.html collection=site.contribute_community_tickets %}
 
 ### Tools and Libraries
 
@@ -109,7 +41,7 @@ with their own maintainers and community of contributors.  Helping out
 one of these projects is another way to help Scala.  Consider lending
 on a hand on a project you're already using.  Or, to find out about
 other projects, see the
-[Libraries and Tools section](../community/index.html#community-libraries-and-tools)
+[Libraries and Tools section](/community/#community-libraries-and-tools)
 on our Community page.
 
 ### Scala Community Build
diff --git a/contribute/partest-guide.md b/contribute/partest-guide.md
@@ -1,6 +1,8 @@
 ---
-layout: page
 title: Running the Test Suite
+layout: inner-page-no-masthead
+permalink: /contribute/partest-guide/
+includeTOC: true
 ---
 
 Partest is a custom parallel testing tool that we use to run the test suite for the Scala compiler and library. Go the scala project folder from your local checkout and run it via `ant` or standalone as follows.
diff --git a/contribute/scala-internals.md b/contribute/scala-internals.md
@@ -1,6 +1,8 @@
 ---
-layout: page
 title: Scala Internals Mailing List
+layout: inner-page-no-masthead
+permalink: /contribute/scala-internals/
+includeTOC: true
 ---
 
 ## scala-internals
diff --git a/contribute/scala-standard-library-api-documentation.md b/contribute/scala-standard-library-api-documentation.md
@@ -1,6 +1,8 @@
 ---
-layout: page
 title: Contribute to API Documentation
+layout: inner-page-no-masthead
+permalink: /contribute/scala-standard-library-api-documentation/
+includeTOC: true
 ---
 
 This page is specific to API documentation contributions – that is, API
diff --git a/contribute/tools.md b/contribute/tools.md
