diff --git a/public/_data.json b/public/_data.json index f34f811f46..e3df10773e 100644 --- a/public/_data.json +++ b/public/_data.json @@ -21,6 +21,11 @@ "subtitle": "Check out what we are up to" }, + "events": { + "title": "Events", + "subtitle": "Where we'll be presenting" + }, + "support": { "title": "Support", "subtitle": "Get help from the Angular Community" diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade index 16ba8719cb..4cbe5e397e 100644 --- a/public/_includes/_main-nav.jade +++ b/public/_includes/_main-nav.jade @@ -11,4 +11,5 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5",scroll-y-off li.l-left Contribute li.l-left Support li.l-left News + li.l-left Events li.l-right.feedback-button feedback diff --git a/public/events.jade b/public/events.jade new file mode 100644 index 0000000000..0cc46d5d00 --- /dev/null +++ b/public/events.jade @@ -0,0 +1,92 @@ + + +.grid-fluid + .c2.text-left + h4 Feb. 18, 2016 + .c4.text-left + h4 Amsterdam, Netherlands + .c4.text-left + h4 + a( + target="_blank" + href="http://www.ng-nl.org" + ) ng-nl +.grid-fluid + .c10.text-center + hr + + +.grid-fluid + .c2.text-left + h4 Feb. 21-23, 2016 + .c4.text-left + h4 Munich, Germany + .c4.text-left + h4 + a( + target="_blank" + href="http://angularjs-days.de/" + ) AngularJS Days +.grid-fluid + .c10.text-center + hr + + +.grid-fluid + .c2.text-left + h4 Mar. 8-10, 2016 + .c4.text-left + h4 San Francisco, CA, USA + .c4.text-left + h4 + a( + target="_blank" + href="http://conferences.oreilly.com/fluent/javascript-html-us" + ) O'Reilly Fluent +.grid-fluid + .c10.text-center + hr + + +.grid-fluid + .c2.text-left + h4 May 5-6, 2016 + .c4.text-left + h4 Salt Lake City, NV, USA + .c4.text-left + h4 + a( + target="_blank" + href="http://www.ng-conf.org/" + ) ng-conf +.grid-fluid + .c10.text-center + hr + +.grid-fluid + .c2.text-left + h4 Sept. 27-28, 2016 + .c4.text-left + h4 London, UK + .c4.text-left + h4 + a( + target="_blank" + href="http://angularconnect.com/" + ) ng-conf +.grid-fluid + .c10.text-center + hr + + +.grid-fluid + .c2.text-left + h4 Oct. 24-26, 2016 + .c4.text-left + h4 Paris, France + .c4.text-left + h4 + a( + target="_blank" + href="https://ng-europe.org/" + ) ngconf