diff options
| -rw-r--r-- | www/css/style.css | 18 | ||||
| -rw-r--r-- | www/js/ModalCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 1 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 2 |
5 files changed, 26 insertions, 0 deletions
diff --git a/www/css/style.css b/www/css/style.css index 042b9ee8..b3afe635 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -240,6 +240,24 @@ http://www.cssportal.com/tryit/index.php?file=blog/css-notification-badge */ } + +.monitor-modal-text +{ + position:absolute; + bottom:30px; + + left: 50%; + transform: translate(-50%, 0%); + z-index:10; + opacity:0.7; + color:white; + background-color: black; + border-radius: 5px 5px 5px 5px; + padding-left:3px; + padding-right:3px; + +} + .events-alarm-line { diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index 954388a5..3a130363 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -337,6 +337,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco } $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); $ionicLoading.hide(); $ionicLoading.show({ @@ -383,6 +384,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco } $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); $ionicLoading.hide(); @@ -427,6 +429,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco } $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); $ionicLoading.show({ template: "please wait...", @@ -463,6 +466,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco } $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); $ionicLoading.show({ template: "please wait...", noBackdrop: true, diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index c996b8e8..60b9f0cb 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -270,6 +270,7 @@ angular.module('zmApp.controllers') $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); $scope.LoginData = ZMDataModel.getLogin(); $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 4850d0f9..169d79b7 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -558,6 +558,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' // }.bind(this), 1000); $scope.monitorId = mid; + $scope.monitorName = ZMDataModel.getMonitorName(mid); $scope.LoginData = ZMDataModel.getLogin(); $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111; diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 0e49417b..8db208e9 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -68,5 +68,7 @@ ng-click="handleAlarms();" ng-if="$root.isAlarm"></a> </span> +<div class="monitor-modal-text" >{{monitorName}}</div> + </div> |