Merge pull request gearpump#497 from stanleyxu2005/fix_422

clockfly · clockfly · commit fa0d0c96979a · 2015-02-16T11:10:35.000+08:00
fix gearpump#422: (1) redirect to cluster page (2) added color to master status ...
diff --git a/core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala b/core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala
@@ -79,7 +79,7 @@ object AppMasterToMaster {
   case class WorkerData(workerDescription: Option[WorkerDescription])
 
   case object GetMasterData
-  case class MasterData(masterDescripton: MasterDescription)
+  case class MasterData(masterDescription: MasterDescription)
 }
 
 object MasterToAppMaster {
diff --git a/services/dashboard/partials/master.html b/services/dashboard/partials/master.html
@@ -12,14 +12,14 @@
     </tr>
     <tr>
       <td class="summaryItemName">Status</td>
-      <td>{{summary.status}}</td>
+      <td><span ng-class="summary.status=='synced'?'label-success':'label-warning'" class="label">{{summary.status}}</span></td>
     </tr>
     <tr>
       <td class="summaryItemName">Alive For</td>
       <td>{{summary.aliveFor|readableTime}}</td>
     </tr>
     <tr>
-      <td class="summaryItemName">Logfile Location</td>
+      <td class="summaryItemName">Log File Location</td>
       <td>{{summary.logFile}}</td>
     </tr>
     <tr>
diff --git a/services/dashboard/scripts/app-01.js b/services/dashboard/scripts/app-01.js
@@ -32,7 +32,7 @@ angular.module('app-01', ['ngTable', 'readable'])
     var url = location.origin + '/master';
     $scope.summary = {};
     $http.get(url).then(function (response) {
-      var description = response.data.masterDescripton;
+      var description = response.data.masterDescription;
       $scope.summary = {
         aliveFor: description.aliveFor,
         logFile: description.logFile,
diff --git a/services/dashboard/scripts/app.js b/services/dashboard/scripts/app.js
@@ -47,7 +47,7 @@ angular.module('app', [
   }).when('/apps', {
     templateUrl: 'partials/app.html',
     controller: 'app02Ctrl'
-  });
+  }).otherwise({redirectTo: '/cluster'});
 
 })
 .controller('navigationCtrl', function($scope, $location){

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ object AppMasterToMaster {`
`79`	`79`	`case class WorkerData(workerDescription: Option[WorkerDescription])`
`80`	`80`
`81`	`81`	`case object GetMasterData`
`82`		`- case class MasterData(masterDescripton: MasterDescription)`
	`82`	`+ case class MasterData(masterDescription: MasterDescription)`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`object MasterToAppMaster {`