diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-05-11 20:10:59 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-05-11 20:10:59 -0400 |
| commit | 0bc5ccf818fb8abb3f6efd7b577ff03fc02f3d62 (patch) | |
| tree | 953155408f7b2da215ae3b96a9018986e54332c1 /www | |
| parent | c3ba2a404c147990e4f13896f9a11e3e1ffed139 (diff) | |
consistency - floating menu options
Diffstat (limited to 'www')
| -rw-r--r-- | www/lang/locale-en.json | 1 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 9 | ||||
| -rw-r--r-- | www/templates/timeline-modal.html | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index e394c483..80cf7cbd 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -117,6 +117,7 @@ "kEventView" :"Event View", "kEvents" :"events", "kEventsCap" :"Events", + "kExit" :"exit", "kExampleServer" :"eg. My House", "kExitAppBackground" :"exit app in background", "kExitEventView" :"exit event view", diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 36810257..f54bf543 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -120,21 +120,22 @@ </ion-content> </ion-modal-view> - + - <div ng-show="!liveFeedMid && !isSnapShot()"> + <div ng-show="!liveFeedMid"> <nav mfb-menu position="tr" effect="zoomin" label="{{'kCollapse'|translate}}" active-icon="ion-chevron-up" resting-icon="ion-chevron-down" toggling-method="click"> <a mfb-button icon="ion-arrow-right-c" label="{{'kNextEvent'|translate}}" ng-click="jumpToEvent(nextId,1);"></a> <a mfb-button icon="ion-arrow-left-c" label="{{'kPrevEvent'|translate}}" ng-click="jumpToEvent(prevId,-1);"></a> - <a mfb-button icon="ion-arrow-resize" label="{{imageFit? ('kFillScreen' | translate):('kFitScreen' | translate)}}" ng-click="scaleImage();"></a> + <a ng-if="!isSnapShot()" mfb-button icon="ion-arrow-resize" label="{{imageFit? ('kFillScreen' | translate):('kFitScreen' | translate)}}" ng-click="scaleImage();"></a> <a mfb-button icon="ion-close" label="{{'kExitEventView' | translate}}" ng-click="closeModal()"> </a> </nav> - <nav ng-if="loginData.useNphZmsForEvents && defaultVideo==''" mfb-menu position="br" effect="zoomin" label="{{'kCollapse' | translate}}" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> + <nav ng-if=" !isSnapShot() && defaultVideo==''" mfb-menu position="br" effect="zoomin" label="{{'kCollapse' | translate}}" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> <a mfb-button icon="ion-skip-backward" label="{{'kFastRewind'|translate}}" ng-click="adjustSpeed('fr');"></a> <a mfb-button icon="ion-skip-forward" label="{{'kFastForward'|translate}}" ng-click="adjustSpeed('ff');"></a> <a mfb-button icon="ion-play" label="{{'kNormalPlay'|translate}}" ng-click="adjustSpeed('np');"></a> <a mfb-button icon="ion-pause" label="{{'kPause'|translate}}" ng-click="adjustSpeed('p');"> </a> </nav> + <div class="events-range-modal-text">{{mName}} <i class="ion-arrow-right-b"></i> {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}] <span class="events-range-modal-warning-text">{{eventWarning}}</span> </div> <div id="flyoutmenu" style="position:absolute;bottom:100px;left:10px"> <ul> diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html index d3e4592e..b33aa4bf 100644 --- a/www/templates/timeline-modal.html +++ b/www/templates/timeline-modal.html @@ -34,5 +34,10 @@ <!--</ion-scroll>--> </div> </div> + + <nav mfb-menu position="br" effect="zoomin" label="{{'kCollapse'|translate}}" active-icon="ion-chevron-up" resting-icon="ion-chevron-down" toggling-method="click"> + <a mfb-button icon="ion-close" label="{{'kExit' | translate}}" ng-click="closeModal()"> </a> + + </nav> </ion-content> </ion-modal-view> |