#806 support

ZoneMinder · Apr 11, 2019 · d00f6fb · d00f6fb
1 parent 97b237e
commit d00f6fb
Show file tree

Hide file tree

Showing 12 changed files with 1,109 additions and 678 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.056" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.057" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -169,13 +169,13 @@
     <plugin name="cordova-custom-config" spec="5.0.2" />
     <plugin name="cordova-plugin-advanced-http" spec="git+https://github.com/silkimen/cordova-plugin-advanced-http.git" />
     <plugin name="cordova-plugin-advanced-websocket" spec="1.1.5" />
-    <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
     <plugin name="cordova-plugin-photo-library" spec="https://github.com/nilebma/cordova-plugin-photo-library.git">
         <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
     </plugin>
-    <engine name="android" spec="7.1.4" />
-    <engine name="ios" spec="4.5.5" />
     <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
         <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
     </plugin>
+    <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+    <engine name="android" spec="7.1.4" />
+    <engine name="ios" spec="5.0.0" />
 </widget>
diff --git a/package.json b/package.json
@@ -53,20 +53,20 @@
       },
       "cordova-custom-config": {},
       "cordova-plugin-advanced-websocket": {},
-      "cordova-plugin-media-pp-fork": {},
       "cordova-plugin-photo-library": {
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums "
       },
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
-      }
+      },
+      "cordova-plugin-media-pp-fork": {}
     }
   },
   "dependencies": {
     "clivas": "^0.2.0",
     "cordova-android": "7.1.4",
     "cordova-custom-config": "^5.0.2",
-    "cordova-ios": "4.5.5",
+    "cordova-ios": "5.0.0",
     "cordova-library-helper-pp-fork": "^1.0.1",
     "cordova-plugin-add-swift-support": "^1.7.2",
     "cordova-plugin-advanced-http": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git",
@@ -108,7 +108,7 @@
     "phonegap-plugin-push": "^2.2.3"
   },
   "devDependencies": {
-    "electron": "^4.0.1",
+    "electron": "^3.1.3",
     "electron-cli": "^0.2.8",
     "@ionic/v1-toolkit": "^1.0.14",
     "bower": "^1.8.4",

diff --git a/www/css/style.css b/www/css/style.css
@@ -279,19 +279,85 @@ figcaption {
     white-space: nowrap;
 }
 
+.montage-sidebar {
+    background: rgba(83, 92, 104,1.0);
+    color: #FFF;
+    font-size: 80%  !important;
+    padding: 5px  !important;
+
+    box-sizing: border-box !important;
+
+}
+
+.circle {
+    margin:auto;
+
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    border-color: #fff  !important;
+    font-size: 80%  !important;
+    font-style: bold !important;
+    color: #fff;
+    line-height: 40px;
+    text-align:center;
+
+    background:rgba(155, 89, 182,1.0);
+  }
+
+.montage-image {
+    position:relative;
+}
+
+.montage-buttons {
+    z-index: 9999;
+    position: absolute;
+    right:0;
+    bottom:0;
+    opacity:0.7;
+    margin: auto;
+}
+
+.montage-sidebar-button {
+    z-index: 9999;
+    position: absolute;
+    right:0;
+    bottom:50%;
+    opacity:0.7;
+    margin: auto;
+}
 
 .normal-figcaption {
     background: rgba(0, 0, 0, 0.2);
     color: #FFF;
-    position: absolute;
+    /*position: absolute;
     bottom: 0;
     left: 0;
-    right: 0;
+    right: 0;*/
+    opacity: 1;
+    font-size: 80%;
+}
+
+.alarmed-figcaption {
+    background: #ba3e3e;
+    color: #ffffff;
+    opacity: 0.7;
+    font-size: 80%;
+}
+.extended-figcaption {
+    background: rgba(52, 152, 219,0.2);
+    color: #FFF;
+    /*position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;*/
     opacity: 1;
     font-size: 80%;
 }
 
 
+
+
 .normal-subfigcaption {
     color: #FFF;
     position: absolute;
@@ -322,15 +388,7 @@ figcaption {
 
 
 
-.alarmed-figcaption {
-    background: #ba3e3e;
-    color: #ffffff;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    opacity: 0.7;
-}
+
 
 
 /* modified from:

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
@@ -93,8 +93,6 @@ angular.module('zmApp.controllers')
 
     $scope.$on('$ionicView.afterEnter', function () {
 
-      // console.log ("********* AFTER ENTER");
-      //
       window.addEventListener("resize", recomputeThumbSize, false);
       $ionicListDelegate.canSwipeItems(true);
      // NVR.debug("enabling options swipe");

diff --git a/www/js/MenuController.js b/www/js/MenuController.js
@@ -69,6 +69,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
     var zmServers = NVR.getServerGroups();
     var loginData = zmServers[s];
     NVR.debug("Retrieved state for this profile:" + JSON.stringify(loginData));
+    NVR.checkInitSanity(loginData);
     NVR.setLogin(loginData);