diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 177fa273ec3cd..f0bae546a1e04 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,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 @@ -51,3 +50,41 @@ 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}} +``` diff --git a/README.md b/README.md index 50e4e4f9465af..84c315db38bde 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ Note: You'll need io.js 2.x or newer as the build system uses some native ES2015 * The top of each Markdown file is a block of YAML for page specific localization information that is passed to various templates. * The bulk of the Markdown content for each page is referenced as `{{{content}}}` in the corresponding template. +[Adding new pages](./CONTRIBUTING.md#adding-new-pages) + ## Governance and Current Members All of the Node.js Foundation websites, including this repo, are jointly governed by the **Website Working Group**. See [GOVERNANCE.md](./GOVERNANCE.md) to learn more about the group's structure and [CONTRIBUTING.md](./CONTRIBUTING.md) for guidance about the expectations for all contributors to this project. diff --git a/layouts/contribute.hbs b/layouts/contribute.hbs index 47abc9dd086f8..014b34c674e00 100644 --- a/layouts/contribute.hbs +++ b/layouts/contribute.hbs @@ -19,6 +19,9 @@ {{site.getinvolved.development.text}} + + {{site.getinvolved.events.text}} + diff --git a/locale/en/get-involved/events.md b/locale/en/get-involved/events.md new file mode 100644 index 0000000000000..dd0f9e49c3e86 --- /dev/null +++ b/locale/en/get-involved/events.md @@ -0,0 +1,36 @@ +--- +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. + +
+ +## Global + +### United States + +- [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. + +### Japan + +- [NodeFest (東京Node学園祭)](http://nodefest.jp/) is organized by the [Node.js Japan user group](http://nodejs.jp). + +
+ +## 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 diff --git a/locale/en/get-involved/index.md b/locale/en/get-involved/index.md index 5ae74d519b42c..27b253b8cfe8a 100644 --- a/locale/en/get-involved/index.md +++ b/locale/en/get-involved/index.md @@ -14,23 +14,6 @@ right place. Explore our community resources to find out how you can help:
-## Events - -- [NodeConf](http://www.nodeconf.com/) conferences are the main event in the United States. - -- [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. - -- [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. - -- [NodeConf ONE-SHOT](http://oneshot.nodeconf.com/) are forkable conferences for a local communities - - ## Discussion - The [mailing list](http://groups.google.com/group/nodejs) is used for announcements and discussion about Node. diff --git a/locale/en/site.json b/locale/en/site.json index dd55e048ed762..649ccc4fc6fc7 100644 --- a/locale/en/site.json +++ b/locale/en/site.json @@ -100,6 +100,10 @@ "development": { "link": "get-involved/development", "text": "Development" + }, + "events": { + "link": "get-involved/events", + "text": "Events" } }, "trademark" : { "link": "about/trademark", "text": "Trademark" },