From b45561b5094c099a28c8ed951a61cd9a67999668 Mon Sep 17 00:00:00 2001 From: Ian Crowther Date: Sat, 12 Sep 2015 15:08:52 +0100 Subject: [PATCH 1/3] Moved events into its own page --- CONTRIBUTING.md | 39 +++++++++++++++++++++++++++++++- README.md | 2 +- layouts/contribute.hbs | 3 +++ locale/en/get-involved/events.md | 36 +++++++++++++++++++++++++++++ locale/en/get-involved/index.md | 18 --------------- locale/en/site.json | 4 ++++ 6 files changed, 82 insertions(+), 20 deletions(-) create mode 100644 locale/en/get-involved/events.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 896e49971002a..80b6e8055a71a 100644 --- a/CONTRIBUTING.md +++ b/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,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 57020dcc87679..0f746948a89e4 100644 --- a/README.md +++ b/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 diff --git a/layouts/contribute.hbs b/layouts/contribute.hbs index f5e015476e61f..0ec824ea18a41 100644 --- a/layouts/contribute.hbs +++ b/layouts/contribute.hbs @@ -22,6 +22,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 324232a1154d1..237629a6be4bd 100644 --- a/locale/en/get-involved/index.md +++ b/locale/en/get-involved/index.md @@ -14,24 +14,6 @@ right place. Explore our community resources to find out how you can help:
-## 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 diff --git a/locale/en/site.json b/locale/en/site.json index eb8842cf200e5..4e689651343a0 100644 --- a/locale/en/site.json +++ b/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" }, From 6b099f13b5593afea198b83f093c7a83a616e190 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Thu, 15 Oct 2015 16:31:28 +0200 Subject: [PATCH 2/3] Add back the Node.js Interactive and NodeConf Barcelona events --- locale/en/get-involved/events.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/en/get-involved/events.md b/locale/en/get-involved/events.md index dd0f9e49c3e86..f17f115ae5616 100644 --- a/locale/en/get-involved/events.md +++ b/locale/en/get-involved/events.md @@ -13,6 +13,8 @@ The Node.js community is committed to bringing you events from around the world, ### 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. @@ -23,6 +25,8 @@ The Node.js community is committed to bringing you events from around the world, - 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). From f8463333c1eeedb6ae44537100b8d6641a2f7333 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Thu, 15 Oct 2015 16:32:28 +0200 Subject: [PATCH 3/3] Respect the limit of 80 characters per line --- CONTRIBUTING.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 80b6e8055a71a..c6a08ad8c5ecc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -138,12 +138,15 @@ CoC](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct). ## 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. + +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. @@ -157,17 +160,21 @@ layout: contribute.hbs ``` #### 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. + +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" + "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. + +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}}