Modified the files for Bootstrap

author: Hari <hari289@outlook.com> 2015-09-13 22:59:33 +0530
committer: Hari <hari289@outlook.com> 2015-09-13 22:59:33 +0530
commit: c64a0911d459e757976883a55e69cec017875424 (patch)
tree: b4dcf0eff3caac89394413d79e0f234f756b8958 /src/usr/local/www/status_openvpn.php
parent: 2f266da1801f1c9f71c38aa8d31b4e8b18a09440 (diff)
download: pfsense-c64a0911d459e757976883a55e69cec017875424.zip
pfsense-c64a0911d459e757976883a55e69cec017875424.tar.gz
1 files changed, 162 insertions, 217 deletions
diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php
index 2cd2770..829f659 100644
--- a/src/usr/local/www/status_openvpn.php
+++ b/src/usr/local/www/status_openvpn.php
@@ -109,8 +109,7 @@ $clients = openvpn_get_active_clients();
 
 include("head.inc"); ?>
 
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?=$jsevents["body"]["onload"];?>">
-<?php include("fbegin.inc"); ?>
+<body>
 <form action="status_openvpn.php" method="get" name="iform">
 <script type="text/javascript">
 //<![CDATA[
@@ -143,130 +142,109 @@ include("head.inc"); ?>
 	}
 //]]>
 </script>
+
 <?php
 	$i = 0;
 	foreach ($servers as $server):
 ?>
 
-<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" summary="status openvpn">
-	<tr>
-		<td colspan="6" class="listtopic">
-			<?=htmlspecialchars($server['name']);?> <?=gettext("Client connections"); ?>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="connections">
-			<tr>
-				<td class="listhdrr"><?=gettext("Common Name"); ?></td>
-				<td class="listhdrr"><?=gettext("Real Address"); ?></td>
-				<td class="listhdrr"><?=gettext("Virtual Address"); ?></td>
-				<td class="listhdrr"><?=gettext("Connected Since"); ?></td>
-				<td class="listhdrr"><?=gettext("Bytes Sent"); ?></td>
-				<td class="listhdrr"><?=gettext("Bytes Received"); ?></td>
-			</tr>
+<div class="panel panel-default">
+		<div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?> <?=gettext('Client connections')?></h2></div>
+		<div class="panel-body table-responsive">
+			<table class="table table-striped table-hover">
+				<thead>
+					<tr>
+						<th><?=gettext("Common Name")?></th>
+						<th><?=gettext("Real Address")?></th>
+						<th><?=gettext("Virtual Address"); ?></th>
+						<th><?=gettext("Connected Since"); ?></th>
+						<th><?=gettext("Bytes Sent")?></th>
+						<th><?=gettext("Bytes Received")?></th>
+					</tr>
+				</thead>
+				<tbody>
+			
 <?php
 		foreach ($server['conns'] as $conn):
 ?>
-			<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
-				<td class="listlr">
-					<?=$conn['common_name'];?>
-				</td>
-				<td class="listr">
-					<?=$conn['remote_host'];?>
-				</td>
-				<td class="listr">
-					<?=$conn['virtual_addr'];?>
-				</td>
-				<td class="listr">
-					<?=$conn['connect_time'];?>
-				</td>
-				<td class="listr">
-					<?=format_bytes($conn['bytes_sent']);?>
-				</td>
-				<td class="listr">
-					<?=format_bytes($conn['bytes_recv']);?>
-				</td>
-				<td class="list">
-					<img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" height="17" width="17" border="0"
-					   onclick="killClient('<?php echo $server['mgmt']; ?>', '<?php echo $conn['remote_host']; ?>');" style="cursor:pointer;"
-					   id="<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>"
-					   title="<?php echo gettext("Kill client connection from") . " " . $conn['remote_host']; ?>" alt="delete" />
-				</td>
-			</tr>
+					<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
+						<td><?=$conn['common_name'];?></td>
+						<td><?=$conn['remote_host'];?></td>
+						<td><?=$conn['virtual_addr'];?></td>
+						<td><?=$conn['connect_time'];?></td>
+						<td><?=format_bytes($conn['bytes_sent']);?></td>
+						<td><?=format_bytes($conn['bytes_recv']);?></td>
+						<td>
+							<img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif"
+							   onclick="killClient('<?php echo $server['mgmt']; ?>', '<?php echo $conn['remote_host']; ?>');" style="cursor:pointer;"
+							   id="<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>"
+							   title="<?php echo gettext("Kill client connection from") . " " . $conn['remote_host']; ?>" alt="delete" />
+						</td>
+					</tr>
 <?php
 		endforeach;
 ?>
-			<tfoot>
-			<tr>
-				<td colspan="2" class="list" height="12">
-				<table>
-				<tr>
-				<td><?php $ssvc = find_service_by_openvpn_vpnid($server['vpnid']); ?>
-				<?= get_service_status_icon($ssvc, true, true); ?>
-				<?= get_service_control_links($ssvc, true); ?></td>
-				</tr>
-				</table>
-				</td>
-				<td colspan="4" class="list" height="12">&nbsp;</td>
-			</tr>
-			</tfoot>
-		</table>
-		</td>
-	</tr>
-</table>
+				</tbody>
+				<tfoot>
+					<tr>
+						<td>
+							<table>
+								<tr>
+									<td>
+										<?php $ssvc = find_service_by_openvpn_vpnid($server['vpnid']); ?>
+										<?= get_service_status_icon($ssvc, true, true); ?>
+										<?= get_service_control_links($ssvc, true); ?>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</tfoot>
+			</table>
+		</div>
+</div>
 <?php
 		if (is_array($server['routes']) && count($server['routes'])):
 ?>
 <div id="shroutebut-<?= $i ?>">
-<input type="button" onClick="show_routes('tabroute-<?= $i ?>','shroutebut-<?= $i ?>')" value="<?php echo gettext("Show Routing Table"); ?>" /> - <?= gettext("Display OpenVPN's internal routing table for this server.") ?>
-<br /><br />
+	<input type="button" onClick="show_routes('tabroute-<?= $i ?>','shroutebut-<?= $i ?>')" value="<?php echo gettext("Show Routing Table"); ?>" /> - <?= gettext("Display OpenVPN's internal routing table for this server.") ?>
+		<br /><br />
 </div>
-<table style="display: none; padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" id="tabroute-<?= $i ?>" summary="routing table">
-	<tr>
-		<td colspan="6" class="listtopic">
-			<?=htmlspecialchars($server['name']);?> <?=gettext("Routing Table"); ?>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="results">
-			<tr>
-				<td class="listhdrr"><?=gettext("Common Name"); ?></td>
-				<td class="listhdrr"><?=gettext("Real Address"); ?></td>
-				<td class="listhdrr"><?=gettext("Target Network"); ?></td>
-				<td class="listhdrr"><?=gettext("Last Used"); ?></td>
-			</tr>
+<div class="panel panel-default">
+		<div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?> <?=gettext("Routing Table"); ?></h2></div>
+		<div class="panel-body table-responsive">
+			<table class="table table-striped table-hover">
+				<thead>
+					<tr>
+						<th><?=gettext("Common Name"); ?></th>
+						<th><?=gettext("Real Address"); ?></th>
+						<th><?=gettext("Target Network"); ?></th>
+						<th><?=gettext("Last Used"); ?></th>
+					</tr>
+				</thead>	
+				<tbody>
 
 <?php
 			foreach ($server['routes'] as $conn):
 ?>
-			<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
-				<td class="listlr">
-					<?=$conn['common_name'];?>
-				</td>
-				<td class="listr">
-					<?=$conn['remote_host'];?>
-				</td>
-				<td class="listr">
-					<?=$conn['virtual_addr'];?>
-				</td>
-				<td class="listr">
-					<?=$conn['last_time'];?>
-				</td>
-			</tr>
+					<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
+						<td><?=$conn['common_name'];?></td>
+						<td><?=$conn['remote_host'];?></td>
+						<td><?=$conn['virtual_addr'];?></td>
+						<td><?=$conn['last_time'];?></td>
+					</tr>
 <?php
 			endforeach;
 ?>
-			<tfoot>
-			<tr>
-				<td colspan="6" class="list" height="12"><?= gettext("An IP address followed by C indicates a host currently connected through the VPN.") ?></td>
-			</tr>
-			</tfoot>
-		</table>
-		</td>
-	</tr>
-</table>
+				</tbody>
+				<tfoot>
+					<tr>
+						<td><?= gettext("An IP address followed by C indicates a host currently connected through the VPN.") ?></td>
+					</tr>
+				</tfoot>
+			</table>
+		</div>
+</div>
 <?php
 		endif;
 ?>
@@ -280,69 +258,53 @@ include("head.inc"); ?>
 <?php
 	if (!empty($sk_servers)) {
 ?>
-<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" summary="peer to peer stats">
-	<tr>
-		<td colspan="6" class="listtopic">
-			<?=gettext("Peer to Peer Server Instance Statistics"); ?>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="results">
-			<tr>
-				<td class="listhdrr"><?=gettext("Name"); ?></td>
-				<td class="listhdrr"><?=gettext("Status"); ?></td>
-				<td class="listhdrr"><?=gettext("Connected Since"); ?></td>
-				<td class="listhdrr"><?=gettext("Virtual Addr"); ?></td>
-				<td class="listhdrr"><?=gettext("Remote Host"); ?></td>
-				<td class="listhdrr"><?=gettext("Bytes Sent"); ?></td>
-				<td class="listhdrr"><?=gettext("Bytes Rcvd"); ?></td>
-				<td class="listhdrr"><?=gettext("Service"); ?></td>
-			</tr>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Peer to Peer Server Instance Statistics"); ?></h2></div>
+		<div class="panel-body table-responsive">
+			<table class="table table-striped table-hover">
+				<thead>
+					<tr>  
+						<th><?=gettext("Name"); ?></th>
+						<th><?=gettext("Connected Since"); ?></th>
+						<th><?=gettext("Virtual Addr"); ?></th>
+						<th><?=gettext("Remote Host"); ?></th>
+						<th><?=gettext("Bytes Sent"); ?></th>
+						<th><?=gettext("Bytes Rcvd"); ?></th>
+						<th><?=gettext("Service"); ?></th>
+					</tr>
+				</thead>
+				<tbody>
 
 <?php
 		foreach ($sk_servers as $sk_server):
 ?>
-			<tr id="<?php echo "r:{$sk_server['port']}:{$sk_server['vpnid']}"; ?>">
-				<td class="listlr">
-					<?=htmlspecialchars($sk_server['name']);?>
-				</td>
-				<td class="listr">
-					<?=$sk_server['status'];?>
-				</td>
-				<td class="listr">
-					<?=$sk_server['connect_time'];?>
-				</td>
-				<td class="listr">
-					<?=$sk_server['virtual_addr'];?>
-				</td>
-				<td class="listr">
-					<?=$sk_server['remote_host'];?>
-				</td>
-				<td class="listr">
-					<?=format_bytes($sk_server['bytes_sent']);?>
-				</td>
-				<td class="listr">
-					<?=format_bytes($sk_server['bytes_recv']);?>
-				</td>
-				<td class="listr">
-				<table>
-				<tr>
-				<td><?php $ssvc = find_service_by_openvpn_vpnid($sk_server['vpnid']); ?>
-				<?= get_service_status_icon($ssvc, false, true); ?>
-									<?= get_service_control_links($ssvc, true); ?>
-								</td>
-				</tr>
-				</table>
-				</td>
-			</tr>
+					<tr id="<?php echo "r:{$sk_server['port']}:{$sk_server['vpnid']}"; ?>">
+						<td><?=htmlspecialchars($sk_server['name']);?></td>
+						<td><?=$sk_server['status'];?></td>
+						<td><?=$sk_server['connect_time'];?></td>
+						<td><?=$sk_server['virtual_addr'];?></td>
+						<td><?=$sk_server['remote_host'];?></td>
+						<td><?=format_bytes($sk_server['bytes_sent']);?></td>
+						<td><?=format_bytes($sk_server['bytes_recv']);?></td>
+						<td>
+							<table>
+								<tr>
+									<td>
+										<?php $ssvc = find_service_by_openvpn_vpnid($sk_server['vpnid']); ?>
+										<?= get_service_status_icon($ssvc, false, true); ?>
+										<?= get_service_control_links($ssvc, true); ?>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
 <?php
 		endforeach;
 ?>
+				</tbody>
 			</table>
-		</td>
-	</tr>
-</table>
+		</div>
+</div>
 
 <?php
 	}
@@ -351,84 +313,67 @@ include("head.inc"); ?>
 <?php
 	if (!empty($clients)) {
 ?>
-<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" summary="client stats">
-	<tr>
-		<td colspan="6" class="listtopic">
-			<?=gettext("Client Instance Statistics"); ?>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary="results">
-			<tr>
-				<td class="listhdrr"><?=gettext("Name"); ?></td>
-				<td class="listhdrr"><?=gettext("Status"); ?></td>
-				<td class="listhdrr"><?=gettext("Connected Since"); ?></td>
-				<td class="listhdrr"><?=gettext("Virtual Addr"); ?></td>
-				<td class="listhdrr"><?=gettext("Remote Host"); ?></td>
-				<td class="listhdrr"><?=gettext("Bytes Sent"); ?></td>
-				<td class="listhdrr"><?=gettext("Bytes Rcvd"); ?></td>
-				<td class="listhdrr"><?=gettext("Service"); ?></td>
-			</tr>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Client Instance Statistics"); ?></h2></div>
+		<div class="panel-body table-responsive">
+			<table class="table table-striped table-hover">
+				<thead>
+					<tr>  
+						<th><?=gettext("Name"); ?></th>
+						<th><?=gettext("Status"); ?></th>
+						<th><?=gettext("Connected Since"); ?></th>
+						<th><?=gettext("Virtual Addr"); ?></th>
+						<th><?=gettext("Remote Host"); ?></th>
+						<th><?=gettext("Bytes Sent"); ?></th>
+						<th><?=gettext("Bytes Rcvd"); ?></th>
+						<th><?=gettext("Service"); ?></th>
+					</tr>
+				</thead>
+				<tbody>
 
 <?php
 		foreach ($clients as $client):
 ?>
-			<tr id="<?php echo "r:{$client['port']}:{$client['vpnid']}"; ?>">
-				<td class="listlr">
-					<?=htmlspecialchars($client['name']);?>
-				</td>
-				<td class="listr">
-					<?=$client['status'];?>
-				</td>
-				<td class="listr">
-					<?=$client['connect_time'];?>
-				</td>
-				<td class="listr">
-					<?=$client['virtual_addr'];?>
-				</td>
-				<td class="listr">
-					<?=$client['remote_host'];?>
-				</td>
-				<td class="listr">
-					<?=format_bytes($client['bytes_sent']);?>
-				</td>
-				<td class="listr">
-					<?=format_bytes($client['bytes_recv']);?>
-				</td>
-				<td class="listr" height="12">
-				<table>
-				<tr>
-								<td>
-									<?php $ssvc = find_service_by_openvpn_vpnid($client['vpnid']); ?>
-				<?= get_service_status_icon($ssvc, false, true); ?>
-									<?= get_service_control_links($ssvc, true); ?>
-								</td>
-				</tr>
-				</table>
-				</td>
-			</tr>
+					<tr id="<?php echo "r:{$client['port']}:{$client['vpnid']}"; ?>">
+						<td><?=htmlspecialchars($client['name']);?></td>
+						<td><?=$client['status'];?></td>
+						<td><?=$client['connect_time'];?></td>
+						<td><?=$client['virtual_addr'];?></td>
+						<td><?=$client['remote_host'];?></td>
+						<td><?=format_bytes($client['bytes_sent']);?></td>
+						<td><?=format_bytes($client['bytes_recv']);?></td>
+						<td>
+							<table>
+								<tr>
+									<td>
+										<?php $ssvc = find_service_by_openvpn_vpnid($client['vpnid']); ?>
+										<?= get_service_status_icon($ssvc, false, true); ?>
+										<?= get_service_control_links($ssvc, true); ?>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
 <?php
 		endforeach;
 ?>
+				</tbody>
 			</table>
-		</td>
-	</tr>
-</table>
+		</div>
+</div>
 
 <?php 
 }
 
 if ($DisplayNote) {
-	echo "<br /><b>" . gettext("NOTE") . ":</b> " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page.");
+ 	print_info_box("<br /><b>" . gettext("NOTE") . ":</b> " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page."));
 }
 
 if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) {
-	echo gettext("No OpenVPN instances defined");
+	print_info_box(gettext("No OpenVPN instances defined"));
 }
 ?>
 </form>
-
 <?php include("fend.inc"); ?>
 <script type="text/javascript">
 //<![CDATA[
author	Hari <hari289@outlook.com>	2015-09-13 22:59:33 +0530
committer	Hari <hari289@outlook.com>	2015-09-13 22:59:33 +0530
commit	c64a0911d459e757976883a55e69cec017875424 (patch)
tree	b4dcf0eff3caac89394413d79e0f234f756b8958 /src/usr/local/www/status_openvpn.php
parent	2f266da1801f1c9f71c38aa8d31b4e8b18a09440 (diff)
download	pfsense-c64a0911d459e757976883a55e69cec017875424.zip pfsense-c64a0911d459e757976883a55e69cec017875424.tar.gz