update gui 28/11/2014

etc/inc/captiveportal.inc

@@ -360,7 +360,6 @@ EOD;
 		/* Release allocated pipes for this zone */
 		captiveportal_free_dnrules();
 
-		mwexec("/sbin/ipfw zone {$cpzoneid} destroy", true);
 
 		if (empty($config['captiveportal']))
 			set_single_sysctl("net.link.ether.ipfw", "0");
@@ -456,7 +455,6 @@ function captiveportal_init_rules($reinit = false) {
 		return;
 
 	captiveportal_load_modules();
-	mwexec("/sbin/ipfw zone {$cpzoneid} create", true);
 
 	$cpips = array();
 	$ifaces = get_configured_interface_list();
@@ -473,7 +471,6 @@ function captiveportal_init_rules($reinit = false) {
 				if (!empty($carpif)) {
 					$carpsif = explode(" ", $carpif);
 					foreach ($carpsif as $cpcarp) {
-						mwexec("/sbin/ipfw zone {$cpzoneid} madd {$cpcarp}", true);
 						$carpip = find_interface_ip($cpcarp);
 						if (is_ipaddr($carpip))
 							$cpips[] = $carpip;
@@ -481,7 +478,6 @@ function captiveportal_init_rules($reinit = false) {
 				}
 				$cpips[] = $cpipm;
 			}
-			mwexec("/sbin/ipfw zone {$cpzoneid} madd {$tmpif}", true);
 		}
 	}
 	if (count($cpips) > 0) {
@@ -583,7 +579,7 @@ EOD;
 	/* load rules */
 	$cprules = "flush\n{$cprules}";
 	file_put_contents("{$g['tmp_path']}/ipfw_{$cpzone}.cp.rules", $cprules);
-	mwexec("/sbin/ipfw -x {$cpzoneid} -q {$g['tmp_path']}/ipfw_{$cpzone}.cp.rules", true);
+	mwexec("/sbin/ipfw  -q {$g['tmp_path']}/ipfw_{$cpzone}.cp.rules", true);
 	//@unlink("{$g['tmp_path']}/ipfw_{$cpzone}.cp.rules");
 	unset($cprules, $tmprules);
 
@@ -1461,7 +1457,7 @@ function captiveportal_get_dn_passthru_ruleno($value) {
 	if (file_exists("{$g['vardb_path']}/captiveportaldn.rules")) {
 		$rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportaldn.rules"));
 		unset($output);
-		$_gb = exec("/sbin/ipfw -x {$cpzoneid} show | /usr/bin/grep " . escapeshellarg($value) . " | /usr/bin/grep -v grep | /usr/bin/awk '{print $5}' | /usr/bin/head -n 1", $output);
+		$_gb = exec("/sbin/ipfw show | /usr/bin/grep " . escapeshellarg($value) . " | /usr/bin/grep -v grep | /usr/bin/awk '{print $5}' | /usr/bin/head -n 1", $output);
 		$ruleno = intval($output[0]);
 		if (!$rules[$ruleno])
 			$ruleno = NULL;
@@ -1549,7 +1545,7 @@ function captiveportal_get_ipfw_passthru_ruleno($value) {
 	if (file_exists("{$g['vardb_path']}/captiveportal_{$cpzone}.rules")) {
 		$rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportal_{$cpzone}.rules"));
 		unset($output);
-		$_gb = exec("/sbin/ipfw -x {$cpzoneid} show | /usr/bin/grep " . escapeshellarg($value) . " | /usr/bin/grep -v grep | /usr/bin/awk '{print $1}' | /usr/bin/head -n 1", $output);
+		$_gb = exec("/sbin/ipfw  show | /usr/bin/grep " . escapeshellarg($value) . " | /usr/bin/grep -v grep | /usr/bin/awk '{print $1}' | /usr/bin/head -n 1", $output);
 		$ruleno = intval($output[0]);
 		if (!$rules[$ruleno])
 			$ruleno = NULL;
@@ -1824,7 +1820,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
 							$config['captiveportal'][$cpzone]['passthrumac'][] = $mac;
 							$macrules .= captiveportal_passthrumac_configure_entry($mac);
 							file_put_contents("{$g['tmp_path']}/macentry_{$cpzone}.rules.tmp", $macrules);
-							mwexec("/sbin/ipfw -x {$cpzoneid} -q {$g['tmp_path']}/macentry_{$cpzone}.rules.tmp");
+							mwexec("/sbin/ipfw -q {$g['tmp_path']}/macentry_{$cpzone}.rules.tmp");
 							$writecfg = true;
 							$sessionid = true;
 							break;
@@ -1925,7 +1921,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
 			unlock($cpdblck);
 			$macrules = captiveportal_passthrumac_configure_entry($mac);
 			file_put_contents("{$g['tmp_path']}/macentry_{$cpzone}.rules.tmp", $macrules);
-			mwexec("/sbin/ipfw -x {$cpzoneid} -q {$g['tmp_path']}/macentry_{$cpzone}.rules.tmp");
+			mwexec("/sbin/ipfw  -q {$g['tmp_path']}/macentry_{$cpzone}.rules.tmp");
 			$writecfg = true;
 		} else {
 			/* See if a pipeno is passed, if not start sessions because this means there isn't one atm */

usr/local/www/classes/maintable.inc

@@ -73,7 +73,7 @@ class MainTable {
 
 	function display() {
 		echo "<!-- begin content table -->\n";
-		echo "<table class=\"tabcont\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"display\">\n";
+		echo "<table class=\"table table-striped table-sort\" >\n";
 		echo "  <!-- begin content table header -->\n";
 		echo $this->display_header();
 		echo "  <!-- end content table header -->\n";
@@ -95,12 +95,7 @@ class MainTable {
 		}
 		echo "  <td width=\"{$this->width[$this->columns - 1]}%\" class=\"listhdr\">{$this->headers[$this->columns - 1]}</td>\n";
 		echo "  <td width=\"10%\" class=\"list\">\n";
-		echo "    <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\" summary=\"display header\">\n";
-		echo "      <tr>\n";
-		echo "        <td width=\"17\"></td>\n";
-		echo "         <td valign=\"middle\"><a href=\"{$this->edit_uri}\"><img src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"17\" height=\"17\" border=\"0\" alt=\"plus\" /></a></td>\n";
-		echo "      </tr>\n";
-		echo "    </table>\n";
+		
 		echo "  </td>\n";
 		echo "</tr>\n";
 
@@ -139,56 +134,43 @@ class MainTable {
 	}
 	private function display_footer() {
 		global $g;
-		echo "<tr>\n";
-		echo "  <td class=\"list\" colspan=\"{$this->columns}\"></td>\n";
-		echo "  <td class=\"list\">\n";
-		echo "    <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\" summary=\"display footer\">\n";
-		echo "      <tr>\n";
-		echo "        <td width=\"17\"></td>\n";
-		echo "        <td valign=\"middle\"><a href=\"{$this->edit_uri}\"><img src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"17\" height=\"17\" border=\"0\" alt=\"plus\" /></a></td>\n";
-		echo "      </tr>\n";
-		echo "    </table>\n";
-		echo "  </td>\n";
-		echo "</tr>\n";
+		
 	}
 	private function display_buttons($row) {
-		echo "    <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\" summary=\"display buttons\">\n";
-		echo "      <tr>\n";
+		
 		if ($this->buttons['move'])
 			echo $this->display_button('move', $row);
 		if ($this->buttons['edit'])
 			echo $this->display_button('edit', $row);
-		echo "      </tr>\n";
-		echo "      <tr>\n";
+	
 		if ($this->buttons['del'])
 			echo $this->display_button('del', $row);
 		if ($this->buttons['dup'])
 			echo $this->display_button('dup', $row);
-		echo "      </tr>\n";
-		echo "    </table>\n";
+	
 	}
 	private function display_button($button, $row) {
 		global $g;
-		echo "<td valign=\"middle\">";
+		
 		switch ($button) {
 			case "move": {
-				echo "<input name=\"move_{$row}\" type=\"image\" src=\"./themes/{$g['theme']}/images/icons/icon_left.gif\" width=\"17\" height=\"17\" title=\"Move selected entries before this entry\" onmouseover=\"fr_insline({$row}, true)\" onmouseout=\"fr_insline({$row}, false)\" />";
+				echo "<button name=\"move_{$row}\" type=\"submit\" title=\"Move selected entries before this entry\" onmouseover=\"fr_insline({$row}, true)\" onmouseout=\"fr_insline({$row}, false)\" class=\"btn btn-default btn-xs\"><span class=\"glyphicon glyphicon-arrow-left\"></span></button>";
 				break;
 			}
 			case "edit": {
-				echo "<a href=\"{$this->edit_uri}?id={$row}\"><img src=\"/themes/{$g['theme']}/images/icons/icon_e.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"Edit entry\" alt=\"edit\" /></a>";
+				echo "<a href=\"{$this->edit_uri}?id={$row}\" class=\"btn btn-default btn-xs\"><span class=\"glyphicon glyphicon-pencil\"></span></a>";
 				break;
 			}
 			case "del": {
-				echo "<a href=\"{$this->my_uri}?act=del&amp;id={$row}\" onclick=\"return confirm('Do you really want to delete this entry?')\"><img src=\"/themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"Delete entry\" alt=\"delete\" /></a>";
+				echo "<a href=\"{$this->my_uri}?act=del&amp;id={$row}\" onclick=\"return confirm('Do you really want to delete this entry?')\" class=\"btn btn-default btn-xs\"><span class=\"glyphicon glyphicon-remove\"></span></a>";
 				break;
 			}
 			case "dup": {
-				echo "<a href=\"{$this->edit_uri}?act=dup&amp;id={$row}\"><img src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"Duplicate entry\" alt=\"duplicate\" /></a>";
+				echo "<a href=\"{$this->edit_uri}?act=dup&amp;id={$row}\" class=\"btn btn-default btn-xs\" title=\"Duplicate entry\" alt=\"duplicate\" /><span class=\"glyphicon glyphicon-plus\"></span></a>";
 				break;
 			}
 		}
-		echo "</td>";
+		
 	}
 
 }

usr/local/www/diag_edit.php

+<? include("edit.php"); ?>
\ No newline at end of file

usr/local/www/diag_exec.php

+<? include("exec.php"); ?>
\ No newline at end of file

usr/local/www/diag_halt.php

+<? include("halt.php"); ?>
\ No newline at end of file

usr/local/www/diag_patterns.php

@@ -64,33 +64,47 @@ $pgtitle = array(gettext("Diagnostics"), gettext("Add layer7 pattern"));
 include("head.inc");
 ?>
 
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<body>
 <?php include("fbegin.inc"); ?>
-<?php if ($ulmsg) echo "<p class=\"red\"><strong>" . $ulmsg . "</strong></p>\n"; ?>
-<div id="mainarea">
-<form action="diag_patterns.php" method="post" enctype="multipart/form-data" name="frmPattern">
-<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="upload pattern">
-	<tr>
-		<td colspan="4" valign="top" class="listtopic"><?=gettext("Upload layer7 pattern file");?></td>
-	</tr>
-	<tr>
-		<td align="right"><strong><?=gettext("File to upload:");?></strong></td>
-		<td valign="top" class="label">
-			<input name="ulfile" type="file" class="formfld file" id="ulfile" />
-		</td>
-	</tr>
-	<tr>
-		<td valign="top">&nbsp;&nbsp;&nbsp;</td>
-		<td valign="top" class="label">
-			<input name="submit" type="submit" class="button" id="upload" value="<?=gettext("Upload Pattern file");?>" />
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2" valign="top" height="16"></td>
-	</tr>
-</table>
-</form>
-</div>
-<?php include("fend.inc"); ?>
-</body>
-</html>
+
+	<section class="page-content-main">
+
+		<div class="container-fluid">
+	
+			<div class="row">	
+
+			    <section class="col-xs-12">
+    				
+    				<div class="content-box">	
+								
+                        <form action="diag_patterns.php" method="post" enctype="multipart/form-data" name="frmPattern">							
+                        	
+                        	<?php if ($ulmsg) echo "<p class=\"text-danger\"><strong>" . $ulmsg . "</strong></p>\n"; ?>
+                        	
+                        	<div class="table-responsive">
+	                        	<table class="table table-striped table-sort">
+									<tr>
+										<td colspan="2" valign="top" class="listtopic"><?=gettext("Upload layer7 pattern file");?></td>
+									</tr>
+									<tr>
+										<td align="right"><strong><?=gettext("File to upload:");?></strong></td>
+										<td valign="top" >
+											<input name="ulfile" type="file" class="formfld file" id="ulfile" />
+										</td>
+									</tr>
+									<tr>
+										<td valign="top" width="22%"></td>
+										<td valign="top" width="78%">
+											<input name="submit" type="submit" class="btn btn-primary" id="upload" value="<?=gettext("Upload Pattern file");?>" />
+										</td>
+									</tr>
+								</table>
+                        	</div>
+                        </form>
+    				</div>
+			    </section>
+			</div>
+		</div>
+	</section>
+	
+<?php include("foot.inc"); ?>
\ No newline at end of file

usr/local/www/diag_reboot.php

+<? include("reboot.php"); ?>
\ No newline at end of file

usr/local/www/easyrule.php

@@ -64,11 +64,16 @@ if(stristr($retval, "error") == true)
     $message = $retval;
 
 include("head.inc"); ?>
+
+			    
 <body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td>
+
+<section class="page-content-main">
+	<div class="container-fluid col-xs-12 col-sm-10 col-md-9">
+		<div class="row">
+		    <section class="col-xs-12">
+
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 
 <?php if ($message) { ?>
@@ -83,5 +88,9 @@ include("head.inc"); ?>
 "Firewall Tab"); ?></a>.
 <br />
 <?php } ?>
-</td></tr></table>
-<?php include("fend.inc"); ?>
+		    </section>
+		</div>
+	</div>
+</section>
+
+<?php include("foot.inc"); ?>

usr/local/www/edit.php

@@ -88,14 +88,16 @@ if($_POST['action']) {
 
 $closehead = false;
 require("head.inc");
-outputCSSFileInline("code-syntax-highlighter/SyntaxHighlighter.css");
-outputJavaScriptFileInline("filebrowser/browser.js");
-outputJavaScriptFileInline("javascript/base64.js");
 
 ?>
-</head>
+
 <body>
-<?php include("fbegin.inc"); ?>
+<?php 
+outputJavaScriptFileInline("filebrowser/browser.js");
+outputJavaScriptFileInline("javascript/base64.js");
+include("fbegin.inc"); 
+?>
+
 
 <script type="text/javascript">	
 //<![CDATA[
@@ -122,18 +124,6 @@ outputJavaScriptFileInline("javascript/base64.js");
 			var fileContent = Base64.decode(values.join("|"));
 			jQuery("#fileStatus").html("<?=gettext("File successfully loaded"); ?>.");
 			jQuery("#fileContent").val(fileContent);
-
-			var lang = "none";
-				 if(file.indexOf(".php") > 0) lang = "php";
-			else if(file.indexOf(".inc") > 0) lang = "php";
-			else if(file.indexOf(".xml") > 0) lang = "xml";
-			else if(file.indexOf(".js" ) > 0) lang = "js";
-			else if(file.indexOf(".css") > 0) lang = "css";
-
-			if(jQuery("#highlight").checked && lang != "none") {
-				jQuery("fileContent").prop("className",lang + ":showcolumns");
-				dp.SyntaxHighlighter.HighlightAll("fileContent", true, false);
-			}
 		}
 		else {
 			jQuery("#fileStatus").html(values[0]);
@@ -164,76 +154,66 @@ outputJavaScriptFileInline("javascript/base64.js");
 //]]>
 </script>
 
-
 <section class="page-content-main">
-	<div class="container-fluid col-xs-12 col-sm-10 col-md-9">
+	<div class="container-fluid">
 		<div class="row">
-		    <section class="col-xs-12">
 
+		    <section class="col-xs-12">
+		    	<div class="content-box">
+
+		    		<div class="content-box-head col-xs-12">
+						<!-- file status box -->
+						<div style="display:none; background:#eeeeee;" id="fileStatusBox">
+							<div class="vexpl" style="padding-left:15px;">
+								<strong id="fileStatus"></strong>
+							</div>
+						</div>
 				
-				<!-- file status box -->
-				<div style="display:none; background:#eeeeee;" id="fileStatusBox">
-					<div class="vexpl" style="padding-left:15px;">
-						<strong id="fileStatus"></strong>
-					</div>
-				</div>
-				
-				<div class="content-box-main col-xs-12">
-					<div class="table-responsive">
-    			        <table class="table table-striped">
-    				        <tbody>
-        				        <tr>
-        				          <td><?=gettext("Save / Load from path"); ?>:</td>
-        				          <td><input type="text" class="form-control file" id="fbTarget" size="45" /></td>
-        				        </tr>
-        				        <tr>
-        				          <td>&nbsp;</td>
-        				          <td>
-	        				          <div class="btn-group">
-		        				          <input type="button" class="btn btn-primary"      onclick="loadFile();" value="<?=gettext('Load');?>" />
-										  <input type="button" class="btn btn-default"      id="fbOpen"           value="<?=gettext('Browse');?>" />
-										  <input type="button" class="btn btn-default"      onclick="saveFile();" value="<?=gettext('Save');?>" />
-	        				          </div>
-        				          </td>
-        				        </tr>	        				       
-    				        </tbody>
-    				    </table>
-				    </div>
-				    
-				    <div id="fbBrowser" style="display:none; border:1px dashed gray; width:98%;"></div>
-				
-					<!-- file viewer/editor -->
-					<table width="100%" summary="file editor">
-						<tr>
-							<td valign="top">
-								<div style="background:#eeeeee;" id="fileOutput">
-									<script type="text/javascript">
+						<!-- control buttons -->
+						<div class="content-box-main col-xs-12">
+							<div class="table-responsive">
+    			        		<table class="table table-striped">
+    				        		<tbody>
+        				        		<tr>
+        				          			<td><?=gettext("Save / Load from path"); ?>:</td>
+        				          			<td><input type="text" class="form-control file" id="fbTarget" size="45" /></td>
+        				        		</tr>
+        				        		<tr>
+        				          			<td>&nbsp;</td>
+        				          			<td>
+	        				          			<div class="btn-group">
+		        				          			<input type="button" class="btn btn-primary"      onclick="loadFile();" value="<?=gettext('Load');?>" />
+										  			<input type="button" class="btn btn-default"      id="fbOpen"           value="<?=gettext('Browse');?>" />
+										  			<input type="button" class="btn btn-default"      onclick="saveFile();" value="<?=gettext('Save');?>" />
+	        				          			</div>
+        				          			</td>
+        				        		</tr>	        				       
+    				        		</tbody>
+    				    		</table> 
+    				    	</div>   				        	
+
+
+    				        <!-- file browser window, is hidden by default -->
+				    		<div id="fbBrowser" style="display:none; background-color:#ffffff; border: 1px solid #cccccc; padding: 10px;"></div>
+
+				    		<!-- file viewer/editor -->
+				    		<div style="background:#eeeeee;" id="fileOutput">
+								<script type="text/javascript">
 									//<![CDATA[
-									window.onload=function(){
-										document.getElementById("fileContent").wrap='off';
-									}
+										window.onload=function(){
+											document.getElementById("fileContent").wrap='off';
+										}
 									//]]>
-									</script>
-									<textarea id="fileContent" name="fileContent" style="width:100%;" rows="30" cols=""></textarea>
-								</div>
-							</td>
-						</tr>
-					</table>
-				    
+								</script>
+								<textarea id="fileContent" name="fileContent" style="display:none; width: 100%; max-width:100%;" rows="30" cols=""></textarea>
+							</div>
+				    </div>  
 				</div>
-		    
-		    </section>
-				
+		    </section>	
 		</div>
 	</div>
 </section>
 
-
-<script type="text/javascript" src="/code-syntax-highlighter/shCore.js"></script>
-<script type="text/javascript" src="/code-syntax-highlighter/shBrushCss.js"></script>
-<script type="text/javascript" src="/code-syntax-highlighter/shBrushJScript.js"></script>
-<script type="text/javascript" src="/code-syntax-highlighter/shBrushPhp.js"></script>
-<script type="text/javascript" src="/code-syntax-highlighter/shBrushXml.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 	jQuery(window).load(

usr/local/www/filebrowser/browser.php

@@ -40,11 +40,11 @@ if(is_file($path))
 <table width="100%">
 	<tr>
 		<td class="fbHome" width="25px" align="left">
-			<img onClick="jQuery('#fbTarget').val('<?=$realDir?>'); fbBrowse('/');" src="/filebrowser/images/icon_home.gif" alt="Home" title="Home" />
+			<span onClick="jQuery('#fbTarget').val('<?=$realDir?>'); fbBrowse('/');" alt="Home" title="Home" class="glyphicon glyphicon-home"></span>
 		</td>
 		<td><b><?=$path;?></b></td>
 		<td class="fbClose" align="right">
-			<img onClick="jQuery('#fbBrowser').fadeOut();" border="0" src="/filebrowser/images/icon_cancel.gif" alt="Close" title="Close" />
+			<span onClick="jQuery('#fbBrowser').fadeOut();" border="0" class="glyphicon glyphicon-remove" alt="Close" title="Close" ></span>
 		</td>
 	</tr>
 	<tr>
@@ -78,7 +78,7 @@ foreach($dirs as $dir):
 		<td></td>
 		<td class="fbDir vexpl" id="<?=$realDir;?>" align="left">
 			<div onClick="jQuery('#fbTarget').val('<?=$realDir?>'); fbBrowse('<?=$realDir?>');">
-				<img src="/filebrowser/images/folder_generic.gif" />
+				<span class="glyphicon glyphicon-folder-close text-primary"></span>
 				&nbsp;<?=$dir;?>
 			</div>
 		</td>
@@ -95,7 +95,7 @@ foreach($files as $file):
 	   case ".css":
 	   case ".html":
 	   case ".xml":
-		$type = "code";
+		$type = "glyphicon glyphicon-globe";
 		break;
 	   case ".rrd":
 		$type = "database";
@@ -103,31 +103,31 @@ foreach($files as $file):
 	   case ".gif":
 	   case ".jpg":
 	   case ".png":
-		$type = "image";
+		$type = "glyphicon glyphicon-picture";
 		break;
 	   case ".js":
-		 $type = "js";
+		 $type = "glyphicon glyphicon-globe";
 		break;
 	   case ".pdf":
-		$type = "pdf";
+		$type = "glyphicon glyphicon-book";
 		break;
 	   case ".inc":
 	   case ".php":
-		$type = "php";
+		$type = "glyphicon glyphicon-globe";
 		break;
 	   case ".conf":
 	   case ".pid":
 	   case ".sh":
-		$type = "system";
+		$type = "glyphicon glyphicon-wrench";
 		break;
 	   case ".bz2":
 	   case ".gz":
 	   case ".tgz":
 	   case ".zip":
-		$type = "zip";
+		$type = "glyphicon glyphicon-compressed";
 		break;
 	   default:
-		$type = "generic";
+		$type = "glyphicon glyphicon-cog";
 	}
 
 	$fqpn = "{$path}/{$file}";
@@ -145,7 +145,7 @@ foreach($files as $file):
 		<td class="fbFile vexpl" id="<?=$fqpn;?>" align="left">
 			<?php $filename = str_replace("//","/", "{$path}/{$file}"); ?>
 			<div onClick="jQuery('#fbTarget').val('<?=$filename?>'); loadFile(); jQuery('#fbBrowser').fadeOut();">
-				<img src="/filebrowser/images/file_<?=$type;?>.gif" alt="" title="">
+				<span class="<?=$type;?>"></span>
 				&nbsp;<?=$file;?>
 			</div>
 		</td>

usr/local/www/firewall_aliases_import.php

@@ -157,75 +157,87 @@ if($_POST['aliasimport'] <> "") {
 include("head.inc");
 
 ?>
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<body>
 <?php include("fbegin.inc"); ?>
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<div id="niftyOutter">
-<form action="firewall_aliases_import.php" method="post" name="iform" id="iform">
-<div id="inputerrors"></div>
-<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="firewall alias import">
-	<tr>
-		<td colspan="2" valign="top" class="listtopic"><?=gettext("Alias Import"); ?></td>
-	</tr>
-	<tr>
-		<td valign="top" class="vncellreq"><?=gettext("Alias Name"); ?></td>
-		<td class="vtable">
-			<input name="name" type="text" class="formfld unknown" id="name" size="40" maxlength="31" value="<?=htmlspecialchars($_POST['name']);?>" />
-			<br />
-			<span class="vexpl">
-				<?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z and 0-9\"."); ?>
-			</span>
-		</td>
-	</tr>
-	<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
-		<td width="78%" class="vtable">
-			<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($_POST['descr']);?>" />
-			<br />
-			<span class="vexpl">
-				<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
-			</span>
-		</td>
-	</tr>
-	<tr>
-		<td valign="top" class="vncellreq"><?=gettext("Aliases to import"); ?></td>
-		<td class="vtable">
-			<textarea name="aliasimport" rows="15" cols="40"><?php echo $_POST['aliasimport']; ?></textarea>
-			<br />
-			<span class="vexpl">
-				<?=gettext("Paste in the aliases to import separated by a carriage return.  Common examples are lists of IPs, networks, blacklists, etc."); ?>
-				<br />
-				<?=gettext("The list may contain IP addresses, with or without CIDR prefix, IP ranges, blank lines (ignored) and an optional description after each IP. e.g.:"); ?>
-				<br />172.16.1.2
-				<br />172.16.0.0/24
-				<br />10.11.12.100-10.11.12.200
-				<br />192.168.1.254 Home router
-				<br />10.20.0.0/16 Office network
-				<br />10.40.1.10-10.40.1.19 Managed switches
-			</span>
-		</td>
-	</tr>
-	<tr>
-		<td width="22%" valign="top">&nbsp;</td>
-		<td width="78%">
-			<input id="submit" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
-			<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-		</td>
-	</tr>
-</table>
-
-
-</form>
-</div>
-
-<?php include("fend.inc"); ?>
-
-<script type="text/javascript">
-//<![CDATA[
-	NiftyCheck();
-	Rounded("div#nifty","top","#FFF","#EEEEEE","smooth");
-//]]>
-</script>
-
-</body>
-</html>
+
+
+	<section class="page-content-main">
+		<div class="container-fluid">	
+			<div class="row">
+				
+				<?php if ($input_errors) print_input_errors($input_errors); ?>
+				<div id="inputerrors"></div>
+
+				
+			    <section class="col-xs-12">
+    				
+    				<div class="content-box">
+	    				
+	    				 <header class="content-box-head col-xs-12">
+    				        <h3><?=gettext("Alias Import");?></h3>
+    				    </header>
+    				    
+    				    <div class="content-box-main col-xs-12">
+	    					
+	    					<form action="firewall_aliases_import.php" method="post" name="iform" id="iform">
+		    							                        
+		                        <div class="table-responsive">
+			                        <table class="table table-striped table-sort">
+										<tr>
+											<td valign="top" class="vncellreq"><?=gettext("Alias Name"); ?></td>
+											<td class="vtable">
+												<input name="name" type="text" class="form-control unknown" id="name" size="40" maxlength="31" value="<?=htmlspecialchars($_POST['name']);?>" />
+												<br />
+												<span class="vexpl">
+													<?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z and 0-9\"."); ?>
+												</span>
+											</td>
+										</tr>
+										<tr>
+											<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
+											<td width="78%" class="vtable">
+												<input name="descr" type="text" class="form-control unknown" id="descr" size="40" value="<?=htmlspecialchars($_POST['descr']);?>" />
+												<br />
+												<span class="vexpl">
+													<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
+												</span>
+											</td>
+										</tr>
+										<tr>
+											<td valign="top" class="vncellreq"><?=gettext("Aliases to import"); ?></td>
+											<td class="vtable">
+												<textarea name="aliasimport" rows="15" cols="40"><?php echo $_POST['aliasimport']; ?></textarea>
+												<br />
+												<span class="vexpl">
+													<?=gettext("Paste in the aliases to import separated by a carriage return.  Common examples are lists of IPs, networks, blacklists, etc."); ?>
+													<br />
+													<?=gettext("The list may contain IP addresses, with or without CIDR prefix, IP ranges, blank lines (ignored) and an optional description after each IP. e.g.:"); ?>
+													<br />172.16.1.2
+													<br />172.16.0.0/24
+													<br />10.11.12.100-10.11.12.200
+													<br />192.168.1.254 Home router
+													<br />10.20.0.0/16 Office network
+													<br />10.40.1.10-10.40.1.19 Managed switches
+												</span>
+											</td>
+										</tr>
+										<tr>
+											<td width="22%" valign="top">&nbsp;</td>
+											<td width="78%">
+												<input id="submit" name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
+												<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+											</td>
+										</tr>
+									</table>
+		                        </div>
+	    					</form>
+    				    </div>
+    				</div>
+			    </section>
+			</div>
+		</div>
+	</section>
+
+
+
+<?php include("foot.inc"); ?>
\ No newline at end of file

usr/local/www/firewall_nat_npt.php

@@ -78,106 +78,106 @@ if ($_GET['act'] == "del") {
 $pgtitle = array(gettext("Firewall"),gettext("NAT"),gettext("NPt"));
 include("head.inc");
 
+$main_buttons = array(
+	array('label'=>'Add rule', 'href'=>'firewall_nat_npt_edit.php'),
+);
 ?>
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+
+
+<body>
 <?php include("fbegin.inc"); ?>
-<form action="firewall_nat_npt.php" method="post">
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (is_subsystem_dirty('natconf')): ?>
-<?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firewall nat npt">  <tr><td>
-<?php
-	$tab_array = array();
-	$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
-	$tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
-	$tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
-	$tab_array[] = array(gettext("NPt"), true, "firewall_nat_npt.php");
-	display_top_tabs($tab_array);
-?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
-                <tr>
-		  <td width="10%" class="listhdrr"><?=gettext("Interface"); ?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("External Prefix"); ?></td>
-                  <td width="15%" class="listhdrr"><?=gettext("Internal prefix"); ?></td>
-                  <td width="30%" class="listhdr"><?=gettext("Description"); ?></td>
-                  <td width="10%" class="list">
-                    <table border="0" cellspacing="0" cellpadding="1" summary="add">
-                      <tr>
-			<td width="17"></td>
-                        <td valign="middle"><a href="firewall_nat_npt_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add rule"); ?>" alt="add" /></a></td>
-                      </tr>
-                    </table>
-		  </td>
-				</tr>
-	  <?php 
-			$textse = "</span>";
-
-			$i = 0; foreach ($a_npt as $natent):
-
-			if (isset($natent['disabled']))
-				$textss = "<span class=\"gray\">";
-			else
-				$textss = "<span>"; ?>
-                <tr>
-		  <td class="listlr" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
-                  <?php
-			echo $textss;
-					if (!$natent['interface'])
-						echo htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan"));
-					else
-						echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface']));
-			echo $textse;
-				  ?>
-                  </td>
-                    <?php 
-			$source_net = pprint_address($natent['source']);
-			$source_cidr = strstr($source_net, '/');
-			$destination_net = pprint_address($natent['destination']);
-			$destination_cidr = strstr($destination_net, '/');
-                    ?>
-                  <td class="listr" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
-                    <?php 		echo $textss . $destination_net . $textse; ?>
-                  </td>
-                  <td class="listr" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
-                    <?php 		echo $textss . $source_net . $textse; ?>
-                  </td>
-                  <td class="listbg" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
-			<?=$textss;?>
-                    <?=htmlspecialchars($natent['descr']);?>&nbsp;
-			<?=$textse;?>
-                  </td>
-                  <td class="list nowrap">
-                    <table border="0" cellspacing="0" cellpadding="1" summary="edit">
-                      <tr>
-                        <td valign="middle"><a href="firewall_nat_npt_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit rule"); ?>" alt="edit" /></a></td>
-			<td valign="middle"><a href="firewall_nat_npt.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule"); ?>" alt="delete" /></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-		<?php $i++; endforeach; ?>
-                <tr>
-                  <td class="list" colspan="4"></td>
-                  <td class="list">
-                    <table border="0" cellspacing="0" cellpadding="1" summary="add">
-                      <tr>
-			<td width="17"></td>
-                        <td valign="middle"><a href="firewall_nat_npt_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add rule"); ?>" alt="add" /></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-	    </div>
-	</td>
-</tr>
-</table>
+	
+	<script type="text/javascript" src="/javascript/row_toggle.js"></script>
+
+	<section class="page-content-main">
+		<div class="container-fluid">	
+			<div class="row">				
+				
+				<?php if ($savemsg) print_info_box($savemsg); ?>
+				<?php if (is_subsystem_dirty('natconf')): ?>
+				<?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
+				<?php endif; ?>
+				
+			    <section class="col-xs-12">    				
+    					
+					<?php
+						$tab_array = array();
+						$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
+						$tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
+						$tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
+						$tab_array[] = array(gettext("NPt"), true, "firewall_nat_npt.php");
+						display_top_tabs($tab_array);
+					?>
+				
+					<div class="tab-content content-box col-xs-12">	
+    					
+    				    <div class="container-fluid">	    					
+
+	                        <form action="firewall_nat_npt.php" method="post" name="iform" id="iform">
+	                        	
+	                        	<div class="table-responsive">
+		                       	 	<table class="table table-striped table-sort">
+			                    
+							   	 		<tr>
+										  <td width="10%" class="listhdrr"><?=gettext("Interface"); ?></td>
+								                  <td width="20%" class="listhdrr"><?=gettext("External Prefix"); ?></td>
+								                  <td width="15%" class="listhdrr"><?=gettext("Internal prefix"); ?></td>
+								                  <td width="30%" class="listhdr"><?=gettext("Description"); ?></td>
+								                  <td width="10%" class="list">
+								                    
+										  </td>
+												</tr>
+									  <?php 
+											$textse = "</span>";
+								
+											$i = 0; foreach ($a_npt as $natent):
+								
+											if (isset($natent['disabled']))
+												$textss = "<span class=\"gray\">";
+											else
+												$textss = "<span>"; ?>
+								                <tr>
+										  <td class="listlr" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
+								                  <?php
+											echo $textss;
+													if (!$natent['interface'])
+														echo htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan"));
+													else
+														echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface']));
+											echo $textse;
+												  ?>
+								                  </td>
+								                    <?php 
+											$source_net = pprint_address($natent['source']);
+											$source_cidr = strstr($source_net, '/');
+											$destination_net = pprint_address($natent['destination']);
+											$destination_cidr = strstr($destination_net, '/');
+								                    ?>
+								                  <td class="listr" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
+								                    <?php 		echo $textss . $destination_net . $textse; ?>
+								                  </td>
+								                  <td class="listr" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
+								                    <?php 		echo $textss . $source_net . $textse; ?>
+								                  </td>
+								                  <td class="listbg" ondblclick="document.location='firewall_nat_npt_edit.php?id=<?=$i;?>';">
+											<?=$textss;?>
+								                    <?=htmlspecialchars($natent['descr']);?>&nbsp;
+											<?=$textse;?>
+								                  </td>
+								                  <td class="list nowrap">
+								                    <a href="firewall_nat_npt_edit.php?id=<?=$i;?>" title="<?=gettext("edit rule"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a><a href="firewall_nat_npt.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')" title="<?=gettext("delete rule"); ?>" alt="delete"  class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+								                  </td>
+								                </tr>
+										<?php $i++; endforeach; ?>
+								                
+								              </table>
+	                        	</div>
+	                        </form>
+    				    </div>
+					</div>
+			    </section>
+			</div>
+		</div>
+	</section>
+
+<?php include("foot.inc"); ?>
\ No newline at end of file
-</form>
-<?php include("fend.inc"); ?>
-</body>
-</html>

usr/local/www/firewall_shaper.php

@@ -347,7 +347,7 @@ $output_form .= "<tr><td width=\"22%\" valign=\"middle\" class=\"vncellreq\">";
 $output_form .= "<br />" . gettext("Queue Actions") . "<br />";
 $output_form .= "</td><td valign=\"middle\" class=\"vncellreq\" width=\"78%\"><br />";
 
-$output_form .= "<input type=\"submit\" name=\"Submit\" value=\"" . gettext("Save") . "\" class=\"formbtn\" />";
+$output_form .= "<input type=\"submit\" name=\"Submit\" value=\"" . gettext("Save") . "\" class=\"btn btn-primary\" />";
 if ($can_add || $addnewaltq) {
 	$output_form .= "<a href=\"firewall_shaper.php?interface=";
 	$output_form .= $interface; 
@@ -355,7 +355,7 @@ if ($can_add || $addnewaltq) {
 		$output_form .= "&amp;queue=" . $queue->GetQname();
 	}
 	$output_form .= "&amp;action=add\">";
-	$output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") . "\" />";
+	$output_form .= "<input type=\"button\" class=\"btn btn-default\" name=\"add\" value=\"" . gettext("Add new queue") . "\" />";
 	$output_form .= "</a>";
 }
 $output_form .= "<a href=\"firewall_shaper.php?interface=";
@@ -364,7 +364,7 @@ if ($queue) {
 	$output_form .= "&amp;queue=" . $queue->GetQname();
 }
 $output_form .= "&amp;action=delete\">";
-$output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\"";
+$output_form .= "<input type=\"button\" class=\"btn btn-default\" name=\"delete\"";
 if ($queue)
 	$output_form .= " value=\"" . gettext("Delete this queue") . "\" />";
 else
@@ -383,70 +383,87 @@ $output .= $output_form;
 $closehead = false;
 include("head.inc");
 ?>
+
+<body>
+
 <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" />
 <script type="text/javascript" src="./tree/tree.js"></script>
-</head>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC" >
 <?php
 if ($queue)
         echo $queue->build_javascript();
 echo $newjavascript;
 
 include("fbegin.inc"); 
+
 ?>
-<div id="inputerrors"></div>
-<?php if ($input_errors) print_input_errors($input_errors); ?>
 
-<form action="firewall_shaper.php" method="post" id="iform" name="iform">
 
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (is_subsystem_dirty('shaper')): ?><p>
-<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));?><br /></p>
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="traffic shaper">
-  <tr><td>
-<?php
-	$tab_array = array();
-	$tab_array[0] = array(gettext("By Interface"), true, "firewall_shaper.php");
-	$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
-	$tab_array[2] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php");
-	$tab_array[3] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php");
-	$tab_array[4] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
-	display_top_tabs($tab_array);
-?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
-<?php if (count($altq_list_queues) > 0): ?>
-                        <tr class="tabcont"><td width="25%" align="left">
-                                <a href="firewall_shaper.php?action=resetall" >
-                                        <input type="button" value="<?=gettext("Remove Shaper")?>" class="formbtn" />
-                                </a>
-                        </td><td width="75%"> </td></tr>
-<?php endif; ?>
-			<tr>
-			<td width="25%" valign="top" align="left">
-			<?php
-				echo $tree; 
-			?>
-			</td>
-			<td width="75%" valign="top" align="center">
-			<div id="shaperarea" style="position:relative">
-			<?php
-				echo $output;
-			?>	
+	<section class="page-content-main">
+		<div class="container-fluid">	
+			<div class="row">				
+				
+				<div id="inputerrors"></div>
+				<?php if ($input_errors) print_input_errors($input_errors); ?>
+				
+				<?php if ($savemsg) print_info_box($savemsg); ?>
+				<?php if (is_subsystem_dirty('shaper')): ?>
+				<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));?><br />
+				<?php endif; ?>
+
+			    <section class="col-xs-12">
+    				
+    					
+    					<?php
+							$tab_array = array();
+							$tab_array[0] = array(gettext("By Interface"), true, "firewall_shaper.php");
+							$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
+							$tab_array[2] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php");
+							$tab_array[3] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php");
+							$tab_array[4] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
+							display_top_tabs($tab_array);
+						?>
+						
+					
+						<div class="tab-content content-box col-xs-12">	
+	    					
+	    				    <div class="container-fluid">	
+	    					
+   
+		                        <form action="firewall_shaper.php" method="post" name="iform" id="iform">
+		                       
+		                        <div class="table-responsive">
+			                        <table class="table table-striped table-sort">
+				                        
+										<?php if (count($altq_list_queues) > 0): ?>
+				                        <tr class="tabcont"><td width="25%" align="left">
+
+				                                <a href="firewall_shaper.php?action=resetall" >
+				                                        <input type="button" value="<?=gettext("Remove Shaper")?>" class="btn btn-primary" />
+				                                </a>
+				                        </td><td width="75%"> </td></tr>
+										<?php endif; ?>
+										<tr>
+										<td width="25%" valign="top" align="left" style="vertical-align:top">
+										<?php
+											echo $tree; 
+										?>
+										</td>
+										<td width="75%" valign="top" align="center">
+										<div id="shaperarea" style="position:relative">
+										<?php
+											echo $output;
+										?>	
+										</div>
+							
+									      </td></tr>
+						            </table>
+		                        </div>
+		                        </form>
+	    				    </div>
+						</div>
+			    </section>
 			</div>
-
-		      </td></tr>
-                    </table>
 		</div>
-	  </td>
-	</tr>
-</table>
-            </form>
+	</section>
+	
+<?php include("foot.inc"); ?>
\ No newline at end of file
-<?php include("fend.inc"); ?>
-</body>
-</html>

usr/local/www/foot.inc

@@ -12,34 +12,54 @@
         
 		</main>	
 		
+		<?php if (isset($widgetfiles)):
+			$widgetfiles_add = $widgetfiles;
+			sort($widgetfiles_add);
+				
+		?>
 		<div class="modal fade" id="modal_widgets" tabindex="-1" role="dialog" aria-labelledby="modal_widgets_label" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                        <h4 class="modal-title" id="modal_widgets_label">Widgets</h4>
+                        <h4 class="modal-title" id="modal_widgets_label"><?=gettext("Available Widgets"); ?></h4>
                     </div>
                 
                     <div class="modal-body">
                         <table class="table table-striped table-hover">
-                            <tr><td>pfSense.localdomain</td></tr>
-                            <tr><td>pfSense.localdomain</td></tr>
-                            <tr><td>pfSense.localdomain</td></tr>
-                            <tr><td>pfSense.localdomain</td></tr>
-                            <tr><td>pfSense.localdomain</td></tr>
-                            <tr><td>pfSense.localdomain</td></tr>
-                            <tr><td>pfSense.localdomain</td></tr>
+	                        <?php
+		                       	foreach($widgetfiles_add as $widget):
+									if(!stristr($widget, "widget.php"))
+										continue;
+
+									$periodpos = strpos($widget, ".");
+									$widgetname = substr($widget, 0, $periodpos);
+									$nicename = $widgetname;
+									$nicename = str_replace("_", " ", $nicename);
+									//make the title look nice
+									$nicename = ucwords($nicename);
+
+									$widgettitle = $widgetname . "_title";
+									$widgettitlelink = $widgetname . "_title_link";
+										if ($$widgettitle != ""):
+							?>
+							
+				
+								<tr><td style="cursor: pointer;" onclick='return addWidget("<?php echo $widgetname; ?>")'><?php echo $$widgettitle; ?></td></tr>
+							<?php elseif ($nicename != ""): ?>					
+								<tr><td style="cursor: pointer;" onclick='return addWidget("<?php echo $widgetname; ?>")'><?php echo $nicename; ?></td></tr>
+							<?php endif; endforeach; ?>
+								
                         </table>
                     </div>
                 
                     <div class="modal-footer">
                         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                        <button type="button" class="btn btn-primary">Add widgets</button>
                     </div>
                 </div><!-- /modal-content -->
             </div><!-- /modal-dialog -->
         </div><!-- /modal -->
-	
+		<?php endif; ?>
 	
 	</body>
 </html>
\ No newline at end of file