bazillion changes/cleanup - I think I got the big offender it was unload handler in app.js #550

5 files changed, 123 insertions, 3 deletions

diff --git a/www/templates/events.html b/www/templates/events.html
index 01aef4a8..5666ea61 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -139,7 +139,7 @@
                                             <figure  class = "animated slideInLeft" style="display:inline-block">
                                                 <!--{{event.Event.baseURL}} p:{{event.Event.imageMode}}-->
                                                 <figcaption class="smallnote"><span translate="kFrame"></span>:{{alarm.frameid}},<span translate="kScore"></span>:{{alarm.score}}, <span translate="kTime"></span>: {{prettifyTimeSec(alarm.time)}}</figcaption>
-                        <img ng-if="event.Event.imageMode=='path'" ng-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{outlineMotion? alarm.aname:alarm.fname}}&height=380" fallback-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)" />
+                        <img ng-if="event.Event.imageMode=='path'" ng-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{outlineMotion? alarm.aname:alarm.fname}}&height=380" fallback-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)" />
 
                         <img ng-if="event.Event.imageMode=='fid'" ng-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}{{outlineMotionParam}}" fallback-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)" />
                         </figure>
diff --git a/www/templates/menu.html b/www/templates/menu.html
new file mode 100644
index 00000000..3caacfd2
--- /dev/null
+++ b/www/templates/menu.html
@@ -0,0 +1,119 @@
+<ion-side-menus delegate-handle="sideMenu" ng-cloak>
+    <ion-side-menu-content>
+        <ion-nav-bar class="bar-stable nav-title-slide-ios7">
+            <ion-nav-back-button class="button-icon">
+                <span class="icon ion-ios7-arrow-left"></span>
+            </ion-nav-back-button>
+        </ion-nav-bar>
+        <ion-nav-view></ion-nav-view>
+    </ion-side-menu-content>
+    <ion-side-menu>
+        <ion-header-bar class="bar bar-header bar-stable">
+            <h1 class="title">{{'kMenuOptions'|translate}}</h1>
+        </ion-header-bar>
+        <ion-content has-header="true" mouse-wheel-scroll>
+            <!-- <ion-scroll scrollbar-y="false" style="height:100%" >-->
+            <ion-list>
+                <ion-item href="#/app/montage" menu-close>
+                    <!--<span ng-if="$root.runMode=='lowbw'" style="float:right;margin-top:-18px;background-color:#f1c40f;color:#000;font-size:11px;opacity:0.7;width:20px;border-radius: 0px 0px 5px 5px;display:inline-block;text-align:center;">&nbsp;<i class="icon ion-arrow-graph-down-left"></i>&nbsp;</span>-->
+                    <span class=" item-icon-left">
+                        <i class="icon ion-grid"></i>
+                    </span>{{'kMenuMontage'|translate}}
+                </ion-item>
+               
+                <ion-item href="#/app/timeline" menu-close>
+                    <span class=" item-icon-left">
+                        <i class="icon ion-android-time"></i>
+                    </span>{{'kMenuTimeline'|translate}}
+                </ion-item>
+                <ion-item href="#/app/events/0/false" menu-close>
+                    <span class=" item-icon-left">
+                        <i class="icon ion-ios-calendar-outline"></i>
+                    </span>{{'kMenuEvents'|translate}}
+                </ion-item>
+
+                 <ion-item href="#/app/montage-history" menu-close>
+                    <span class=" item-icon-left">
+                        <i class="icon ion-ios-keypad-outline"></i>
+                    </span>{{'kMenuEventMontage'|translate}}
+                </ion-item>
+
+                
+                <ion-item href="#/app/monitors" menu-close>
+                    <span class=" item-icon-left">
+                        <i class="icon ion-ios-videocam-outline"></i>
+                    </span>{{'kMenuMonitors'|translate}}
+                </ion-item>
+                <ion-item href="#/app/state" menu-close>
+                    <span class=" item-icon-left">
+                        <i class="icon ion-information-circled"></i>
+                    </span> {{'kMenuSystemStatus'|translate}}
+                </ion-item>
+                <ion-item nav-clear menu-close href="#/app/login/false">
+                    <span class=" item-icon-left">
+                            <i class="icon ion-person"></i>
+                            {{'kMenuZMSettings'|translate}}
+                            <!--<span class="item-note" style="width:90px">
+                                {{$root.getProfileName();}}
+                            </span>-->
+                    <span style="float:right; margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;display:inline-block;text-align:center;">&nbsp;{{$root.getProfileName();}}&nbsp;</span>
+                    </span>
+                </ion-item>
+                <ion-item nav-clear menu-close href="#/app/devoptions">
+                    <span class=" item-icon-left">
+                        <i class="icon ion-settings"></i>
+                    </span> {{'kMenuDevSettings'|translate}}
+                </ion-item>
+                <div ng-controller="MenuController">
+                    <ion-item ng-click="switchLang()" nav-clear menu-close href="">
+                        <span class=" item-icon-left">
+                        <i class="icon ion-earth"></i>
+                    </span> {{'kLanguage'|translate}}
+                    </ion-item>
+                </div>
+                <ion-item nav-clear menu-close href="#/app/help">
+                    <span class=" item-icon-left">
+                        <i class="icon ion-help"></i>
+                    </span> {{'kMenuHelp'|translate}}
+                </ion-item>
+                <ion-item nav-clear menu-close href="#/app/wizard">
+                    <span class=" item-icon-left">
+                        <i class="icon ion-wand"></i>
+                    </span> {{'kMenuWizard'|translate}}
+                </ion-item>
+                <div ng-if="$root.showBlog">
+                    <ion-item nav-clear menu-close href="#/app/news">
+                        <span class=" item-icon-left">
+                            <i class="icon ion-radio-waves"></i>
+                        </span>{{'kMenuNews'|translate}}<span style="color:#268d3a;"> {{$root.newBlogPost}}</span>
+                    </ion-item>
+                </div>
+                <ion-item nav-clear menu-close href="#/app/log">
+                    <span class=" item-icon-left">
+                        <i class="icon ion-clipboard"></i>
+                    </span> {{'kMenuLogs'|translate}}
+                </ion-item>
+                <div ng-if="$root.newVersionAvailable &&  $root.platformOS=='desktop'">
+                    <ion-item nav-clear menu-close href="">
+                        <span class=" item-icon-left">
+                            <i class="icon ion-email-unread"></i>
+                        </span> <span style="color:#268d3a;">{{$root.newVersionAvailable}}</span>
+                    </ion-item>
+                </div>
+                <div ng-if="$root.platformOS=='android'">
+                    <ion-item ng-click="$root.exitApp();">
+                        <span class=" item-icon-left">
+                        <i class="icon ion-close-circled"></i>
+                    </span> {{'kMenuExit'|translate}}
+                    </ion-item>
+                </div>
+                <ion-item style="color:rgb(106, 106, 106); font-size:90%;">
+                    <i class="ion-ios-location"></i> {{$root.getLocalTimeZone();}}
+                    <br/>
+                    <span ng-if="$root.isTzSupported()"><i class="icon icon-server"></i> {{$root.getServerTimeZoneNow();}}   </span>
+                </ion-item>
+            </ion-list>
+            <!--</ion-scroll>-->
+        </ion-content>
+    </ion-side-menu>
+</ion-side-menus>
\ No newline at end of file
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index cd9e8e8e..9bd2d5fa 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -50,7 +50,7 @@
             </p>
             <div style="float:right;">
                 <a class="button button-small icon icon-left icon ion-gear-a" href="" ng-click="changeConfig(monitor.Monitor.Name, monitor.Monitor.Id,monitor.Monitor.Enabled,monitor.Monitor.Function);">{{'kConfiguration' | translate}}</a>
-                <a class="button button-small icon icon-left ion-calendar" href="#/events/{{monitor.Monitor.Id}}/false">{{'kEventsCap'|translate}}</a>
+                <a class="button button-small icon icon-left ion-calendar" href="#/app/events/{{monitor.Monitor.Id}}/false">{{'kEventsCap'|translate}}</a>
                 <a class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,  monitor)">{{'kLiveView' | translate}}</a>
             </div>
         </div>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index e591179f..336ef214 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -167,7 +167,7 @@
         </nav>
         <span class="modal-alarm-badge">
             <a data-badge="{{$root.alarmCount}}" class="animated infinite tada button icon  ion-ios-bell notification-badge button-assertive" 
-                    ng-click="handleAlarmsWhileMinimized();" ng-if="$root.isAlarm"></a>
+                    ng-click="handleAlarmsWhileMinimized();" ng-if="!$root.isAlarm"></a>
         </span>
     </div>
     <br/>
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index a64edceb..02bf0eb4 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -54,3 +54,4 @@
         <!-- -->
     </div>
 </div>
+