summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/events-modal.html4
-rw-r--r--www/templates/monitors.html9
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'