ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move FPS options to bottom of General tab

This commit is contained in:
Kyle Johnson 2014-12-16 17:11:02 -05:00
parent f9519d963c
commit f770382268
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/skins/bootstrap/views/tab-monitor-general.php
View File

@ -1,5 +1,9 @@
<div role="tabpanel" class="tab-pane active" id="general"> <div role="tabpanel" class="tab-pane active" id="general">
<div class="row">
<div class="col-md-4">
<div class="form-group"> <div class="form-group">
<label for="Name"><?= $SLANG['Name'] ?></label> <label for="Name"><?= $SLANG['Name'] ?></label>
<input type="text" id="Name" class="form-control" ng-model="Name" placeholder="Monitor-Name" /> <input type="text" id="Name" class="form-control" ng-model="Name" placeholder="Monitor-Name" />
@ -32,14 +36,6 @@
Enabled Enabled
</label> </label>
</div> </div>
<div class="form-group">
<label for="MaxFPS"><?= $SLANG['MaximumFPS'] ?></label>
<input type="number" id="MaxFPS" class="form-control" ng-model="newMonitor[MaxFPS]" value="<?= validHtmlStr($newMonitor['MaxFPS']) ?>" />
</div>
<div class="form-group">
<label for="AlarmMaxFPS"><?= $SLANG['AlarmMaximumFPS'] ?></label>
<input type="number" id="AlarmMaxFPS" class="form-control" ng-model="newMonitor[AlarmMaxFPS]" value="<?= validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" />
</div>
<?php <?php
if ( ZM_FAST_IMAGE_BLENDS ) if ( ZM_FAST_IMAGE_BLENDS )
{ {
@ -64,6 +60,14 @@
<?php <?php
} }
?> ?>
<div class="form-group" ng-show="sourceType == 'Local'">
<label for="MaxFPS"><?= $SLANG['MaximumFPS'] ?></label>
<input type="number" id="MaxFPS" class="form-control" ng-model="MaxFPS" />
</div>
<div class="form-group" ng-show="sourceType == 'Local'">
<label for="AlarmMaxFPS"><?= $SLANG['AlarmMaximumFPS'] ?></label>
<input type="number" id="AlarmMaxFPS" class="form-control" ng-model="AlarmMaxFPS" />
</div>
</div> <!-- End .col-md-6 --> </div> <!-- End .col-md-6 -->
<div class="col-md-4"> <div class="col-md-4">