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

Fix ng-model names in General tab 

As ng-model is namespaced into the MonitorController,
it is safe to name the variables 'Name' instead of
newMonitor[Name] as before
This commit is contained in:
Kyle Johnson 2014-12-16 17:09:45 -05:00
parent d662bf41e9
commit f9519d963c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,11 @@
<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="newMonitor[Name]" placeholder="Monitor-Name" /> <input type="text" id="Name" class="form-control" ng-model="Name" placeholder="Monitor-Name" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="SourceType"><?= $SLANG['SourceType'] ?></label> <label for="SourceType"><?= $SLANG['SourceType'] ?></label>
<select ng-model="newMonitor[Type]" id="SourceType" class="form-control"> <select ng-model="sourceType" id="SourceType" class="form-control">
<option value="Local">Local</option> <option value="Local">Local</option>
<option value="Remote">Remote</option> <option value="Remote">Remote</option>
<option value="File">File</option> <option value="File">File</option>
@ -17,7 +17,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="Function"><?= $SLANG['Function'] ?></label> <label for="Function"><?= $SLANG['Function'] ?></label>
<select class="form-control" id="Function" ng-model="newMonitor[Function]"> <select class="form-control" id="Function" ng-model="Function">
<option value="None">None</option> <option value="None">None</option>
<option value="Monitor" selected="selected">Monitor</option> <option value="Monitor" selected="selected">Monitor</option>
<option value="Modect">Modect</option> <option value="Modect">Modect</option>
@ -28,7 +28,7 @@
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" id="Enabled" ng-model="newMonitor[Enabled]" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/> <input type="checkbox" id="Enabled" ng-model="Enabled" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/>
Enabled Enabled
</label> </label>
</div> </div>
@ -46,18 +46,20 @@
?> ?>
<div class="form-group"> <div class="form-group">
<label for=""><?= $SLANG['RefImageBlendPct'] ?></label> <label for=""><?= $SLANG['RefImageBlendPct'] ?></label>
<select class="form-control" ng-model="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></div> <select class="form-control" ng-model="RefBlendPerc"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></div>
<div class="form-group"><?= "Alarm " . $SLANG['RefImageBlendPct'] ?></label> <div class="form-group">
<select class="form-control" ng-model="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></div> <label for=""><?= "Alarm " . $SLANG['RefImageBlendPct'] ?></label>
<select class="form-control" ng-model="AlarmRefBlendPerc"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></div>
<?php <?php
} else { } else {
?> ?>
<div class="form-group"> <div class="form-group">
<label for=""><?= $SLANG['RefImageBlendPct'] ?></label> <label for=""><?= $SLANG['RefImageBlendPct'] ?></label>
<input type="text" class="form-control" ng-model="newMonitor[RefBlendPerc]" value="<?= validHtmlStr($newMonitor['RefBlendPerc']) ?>" /> <input type="text" class="form-control" ng-model="RefBlendPerc" value="6" />
</div> </div>
<div class="form-group"><?= "Alarm " . $SLANG['RefImageBlendPct'] ?></label> <div class="form-group">
<input type="text" class="form-control" ng-model="newMonitor[AlarmRefBlendPerc]" value="<?= validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" /> <label for=""><?= "Alarm " . $SLANG['RefImageBlendPct'] ?></label>
<input type="text" class="form-control" ng-model="AlarmRefBlendPerc" value="6" />
</div> </div>
<?php <?php
} }