diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/css/style.css | 34 | ||||
| -rwxr-xr-x | www/js/app.js | 16 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
3 files changed, 48 insertions, 4 deletions
diff --git a/www/css/style.css b/www/css/style.css index 82160ea0..15decf09 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -1331,4 +1331,38 @@ body { * { font-family: -apple-system, "Helvetica Neue", sans-serif; +} + +/*Disabling platform specific tweaks */ +.platform-ios.platform-cordova:not(.fullscreen) .bar-header +{ + height: 44px !important; +} +.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) +{ + height: 44px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader).item-input-inset .item-input-wrapper +{ + margin-top: 0px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) > * +{ + margin-top: 0px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .tabs-top > .tabs, .platform-ios.platform-cordova:not(.fullscreen) .tabs.tabs-top +{ + top: 44px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .has-header, .platform-ios.platform-cordova:not(.fullscreen) .bar-subheader +{ + top: 44px !important; +} + +.platform-ios.platform-cordova:not(.fullscreen) .has-subheader { + top: 88px !important; }
\ No newline at end of file diff --git a/www/js/app.js b/www/js/app.js index e7e9d883..0bca8099 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -28,7 +28,8 @@ angular.module('zmApp', [ 'pascalprecht.translate', 'jett.ionic.scroll.sista', 'uk.ac.soton.ecs.videogular.plugins.cuepoints', - 'dcbImgFallback' + 'dcbImgFallback', + ]) @@ -482,8 +483,13 @@ angular.module('zmApp', [ // console.log ("DIRECTIVE: IMAGE ERROR"); loader.remove(); + var url = 'img/novideo.png'; - $element.prop('src', url); + // var hurl = "holder.js/2000x$2000?auto=yes&theme=sky&text=..."; + + $element.prop('src', url); + // $element.prop('data-src', hurl); + imageLoadingDataShare.set(0); }); @@ -1619,7 +1625,11 @@ angular.module('zmApp', [ console.log("statusbar"); NVRDataModel.log("Updating statusbar"); StatusBar.styleDefault(); - //StatusBar.overlaysWebView(true); + if ($rootScope.platformOS=='ios') { + console.log ("<<<<<<<<<<<<<<<< OVERLAY"); + StatusBar.overlaysWebView(false); + } + StatusBar.backgroundColorByHexString("#2980b9"); } diff --git a/www/templates/montage.html b/www/templates/montage.html index bcdfdf6c..baaea947 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -101,7 +101,7 @@ <figure class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'"> - <!--<div ng-if="!isModalActive" >--> + <!--<div ng-if="!isModalActive" >--> <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> <div ng-if="$root.authSession!='undefined' && !isBackground() "> <div ng-if = "!minimal"> |