diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 27 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 14 | ||||
| -rw-r--r-- | www/templates/timeline.html | 43 |
3 files changed, 44 insertions, 40 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 2b0c2abe..b66a0655 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,5 +1,6 @@ <div ng-controller="ModalCtrl"> - <ion-modal-view cache="false"> + <!-- style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"--> + <ion-modal-view cache="false" > <ion-content style="background-color:#444444" ng-cloak> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" @@ -32,9 +33,17 @@ </ion-content> + + + <!-- <div class="range"> + <input type="range" ng-model="ionRange.index" min="0" max="{{eFramesNum-1}}" > + </div>--> + </div> + </ion-modal-view> - <nav mfb-menu position="tr" effect="zoomin" label="collapse" + +<nav mfb-menu position="tr" effect="zoomin" label="collapse" active-icon="ion-chevron-up" resting-icon="ion-chevron-down" toggling-method="click"> @@ -49,6 +58,11 @@ </nav> + <div class="events-range-modal" > + + <div style="width:90%"> + <input ng-model="ionRange.index" type="text" id="mySlider2" slider options="slider_modal_options" /> + </div> <!-- <nav mfb-menu position="bl" effect="zoomin" label="collapse" @@ -77,14 +91,5 @@ <progress max="{{totalEventTime}}" value="{{currentEventTime}}" class="eventprogress"></progress> --> - <div class="events-range-modal" > - - <div style="width:90%"> - <input ng-model="ionRange.index" type="text" id="mySlider2" slider options="slider_modal_options" /> - </div> - <!-- <div class="range"> - <input type="range" ng-model="ionRange.index" min="0" max="{{eFramesNum-1}}" > - </div>--> - </div> </div> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 6e651795..979d307d 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -1,6 +1,10 @@ + <div ng-controller="ModalCtrl"> - <ion-modal-view cache="false" > - <ion-content style="background-color:#444444"> + + <!--style="background-color:#444444;width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"--> + + <ion-modal-view cache="false" > + <ion-content > <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> @@ -22,8 +26,10 @@ </div> + </span> + </ion-modal-view> - <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> + <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> <button mfb-button icon="ion-arrow-resize" label="fit image" ng-click="scaleImage();"> </button> <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView();"> @@ -36,6 +42,6 @@ <span class="camera-icon"> <a class="button icon ion-ios-camera button-positive" href="" ng-click="saveImageToPhone(monitorId)"></a> - </span> + </div> diff --git a/www/templates/timeline.html b/www/templates/timeline.html index 9dea9d98..8cf83715 100644 --- a/www/templates/timeline.html +++ b/www/templates/timeline.html @@ -1,9 +1,11 @@ <meta name="format-detection" content="telephone=no" /> -<ion-view title="" cache-view="false"> +<ion-view title="Timeline" cache-view="false"> <ion-nav-buttons side="left"> - <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> + <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> + + <!-- <button class="button button-icon button-clear ion-arrow-left-c" ng-click="move(0.2)"></button> - <button class="button button-icon button-clear ion-arrow-right-c" ng-click="move(-0.2)"></button> + <button class="button button-icon button-clear ion-arrow-right-c" ng-click="move(-0.2)"></button>--> @@ -13,8 +15,11 @@ <ion-nav-buttons side="right"> <button class="button button-icon button-clear ion-arrow-shrink" ng-click="fit()"></button> + + <button class="button button-icon button-clear ion-arrow-move" ng-click="toggleNav();"></button> + <!-- <button class="button button-icon button-clear ion-log-in" ng-click="zoom(-0.2)"></button> - <button class="button button-icon button-clear ion-log-out" ng-click="zoom(0.2)"></button> + <button class="button button-icon button-clear ion-log-out" ng-click="zoom(0.2)"></button> --> <a style="" class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)";> </a> </ion-nav-buttons> <!--<ion-content data-tap-disabled="true">--> @@ -24,33 +29,21 @@ Latest {{maxItems}} events between: {{prettify(fromDate)}} - {{prettify(toDate)}} </div> - <!-- <div style="float:left"> - <ti-segmented-control on-select="buttonClicked($index)" style="width: 360px;"> - <ti-segmented-control-button class="button-positive" title="'Month'"> - </ti-segmented-control-button> - - <ti-segmented-control-button class="button-positive" title="'Week'"> - </ti-segmented-control-button> - - - <ti-segmented-control-button class="button-positive" title="'Day'"> - </ti-segmented-control-button> - - <ti-segmented-control-button class="button-positive" title="'Custom'"> - </ti-segmented-control-button> - - + <div style="padding-left:15px; padding-right:15px;"> + <div id="visualization"> - </ti-segmented-control> - </div>--> + </div> + </div> - <div style="padding-left:15px; padding-right:15px;"> - <div id="visualization"></div> - </div> <br/> </ion-content> + </ion-view> +<div class="timelinebuttons" > + <circular id ="timeline-ctrl" options="radialMenuOptions" class="animated bounceInRight"> + </circular> +</div> |