Merge pull request #50 from davideast/polish

Polish

harp.json

@@ -3,7 +3,7 @@
     "title": "Angular",
     "description": "Angular is a development platform for building mobile and desktop web applications",
     "siteURL": "http://angular.io",
-    "jsLatest": "2.0.0-alpha.11",
+    "jsLatest": "2.0.0-alpha.12",
     "dartLatest": "2.0.0-alpha.6",
 
     "bios": {
@@ -114,7 +114,7 @@
         "yegor": {
             "name": "Yegor Jbanov",
             "picture": "/resources/images/bios/yegor.jpg",
-        "twitter": "AngularJS",
+            "twitter": "BLANK",
             "website": "http://google.com/+YegorJbanov",
             "bio": "I'm Yegor and I work on Angular 2 for Dart and performance."
         },
@@ -157,6 +157,94 @@
             "twitter": "berlinjohnson",
             "website": "http://www.berlinjohnson.com/",
             "bio": "I am a designer, illustrator, and biomedical engineer who loves combining creativity and science. Previously, I worked as a Cardiovascular Modeling and Simulation engineer where I built complex 3D and computational models of the human cardiovascular system based on patient-specific medical imaging data."
+        },
+
+        "matias": {
+            "name": "Matias Niemela",
+            "picture": "/resources/images/bios/matias.jpg",
+            "twitter": "yearofmoo",
+            "website": "http://yearofmoo.com",
+            "bio": "Matias Niemela is a fullstack web developer who has been programming & building websites for over 10 years, and a core team member of AngularJS for two years. In the spring of 2015 Matias will be moving to California to work on AngularJS full time at Google. In his free time Matias loves to build complex things and is always up for public speaking, travelling and tweaking his current Vim setup."
+        },
+
+        "marcy": {
+            "name": "Marcy Sutton",
+            "picture": "/resources/images/bios/marcy.jpg",
+            "twitter": "marcysutton",
+            "website": "http://marcysutton.com",
+            "bio": "Marcy Sutton is a developer at Substantial in Seattle working on Angular accessibility and Material Design. She is a primary contributor to ngAria, the accessibility module, as well as the author of a new accessibility plug-in for Protractor. She's also in love with riding bicycles."
+        },
+
+        "caitp": {
+            "name": "Caitlin Potter",
+            "picture": "/resources/images/bios/caitp-kitten.jpg",
+            "twitter": "caitp88",
+            "website": "BLANK",
+            "bio": "Prolific hacker, maker, breaker, and baker. Aims to make the web a viable and comfortable platform to work on."
+        },
+
+        "shahar": {
+            "name": "Shahar Talmi",
+            "picture": "/resources/images/bios/shahar.jpg",
+            "twitter": "shahata",
+            "website": "https://plus.google.com/+ShaharTalmi",
+            "bio": "Shahar is a full-stack architect at Wix, leading Wix Angular and client infrastructure. He has been writing software ranging between kernel drivers, massive servers and casual games for the better part of his life. In the last couple of years he's developed a major crush on web applications development and specifically on Angular. Shahar is a big fan of TDD and is doing his best to promote it within the javascript community."
+        },
+
+        "lucas": {
+            "name": "Lucas Mirelmann",
+            "picture": "/resources/images/bios/lucas-kitten.jpg",
+            "twitter": "lgalfaso",
+            "website": "BLANK",
+            "bio": "Lucas works as a Software Engineer at Google and is a core Angular contributor."
+        },
+
+        "thomas": {
+            "name": "Thomas Burleson",
+            "picture": "/resources/images/bios/thomas.jpg",
+            "twitter": "ThomasBurleson",
+            "website": "http://www.solutionOptimist.com",
+            "bio": "Thomas is a software Architect for commercial & open-source web solutions. Thomas is passionate about IoC, architecture patterns, and software excellence, and distributed team-development. Currently, he is the team lead for Angular Material and helps deliver the Angular Material reference implementation for Material Design. Check out the team's amazing work at http://material.angularjs.org."
+        },
+
+        "pete": {
+            "name": "Pete Bacon Darwin",
+            "picture": "/resources/images/bios/pete.jpg",
+            "twitter": "petebd",
+            "website": "http://www.bacondarwin.com",
+            "bio": "AngularJS 1.x Team Lead. Pete has been working on the core team since 2012 and became the team lead for the 1.x branch in November 2014. He has co-authored a book on AngularJS and regularly talks about and teaches Angular."
+        },
+
+        "tonyc": {
+            "name": "Tony Childs",
+            "picture": "/resources/images/bios/tonyc.jpg",
+            "twitter": "javatricks",
+            "website": "http://www.stupidjavatricks.com",
+            "bio": "Tony Childs is a consultant working for Google. He is a contributor to the Angular Material project and is responsible for the md-icon component."
+        },
+
+        "ryan": {
+            "name": "Ryan Schmukler",
+            "picture": "/resources/images/bios/ryan.jpg",
+            "twitter": "rschmukler",
+            "website": "http://slingingcode.com",
+            "bio": "Developer on ngMaterial. Full-stack JavaScript hacker. Open-source contributor with libraries totaling over 225K downloads."
+        },
+
+        "rmesserle": {
+            "name": "Robert Messerle",
+            "picture": "/resources/images/bios/rmesserle.jpg",
+            "twitter": "Bobbo_O",
+            "website": "BLANK",
+            "bio": "Robert is a software engineer on the Angular team at Google, working primarily on the Angular Material project."
+        },
+
+        "kathy": {
+            "name": "Kathy Walrath",
+            "picture": "/resources/images/bios/kathy.jpg",
+            "twitter": "kwalrath",
+            "website": "https://plus.google.com/+KathyWalrath",
+            "bio": "Kathy writes and edits docs about Dart and related technologies. Before Google, she worked at Sun, NeXT, and HP. Long ago, Kathy co-created and maintained The Java Tutorial."
         }
     }
   }

public/_includes/_footer.jade

@@ -9,8 +9,8 @@
 
       ul.text-body
         li <a href="/"> Angular 2.0</a>
-        li <a href="https://angularjs.org/"> Angular JS 1.X</a>
-        li <a href="https://angulardart.org/"> Angular Dart 1.X</a>
+        li <a href="https://angularjs.org/"> Angular for JavaScript 1.X</a>
+        li <a href="https://angulardart.org/"> Angular for Dart 1.X</a>
         li <a href="https://material.angularjs.org"> Angular Material</a>
         li <a href="https://www.firebase.com/docs/web/libraries/angular/"> AngularFire</a>
 

public/_includes/_version-dropdown.jade

@@ -21,16 +21,16 @@ mixin tree(directory, urlPrefix, name, latest)
 <!-- BUTTON TITLE GENERATION  -->
 if language == 'js'
   if version == "latest"
-    title = 'JavaScript ' + jsLatest
+    title = 'Angular 2 for JavaScript'
   else
-    title = 'JavaScript ' + version
+    title = 'Angular ' + version + ' for JavaScript'
 
 
 if language == 'dart'
   if version == "latest"
-    title = 'Dart ' + dartLatest
+    title = 'Angular 2 for Dart'
   else
-    title = 'Dart ' + version
+    title = 'Angular ' + version + ' for Dart'
 
 
 <!-- DROPDOWN BUTTON -->
@@ -40,8 +40,8 @@ nav.hero-subtitle.text-subhead.dropdown
 
   <!-- DROPDOWN MENU -->
   div(class="dropdown-menu ng-hide" ng-show="showMenu")
-    mixin tree(public.docs.js, "/docs/js", "JavaScript", jsLatest)
-    mixin tree(public.docs.dart, "/docs/dart", "Dart", dartLatest)
+    mixin tree(public.docs.js, "/docs/js", "Angular 2 for JavaScript")
+    mixin tree(public.docs.dart, "/docs/dart", "Angular 2 for Dart")
     ul
-      li <a href="https://angularjs.org/" md-button>#{name} Angular 1.X</a>
-      li <a href="https://angulardart.org/" md-button>#{name} AngularDart 1.X</a>
+      li <a href="https://angularjs.org/" md-button>#{name} Angular 1.X for JavaScript</a>
+      li <a href="https://angulardart.org/" md-button>#{name} Angular 1.X for Dart</a>

public/contribute.jade

@@ -3,22 +3,22 @@
   p We'd love for you to contribute to our source code and to make Angular projects even better.
 
   .l-sub-section
-    h3 Angular JS
+    h3 Angular for JavaScript
 
     p Angular is a development platform for building mobile and desktop web applications.
 
-    a(href="https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular JS
+    a(href="https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular for JavaScript
 
   .l-sub-section
     h3 Angular Material
 
-    p Our goal is to deliver a lean, lightweight set of AngularJS-native UI elements that implement the material design specification for use in Angular single-page applications (SPAs).
+    p Our goal is to deliver a lean, lightweight set of Angular-based UI elements that implement the material design specification for use in Angular single-page applications (SPAs).
 
     a(href="https://github.com/angular/material/blob/master/docs/guides/CONTRIBUTING.md" class="button" md-button) Contribute to Angular Material
 
   .l-sub-section
     h3 AngularFire
 
-    p AngularFire is the officially supported AngularJS binding for Firebase. Firebase is a full backend so you don't need servers to build your Angular app.
+    p AngularFire is the officially supported Angular binding for Firebase. Firebase is a full backend so you don't need servers to build your Angular app.
 
     a(href="https://github.com/firebase/angularFire" class="button" md-button) Contribute to AngularFire

public/docs/dart/latest/_data.json

@@ -3,7 +3,7 @@
     "icon": "home",
     "title": "Angular Docs",
     "menuTitle": "Docs Home",
-    "banner": "Angular 2 is currently in Alpha Preview. We recommend using <a href='https://angulardart.org'>AngularDart 1.X</a> for production applications."
+    "banner": "Angular 2 is currently in Alpha Preview. We recommend using <a href='https://angulardart.org'>Angular for Dart</a> for production applications."
   },
 
   "quickstart": {

public/download/_data.json

@@ -1,25 +1,23 @@
 {
   "index": {
     "title": "Setup & Install Angular",
-    "subtitle": "Choose from our list of Frameworks",
+    "subtitle": "Choose from our list of frameworks",
 
     "downloads": {
       "Angular_2": {
-        "description": "Angular 2.0 is currently in alpha preview. Angular 2 is a development platform for building mobile and desktop web applications",
-        "2.0.0-alpha.11": {
+        "description": "Angular 2 is currently in Alpha Preview for JavaScript and Dart.",
+        "2.0.0-alpha for JavaScript": {
           "npm": "https://www.npmjs.com/package/angular2"
+        },
+        "2.0.0-alpha for Dart": {
+          "pub": "https://pub.dartlang.org/packages/angular2#installing"
         }
       },
 
-      "AngularDart_2": {
-        "description": "AngularDart 2.0 is currently in alpha preview. AngularDart 2.0 is a development platform for building mobile and desktop web applications",
-        "2.0.0-alpha.12": {
-          "npm": "https://pub.dartlang.org/packages/angular2"
-        }
-      },
+
 
       "Angular_1.X": {
-        "description": "The production ready version of Angular JS",
+        "description": "The production ready version of Angular for JavaScript",
 
         "1.X": {
           "file": "https://code.angularjs.org/"
@@ -27,7 +25,7 @@
       },
 
       "AngularDart_1.X": {
-        "description": "The production ready version of AngularDart",
+        "description": "The production ready version of Angular for Dart",
 
         "1.X": {
           "file": "https://angulardart.org/"
@@ -35,7 +33,7 @@
       },
 
       "AngularFire_1.X": {
-        "description": "AngularFire is the officially supported AngularJS binding for Firebase.",
+        "description": "AngularFire is the officially supported Angular binding for Firebase.",
         "1.X": {
           "file": "https://www.firebase.com/docs/web/libraries/angular/index.html"
         }

public/download/index.jade

@@ -19,5 +19,8 @@
                 li <a href="#{version.file}"> Download for #{name}</a>
 
               if version.npm
-                li <a href="#{version.npm}"> NPM installion for #{name}</a>
+                li <a href="#{version.npm}"> NPM installation for #{name}</a>
+
+              if version.pub
+                li <a href="#{version.pub}"> Pub installation for #{name}</a>
 

public/features.jade

@@ -14,7 +14,7 @@
     .sticker <span class="sticker-icon icon-fast-forward"></span>
   .c7
     h3.text-headline.text-uppercase  Future Ready
-    p.text-body Angular 2 is written in written in ECMAScript 6, with the addition of TypeScript types and annotations. ES6 allows us to benefit from the best of JavaScript, while writing clean and easy-to-read code.
+    p.text-body Angular 2 is written in written in ECMAScript 6, with the addition of types and annotations. ES6 allows us to benefit from the best of JavaScript, while writing clean and easy-to-read code.
 
 
 <!-- Coffee, Dart, ES6 -->