diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-06-03 16:57:07 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-06-03 16:57:07 -0400 |
| commit | 32d07119c85e9d1c6d310c9a530335d0e8930830 (patch) | |
| tree | 6b2969a7568b84f3b0242e4ee3c95eaa11b48316 /www/templates | |
| parent | 87c1e58c3ad43bb03ad47949131e7a30e820fffd (diff) | |
#951 add forced mjpeg support on per monitor basis
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/monitors.html | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 67a174aa..d4f23bbb 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -246,12 +246,12 @@ </li> - <li ng-if="!isVideoLoading"> + <li ng-if="!isVideoLoading && defaultVideo"> <a href="" ng-click="videoSeek(-10000)"> <i class="ion-arrow-return-left"></i> -10 </a> </li> - <li ng-if="!isVideoLoading"> + <li ng-if="!isVideoLoading && defaultVideo"> <a href="" ng-click="videoSeek(10000)"> <i class="ion-arrow-return-right"></i> +10 </a> diff --git a/www/templates/monitors.html b/www/templates/monitors.html index 6d7651ca..4770b139 100644 --- a/www/templates/monitors.html +++ b/www/templates/monitors.html @@ -40,7 +40,11 @@ <i class="icon {{monitor.Monitor.char}}" style="color:grey;"></i> </span> </div> + + + <p>{{'kMode' | translate}} :{{monitor.Monitor.Function}} + <br /> {{'kForceMjpeg' | translate}}: {{monitor.Monitor.forceMjpeg}} <br /> {{'kResolution' | translate}}: {{monitor.Monitor.Width}}*{{monitor.Monitor.Height}} <br /> {{'kMaxFPS' | translate}}: {{monitor.Monitor.MaxFPS}} <br /> {{'kAlarmMaxFPS' | translate}}:{{monitor.Monitor.AlarmMaxFPS}} @@ -54,8 +58,11 @@ <br /> <br/> </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' + <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, monitor.Monitor.forceMjpeg);">{{'kConfiguration' | translate}}</a> <a class="button button-small icon icon-left ion-calendar" ng-click="gotoEvents(monitor.Monitor.Id)">{{'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' |