diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/devoptions.html | 14 | ||||
| -rw-r--r-- | www/templates/events-graphs.html | 53 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 22 | ||||
| -rw-r--r-- | www/templates/events.html | 2 | ||||
| -rw-r--r-- | www/templates/login.html | 7 |
5 files changed, 38 insertions, 60 deletions
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 7b5fca0e..04b90af1 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -7,37 +7,33 @@ <ion-content class="padding"> <div class="list list-inset"> - - <span style="color:rgb(100,100,100)"><i class="ion-android-settings" style="font-size:150%"></i> Developer Options</span> + <span style="color:rgb(100,100,100)"> + <i class="ion-android-settings" style="font-size:150%"></i> Developer Options + </span> <div class="item item-input-inset"> - Max Monitors in Montage <label class="item-input-wrapper"> <input type="tel" placeholder="be careful" ng-model="loginData.maxMontage"> </label> - </div> <div class="item item-input-inset"> - Max FPS for streaming <label class="item-input-wrapper"> <input type="tel" placeholder="max is 30" ng-model="loginData.maxFPS"> </label> - </div> <div class="item item-input-inset"> - Montage Streaming Quality(%) <label class="item-input-wrapper"> <input type="tel" placeholder="max is 70" ng-model="loginData.montageQuality"> </label> </div> - <button class="button button-block button-balanced icon ion-locked" ng-click="saveDevOptions()"> Save</button> - + <button class="button button-block button-balanced icon ion-locked" + ng-click="saveDevOptions()"> Save</button> </ion-content> </ion-view> diff --git a/www/templates/events-graphs.html b/www/templates/events-graphs.html index 91b58001..b3d19832 100644 --- a/www/templates/events-graphs.html +++ b/www/templates/events-graphs.html @@ -6,74 +6,61 @@ <!-- I'm calling the same controller function but with different parameters when you switch between tabs --> + + <!-- All Events view --> <ion-tabs class="tabs-icon-top tabs-stable"> <ion-tab title="All" icon="ion-stats-bars" on-select="generateTCChart(0,'All Events',0)"> <ion-nav-view> <ion-content class="has-header"> <canvas tc-chartjs-bar chart-data="data" chart-options="options" ng-click="handleChartClick($event)" chart="chart1"> </canvas> - - </ion-content> </ion-nav-view> </ion-tab> - - - - <ion-tab title="Last Hour" icon="ion-stats-bars" on-select="generateTCChart(1,'Events in the last hour',1)"> + <!-- All Events in the last hour --> + <ion-tab title="Last Hour" icon="ion-stats-bars" + on-select="generateTCChart(1,'Events in the last hour',1)"> <ion-nav-view> - <ion-content> - <span></span> - - - - <div style="overflow:scroll;"> - <canvas tc-chartjs-bar chart-data="data" chart-options="options" ng-click="handleChartClick($event)" chart="chart2"> + <canvas tc-chartjs-bar chart-data="data" chart-options="options" + ng-click="handleChartClick($event)" chart="chart2"> </canvas> </div> - </canvas> - - <!-- <div google-chart chart="chartObject[1]"></div>--> - </div> - </ion-content> </ion-nav-view> </ion-tab> - <ion-tab title="Day" icon="ion-stats-bars" on-select="generateTCChart(2,'Events in the last day',24)"> + <!-- All Events in last 24 hrs --> + <ion-tab title="Day" icon="ion-stats-bars" + on-select="generateTCChart(2,'Events in the last day',24)"> <ion-nav-view> - <ion-content> - <span></span> <div style="overflow:scroll;"> - <canvas tc-chartjs-bar chart-data="data" chart-options="options" chart="chart3" ng-click="handleChartClick($event)"> + <canvas tc-chartjs-bar chart-data="data" + chart-options="options" chart="chart3" + ng-click="handleChartClick($event)"> </canvas> </div> - </ion-content> </ion-nav-view> </ion-tab> - <ion-tab title="Week" icon="ion-stats-bars" on-select="generateTCChart(3,'Events in the last week',168)"> - <ion-nav-view> + <!-- All Events in last week --> + <ion-tab title="Week" icon="ion-stats-bars" + on-select="generateTCChart(3,'Events in the last week',168)"> + <ion-nav-view> <ion-content> - <span></span> - <!-- - <div google-chart chart="chartObject[3]"></div>--> <div style="overflow:scroll;"> - <canvas tc-chartjs-bar chart-data="data" chart-options="options" chart="chart4" ng-click="handleChartClick($event)"> + <canvas tc-chartjs-bar chart-data="data" + chart-options="options" chart="chart4" + ng-click="handleChartClick($event)"> </canvas> </div> </ion-content> </ion-nav-view> </ion-tab> - </ion-tabs> - - - </ion-view> diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index c904c9d0..a3cd5bcc 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,22 +1,12 @@ <ion-modal-view cache="false"> - - <!-- <ion-header-bar> - <h1 class="title"> - <span style="float:left"> - <button class="button button-clear icon icon-left ion-close" ng-click="closeModal()" >Close</button> - </span> - <span style="float:right"> - {{eventName}} (Duration:{{eventDur}}s) - </span> - </h1> - </ion-header-bar> --> <ion-content> + <!-- so I can access my common modal controller + which is shared between events and monitors for modal views --> <div ng-controller="ModalCtrl"> - - <!-- replay can also be gapless --> - - <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> - <img imageonload="finishedLoadingImage()" ng-src="{{loginData.streamingurl}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" /> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" + direction="xy" style="width: 100%; "> + <img imageonload="finishedLoadingImage()" + ng-src="{{loginData.streamingurl}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" /> </ion-scroll> </div> </ion-content> diff --git a/www/templates/events.html b/www/templates/events.html index 0f9a5570..12a2afc7 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -65,7 +65,7 @@ <span style="float:right"> <button class="button button-small icon icon-left ion-ios-eye" - ng-click="openModal(event.Event.Id, event.Event.Name, event.Event.Length)" >View Footage</button> + ng-click="openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames)" >View Footage</button> </span> </div> diff --git a/www/templates/login.html b/www/templates/login.html index bf1fc487..e0eb8b33 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -26,8 +26,13 @@ <label class="item item-input"> <input autocapitalize="none" type="text" placeholder="ZM Api URL" ng-model="loginData.apiurl"> </label> + + <label > + <ion-toggle ng-model="loginData.useSSL" ng-checked="{{loginData.useSSL}}" toggle-class="toggle-calm">Use SSL</ion-toggle> + </label> + </div> - <button class="button button-block button-balanced icon ion-locked" ng-click="login()"> Save</button> + <button class="button button-block button-balanced icon ion-locked" ng-click="save()"> Save</button> </ion-content> </ion-view> |
