Change terminology for status on weather/traffic/towers plates. Ref #210.

pull/238/head v0.6r1
Christopher Young 2016-01-29 14:41:30 -05:00
rodzic 442e882646
commit bbbcd3bbe1
5 zmienionych plików z 12 dodań i 12 usunięć

Wyświetl plik

@ -61,16 +61,16 @@ function TrafficCtrl($rootScope, $scope, $state, $http, $interval) {
$scope.socket = socket; // store socket in scope for enter/exit usage
}
$scope.ConnectState = "Not Receiving";
$scope.ConnectState = "Disconnected";
socket.onopen = function (msg) {
// $scope.ConnectStyle = "label-success";
$scope.ConnectState = "Receiving";
$scope.ConnectState = "Connected";
};
socket.onclose = function (msg) {
// $scope.ConnectStyle = "label-danger";
$scope.ConnectState = "Not Receiving";
$scope.ConnectState = "Disconnected";
$scope.$apply();
setTimeout(connect, 1000);
};

Wyświetl plik

@ -154,16 +154,16 @@ function WeatherCtrl($rootScope, $scope, $state, $http, $interval) {
$scope.socket = socket; // store socket in scope for enter/exit usage
}
$scope.ConnectState = "Not Receiving";
$scope.ConnectState = "Disconnected";
socket.onopen = function (msg) {
// $scope.ConnectStyle = "label-success";
$scope.ConnectState = "Receiving";
$scope.ConnectState = "Connected";
};
socket.onclose = function (msg) {
// $scope.ConnectStyle = "label-danger";
$scope.ConnectState = "Not Receiving";
$scope.ConnectState = "Disconnected";
$scope.$apply();
setTimeout(connect, 1000);
};

Wyświetl plik

@ -2,8 +2,8 @@
<div class="panel panel-default">
<div class="panel-heading">
<span class="panel_label">Towers</span>
<span ng-show="ConnectState == 'Receiving'" class="label label-success">{{ConnectState}}</span>
<span ng-hide="ConnectState == 'Receiving'" class="label label-danger">{{ConnectState}}</span>
<span ng-show="ConnectState == 'Connected'" class="label label-success">{{ConnectState}}</span>
<span ng-hide="ConnectState == 'Connected'" class="label label-danger">{{ConnectState}}</span>
</div>
<div class="panel-body towers-page">
<div class="row">

Wyświetl plik

@ -2,8 +2,8 @@
<div class="panel panel-default">
<div class="panel-heading">
<span class="panel_label">Traffic</span>
<span ng-show="ConnectState == 'Receiving'" class="label label-success">{{ConnectState}}</span>
<span ng-hide="ConnectState == 'Receiving'" class="label label-danger">{{ConnectState}}</span>
<span ng-show="ConnectState == 'Connected'" class="label label-success">{{ConnectState}}</span>
<span ng-hide="ConnectState == 'Connected'" class="label label-danger">{{ConnectState}}</span>
</div>
<div class="panel-body traffic-page">
<div class="row">

Wyświetl plik

@ -2,8 +2,8 @@
<div class="panel panel-default">
<div class="panel-heading">
<span class="panel_label">Weather</span>
<span ng-show="ConnectState == 'Receiving'" class="label label-success">{{ConnectState}}</span>
<span ng-hide="ConnectState == 'Receiving'" class="label label-danger">{{ConnectState}}</span>
<span ng-show="ConnectState == 'Connected'" class="label label-success">{{ConnectState}}</span>
<span ng-hide="ConnectState == 'Connected'" class="label label-danger">{{ConnectState}}</span>
</div>
</div>