snort, major changes, fix pid bug, add jquery lightbox, update gui

5 files changed, 518 insertions, 115 deletions

diff --git a/config/snort/css/colorbox.css b/config/snort/css/colorbox.css
new file mode 100644
index 00000000..97155a56
--- /dev/null
+++ b/config/snort/css/colorbox.css
@@ -0,0 +1,36 @@
+/*

+    ColorBox Core Style

+    The following rules are the styles that are consistant between themes.

+    Avoid changing this area to maintain compatability with future versions of ColorBox.

+*/

+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}

+#cboxOverlay{position:fixed; width:100%; height:100%;}

+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}

+#cboxContent{position:relative;}

+#cboxLoadedContent{overflow:auto;}

+#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;}

+#cboxTitle{margin:0;}

+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;}

+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}

+

+/* 

+    ColorBox example user style

+    The following rules are ordered and tabbed in a way that represents the

+    order/nesting of the generated HTML, so that the structure easier to understand.

+*/

+#cboxOverlay{background:#000;}

+

+#colorbox{}

+    #cboxContent{margin-top:20px;}

+        #cboxLoadedContent{background:#000; padding:5px;}

+        #cboxTitle{position:absolute; top:-20px; left:0; color:#ccc;}

+        #cboxCurrent{position:absolute; top:-20px; right:0px; color:#ccc;}

+        #cboxSlideshow{position:absolute; top:-20px; right:90px; color:#fff;}

+        #cboxPrevious{position:absolute; top:50%; left:5px; margin-top:-32px; background:url(/snort/images//controls.png) top left no-repeat; width:28px; height:65px; text-indent:-9999px;}

+        #cboxPrevious.hover{background-position:bottom left;}

+        #cboxNext{position:absolute; top:50%; right:5px; margin-top:-32px; background:url(/snort/images//controls.png) top right no-repeat; width:28px; height:65px; text-indent:-9999px;}

+        #cboxNext.hover{background-position:bottom right;}

+        #cboxLoadingOverlay{background:#000;}

+        #cboxLoadingGraphic{background:url(/snort/images//loading.gif) center center no-repeat;}

+        #cboxClose{position:absolute; top:5px; right:5px; display:block; background:url(/snort/images//controls.png) top center no-repeat; width:38px; height:19px; text-indent:-9999px;}

+        #cboxClose.hover{background-position:bottom center;}
\ No newline at end of file
diff --git a/config/snort/css/new_tab_menu.css b/config/snort/css/new_tab_menu.css
new file mode 100644
index 00000000..9d02348b
--- /dev/null
+++ b/config/snort/css/new_tab_menu.css
@@ -0,0 +1,101 @@
+/* 

+	new_tab_menu.css

+	part of pfSense

+	Copyright (C) 2010-2011 Robert Zelaya

+

+	Redistribution and use in source and binary forms, with or without

+	modification, are permitted provided that the following conditions are met:

+

+	1. Redistributions of source code must retain the above copyright notice,

+	   this list of conditions and the following disclaimer.

+

+	2. Redistributions in binary form must reproduce the above copyright

+	   notice, this list of conditions and the following disclaimer in the

+	   documentation and/or other materials provided with the distribution.

+

+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+	POSSIBILITY OF SUCH DAMAGE.

+	

+

+	Replace your old tab menu with the following code. To add a second tab menu line just cut and paste again.

+	The following code is dependent on new_tab_menu.css and images/new_tab_menu.png.

+

+			<tr>

+				<td>

+					<?php

+						$tab_array_indent = 0; // move to the line in px

+						$tab_array_space = 1; // space betwen lines in px

+						$tab_array_char_limit = 82; // number or chr before the drop down box

+						$tab_array = array();

+						$tab_array[] = array(gettext("Admin Access"), true, "system_advanced_admin.php");

+						$tab_array[] = array(gettext("Firewall / NAT"), false, "system_advanced_firewall.php");

+						$tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php");

+						$tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php");

+						$tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php");

+						$tab_array[] = array(gettext("Notifications"), false, "system_advanced_notifications.php");

+						display_top_tabs($tab_array);

+					?>

+				</td>

+			</tr>

+			

+*/

+

+.snorttabs ul, li{border:0; margin:0; padding:0; list-style:none;}

+

+.snorttabs li{float:left; margin-right:2px; text-align: center;}

+.snorttabs a:link, .snorttabs a:visited{

+	background:url(/snort/images/new_tab_menu.png) right 45px;

+	color:#ffffff; /* noactive font */

+	display:block;

+	/* fix for IE6 */

+	display: inline-block;

+	/*     END     */

+	font-weight:bold;

+	font-size:.9em;

+	height:20px;

+	line-height:20px;

+	text-decoration:none;

+}

+.snorttabs a span{

+	background:url(/snort/images/new_tab_menu.png) left 45px;

+	display:block;

+	/* fix for IE6 */

+	display: inline-block;

+	/*     END     */

+	height:20px;

+	margin-right:7px;

+	padding-left:7px;

+}

+.snorttabs a:hover{

+	background:url(/snort/images/new_tab_menu.png) right 23px;

+	display:block;

+	/* fix for IE6 */

+	display: inline-block;

+	/*     END     */

+	color:#ffffff; /* hover over font */

+}

+.snorttabs a:hover span{

+	background:url(/snort/images/new_tab_menu.png) left 23px;

+	display:block;

+	/* fix for IE6 */

+	display: inline-block;

+	/*     END     */

+}

+

+/* -------------------------------- */

+/* 	ACTIVE ELEMENTS					*/

+.snorttabs_active a:link, .snorttabs_active a:visited, .snorttabs_active a:visited, .snorttabs_active a:hover{

+	color:#000000; /* active font */

+	background:url(/snort/images/new_tab_menu.png) right 0 no-repeat;

+} 

+.snorttabs_active a span, .snorttabs_active a:hover span{

+	background:url(/snort/images/new_tab_menu.png) left 0 no-repeat;

+}
\ No newline at end of file
diff --git a/config/snort/css/sexybuttons.css b/config/snort/css/sexybuttons.css
new file mode 100644
index 00000000..db36a287
--- /dev/null
+++ b/config/snort/css/sexybuttons.css
@@ -0,0 +1,342 @@
+/*

+ * Sexy Buttons

+ * 

+ * DESCRIPTION:

+ * 	Sexy, skinnable HTML/CSS buttons with icons.

+ * 

+ * PROJECT URL: 

+ * 	http://code.google.com/p/sexybuttons/

+ * 

+ * AUTHOR:

+ * 	Richard Davies

+ * 	http://www.richarddavies.us

+ * 	Richard@richarddavies.us

+ * 

+ * VERSION:

+ * 	1.1

+ * 

+ * LICENSE:

+ * 	Apache License 2.0  (http://www.apache.org/licenses/LICENSE-2.0)

+ * 	Creative Commons 3.0 Attribution  (http://creativecommons.org/licenses/by/3.0/)

+ * 

+ * CREDITS:

+ * 	Inspired by, derived from, and thanks to:

+ * 	http://www.p51labs.com/simply-buttons-v2/

+ * 	http://www.oscaralexander.com/tutorials/how-to-make-sexy-buttons-with-css.html

+ * 	http://www.zurb.com/article/266/super-awesome-buttons-with-css3-and-rgba

+ * 	http://www.elctech.com/snippets/make-your-buttons-look-super-awesome

+ * 

+ * USAGE:

+ * 	Simply add class="sexybutton [skin]" to a <button> or <a> element and wrap the label text with double <span>s.

+ * 	You can optionally add a "silk" icon to the button text by using a third <span> with class to identify the icon.   

+ * 

+ * EXAMPLE: 

+ * 	<button id="btn1" class="sexybutton" name="btn1" type="submit" value="Submit">

+ * 		<span><span><span class="ok">Submit</span></span></span>

+ * 	</button>

+ */

+

+

+/* 

+ *	Generic styles for all Sexy Buttons

+ */

+

+.sexybutton {

+	display: inline-block;

+	margin: 0;

+	padding: 0;

+	font: bold 13px "Helvetica Neue", Helvetica, Arial !important;

+	text-decoration: none !important;

+	text-shadow: 1px 1px 2px rgba(0,0,0,0.20);

+	background: none;

+	border: none;

+	white-space: nowrap;

+	cursor: pointer;

+	user-select: none;

+	-moz-user-select: none;

+	

+	/* Fix extra width padding in IE */

+	_width: 0;

+	overflow: visible;

+}

+

+.sexybutton span {

+	display: block;						/* Prevents :active from working in IE--oh well! */

+	height: 24px;

+	padding-right: 12px;

+	background-repeat: no-repeat;

+	background-position: right top;

+}

+

+.sexybutton span span {

+	padding-right: 0;

+	padding-left: 12px;

+	line-height: 24px;

+	background-position: left top;

+}

+

+.sexybutton span span span {

+	padding-left: 21px;

+	background-image: none;

+	background-repeat: no-repeat;

+	background-position: left center;

+	/* IE6 still requires a PNG transparency fix */ 

+	/* _background-image: none;		Or just hide icons from the undeserving IE6 */

+	/* _padding-left: 0;					Or just hide icons from the undeserving IE6 */

+}

+

+.sexybutton span span span.after {

+	padding-left: 0px;

+	padding-right: 21px;

+	background-position: right center;

+	/* IE6 still requires a PNG transparency fix */ 

+	/* _padding-right: 0;					Or just hide icons from the undeserving IE6 */

+}

+

+.sexybutton[disabled],

+.sexybutton[disabled]:hover,

+.sexybutton[disabled]:focus,

+.sexybutton[disabled]:active,

+.sexybutton.disabled,

+.sexybutton.disabled:hover,

+.sexybutton.disabled:focus,

+.sexybutton.disabled:active {

+	color: #333 !important;

+	cursor: inherit;

+	text-shadow: none; 

+	opacity: 0.33;

+}

+

+.sexybutton:hover span,

+.sexybutton:focus span {

+	background-position: 100% -24px;

+}

+

+.sexybutton:hover span span,

+.sexybutton:focus span span {

+	background-position: 0% -24px;

+}

+

+.sexybutton:active span {

+	background-position: 100% -48px;

+}

+

+.sexybutton:active span span {

+	background-position: 0% -48px;

+}

+

+.sexybutton[disabled] span,

+.sexybutton.disabled span {

+	background-position: 100% -72px;

+}

+

+.sexybutton[disabled] span span,

+.sexybutton.disabled span span {

+	background-position: 0% -72px;

+}

+

+.sexybutton:hover span span span,

+.sexybutton:focus span span span,

+.sexybutton:active span span span,

+.sexybutton[disabled] span span span,

+.sexybutton.disabled span span span {

+	background-position: left center;

+}

+

+.sexybutton:hover span span span.after,

+.sexybutton:focus span span span.after,

+.sexybutton:active span span span.after,

+.sexybutton[disabled] span span span.after,

+.sexybutton.disabled span span span.after {

+	background-position: right center;

+}

+

+.sexybutton img {

+	margin-right: 5px;

+	vertical-align: text-top;

+	/* IE6 Hack */

+	_margin-top: 4px;

+	_vertical-align: text-bottom;

+	/* IE6 still requires a PNG transparency fix */ 

+	/* _display: none;		Or just hide icons from the undeserving IE6 */

+}

+

+.sexybutton img.after {

+	margin-right: 0;

+	margin-left: 5px;

+	/* IE6 still requires a PNG transparency fix */ 

+	/* _margin-left: 0;		Or just hide icons from the undeserving IE6 */

+}

+

+.sexybutton.sexysmalls	{ font-size:.8em !important; }

+.sexybutton.sexymedium	{ font-size: 15px !important; }

+.sexybutton.sexylarge	{ font-size: 18px !important; }

+

+

+/*

+ * Button Skins

+ * 

+ * .PNG background images with alpha transparency are also supplied if you'd rather use them instead of the 

+ * default .GIF images. (Just beware of IE6's lack of support.) 

+ * 

+ * Additional skins can be added below. The images/skins/ButtonTemplate.psd can be used to create new skins.

+ * Prefix the skin name with "sexy" to avoid any potential conflicts with other class names. 

+ */

+

+/* 

+ * Simple Skin Buttons

+ */

+

+.sexybutton.sexysimple { 

+	position: relative; 

+	padding: 5px 10px 5px;

+	font: inherit;

+	font-size: .85em !important;

+	font-style: normal !important; 

+	font-weight: bold !important; 

+	color: #fff !important;

+	line-height: 1; 

+	background-image: url(/snort/images//awesome-overlay-sprite.png);

+	background-repeat: repeat-x;

+	background-position: 0 0;

+	

+	/* Special effects */

+	text-shadow: 0 -1px 1px rgba(0,0,0,0.25), -2px 0 1px rgba(0,0,0,0.25); 

+	border-radius: 5px; 

+	-moz-border-radius: 5px; 

+	-webkit-border-radius: 5px; 

+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5); 

+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5);

+	

+	/* IE only stuff */

+	border-bottom: 1px solid transparent\9;

+	_background-image: none;

+	

+	/* Cross browser inline block hack - http://blog.mozilla.com/webdev/2009/02/20/cross-browser-inline-block/ */

+	display: -moz-inline-stack;

+	display: inline-block;

+	vertical-align: middle;

+	*display: inline !important;

+	position: relative;

+	

+	/* Force hasLayout in IE */

+	zoom: 1;

+	

+	/* Disable text selection (Firefox only)*/

+	-moz-user-select: none;

+}

+

+.sexybutton.sexysimple::selection {

+	background: transparent;

+}

+

+.sexybutton.sexysimple:hover,

+.sexybutton.sexysimple:focus {

+	background-position: 0 -50px; 

+	color: #fff !important;

+}

+

+.sexybutton.sexysimple:active { 

+	background-position: 0 -100px; 

+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.7); 

+	/* Unfortunately, Safari doesn't support inset yet */

+	-webkit-box-shadow: none;

+	

+	/* IE only stuff */

+	border-bottom: 0\9;

+	border-top: 1px solid #666\9;

+}

+

+.sexybutton.sexysimple[disabled], 

+.sexybutton.sexysimple.disabled { 

+	background-position: 0 -150px; 

+	color: #333 !important;

+	text-shadow: none; 

+}

+

+.sexybutton.sexysimple[disabled]:hover,

+.sexybutton.sexysimple[disabled]:focus,

+.sexybutton.sexysimple[disabled]:active,

+.sexybutton.sexysimple.disabled:hover,

+.sexybutton.sexysimple.disabled:focus,

+.sexybutton.sexysimple.disabled:active {

+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5); 

+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5);

+} 

+

+.sexybutton.sexysimple span {

+	height: auto;

+	padding-left: 24px;

+	padding-right: 0;

+	background-position: left center;

+	background-repeat: no-repeat;

+	/* IE6 still requires a PNG transparency fix */ 

+	/* _padding-left: 0;		Or just hide icons from the undeserving IE6 */

+}

+

+.sexybutton.sexysimple span.after {

+	padding-left: 0;

+	padding-right: 24px;

+	background-position: right center;

+	/* IE6 still requires a PNG transparency fix */ 

+	/* _padding-right: 0;		Or just hide icons from the undeserving IE6 */

+}

+

+/* Simple button colors */

+.sexybutton.sexysimple					{ background-color: #333; }		/* Default */

+.sexybutton.sexysimple.sexyblack		{ background-color: #333; }

+.sexybutton.sexysimple.sexyred		{ background-color: #a90118; }

+.sexybutton.sexysimple.sexyorange	{ background-color: #ff8a00; }

+.sexybutton.sexysimple.sexyyellow	{ background-color: #ffb515; }

+.sexybutton.sexysimple.sexygreen		{ background-color: #59a901; }

+.sexybutton.sexysimple.sexyblue		{ background-color: #015ea9; }

+.sexybutton.sexysimple.sexyteal		{ background-color: #2daebf; }

+.sexybutton.sexysimple.sexymagenta	{ background-color: #a9014b; }

+.sexybutton.sexysimple.sexypurple	{ background-color: #9d01a9; }

+

+/* Simple button sizes */

+.sexybutton.sexysimple.sexysmall          { padding: 4px 7px 5px; font-size: 10px !important; }

+.sexybutton.sexysimple.sexysmall:active   { padding: 5px 7px 4px; }

+.sexybutton.sexysimple                    { /* default */ }

+.sexybutton.sexysimple:active             { padding: 6px 10px 4px; }

+.sexybutton.sexysimple.sexymedium         { /* default */ }

+.sexybutton.sexysimple.sexymedium:active  { padding: 6px 10px 4px; }

+.sexybutton.sexysimple.sexylarge          { padding: 8px 14px 8px; font-size: 14px !important; }

+.sexybutton.sexysimple.sexylarge:active   { padding: 9px 14px 7px; }

+.sexybutton.sexysimple.sexyxl             { padding: 8px 14px 8px; font-size: 16px !important; }

+.sexybutton.sexysimple.sexyxl:active      { padding: 9px 14px 7px; }

+.sexybutton.sexysimple.sexyxxl            { padding: 8px 14px 8px; font-size: 20px !important; }

+.sexybutton.sexysimple.sexyxxl:active     { padding: 9px 14px 7px; }

+.sexybutton.sexysimple.sexyxxxl           { padding: 8px 14px 8px; font-size: 26px !important; }

+.sexybutton.sexysimple.sexyxxxl:active    { padding: 9px 14px 7px; }

+

+.sexybutton.sexysimple.sexysmall[disabled]:active,

+.sexybutton.sexysimple.sexysmall.disabled:active   	{ padding: 4px 7px 5px; }

+.sexybutton.sexysimple[disabled]:active,

+.sexybutton.sexysimple.disabled:active 	            { padding: 5px 10px 5px; }

+.sexybutton.sexysimple.sexymedium[disabled]:active,

+.sexybutton.sexysimple.sexymedium.disabled:active 		{ padding: 6px 10px 4px; }

+.sexybutton.sexysimple.sexylarge[disabled]:active,

+.sexybutton.sexysimple.sexylarge.disabled:active   	{ padding: 8px 14px 8px; }

+.sexybutton.sexysimple.sexyxl[disabled]:active,

+.sexybutton.sexysimple.sexyxl.disabled:active	      { padding: 8px 14px 8px; }

+.sexybutton.sexysimple.sexyxxl[disabled]:active,

+.sexybutton.sexysimple.sexyxxl.disabled:active 		   { padding: 8px 14px 8px; }

+.sexybutton.sexysimple.sexyxxxl[disabled]:active,

+.sexybutton.sexysimple.sexyxxxl.disabled:active    	{ padding: 8px 14px 8px; }

+

+

+/*

+ * Icon Definitions

+ */

+

+/* Silk Icons - http://www.famfamfam.com/lab/icons/silk/ */

+/* (Obviously not all Silk icons are defined here. Feel free to define any other icons that you may need.) */

+

+.sexybutton span.ok				{ background-image: url(/snort/images//tick.png) !important; }

+.sexybutton span.cancel			{ background-image: url(/snort/images//cross.png) !important; }

+.sexybutton span.add				{ background-image: url(/snort/images//add.png) !important; }

+.sexybutton span.delete			{ background-image: url(/snort/images//delete.png) !important; }

+.sexybutton span.download		{ background-image: url(/snort/images//arrow_down.png) !important; }

+.sexybutton span.pwhitetxt		{ background-image: url(/snort/images//page_white_text.png) !important; }

+

diff --git a/config/snort/css/style.css b/config/snort/css/style.css
index 44568873..9c627971 100644
--- a/config/snort/css/style.css
+++ b/config/snort/css/style.css
@@ -1,3 +1,42 @@
+.alert {
+ position:absolute;
+ top:10px;
+ left:0px;
+ width:94%;
+background:#FCE9C0;
+background-position: 15px; 
+border-top:2px solid #DBAC48;
+border-bottom:2px solid #DBAC48;
+padding: 15px 10px 85% 50px;
+}
+
+.formpre {
+font-family:arial;
+font-size: 1.1em;
+}
+
+#download_rules {
+font-family: arial;
+font-size: 13px;
+font-weight: bold;
+text-align: center
+}
+
+#download_rules_td {
+font-family: arial;
+font-size: 13px;
+font-weight: bold;
+text-align: center
+}
+
+.body2 {
+font-family:arial;
+font-size:12px;
+}
+
+
+
+
 /* Start of main css Pfsense */
 /* Start of main css Pfsense */
 
@@ -147,7 +186,3 @@ tr.hide {
 	border: 1px solid #ccc;
 }
 
-
-/*************************************************************/
-
-
diff --git a/config/snort/css/style2.css b/config/snort/css/style2.css
deleted file mode 100644
index d7a1616c..00000000
--- a/config/snort/css/style2.css
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -----------------------------------
-general
------------------------------------ */
-
-body
-{
-	margin: 0px;
-	padding: 0px;
-	font: 100%/1.4 helvetica, arial, sans-serif;
-	color: #444;
-	background: #fff;
-}
-
-h1, h2, h3, h4, h5, h6
-{
-	margin: 0 0 1em;
-	line-height: 1.1;
-}
-
-h2, h3 { color: #003d5d; }
-h2 { font-size: 218.75%; }
-
-
-p 
-{
-margin-top: 35pt;
-margin-right: 0pt;
-margin-bottom: -25px;
-margin-left: 0pt;
-text-indent: 25px; 
-}
-
-img { border: none; }
-a:link { color: #035389; }
-a:visited { color: #09619C; }
-
-/* -----------------------------------
-Play Hide the tab
------------------------------------ */
-
-div.items p:not(:target) {display: none}
-div.items p:target {display: block}
-
-
-/* -----------------------------------
-layout
------------------------------------ */
-
-#container
-{
-	margin: 0 0px;
-	background: #fff;
-}
-
-#header
-{
-	background: #fff;
-}
-
-#header h1 { margin: 0; }
-
-#navigation
-{
-	float: left;
-	width: 100%;
-	background: #333;
-}
-
-#navigation ul
-{
-	margin: 0;
-	padding: 0;
-}
-
-#navigation ul li
-{
-	list-style-type: none;
-	display: inline;
-}
-
-#navigation li a
-{
-	display: block;
-	float: left;
-	padding: 5px 10px;
-	color: #fff;
-	text-decoration: none;
-	border-right: 1px solid #fff;
-}
-
-#navigation li a:hover 
-{
-	background-color: #3366cc;
-	background-image: none;
-	background-repeat: repeat;
-	background-attachment: scroll;
-	background-position: 0% 0%;
-}
-
-#content
-{
-	clear: left;
-	padding: 20px;
-}
-
-#content h2
-{
-	color: #000;
-	font-size: 160%;
-	margin: 0 0 .5em;
-}
\ No newline at end of file