From 673149683e27643419c36f83349f50065ae2f5c8 Mon Sep 17 00:00:00 2001
From: caseylargent <caseylargent@unomaha.edu>
Date: Mon, 27 Mar 2017 16:36:46 -0500
Subject: [PATCH 1/3] Change title to reflect what page the user is on.

---
 HCCGo/app/html/navbar.html | 2 --
 HCCGo/app/js/navService.js | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/HCCGo/app/html/navbar.html b/HCCGo/app/html/navbar.html
index 5ae5d1b..27084e4 100644
--- a/HCCGo/app/html/navbar.html
+++ b/HCCGo/app/html/navbar.html
@@ -39,8 +39,6 @@
      </li>
     </ul>
 
-    
-
     <ul class="nav navbar-nav navbar-right">
       <li ng-controller="updateButtonCtrl">
         <button type="button" 
diff --git a/HCCGo/app/js/navService.js b/HCCGo/app/js/navService.js
index a1e9a8b..11b9565 100644
--- a/HCCGo/app/js/navService.js
+++ b/HCCGo/app/js/navService.js
@@ -17,33 +17,38 @@ fileManageService.factory('navService',['$log', '$q', '$location', '$routeParams
    //
    service.currentPath = $location.path();
    service.username = new String("");
+   angular.element("title").text("Home");
 
    service.logout = function() {
       connectionService.closeStream();
       $location.path("/");
+      angular.element("title").text("HCC Go");
    };
 
    service.goHome = function() {
      $location.path("/cluster");
+     angular.element("title").text("Home");
    };
 
    service.goToSCP = function() {
       $location.path("/filesystem");
+      angular.element("title").text("File Transfer");
    };
    
    // Nav to jobHistory
    service.jobHistory = function() {
       $location.path("/jobHistory");
+      angular.element("title").text("Job History");
    }
    
    service.goToTutorials = function() {
       $location.path("/tutorials");
+      angular.element("title").text("Tutorials");
    }
    
    //if($templateCache.get('username') == null){
    service.username = connectionService.connectionDetails.username;
    service.host = connectionService.connectionDetails.hostname;
-  
    return service;
   
 }]);

From edb20bf8770e54997e28510c26a7aa8050106041 Mon Sep 17 00:00:00 2001
From: caseylargent <caseylargent@unomaha.edu>
Date: Mon, 3 Apr 2017 15:32:49 -0500
Subject: [PATCH 2/3] Fixed angular.element calls to call tags

---
 HCCGo/app/js/navService.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/HCCGo/app/js/navService.js b/HCCGo/app/js/navService.js
index 11b9565..e96b568 100644
--- a/HCCGo/app/js/navService.js
+++ b/HCCGo/app/js/navService.js
@@ -17,33 +17,33 @@ fileManageService.factory('navService',['$log', '$q', '$location', '$routeParams
    //
    service.currentPath = $location.path();
    service.username = new String("");
-   angular.element("title").text("Home");
+   angular.element(document).find("title").text("Home");
 
    service.logout = function() {
       connectionService.closeStream();
       $location.path("/");
-      angular.element("title").text("HCC Go");
+      angular.element(document).find("title").text("HCC Go");
    };
 
    service.goHome = function() {
      $location.path("/cluster");
-     angular.element("title").text("Home");
+     angular.element(document).find("title").text("Home");
    };
 
    service.goToSCP = function() {
       $location.path("/filesystem");
-      angular.element("title").text("File Transfer");
+      angular.element(document).find("title").text("File Transfer");
    };
    
    // Nav to jobHistory
    service.jobHistory = function() {
       $location.path("/jobHistory");
-      angular.element("title").text("Job History");
+      angular.element(document).find("title").text("Job History");
    }
    
    service.goToTutorials = function() {
       $location.path("/tutorials");
-      angular.element("title").text("Tutorials");
+      angular.element(document).find("title").text("Tutorials");
    }
    
    //if($templateCache.get('username') == null){

From 066b361a8caeb6abcea2bdb9082e1557eb25df66 Mon Sep 17 00:00:00 2001
From: caseylargent <caseylargent@unomaha.edu>
Date: Wed, 5 Apr 2017 15:54:26 -0500
Subject: [PATCH 3/3] Fixed title to use routing title

---
 HCCGo/app/index.html       | 2 +-
 HCCGo/app/js/app.js        | 3 ++-
 HCCGo/app/js/navService.js | 6 ------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/HCCGo/app/index.html b/HCCGo/app/index.html
index 20266e4..335bc0f 100644
--- a/HCCGo/app/index.html
+++ b/HCCGo/app/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>HCC Go</title>
+    <title ng-bind="'HCC Go &mdash; ' + title">HCC Go</title>
     
 
 
diff --git a/HCCGo/app/js/app.js b/HCCGo/app/js/app.js
index 24e08b1..fe28cbf 100644
--- a/HCCGo/app/js/app.js
+++ b/HCCGo/app/js/app.js
@@ -57,7 +57,8 @@ var app = angular.module('HccGoApp', ['HccGoApp.WelcomeCtrl',
 ]);
 
 app.run(['$rootScope', '$route', 'analyticsService', function($rootScope, $route, analyticsService) {
-    $rootScope.$on('$routeChangeSuccess', function() {
+    $rootScope.$on('$routeChangeSuccess', function(event, current, previous) {
         if($route.current.title) analyticsService.screenView($route.current.title); //screenView value is Dashboard
+        $rootScope.title = current.$$route.title;
     });
 }]);
diff --git a/HCCGo/app/js/navService.js b/HCCGo/app/js/navService.js
index e96b568..5da9f54 100644
--- a/HCCGo/app/js/navService.js
+++ b/HCCGo/app/js/navService.js
@@ -17,33 +17,27 @@ fileManageService.factory('navService',['$log', '$q', '$location', '$routeParams
    //
    service.currentPath = $location.path();
    service.username = new String("");
-   angular.element(document).find("title").text("Home");
 
    service.logout = function() {
       connectionService.closeStream();
       $location.path("/");
-      angular.element(document).find("title").text("HCC Go");
    };
 
    service.goHome = function() {
      $location.path("/cluster");
-     angular.element(document).find("title").text("Home");
    };
 
    service.goToSCP = function() {
       $location.path("/filesystem");
-      angular.element(document).find("title").text("File Transfer");
    };
    
    // Nav to jobHistory
    service.jobHistory = function() {
       $location.path("/jobHistory");
-      angular.element(document).find("title").text("Job History");
    }
    
    service.goToTutorials = function() {
       $location.path("/tutorials");
-      angular.element(document).find("title").text("Tutorials");
    }
    
    //if($templateCache.get('username') == null){