show alarms on top of modals as well

Former-commit-id: fa3da1700499e8b90892f571034e9d939e3e140e

16 files changed, 15 insertions, 269 deletions

diff --git a/www/css/style.css b/www/css/style.css
index 1e2fc162..c1c78f1e 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -470,6 +470,8 @@ http://www.cssportal.com/tryit/index.php?file=blog/css-notification-badge */
    
     position:absolute;
     top:20px;
+    font-size:80%;
+    line-height:100%;
     
     left: 50%;
     transform: translate(-50%, 0%);
diff --git a/www/lib/ionic-content-banner/dist/ionic.content.banner.js b/www/external/ionic.content.banner.js
index e79f46ca..575b0978 100644
--- a/www/lib/ionic-content-banner/dist/ionic.content.banner.js
+++ b/www/external/ionic.content.banner.js
@@ -73,6 +73,14 @@ angular.module('jett.ionic.content.banner', ['ionic']);
         }
 
         function getActiveView (body) {
+          // check if there is an active modal
+          var modal = body.querySelector('ion-modal-view[class*="ng-enter-active"]');
+          if (modal != null) {
+                   // check if modal is not leaving
+                   if (modal.getAttribute('class').indexOf('ng-leave') == -1) {
+                      return modal;
+                  }
+          }
           // get the candidate active views
           var views = body.querySelectorAll('ion-view[nav-view="active"]');
 
diff --git a/www/lib/ionic-content-banner/dist/ionic.content.banner.min.css b/www/external/ionic.content.banner.min.css
index 04d37d1f..04d37d1f 100644
--- a/www/lib/ionic-content-banner/dist/ionic.content.banner.min.css
+++ b/www/external/ionic.content.banner.min.css
diff --git a/www/index.html b/www/index.html
index 7892c0b3..9fd698a4 100644
--- a/www/index.html
+++ b/www/index.html
@@ -26,7 +26,7 @@
    <link rel="stylesheet" href="lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css">
     <link rel="stylesheet" href="lib/vis/dist/vis.min.css">
  
-    <link rel="stylesheet" href="lib/ionic-content-banner/dist/ionic.content.banner.min.css">
+    <link rel="stylesheet" href="external/ionic.content.banner.min.css">
     
     <!--<link rel="stylesheet" href="external/ionic.content.banner.css">-->
     <link rel="stylesheet" href="external/radio.css">
@@ -141,7 +141,7 @@
     <script src="lib/angular-touch/angular-touch.js"></script>
     <script src="external/angular-carousel.js"></script>
     <script src="external/ion-pullup.js"></script>
-   <script src="lib/ionic-content-banner/dist/ionic.content.banner.min.js"></script>
+   <script src="external/ionic.content.banner.js"></script>
     <script src="external/FileSaver.min.js"></script>
     <script src="external/canvas-toBlob.js"></script>
     
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index 2bb19bf1..996e3a81 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -3,12 +3,12 @@
     "k1HourSummary"              :"1 hour summary",
     "k1MonthSummary"             :"1 month summary",
     "k1WeekSummary"              :"1 week summary",
-    "kAgo"                       : "ago",
+    "kAgo"                       :"ago",
     "kAlarmAPIError"             :"error - please make sure your API supports this feature",
     "kAlarmFrameCount"           :"Alarm Frame Count",
     "kAlarmMaxFPS"               :"Alarm Max FPS",
     "kAlarms"                    :"Alarms",
-    "kAll"                       : "All",
+    "kAll"                       :"All",
     "kAnalyze"                   :"Analyze",
     "kApiUrl"                    :"ZM api url",
     "kApplyingChanges"           :"Applying changes. Please wait",
diff --git a/www/lib/ionic-content-banner/.bower.json b/www/lib/ionic-content-banner/.bower.json
deleted file mode 100644
index 1a29595f..00000000
--- a/www/lib/ionic-content-banner/.bower.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "name": "ionic-content-banner",
-  "version": "1.0.1",
-  "description": "A content banner directive for Ionic apps that animates in on the active ion-content",
-  "author": "Devin Jett <djett41@gmail.com> (https://github.com/djett41)",
-  "main": [
-    "dist/ionic.content.banner.css",
-    "dist/ionic.content.banner.js"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/djett41/ionic-content-banner.git"
-  },
-  "ignore": [
-    "demo",
-    "js",
-    "test",
-    ".gitignore",
-    "gulpfile.js",
-    "karma.conf.js",
-    "LICENSE",
-    "package.json",
-    "README.md"
-  ],
-  "dependencies": {},
-  "devDependencies": {
-    "ionic": "^1.0.0-rc.0",
-    "angular-mocks": "1.4.3"
-  },
-  "keywords": [
-    "mobile",
-    "html5",
-    "ionic",
-    "cordova",
-    "phonegap",
-    "banner",
-    "info",
-    "error",
-    "angularjs",
-    "angular"
-  ],
-  "license": "MIT",
-  "private": false,
-  "homepage": "https://github.com/djett41/ionic-content-banner",
-  "_release": "1.0.1",
-  "_resolution": {
-    "type": "version",
-    "tag": "v1.0.1",
-    "commit": "79ce49f1df0b70079424f07e3c9940262cfe8123"
-  },
-  "_source": "git://github.com/djett41/ionic-content-banner.git",
-  "_target": "~1.0.1",
-  "_originalSource": "ionic-content-banner",
-  "_direct": true
-}
\ No newline at end of file
diff --git a/www/lib/ionic-content-banner/.idea/.name b/www/lib/ionic-content-banner/.idea/.name
deleted file mode 100644
index 72424e06..00000000
--- a/www/lib/ionic-content-banner/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-ionic-content-banner
\ No newline at end of file
diff --git a/www/lib/ionic-content-banner/.idea/ionic-content-banner.iml b/www/lib/ionic-content-banner/.idea/ionic-content-banner.iml
deleted file mode 100644
index dfda860c..00000000
--- a/www/lib/ionic-content-banner/.idea/ionic-content-banner.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/demo/node_modules/gulp-jshint/node_modules/jshint/src/platforms" />
-      <excludeFolder url="file://$MODULE_DIR$/demo/platforms" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/www/lib/ionic-content-banner/.idea/misc.xml b/www/lib/ionic-content-banner/.idea/misc.xml
deleted file mode 100644
index 19f74da8..00000000
--- a/www/lib/ionic-content-banner/.idea/misc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" />
-</project>
\ No newline at end of file
diff --git a/www/lib/ionic-content-banner/.idea/modules.xml b/www/lib/ionic-content-banner/.idea/modules.xml
deleted file mode 100644
index a0a4aa02..00000000
--- a/www/lib/ionic-content-banner/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ionic-content-banner.iml" filepath="$PROJECT_DIR$/.idea/ionic-content-banner.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/www/lib/ionic-content-banner/.idea/vcs.xml b/www/lib/ionic-content-banner/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f..00000000
--- a/www/lib/ionic-content-banner/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/www/lib/ionic-content-banner/bower.json b/www/lib/ionic-content-banner/bower.json
deleted file mode 100644
index 7e330544..00000000
--- a/www/lib/ionic-content-banner/bower.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "ionic-content-banner",
-  "version": "1.0.1",
-  "description": "A content banner directive for Ionic apps that animates in on the active ion-content",
-  "author": "Devin Jett <djett41@gmail.com> (https://github.com/djett41)",
-  "main": [
-    "dist/ionic.content.banner.css",
-    "dist/ionic.content.banner.js"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/djett41/ionic-content-banner.git"
-  },
-  "ignore": [
-    "demo",
-    "js",
-    "test",
-    ".gitignore",
-    "gulpfile.js",
-    "karma.conf.js",
-    "LICENSE",
-    "package.json",
-    "README.md"
-  ],
-  "dependencies": {},
-  "devDependencies": {
-    "ionic": "^1.0.0-rc.0",
-    "angular-mocks": "1.4.3"
-  },
-  "keywords": [
-    "mobile",
-    "html5",
-    "ionic",
-    "cordova",
-    "phonegap",
-    "banner",
-    "info",
-    "error",
-    "angularjs",
-    "angular"
-  ],
-  "license": "MIT",
-  "private": false
-}
diff --git a/www/lib/ionic-content-banner/dist/ionic.content.banner.css b/www/lib/ionic-content-banner/dist/ionic.content.banner.css
deleted file mode 100644
index 79519cb9..00000000
--- a/www/lib/ionic-content-banner/dist/ionic.content.banner.css
+++ /dev/null
@@ -1,53 +0,0 @@
-@charset "UTF-8";
-
-.content-banner {
-  width: 100%;
-  color: white;
-  height: 30px;
-  line-height: 30px;
-  position: absolute;
-  top: 0;
-  opacity: 0.7; }
-.content-banner.error {
-  background-color: red; }
-.content-banner.info {
-  background-color: #333; }
-.content-banner .content-banner-text {
-  -webkit-transition: opacity 500ms linear;
-  transition: opacity 500ms linear;
-  position: absolute;
-  top: 0;
-  right: 41px;
-  left: 41px;
-  text-align: center; }
-.content-banner .content-banner-text.active {
-  opacity: 1; }
-.content-banner .content-banner-text:not(.active) {
-  opacity: 0; }
-.content-banner .content-banner-close {
-  position: absolute;
-  right: 5px;
-  top: 0;
-  padding: 0 12px;
-  height: 100%;
-  line-height: 30px;
-  min-height: 0;
-  color: white; }
-.content-banner .content-banner-close:before {
-  line-height: 30px; }
-
-.content-banner-transition-vertical {
-  -webkit-transition: -webkit-transform linear 250ms;
-  transition: transform linear 250ms;
-  -webkit-transform: translate3d(0, -100%, 0);
-  transform: translate3d(0, -100%, 0); }
-
-.content-banner-transition-fade {
-  -webkit-transition: opacity 400ms linear;
-  transition: opacity 400ms linear;
-  opacity: 0; }
-
-.content-banner-in {
-  -webkit-transform: translate3d(0, 0, 0);
-  transform: translate3d(0, 0, 0);
-  opacity: 0.7; }
diff --git a/www/lib/ionic-content-banner/dist/ionic.content.banner.min.js b/www/lib/ionic-content-banner/dist/ionic.content.banner.min.js
deleted file mode 100644
index 3dede18f..00000000
--- a/www/lib/ionic-content-banner/dist/ionic.content.banner.min.js
+++ /dev/null
@@ -1 +0,0 @@
-angular.module("jett.ionic.content.banner",["ionic"]),function(n){"use strict";n.module("jett.ionic.content.banner").directive("ionContentBanner",["$interval",function(n){return{restrict:"E",scope:!0,link:function(e,t){var o;e.currentIndex=0,e.text.length>1&&(o=n(function(){e.currentIndex=e.currentIndex<e.text.length-1?e.currentIndex+1:0},e.interval)),e.$on("$destroy",function(){t.remove(),o&&n.cancel(o)})},template:'<div class="content-banner-text-wrapper"><div ng-repeat="item in text track by $index" ng-class="{active: $index === currentIndex}" class="content-banner-text" ng-bind="item"></div></div><button class="content-banner-close button button-icon icon {{::icon}}" ng-click="close()"></button>'}}])}(angular),function(n,e){"use strict";n.module("jett.ionic.content.banner").factory("$ionicContentBanner",["$document","$rootScope","$compile","$timeout","$ionicPlatform",function(t,o,c,r,i){function a(n){for(;null!==n&&"BODY"!==n.nodeName;){var e=n.getAttribute("nav-view");if(null!==e&&"cached"===e)return!1;n=n.parentNode}return!0}function u(n){var e=n.querySelectorAll('ion-view[nav-view="active"]');return 1===e.length?e[0]:Array.prototype.slice.call(e).filter(function(n){return a(n)})[0]}function l(a){var l=o.$new(!0);n.extend(l,{icon:"ion-ios-close-empty",transition:"vertical",interval:7e3,type:"info",$deregisterBackButton:n.noop,closeOnStateChange:!0,autoClose:null},a);var s="content-banner "+l.type+" content-banner-transition-"+l.transition,d=l.element=c('<ion-content-banner class="'+s+'"></ion-content-banner>')(l),f=t[0].body,v=l.closeOnStateChange?o.$on("$stateChangeSuccess",function(){l.close()}):n.noop;return l.$deregisterBackButton=i.registerBackButtonAction(function(){r(l.close)},300),l.close=function(){l.removed||(l.removed=!0,e.requestAnimationFrame(function(){d.removeClass("content-banner-in"),r(function(){l.$destroy(),d.remove(),f=v=null},400)}),l.$deregisterBackButton(),v())},l.show=function(){l.removed||(u(f).querySelector(".scroll-content").appendChild(d[0]),e.requestAnimationFrame(function(){r(function(){d.addClass("content-banner-in"),l.autoClose&&r(function(){l.close()},l.autoClose,!1)},20,!1)}))},r(function(){l.show()},10,!1),l.close.$scope=l,l.close}return{show:l}}])}(angular,ionic);
diff --git a/www/lib/ionic-content-banner/scss/ionic.content.banner.scss b/www/lib/ionic-content-banner/scss/ionic.content.banner.scss
deleted file mode 100644
index af57ea9f..00000000
--- a/www/lib/ionic-content-banner/scss/ionic.content.banner.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-// Content Banner
-
-// Variables
-//-----------------------------------
-
-$content-banner-height: 30px    !default;
-$content-banner-opacity: .7     !default;
-$content-banner-error-bg: red   !default;
-$content-banner-info-bg: #333   !default;
-
-// Styles
-//-----------------------------------
-
-.content-banner {
-  width: 100%;
-  color: white;
-  height: $content-banner-height;
-  line-height: $content-banner-height;
-  position: absolute;
-  top: 0;
-  opacity: $content-banner-opacity;
-
-  &.error {
-    background-color: $content-banner-error-bg;
-  }
-  &.info {
-    background-color: $content-banner-info-bg;
-  }
-  .content-banner-text {
-    @include transition(opacity 500ms linear) ;
-    position: absolute;
-    top: 0;
-    right: ($button-padding * 2) + 5px + 12px;
-    left: ($button-padding * 2) + 5px + 12px;
-    text-align: center;
-    &.active {
-      opacity: 1;
-    }
-    &:not(.active){
-      opacity: 0;
-    }
-  }
-  .content-banner-close {
-    position: absolute;
-    right: 5px;
-    top: 0;
-    padding: 0 $button-padding;
-    height: 100%;
-    line-height: $content-banner-height;
-    min-height: 0;
-    color: white;
-    &:before {
-      line-height: $content-banner-height;
-    }
-  }
-}
-
-.content-banner-transition-vertical {
-  @include transition-transform(linear 250ms);
-  @include translate3d(0, -100%, 0);
-}
-
-.content-banner-transition-fade {
-  @include transition(opacity 400ms linear) ;
-  opacity: 0;
-}
-
-.content-banner-in {
-  @include translate3d(0, 0, 0);
-  opacity: $content-banner-opacity;
-}
\ No newline at end of file
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 1c0f66d2..41f7d0eb 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -120,7 +120,7 @@
 
 
 
-   <div class="events-range-modal-text">{{mName}}&nbsp;<i class="ion-arrow-right-b"></i>&nbsp;{{'kEvent' | translate}}:{{d_eventId}} ({{humanizeTime}}) </div>
+   <div class="events-range-modal-text">{{mName}}&nbsp;<i class="ion-arrow-right-b"></i>&nbsp;{{humanizeTime}} ({{'kEvent' | translate}}:{{d_eventId}}) </div>
 
    <div id="flyoutmenu" style="position:absolute;bottom:100px;left:10px">
         <ul>