From e5bcf3ba79dfa170d34bf85afafc8cbfed0f3c34 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 7 May 2018 11:36:44 -0400 Subject: #623 copy/paste enabled --- www/css/style.css | 18 ++++++++++++++++++ www/js/LogCtrl.js | 7 +++++++ www/lang/locale-en.json | 1 + www/templates/log.html | 6 +++++- 4 files changed, 31 insertions(+), 1 deletion(-) (limited to 'www') diff --git a/www/css/style.css b/www/css/style.css index 1260d3a9..bb019901 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -126,6 +126,18 @@ ion-popover-view.fit ion-content { } + + +.selectable { + + -webkit-user-select: text !important; + -khtml-user-select: text !important; + -moz-user-select: text !important; + -ms-user-select: text !important; + -o-user-select: text !important; + user-select: text !important; + +} /*.modal { top: 100; @@ -681,6 +693,7 @@ progress[role] /* appearance: none;*/ -moz-appearance: none; -webkit-appearance: none; + appearance:none; /* gets rid of default border in Firefox and Opera. */ border: none; /* Needs to be in here for Safari polyfill so background images work as expected. */ @@ -880,6 +893,7 @@ input[type=range]::-webkit-slider-thumb { font-size: 2em; border: 1px solid #ddd; -webkit-appearance: none; + appearance:none; } .pin-background.scroll-content { @@ -1333,8 +1347,10 @@ videogular div.event-time { display: inline-flex; -webkit-box-direction: normal; -moz-box-direction: normal; + box-direction:normal; -webkit-box-orient: horizontal; -moz-box-orient: horizontal; + box-orient:horizontal; -webkit-flex-direction: row; -ms-flex-direction: row; flex-direction: row; @@ -1343,6 +1359,7 @@ videogular div.event-time { flex-wrap: nowrap; -webkit-box-pack: center; -moz-box-pack: center; + box-pack:center; -webkit-justify-content: center; -ms-flex-pack: center; justify-content: center; @@ -1351,6 +1368,7 @@ videogular div.event-time { align-content: center; -webkit-box-align: center; -moz-box-align: center; + box-align:center; -webkit-align-items: center; -ms-flex-align: center; align-items: center; diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js index 9f00a8f7..530a7178 100644 --- a/www/js/LogCtrl.js +++ b/www/js/LogCtrl.js @@ -244,6 +244,10 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo } + $scope.selectToggle = function() { + $scope.selectOn = !$scope.selectOn; + }; + $scope.changePage = function(p) { $scope.zmPage = $scope.zmPage + p; @@ -295,6 +299,9 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo $scope.$on('$ionicView.enter', function() { //console.log("**VIEW ** Log Ctrl Entered"); + + $ionicSideMenuDelegate.canDragContent(false); + $scope.selectOn = false; NVRDataModel.setAwake(false); $scope.logEntity = $rootScope.appName; $scope.zmPage = 1; diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index d0d1285c..77961cfe 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -190,6 +190,7 @@ "kLoginValidAPIFailedTitle" :"Login validated but API failed", "kLoginValidatedTitle" :"Login Validated", "kLogs" :"Logs", + "kLogsCopyPaste" :"Text select is on, touch scrolling is disabled. Tap icon again to revert", "kLowBWDisplay" :"low bandwidth", "kLowBandwidth" :"low bandwidth mode", "kManageServerGroups" :"Manage Server Groups", diff --git a/www/templates/log.html b/www/templates/log.html index f2ed3f65..af5e345e 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -1,6 +1,9 @@ + + + @@ -27,6 +30,7 @@ {{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}}) +
{{'kLogsCopyPaste' | translate }}
ZoneMinder
@@ -34,5 +38,5 @@
-
{{log.logString}}
+
{{log.logString}}
-- cgit v1.2.3