html updates and fixes

4156a728 · Jos Schellevis · fcc15584 · 4156a728 · 4156a728 · 4156a728
Commit 4156a728 authored Jan 02, 2015 by Jos Schellevis
8 changed files
--- a/src/www/firewall_aliases.php
+++ b/src/www/firewall_aliases.php
@@ -179,10 +179,8 @@ $main_buttons = array(
 						<div class="tab-content content-box col-xs-12">
+	                        <form action="firewall_aliases.php" method="post" name="iform" id="iform">
+								<input type="hidden" name="tab" value="<?=htmlspecialchars($tab);?>" />
-		                        <form action="firewall_aliases.php" method="post" name="iform" id="iform">
-						<input type="hidden" name="tab" value="<?=htmlspecialchars($tab);?>" />
 		                        <div class="table-responsive">
 			                        <table class="table table-striped table-sort">
@@ -190,9 +188,7 @@ $main_buttons = array(
 											<td width="20%" class="listhdrr"><?=gettext("Name"); ?></td>
 											<td width="43%" class="listhdrr"><?=gettext("Values"); ?></td>
 											<td width="30%" class="listhdr"><?=gettext("Description"); ?></td>
-											<td width="7%" class="list">
+											<td width="7%" class="list"></td>
-											</td>
 										</tr>
 										<?php
 										asort($a_aliases);
@@ -268,9 +264,9 @@ $main_buttons = array(
 									</table>
 								</div>
 								<div class="container-fluid">
-								    <p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span></span></p><div style="overflow:hidden; text-align:justify;"><p><span class="vexpl"><?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?></span></p>
+								    <p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span></span></p><div style="overflow:hidden; text-align:justify;"><p><span class="vexpl"><?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?></span></p></div>
 							    </div>
-		                        </form>
+	                        </form>
 						</div>
 			    </section>
 			</div>

--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -163,31 +163,30 @@ $main_buttons = array(
 ?>
-<script type="text/javascript" src="/themes/<?=$g['theme'];?>/assets/javascripts/jquery-sortable.js"></script>
+<body>
-	<style type="text/css">
-		body.dragging, body.dragging * {
-		  cursor: move !important;
-		}
-		.dragged {
+<script type="text/javascript" src="/themes/<?=$g['theme'];?>/assets/javascripts/jquery-sortable.js"></script>
-		  position: absolute;
+<style type="text/css">
-		  opacity: 0.5;
+	body.dragging, body.dragging * {
-		  z-index: 2000;
+	  cursor: move !important;
-		}
+	}
-		ol.example li.placeholder {
+	.dragged {
-		  position: relative;
+	  position: absolute;
-		  /** More li styles **/
+	  opacity: 0.5;
-		}
+	  z-index: 2000;
-		ol.example li.placeholder:before {
+	}
-		  position: absolute;
-		  /** Define arrowhead **/
-		}
-	</style>
-</head>
+	ol.example li.placeholder {
+	  position: relative;
+	  /** More li styles **/
+	}
+	ol.example li.placeholder:before {
+	  position: absolute;
+	  /** Define arrowhead **/
+	}
+</style>
-<body>
 <?php include("fbegin.inc"); ?>
@@ -345,26 +344,25 @@ $main_buttons = array(
 																<a href="firewall_nat_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
 									                      </tr>
-										     <?php $i++; $nnats++; endforeach; ?>
+												<?php $i++; $nnats++; endforeach; ?>
-									                <tr>
+								                <tr>
 									                  <td class="list" colspan="8"></td>
 									                  <td>&nbsp;</td>
 									                  <td>&nbsp;</td>
 									                  <td>&nbsp;</td>
 									                  <td class="list nowrap" valign="middle">
-												<?php if ($nnats == 0): ?><span class="btn btn-default btn-xs text-muted"><span class="glyphicon glyphicon-arrow-left"></span></span><?php else: ?><button name="move_<?=$i;?>_x" value="<?=$i;?>" type="submit" title="<?=gettext("move selected rules to end");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-arrow-left"></span></button><?php endif; ?>
+														<?php if ($nnats == 0): ?><span class="btn btn-default btn-xs text-muted"><span class="glyphicon glyphicon-arrow-left"></span></span><?php else: ?><button name="move_<?=$i;?>_x" value="<?=$i;?>" type="submit" title="<?=gettext("move selected rules to end");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-arrow-left"></span></button><?php endif; ?>
-												<?php if (count($a_nat) == 0): ?>
+														<?php if (count($a_nat) == 0): ?>
-													<span class="btn btn-default btn-xs text-muted"  title="<?=gettext("delete selected rules");?>"><span class="glyphicon glyphicon-remove" ></span></span>
+															<span class="btn btn-default btn-xs text-muted"  title="<?=gettext("delete selected rules");?>"><span class="glyphicon glyphicon-remove" ></span></span>
-												<?php else: ?>
+														<?php else: ?>
-													<button name="del_<?=$i;?>_x" type="submit" title="<?=gettext("delete selected rules"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected rules?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></button>
+															<button name="del_<?=$i;?>_x" type="submit" title="<?=gettext("delete selected rules"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected rules?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></button>
-												<?php endif; ?>
+														<?php endif; ?>
-												 <a href="firewall_nat_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
+														 <a href="firewall_nat_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
+													</td>
-											  </td>
+												</tr>
-											</tr>
 											</tbody>
 											<tfoot>
 											<tr><td colspan="12">&nbsp;</td></tr>

--- a/src/www/firewall_shaper_layer7.php
+++ b/src/www/firewall_shaper_layer7.php
--- a/src/www/firewall_shaper_queues.php
+++ b/src/www/firewall_shaper_queues.php
@@ -162,11 +162,12 @@ $shortcut_section = "trafficshaper";
 $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>
 <?php include("fbegin.inc"); ?>

--- a/src/www/firewall_shaper_vinterface.php
+++ b/src/www/firewall_shaper_vinterface.php
@@ -337,6 +337,9 @@ $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>
 <script type="text/javascript">
@@ -351,9 +354,6 @@ function show_source_port_range() {
 }
 //]]>
 </script>
-</head>
-<body>
 <?php
 if ($queue)

--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -720,10 +720,15 @@ include("head.inc");
 							$tabscounter++;
 						}
 						if ($tabscounter == 0) {
-							echo "</td></tr></table></form>";
+							//echo "</td></tr></table></form>";
-							include("fend.inc");
+							//include("fend.inc");
-							echo "</body>";
+							//echo "</body>";
-							echo "</html>";
+							//echo "</html>";
+							echo "</section>";
+							echo "</div>";
+							echo "</div>";
+							echo "</section>";
+							include("foot.inc");
 							exit;
 						}
 						display_top_tabs($tab_array);
@@ -1152,7 +1157,6 @@ include("head.inc");
 											</tbody>
 											</table>
 											<a onclick="javascript:addRowTo('maintable', 'form-controlalias'); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
-											</a>
 											<script type="text/javascript">
 											//<![CDATA[
 												field_counter_js = 3;

--- a/src/www/services_dhcp_relay.php
+++ b/src/www/services_dhcp_relay.php
@@ -93,6 +93,8 @@ include("head.inc");
 ?>
+<body>
 <script type="text/javascript">
 //<![CDATA[
 function enable_change(enable_over) {
@@ -108,10 +110,7 @@ function enable_change(enable_over) {
 }
 //]]>
 </script>
-</head>
-<body>
 <?php include("fbegin.inc"); ?>
 	<section class="page-content-main">

--- a/src/www/system_hasync.php
+++ b/src/www/system_hasync.php
@@ -106,7 +106,7 @@ include("head.inc");
                        <form action="system_hasync.php" method="post" name="iform" id="iform">
-				<table class="table table-primary" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
+				<table class="table table-primary table-striped" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 				<thead>
 					<tr>
 						<th colspan="2" class="listtopic">State Synchronization Settings (pfsync)</th>
@@ -152,7 +152,7 @@ include("head.inc");
 				</tbody>
 				</table>
-				<table class="table table-primary" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
+				<table class="table table-primary table-striped" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 				<thead>
 					<tr>
 						<th colspan="2" class="listtopic">Configuration Synchronization Settings (XMLRPC Sync)</th>
@@ -343,9 +343,6 @@ include("head.inc");
 							When this option is enabled, this system will automatically sync the Captive Portal configuration to the other HA host when changes are made.
 						</td>
 					</tr>
-					<tr>
-						<td>&nbsp;</td>
-					</tr>
 					<tr>
 						<td width="22%" valign="top">&nbsp;</td>
 						<td width="78%">