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

Change Monitor input type from number to text 

Angular seems to have a bug where when an input is type="number",
assiging a value to it via ng-model produces an error.
This commit is contained in:
Kyle Johnson 2014-12-21 21:47:04 -05:00
parent 0436b099d0
commit 9e417730d2
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/skins/bootstrap/views/tab-monitor-buffers.php
View File

@ -1,26 +1,26 @@
<div role="tabpanel" class="tab-pane" id="buffers"> <div role="tabpanel" class="tab-pane" id="buffers">
<div class="form-group"> <div class="form-group">
<label for="ImageBufferCount"><?= $SLANG['ImageBufferSize'] ?></label> <label for="ImageBufferCount"><?= $SLANG['ImageBufferSize'] ?></label>
<input id="ImageBufferCount" type="number" class="form-control" ng-model="monitor.ImageBufferCount" required /> <input id="ImageBufferCount" type="text" class="form-control" ng-model="monitor.ImageBufferCount" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="WarmupCount"><?= $SLANG['WarmupFrames'] ?></label> <label for="WarmupCount"><?= $SLANG['WarmupFrames'] ?></label>
<input id="WarmupCount" type="number" class="form-control" ng-model="monitor.WarmupCount" required /> <input id="WarmupCount" type="text" class="form-control" ng-model="monitor.WarmupCount" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="PreEventCount"><?= $SLANG['PreEventImageBuffer'] ?></label> <label for="PreEventCount"><?= $SLANG['PreEventImageBuffer'] ?></label>
<input id="PreEventCount" type="number" class="form-control" ng-model="monitor.PreEventCount" required /> <input id="PreEventCount" type="text" class="form-control" ng-model="monitor.PreEventCount" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="PostEventCount"><?= $SLANG['PostEventImageBuffer'] ?></label> <label for="PostEventCount"><?= $SLANG['PostEventImageBuffer'] ?></label>
<input id="PostEventCount" type="number" class="form-control" ng-model="monitor.PostEventCount" required /> <input id="PostEventCount" type="text" class="form-control" ng-model="monitor.PostEventCount" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="StreamReplayBuffer"><?= $SLANG['StreamReplayBuffer'] ?></label> <label for="StreamReplayBuffer"><?= $SLANG['StreamReplayBuffer'] ?></label>
<input id="StreamReplayBuffer" type="number" class="form-control" ng-model="monitor.StreamReplayBuffer" required /> <input id="StreamReplayBuffer" type="text" class="form-control" ng-model="monitor.StreamReplayBuffer" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="AlarmFrameCount"><?= $SLANG['AlarmFrameCount'] ?></label> <label for="AlarmFrameCount"><?= $SLANG['AlarmFrameCount'] ?></label>
<input id="AlarmFrameCount" type="number" class="form-control" ng-model="monitor.AlarmFrameCount" required /> <input id="AlarmFrameCount" type="text" class="form-control" ng-model="monitor.AlarmFrameCount" required />
</div> </div>
</div> </div>

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

@ -62,11 +62,11 @@
?> ?>
<div class="form-group" ng-show="monitor.sourceType == 'Local'"> <div class="form-group" ng-show="monitor.sourceType == 'Local'">
<label for="MaxFPS"><?= $SLANG['MaximumFPS'] ?></label> <label for="MaxFPS"><?= $SLANG['MaximumFPS'] ?></label>
<input type="number" id="MaxFPS" class="form-control" ng-model="monitor.MaxFPS" /> <input type="text" id="MaxFPS" class="form-control" ng-model="monitor.MaxFPS" />
</div> </div>
<div class="form-group" ng-show="monitor.sourceType == 'Local'"> <div class="form-group" ng-show="monitor.sourceType == 'Local'">
<label for="AlarmMaxFPS"><?= $SLANG['AlarmMaximumFPS'] ?></label> <label for="AlarmMaxFPS"><?= $SLANG['AlarmMaximumFPS'] ?></label>
<input type="number" id="AlarmMaxFPS" class="form-control" ng-model="monitor.AlarmMaxFPS" /> <input type="text" id="AlarmMaxFPS" class="form-control" ng-model="monitor.AlarmMaxFPS" />
</div> </div>
</div> <!-- End .col-md-6 --> </div> <!-- End .col-md-6 -->
@ -80,12 +80,12 @@
<div class="form-group"> <div class="form-group">
<label for=""><?= $SLANG['CaptureWidth'] ?> (<?= $SLANG['Pixels'] ?>)</label> <label for=""><?= $SLANG['CaptureWidth'] ?> (<?= $SLANG['Pixels'] ?>)</label>
<input class="form-control" type="number" ng-model="monitor.Width" ng-maxlength="4" placeholder="704" /> <input class="form-control" type="text" ng-model="monitor.Width" placeholder="704" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for=""><?= $SLANG['CaptureHeight'] ?> (<?= $SLANG['Pixels'] ?>)</label> <label for=""><?= $SLANG['CaptureHeight'] ?> (<?= $SLANG['Pixels'] ?>)</label>
<input class="form-control" type="number" ng-model="monitor.Height" ng-maxlength="4" placeholder="480" /> <input class="form-control" type="text" ng-model="monitor.Height" placeholder="480" />
</div> </div>
<div class="checkbox"> <div class="checkbox">
@ -98,7 +98,12 @@
<div class="form-group"> <div class="form-group">
<label for=""><?= $SLANG['Orientation'] ?></label> <label for=""><?= $SLANG['Orientation'] ?></label>
<select class="form-control" ng-model="monitor.Orientation" required> <select class="form-control" ng-model="monitor.Orientation" required>
<?php foreach ( $orientations as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Orientation'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?> <option value="0">Normal</option>
<option value="90">Rotate Right</option>
<option value="180">Inverted</option>
<option value="270">Rotate Left</option>
<option value="hori">Flipped Horizontally</option>
<option value="vert">Flipped Vertically</option>
</select> </select>
</div> </div>
</div> <!-- End .col-md-6 --> </div> <!-- End .col-md-6 -->

2
web/skins/bootstrap/views/tab-monitor-local.php
View File

@ -71,6 +71,6 @@
<div class="form-group"> <div class="form-group">
<label for=""><?= $SLANG['V4LCapturesPerFrame'] ?></label> <label for=""><?= $SLANG['V4LCapturesPerFrame'] ?></label>
<input type="number" ng-model="monitor.V4LCapturesPerFrame" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/> <input type="text" ng-model="monitor.V4LCapturesPerFrame" />
</div> </div>
</div> <!-- End local --> </div> <!-- End local -->

2
web/skins/bootstrap/views/tab-monitor-remote.php
View File

@ -25,7 +25,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for=""><?= $SLANG['RemoteHostPort'] ?></label> <label for=""><?= $SLANG['RemoteHostPort'] ?></label>
<input type="number" class="form-control" ng-model="monitor.Port" placeholder="Usually 80 for http, 554 for rtsp" ng-required="monitor.sourceType == 'Remote'" /> <input type="text" class="form-control" ng-model="monitor.Port" placeholder="Usually 80 for http, 554 for rtsp" ng-required="monitor.sourceType == 'Remote'" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label><?= $SLANG['RemoteHostPath'] ?></label> <label><?= $SLANG['RemoteHostPath'] ?></label>

4
web/skins/bootstrap/views/tab-monitor-timestamp.php
View File

@ -5,10 +5,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="labelX"><?= $SLANG['TimestampLabelX'] ?></label> <label for="labelX"><?= $SLANG['TimestampLabelX'] ?></label>
<input type="number" id="labelX" class="form-control" ng-model="monitor.LabelX" required /> <input type="text" id="labelX" class="form-control" ng-model="monitor.LabelX" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="labelY"><?= $SLANG['TimestampLabelY'] ?></label> <label for="labelY"><?= $SLANG['TimestampLabelY'] ?></label>
<input type="number" id="labelY" class="form-control" ng-model="monitor.LabelY" required /> <input type="text" id="labelY" class="form-control" ng-model="monitor.LabelY" required />
</div> </div>
</div> </div>