From ee5da936dad9253644e398c73f3f8ba75119f723 Mon Sep 17 00:00:00 2001
From: Naomi Black <naomitraveller@gmail.com>
Date: Wed, 9 Dec 2015 12:51:39 -0800
Subject: [PATCH] feature(feedback): add feedback API call to the site

---
 public/_includes/_head-include.jade               |  3 ++-
 public/_includes/_main-nav.jade                   |  3 ++-
 public/_includes/_scripts-include.jade            | 12 ------------
 public/docs/ts/latest/help-new.jade               |  8 --------
 public/resources/js/controllers/app-controller.js |  9 +++++++++
 5 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 public/docs/ts/latest/help-new.jade

diff --git a/public/_includes/_head-include.jade b/public/_includes/_head-include.jade
index 1ed9a2b002..6a757339f3 100644
--- a/public/_includes/_head-include.jade
+++ b/public/_includes/_head-include.jade
@@ -35,7 +35,8 @@ meta(itemprop="image" content="https://angular.io/resources/images/logos/standar
 
 link(rel="icon" type="image/x-icon" href="/resources/images/icons/favicon.ico")
 link(rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/0.8.3/angular-material.min.css")
-link(href='https://fonts.googleapis.com/css?family=Roboto:400,300,500,400italic,700' rel='stylesheet' type='text/css')
+link(href="https://fonts.googleapis.com/css?family=Roboto:400,300,500,400italic,700" rel='stylesheet' type='text/css')
+link(href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet")
 link(rel="stylesheet" href="/resources/css/vendor/icomoon/style.css")
 link(rel="stylesheet" href="/resources/css/vendor/animate.css")
 link(rel="stylesheet" href="/resources/css/main.css")
diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade
index 339952aced..668a897982 100644
--- a/public/_includes/_main-nav.jade
+++ b/public/_includes/_main-nav.jade
@@ -8,4 +8,5 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5")
       li.l-left <a class="main-nav-button" href="/features.html" md-button>Features</a>
       li.l-left <a class="main-nav-button" href="/docs/ts/latest/" md-button>Docs</a>
       li.l-left <a class="main-nav-button" href="/about/" md-button>About</a>
-      li.l-left <a class="main-nav-button" href="/contribute.html" md-button>Contribute</a>
\ No newline at end of file
+      li.l-left <a class="main-nav-button" href="/contribute.html" md-button>Contribute</a>
+      li.l-right <md-button ng-click="appCtrl.openFeedback()" class="md-icon-button top-nav-icon" aria-label="Submit feedback on this page"><span class="material-icons" style="line-height:1.5">feedback</span></md-button>
\ No newline at end of file
diff --git a/public/_includes/_scripts-include.jade b/public/_includes/_scripts-include.jade
index 378c794591..8ee174929c 100644
--- a/public/_includes/_scripts-include.jade
+++ b/public/_includes/_scripts-include.jade
@@ -48,15 +48,3 @@ if current.path[0] == "docs"
 <!-- Google Feedback -->
 script(src="//www.gstatic.com/feedback/api.js" type="text/javascript")
 
-script.
-  var btn = document.getElementById("feedback-btn");
-  var submitFeedback = function() {
-    var dropdown = document.getElementById("feedback-dropdown");
-    var configuration = {
-      'productId': '410509',
-      'authuser': '1',
-      'bucket': dropdown.options[dropdown.selectedIndex].value
-    }
-    userfeedback.api.startFeedback(configuration);
-  }
-  btn.addEventListener("click", submitFeedback);
diff --git a/public/docs/ts/latest/help-new.jade b/public/docs/ts/latest/help-new.jade
deleted file mode 100644
index 26f05a7a2c..0000000000
--- a/public/docs/ts/latest/help-new.jade
+++ /dev/null
@@ -1,8 +0,0 @@
-div(flex)
-  p.
-    What's your question about?
-  select#feedback-dropdown(name="Angular Version")
-    option(value="angular2") Angular 2
-    option(value="angularJS") AngularJS
-  button#feedback-btn.
-    Submit
diff --git a/public/resources/js/controllers/app-controller.js b/public/resources/js/controllers/app-controller.js
index e4e9ddf043..2b70a7ae51 100644
--- a/public/resources/js/controllers/app-controller.js
+++ b/public/resources/js/controllers/app-controller.js
@@ -55,6 +55,15 @@ angularIO.controller('AppCtrl', ['$mdDialog', '$timeout', '$http', '$sce', funct
     else vm.apiType = type;
   };
 
+  vm.openFeedback = function() {
+    var configuration = {
+      'productId': '410509',
+      'authuser': '1',
+      'bucket': 'angulario'
+    };
+    userfeedback.api.startFeedback(configuration);
+  };
+
   vm.apiSections = [
     { name: 'angular2/core', title: 'angular2/core' },
     { name: 'angular2/common', title: 'angular2/common' },