chore(resources): update resources links and header and footer

Author: naomiblack

public/_includes/_footer.jade

@@ -13,47 +13,37 @@ else
     .c3.main-footer-branding
       .logo-inverse-large
 
-    .c2
+    .c3
       h3.text-headline RESOURCES
 
       ul.text-body
-        li <a href="/presskit.html">Press Kit</a>
         // TODO: (ericjim) make a libraries page to showcase all angular 2 libraries
         //li <a href="/libraries.html">Libraries</a>
-        li <a href="https://angularjs.org/"> Angular 1 for JS</a>
-        li <a href="https://material.angularjs.org"> Angular Material</a>
-        li <a href="https://www.firebase.com/docs/web/libraries/angular/"> AngularFire</a>
-
-    .c2
-      h3.text-headline LEARN
+        li <a href="/about/">About</a>
+        li <a href="/resources/">Books & Training</a>
+        li <a href="/resources/">Tools & Libraries</a>
+        li <a href="/resources/">Community</a>
+        li <a href="/presskit.html">Press Kit</a>
 
-      ul.text-body
-        li <a href="/docs/ts/latest/guide/">Basics</a>
-        li <a href="/books.html">Books</a>
-        li <a href="/training.html">Training</a>
-        li <a href="/docs/ts/latest/resources.html">Videos and Posts</a>
-        li <a href="/tooling.html">Tooling & Libraries</a>
-        li <a href="/communities.html">Communities</a>
-        //li <a href="http://goo.gl/sj0Nk1">Design Docs &amp; Notes</a>
-
-    .c2
+    .c3
       h3.text-headline HELP
 
       ul.text-body
-        li <a href="/contribute.html"> Contribute</a>
-        li <a href="/support.html">Support Page</a>
-        li <a href="https://github.com/angular/angular/issues"> File a Ticket</a>
-        li <a class="footer-feedback" ng-click="appCtrl.openFeedback()" aria-label="Submit feedback on this page"> Product Feedback</a>
+        li <a href="http://stackoverflow.com/questions/tagged/angular2">Stack Overflow</a>
+        li <a href="https://gitter.im/angular/angular">Gitter</a>
+        li <a href="https://groups.google.com/forum/#!forum/angular"> Google Group</a>
+        li <a href="https://github.com/angular/angular/issues"> Report Issues</a>
+        li <a class="footer-feedback" ng-click="appCtrl.openFeedback()" aria-label="Submit feedback on this page"> Site Feedback</a>
 
     .c3
       h3.text-headline COMMUNITY
 
       ul.text-body
-        li <a href="/events.html"> Events & Meetups</a>
-        li <a href="https://groups.google.com/forum/#!forum/angular"> Google Group</a>
-        li <a href="https://plus.sandbox.google.com/+AngularJS/posts"> Google+</a>
+        li <a href="/events.html">Events</a>
+        li <a href="http://www.meetup.com/topics/angularjs/">Meetups</a>
         li <a href="https://twitter.com/angularjs"> Twitter</a>
         li <a href="https://github.com/angular/angular"> GitHub</a>
+        li <a href="/contribute.html"> Contribute</a>
 
 
   footer(class="background-steel")

public/_includes/_main-nav.jade

@@ -12,5 +12,4 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5",scroll-y-off
       li.l-left <a class="main-nav-button" href="/docs/#{language}/latest/" md-button>Docs</a>
       li.l-left <a class="main-nav-button" href="/events.html" md-button>Events</a>
       li.l-left <a class="main-nav-button" href="/news.html" md-button>News</a>
-      li.l-left <a class="main-nav-button" href="/about/" md-button>About</a>
       li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>Get Started</a>

public/resources/index.jade

@@ -19,7 +19,7 @@ div
         h3 Udemy
         ul(class="publisher")
           li
-            a(class="title text-body" href="https://www.udemy.com/the-complete-guide-to-angular-2/?utm_content=_._ag_angular%202_._ad_47395956109_._de_c_._dm__._lo_9061189_._&matchtype=b&gclid=CjwKEAjww9O3BRDp1tq0jIP023YSJAB0-j1S4bFN4tudrjzZO_-ABNAfFQJrhrKo7KX1AnV-8yjV-hoCRrDw_wcB&utm_medium=udemyads&k_clickid=dce13cd7-9844-44dc-9967-020275b637c9_408_GOOGLE_NEW-AW-PROS-TECH-Dev-angular-2-EN-ENG_._ci_756150_._sl_ENG_._vi_TECH_._sd_All_._la_EN_.__angular%202_%2Bangular%20%2B2_b_47395956109_c&utm_campaign=NEW-AW-PROS-TECH-Dev-angular-2-EN-ENG_._ci_756150_._sl_ENG_._vi_TECH_._sd_All_._la_EN_._&utm_source=adwords&utm_term=_._pl__._pd__._ti_kwd-68757357257_._kw_%2Bangular%20%2B2_._&pmtag=72bf13dc-329c-411c-b381-a6143735b9dc") The Complete Guide to Angular 2
+            a(class="title text-body" href="https://www.udemy.com/the-complete-guide-to-angular-2") The Complete Guide to Angular 2
           li
             a(class="title text-body" href="https://www.udemy.com/angular-2-tutorial-for-beginners/") Angular 2 With TypeScript for Beginners
           li
@@ -121,11 +121,11 @@ div
         h3 Data Libraries
         ul
           li
-            a(class="text-body" href="https://www.firebase.com/") Firebase
+            a(class="text-body" href="https://github.com/angular/angularfire2") AngularFire
           li
-            a(class="text-body" href="https://www.meteor.com/") Meteor
+            a(class="text-body" href="http://www.angular-meteor.com/angular2") Meteor
           li
-            a(class="text-body" href="http://mean.io/") MEAN
+            a(class="text-body" href="http://docs.apollostack.com/apollo-client/angular2.html") Apollo
 
         h3 UI Components
         ul
@@ -140,10 +140,9 @@ div
           li
             a(class="text-body" href="http://wijmo.com/products/wijmo-5/") Wijmo
           li
-            a(class="text-body" href="https://angular-ui.github.io/bootstrap/") Bootstrap UI
+            a(class="text-body" href="https://vaadin.com/elements") Vaadin
           li
-            a(class="text-body" href="https://vaadin.com/home") Vaadin
-
+            a(class="text-body" href="http://valor-software.com/ng2-bootstrap/") ng2-bootstrap
         h3 Cross-Platform Development
         ul
           li
@@ -158,11 +157,8 @@ div
             a(class="text-body" href="http://github.com/preboot/angular2-universal-windows-app") Windows (UWP)
 
     div
-      h1 Communities
+      h1 Podcasts
       div(class="resources")
-        p(class="text-body") Would you like to be listed in this page? Fill out this <a href="https://docs.google.com/a/rangle.io/forms/d/1qzWaDpTgTPe4iPDRF_VCT9aHXKimUocwlFnVJUdKabY/viewform?c=0&w=1">form</a>.
-
-        h3 Podcasts
         ul(class="podcasts")
           li(class="podcast")
             a(class="text-body" href="https://angularair.com/") AngularAir
@@ -171,29 +167,3 @@ div
           li(class="podcast")
             a(class="text-body" href="https://devchat.tv/adventures-in-angular") Adventures in Angular
 
-
-        h3 Communities
-        ul(class="communities")
-          li(class="community")
-            a(class="text-body" href="http://angularbeers.org/") Angular Beers
-          li(class="community")
-            a(class="text-body" href="http://angularcamp.org/") Angular Camp
-          li(class="community")
-            a(class="text-body" href="http://www.meetup.com/find/?allMeetups=false&keywords=angularjs&radius=Infinity&userFreeform=94043&gcResults=Mountain+View%2C+CA+94043%2C+USA%3AUS%3ACalifornia%3ASanta+Clara+County%3AMountain+View%3Anull%3A94043%3A37.428434%3A-122.07238159999997&change=yes&sort=default") Angular Meetups
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-