From 5f4886f1e90ca9211b553fdffffbf3efbd96972c Mon Sep 17 00:00:00 2001
From: Naomi Black <naomitraveller@gmail.com>
Date: Wed, 4 Mar 2015 12:24:00 -0700
Subject: [PATCH] Dropdown changes and text consistency

---
 public/_includes/_version-dropdown.jade | 16 ++++++++--------
 public/docs/dart/latest/_data.json      |  2 +-
 public/download/_data.json              | 22 ++++++++++------------
 public/download/index.jade              |  5 ++++-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade
index 249f8a2786..bf95ba6e47 100644
--- a/public/_includes/_version-dropdown.jade
+++ b/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>
diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json
index 9e45c45384..625f3be00a 100644
--- a/public/docs/dart/latest/_data.json
+++ b/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": {
diff --git a/public/download/_data.json b/public/download/_data.json
index eacf067dd4..106d102900 100644
--- a/public/download/_data.json
+++ b/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"
         }
diff --git a/public/download/index.jade b/public/download/index.jade
index 0c55be8b63..7009223790 100644
--- a/public/download/index.jade
+++ b/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>