Merge pull request #243 from nodejs/gh-142

Moved events into its own page

Author: fhemberger

CONTRIBUTING.md

@@ -98,7 +98,6 @@ By making a contribution to this project, I certify that:
 * (c) The contribution was provided directly to me by some other
   person who certified (a), (b) or (c) and I have not modified it.
 
-
 ## Code of Conduct
 
 This Code of Conduct is adapted from [Rust's wonderful
@@ -135,3 +134,48 @@ CoC](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct).
 * Avoid the use of personal pronouns in code comments or
   documentation. There is no need to address persons when explaining
   code (e.g. "When the developer")
+
+## Code editing
+
+### Adding new pages
+
+1. Create new page content including the layout, title and copy.
+2. Update ```/locale/en/site.json``` to provide page link attributes.
+3. Update the relevant ```/layout``` to add a link to the new page.
+
+#### Create the page content
+
+Create a new markdown file in ```/local/en```.  As specified in the
+[README.md](./README.md#layout), initial development happens in English.
+
+At the top of the markdown file, set a page the title and layout.
+
+```
+---
+title: Events
+layout: contribute.hbs
+---
+
+[Event copy goes here]
+```
+
+#### Update locale site.json to add link attributes
+
+Open ```local/en/site.json``` and find the appropriate page structure.
+Add a new object defining the link attributes.
+
+```
+"event": {
+  "link": "get-involved/events",
+  "text": "Events"
+}
+```
+
+#### Update the layout to add a link
+
+Using the example layout, open ```/layouts/contribute.hbs``` and add your new
+link to the markup.  It's essential to update the handlebars paths to site.json.
+
+```
+{{site.locale}}/{{site.getinvolved.events.link}}
+```

README.md

@@ -40,7 +40,7 @@ Note: You'll need io.js 2.x or newer as the build system uses some native ES2015
 
 ### Deployment
 
-Full set up is in https://github.com/nodejs/build/tree/master/setup/www minus secrets and certificates. The webhook is setup on GitHub for this project and talks to a small Node server on the host which does the work. See the [github-webhook](https://github.com/rvagg/github-webhook) package for this. 
+Full set up is in https://github.com/nodejs/build/tree/master/setup/www minus secrets and certificates. The webhook is setup on GitHub for this project and talks to a small Node server on the host which does the work. See the [github-webhook](https://github.com/rvagg/github-webhook) package for this.
 
 ## Governance and Current Members
 

layouts/contribute.hbs

@@ -22,6 +22,9 @@
                     <li{{#equals path site.getinvolved.development.link}} class="active"{{/equals}}>
                         <a href="/{{site.locale}}/{{site.getinvolved.development.link}}/">{{site.getinvolved.development.text}}</a>
                     </li>
+                    <li{{#equals path site.getinvolved.events.link}} class="active"{{/equals}}>
+                        <a href="/{{site.locale}}/{{site.getinvolved.events.link}}/">{{site.getinvolved.events.text}}</a>
+                    </li>
                 </ul>
             </aside>
 

locale/en/get-involved/events.md

@@ -0,0 +1,40 @@
+---
+title: Events
+layout: contribute.hbs
+---
+
+# Node Events
+
+The Node.js community is committed to bringing you events from around the world, currently spanning the US, Europe and Japan.
+
+<hr>
+
+## Global
+
+### United States
+
+- [Node.js Interactive](http://interactive.nodejs.org/) is a conference run by the Node.js Foundation.
+
+- [NodeConf](http://www.nodeconf.com/) conferences are the main event in the United States.
+
+- [Node Summit](http://nodesummit.com/) is a conference in San Francisco focusing on the adoption of Node in larger companies.
+
+### Europe
+
+- [NodeConf EU](http://nodeconfeu.com/) is a Node conference in Europe, organized by Cian Ó Maidín.
+
+- An [Italian Node.js Conference](http://nodejsconf.it/) is held in Brescia.
+
+- [NodeConf Barcelona](http://barcelona.nodeconfeu.com/) is a Node conference in Spain, organized by BarcelonaJS.
+
+### Japan
+
+- [NodeFest (東京Node学園祭)](http://nodefest.jp/) is organized by the [Node.js Japan user group](http://nodejs.jp).
+
+<hr>
+
+## Localized
+
+- [JSConf](http://jsconf.com/) organizes the main JavaScript conferences.
+
+- [NodeConf ONE-SHOT](http://oneshot.nodeconf.com/) are fork-able conferences for a local communities

locale/en/get-involved/index.md

@@ -14,24 +14,6 @@ right place. Explore our community resources to find out how you can help:
 
 <hr>
 
-## Events
-
-- [Node.js Interactive](http://interactive.nodejs.org/) is a conference run by the Node.js Foundation.
-
-- [NodeConf](http://www.nodeconf.com/) conferences are a collection of world wide community run events.
-
-- [NodeConf EU](http://nodeconfeu.com/) is a Node conference in Europe, organized by Cian Ó Maidín.
-
-- [NodeFest (東京Node学園祭)](http://nodefest.jp/) is organized by the [Node.js Japan user group](http://nodejs.jp).
-
-- An [Italian Node.js Conference](http://nodejsconf.it/) is held in Brescia.
-
-- [NodeConf Barcelona](http://barcelona.nodeconfeu.com/) is a Node conference in Spain, organized by BarcelonaJS.
-
-- [Node Summit](http://nodesummit.com/) is a conference in San Francisco focusing on the adoption of Node in larger companies.
-
-- [JSConf](http://jsconf.com/) organizes the main JavaScript conferences.
-
 ## Discussion
 
 - The [github issues list](https://github.com/nodejs/node/issues) the place for discussion of Node.js core features

locale/en/site.json

@@ -109,6 +109,10 @@
         "code-and-learn": {
             "link": "get-involved/code-and-learn",
             "text": "Code + Learn"
+        },
+        "events": {
+          "link": "get-involved/events",
+          "text": "Events"
         }
     },
     "trademark"  : { "link": "about/trademark", "text": "Trademark" },