From f7703822681194c5df6882648ddabec2fd25863b Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Tue, 16 Dec 2014 17:11:02 -0500
Subject: [PATCH] Move FPS options to bottom of General tab

---
 .../bootstrap/views/tab-monitor-general.php   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/web/skins/bootstrap/views/tab-monitor-general.php b/web/skins/bootstrap/views/tab-monitor-general.php
index 04bdc3743..8a4657204 100644
--- a/web/skins/bootstrap/views/tab-monitor-general.php
+++ b/web/skins/bootstrap/views/tab-monitor-general.php
@@ -1,5 +1,9 @@
 <div role="tabpanel" class="tab-pane active" id="general">
 
+<div class="row">
+
+	<div class="col-md-4">
+
 	<div class="form-group">
 		<label for="Name"><?= $SLANG['Name'] ?></label>
 		<input type="text" id="Name" class="form-control" ng-model="Name" placeholder="Monitor-Name" />
@@ -32,14 +36,6 @@
 			Enabled
 		</label>
 	</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
 	if ( ZM_FAST_IMAGE_BLENDS )
         {
@@ -64,6 +60,14 @@
 <?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 class="col-md-4">