From f169f0b0724a39ac3dd35c46b90515751c2955ed Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Tue, 21 May 2013 22:01:34 -0400
Subject: Modernize the GUI interface (new progress bar).

---
 config/snort/snort_download_rules.php | 60 +++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 24 deletions(-)

(limited to 'config/snort/snort_download_rules.php')

diff --git a/config/snort/snort_download_rules.php b/config/snort/snort_download_rules.php
index bbbf689c..4f88f1c2 100755
--- a/config/snort/snort_download_rules.php
+++ b/config/snort/snort_download_rules.php
@@ -34,6 +34,8 @@ require_once("functions.inc");
 require_once("service-utils.inc");
 require_once("/usr/local/pkg/snort/snort.inc");
 
+global $g;
+
 $pgtitle = "Services: Snort: Update Rules";
 include("head.inc");
 ?>
@@ -44,35 +46,45 @@ include("head.inc");
 <?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
 
 <form action="/snort/snort_download_updates.php" method="GET">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	<td>
-	<div id="mainarea">
-		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
-		<tr>
-			<td ><!-- progress bar -->
-			<table id="progholder" width='320' style='border-collapse: collapse; border: 1px solid #000000;' cellpadding='2' cellspacing='2'>
+<div id="mainarea">
+<table width="100%" border="0" cellpadding="6" cellspacing="0">
+	<tr>
+		<td class="tabcont" align="center">
+		<table width="100%" border="0" cellpadding="6" cellspacing="0">
+			<tr>
+				<td align="center">
+				<table width="420" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td style="background:url('../themes/<?= $g['theme']; ?>/images/misc/bar_left.gif')" height="15" width="5"></td>
+						<td style="background:url('../themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif')" height="15" width="410">
+						<table id="progholder" width='410' cellpadding='0' cellspacing='0'>
+							<tr>
+								<td><img border='0' src='../themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif'
+								width='0' height='15' name='progressbar' id='progressbar' alt='' /></td
+							</tr>
+						</table>
+						</td>
+						<td style="background:url('../themes/<?= $g['theme']; ?>/images/misc/bar_right.gif')" height="15" width="5"></td>
+					</tr>
+				</table>
+				</td>
+			</tr>
 			<tr>
-				<td>
-					<img border='0' src='../themes/<?= $g['theme']; ?>/images/misc/progress_bar.gif'
-						width='280' height='23' name='progressbar' id='progressbar' alt='' />
+				<td align="center">
+				<!-- status box -->
+				<textarea cols="85" rows="2" name="status" id="status" wrap="soft"><?=gettext("Initializing..."); ?>.</textarea>
+				<!-- command output box -->
+				<textarea cols="85" rows="12" name="output" id="output" wrap="soft"></textarea>
 				</td>
 			</tr>
-			</table>
-			<br />
-				<textarea cols="60" rows="2" name="status" id="status" wrap="hard">
-					<?=gettext("Initializing...");?>
-				</textarea>
-				<textarea cols="60" rows="2" name="output" id="output" wrap="hard">
-				</textarea>
-			</td>
-		</tr>
+			<tr>
+				<td align="center" valign="middle"><input type="submit" name="return" id="return" Value="Return"></td>
+			</tr>
 		</table>
-	</div>
-	</td>
-</tr>
-	<tr><td><input type="submit" name="return" id="return" Value="Return"></td></tr>
+		</td>
+	</tr>
 </table>
+</div>
 </form>
 <?php include("fend.inc");?>
 </body>
-- 
cgit v1.2.3


From e977391528edbf2d27841f2458b2e72e8bb29747 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Tue, 21 May 2013 22:48:47 -0400
Subject: Fix-up missing align left HTML attribute.

---
 config/snort/snort_download_rules.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'config/snort/snort_download_rules.php')

diff --git a/config/snort/snort_download_rules.php b/config/snort/snort_download_rules.php
index 4f88f1c2..f9fca057 100755
--- a/config/snort/snort_download_rules.php
+++ b/config/snort/snort_download_rules.php
@@ -52,33 +52,32 @@ include("head.inc");
 		<td class="tabcont" align="center">
 		<table width="100%" border="0" cellpadding="6" cellspacing="0">
 			<tr>
-				<td align="center">
+				<td class="tabcont" align="center">
 				<table width="420" border="0" cellpadding="0" cellspacing="0">
 					<tr>
 						<td style="background:url('../themes/<?= $g['theme']; ?>/images/misc/bar_left.gif')" height="15" width="5"></td>
 						<td style="background:url('../themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif')" height="15" width="410">
 						<table id="progholder" width='410' cellpadding='0' cellspacing='0'>
 							<tr>
-								<td><img border='0' src='../themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif'
+								<td align="left"><img border='0' src='../themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif'
 								width='0' height='15' name='progressbar' id='progressbar' alt='' /></td
 							</tr>
-						</table>
-						</td>
+						</table></td>
 						<td style="background:url('../themes/<?= $g['theme']; ?>/images/misc/bar_right.gif')" height="15" width="5"></td>
 					</tr>
 				</table>
 				</td>
 			</tr>
 			<tr>
-				<td align="center">
+				<td class="tabcont" align="center">
 				<!-- status box -->
-				<textarea cols="85" rows="2" name="status" id="status" wrap="soft"><?=gettext("Initializing..."); ?>.</textarea>
+				<textarea cols="85" rows="1" name="status" id="status" wrap="soft"><?=gettext("Initializing..."); ?>.</textarea>
 				<!-- command output box -->
 				<textarea cols="85" rows="12" name="output" id="output" wrap="soft"></textarea>
 				</td>
 			</tr>
 			<tr>
-				<td align="center" valign="middle"><input type="submit" name="return" id="return" Value="Return"></td>
+				<td class="tabcont" align="center" valign="middle"><input type="submit" name="return" id="return" Value="Return"></td>
 			</tr>
 		</table>
 		</td>
-- 
cgit v1.2.3


From e8f8b0ab273baa1d772ec914c51e242c3ff22f56 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Wed, 22 May 2013 12:20:35 -0400
Subject: Fix various HTML style issues to tidy up GUI.

---
 config/snort/snort_download_rules.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'config/snort/snort_download_rules.php')

diff --git a/config/snort/snort_download_rules.php b/config/snort/snort_download_rules.php
index f9fca057..e35eb983 100755
--- a/config/snort/snort_download_rules.php
+++ b/config/snort/snort_download_rules.php
@@ -46,11 +46,11 @@ include("head.inc");
 <?if($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}?>
 
 <form action="/snort/snort_download_updates.php" method="GET">
-<div id="mainarea">
+
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
 	<tr>
-		<td class="tabcont" align="center">
-		<table width="100%" border="0" cellpadding="6" cellspacing="0">
+		<td align="center"><div id="mainarea">
+		<table id="maintable" class="tabcont"  width="100%" border="0" cellpadding="6" cellspacing="0">
 			<tr>
 				<td class="tabcont" align="center">
 				<table width="420" border="0" cellpadding="0" cellspacing="0">
@@ -80,10 +80,10 @@ include("head.inc");
 				<td class="tabcont" align="center" valign="middle"><input type="submit" name="return" id="return" Value="Return"></td>
 			</tr>
 		</table>
+		</div>
 		</td>
 	</tr>
 </table>
-</div>
 </form>
 <?php include("fend.inc");?>
 </body>
-- 
cgit v1.2.3