diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-02 10:45:28 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-02 10:45:28 -0400 |
| commit | bc34aa7c3c6f3f9867bfdc0e7162d97fc8d2a0cf (patch) | |
| tree | 88940e6ae4f735c1648ed5e1a0756306fcb9d2e3 | |
| parent | 7a95580e2fcc57cd91ab2b7b9c3042edcbef1236 (diff) | |
make popups larger
Former-commit-id: aef496c1f3dec9c5cc103bb36a3f23cc7a26fe06
| -rw-r--r-- | www/css/style.css | 5 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/LogCtrl.js | 15 | ||||
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/www/css/style.css b/www/css/style.css index 1dad0bb5..1e2fc162 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -422,6 +422,11 @@ http://www.cssportal.com/tryit/index.php?file=blog/css-notification-badge */ width:90% !important; } +.popup95 .popup +{ + width:95% !important; +} + .events-modal-camera-icon { position:absolute; diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 4bd5d4e4..5aaf6034 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -548,7 +548,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro title: 'Select ' + (onlyAlarms ? 'Alarmed ' : '') + 'frame to save', subTitle: 'use left and right arrows to change', scope: $scope, - cssClass: 'popup80', + cssClass: 'popup95', buttons: [ { // left 1 diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js index 76683257..c48ef060 100644 --- a/www/js/LogCtrl.js +++ b/www/js/LogCtrl.js @@ -80,7 +80,11 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo template: $rootScope.appName + ' ' + $translate.instant('kSensitiveBody') }) .then(function (res) { - if (res) sendEmailReally(logstring); + if (res) + { + logstring = "Logs for version:"+$scope.zmAppVersion+"\n"+logstring; + sendEmailReally(logstring); + } }); }; @@ -92,10 +96,6 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo if (window.cordova) { - - - - // do my best to replace sensitive information var loginData = ZMDataModel.getLogin(); @@ -135,8 +135,8 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo var fname = $rootScope.appName + "-logs-" + moment().format('MMM-DD-YY_HH-mm-ss') + ".txt"; - var dlogstring = "version:" + $scope.zmAppVersion + "\n" + logstring; - var blob = new Blob([dlogstring], { + + var blob = new Blob([logstring], { type: "text/plain;charset=utf-8" }); saveAs(blob, fname); @@ -162,6 +162,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo $scope.zmLog.logString = l.split('\n').reverse().join('\n'); + $ionicLoading.hide(); }, function (error) { diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index 68b37925..aa403010 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -137,7 +137,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' $rootScope.zmPopup = $ionicPopup.alert({ title: 'frame:' + fid + '/Event:' + e, template: img, - cssClass: 'popup80' + cssClass: 'popup95' }); }; |