Merge branch 'master' of ssh://github.com/opnsense/core

src/www/services_dhcpv6.php

@@ -444,7 +444,23 @@ include("head.inc");
 //]]>
 </script>
 
-<?php
+
+<?php include("fbegin.inc"); ?>
+
+	<section class="page-content-main">
+
+		<div class="container-fluid">
+
+			<div class="row">
+
+				<?php if ($input_errors) print_input_errors($input_errors); ?>
+				<?php if ($savemsg) print_info_box($savemsg); ?>
+				<?php if (is_subsystem_dirty('staticmaps')): ?><p>
+				<?php print_info_box_np(gettext("The static mapping 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
 						/* active tabs */
 						$tab_array = array();
 						$tabscounter = 0;
@@ -477,25 +493,27 @@ include("head.inc");
 								}
 							}
 						}
-?>
-
-<?php include("fbegin.inc"); ?>
-
-	<section class="page-content-main">
-
-		<div class="container-fluid">
-
-			<div class="row">
-
-				<?php if ($input_errors) print_input_errors($input_errors); ?>
-				<?php if ($savemsg) print_info_box($savemsg); ?>
-				<?php if (is_subsystem_dirty('staticmaps')): ?><p>
-				<?php print_info_box_np(gettext("The static mapping 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">
+						if ($tabscounter == 0) {
+							//echo "</td></tr></table></form>";
+							//include("fend.inc");
+							//echo "</body>";
+							//echo "</html>";
+							echo "</section>";
+							echo "</div>";
+							echo "</div>";
+							echo "</section>";
+							include("foot.inc");
+							exit;
+						}
+						display_top_tabs($tab_array);
+					?>
 
-				<? if ($tabscount > 0) display_top_tabs($tab_array); ?>
+				    <?php
+							$tab_array = array();
+							$tab_array[] = array(gettext("DHCPv6 Server"),         true,  "services_dhcpv6.php?if={$if}");
+							$tab_array[] = array(gettext("Router Advertisements"), false, "services_router_advertisements.php?if={$if}");
+							display_top_tabs($tab_array);
+					?>
 
 				<div class="tab-content content-box col-xs-12">
 
@@ -503,25 +521,14 @@ include("head.inc");
 
 							<?php if ($dhcrelay_enabled): ?>
 								<p>DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.</p>
-							<? elseif ($tabscounter == 0): ?>
-
 							<? else: ?>
 
-
-					    <div class="content-box-main col-xs-12">
-
-						    <?php
-									$tab_array = array();
-									$tab_array[] = array(gettext("DHCPv6 Server"),         true,  "services_dhcpv6.php?if={$if}");
-									$tab_array[] = array(gettext("Router Advertisements"), false, "services_router_advertisements.php?if={$if}");
-								?>
-						    <ul class="nav nav-pills" role="tablist"><? foreach ($tab_array as $tab): ?>
+						    <!--<ul class="nav nav-pills" role="tablist"><? foreach ($tab_array as $tab): ?>
 									<li role="presentation" <? if ($tab[1]):?>class="active"<? endif; ?>><a href="<?=$tab[2];?>"><?=$tab[0];?></a></li>
-								<? endforeach; ?></ul><br />
+								<? endforeach; ?></ul><br />-->
 
 						    <div class="table-responsive">
 									<table class="table table-striped table-sort">
-
 										<tr>
 											<td width="22%" valign="top" class="vncellreq"><?=gettext("DHCPv6 Server");?></td>
 											<td width="78%" class="vtable">
@@ -652,7 +659,7 @@ include("head.inc");
 											<tr>
 												<td width="22%" valign="top" class="vncell"><?=gettext("Time format change"); ?></td>
 												<td width="78%" class="vtable">
-												<table summary="time format change">
+												<table class="table table-striped" summary="time format change">
 													<tr>
 													<td>
 														<input name="dhcpv6leaseinlocaltime" type="checkbox" id="dhcpv6leaseinlocaltime" value="yes" <?php if ($pconfig['dhcpv6leaseinlocaltime']) echo "checked=\"checked\""; ?> />
@@ -678,7 +685,7 @@ include("head.inc");
 											<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td>
 											<td width="78%" class="vtable">
 												<div id="showddnsbox">
-													<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?>
+													<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" class="btn btn-xs btn-default"/> - <?=gettext("Show Dynamic DNS");?>
 												</div>
 												<div id="showddns" style="display:none">
 													<input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked=\"checked\""; ?> />&nbsp;
@@ -701,7 +708,7 @@ include("head.inc");
 											<td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td>
 											<td width="78%" class="vtable">
 												<div id="showntpbox">
-													<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?>
+													<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" class="btn btn-xs btn-default"/> - <?=gettext("Show NTP configuration");?>
 												</div>
 												<div id="showntp" style="display:none">
 													<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="28" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br />
@@ -727,7 +734,7 @@ include("head.inc");
 											<td width="22%" valign="top" class="vncell"><?=gettext("LDAP URI");?></td>
 											<td width="78%" class="vtable">
 												<div id="showldapbox">
-													<input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show LDAP configuration");?>
+													<input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>" class="btn btn-xs btn-default"/> - <?=gettext("Show LDAP configuration");?>
 												</div>
 												<div id="showldap" style="display:none">
 													<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>" /><br />
@@ -739,7 +746,7 @@ include("head.inc");
 											<td width="22%" valign="top" class="vncell"><?=gettext("Enable network booting");?></td>
 											<td width="78%" class="vtable">
 												<div id="shownetbootbox">
-													<input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Network booting");?>
+													<input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" class="btn btn-xs btn-default"/> - <?=gettext("Show Network booting");?>
 												</div>
 												<div id="shownetboot" style="display:none">
 													<input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo " checked=\"checked\""; ?> />&nbsp;
@@ -754,10 +761,10 @@ include("head.inc");
 											<td width="22%" valign="top" class="vncell"><?=gettext("Additional BOOTP/DHCP Options");?></td>
 											<td width="78%" class="vtable">
 												<div id="shownumbervaluebox">
-													<input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Additional BOOTP/DHCP Options");?>
+													<input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" class="btn btn-xs btn-default"/> - <?=gettext("Show Additional BOOTP/DHCP Options");?>
 												</div>
 												<div id="shownumbervalue" style="display:none">
-												<table id="maintable" summary="bootp-dhcp options">
+												<table class="table table-striped" id="maintable" summary="bootp-dhcp options">
 												<tbody>
 												<tr>
 												<td colspan="3">
@@ -787,15 +794,15 @@ include("head.inc");
 													<input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="formfld" id="value<?php echo $counter; ?>" size="55" value="<?=htmlspecialchars($value);?>" />
 												</td>
 												<td>
-													<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" />
+													<butto onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" ><span class="glyphicon glyphicon-remove"></span></button>
 												</td>
 												</tr>
 												<?php $counter++; ?>
 												<?php endforeach; ?>
 												</tbody>
 												</table>
-												<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
-													<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+												<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#" alt="" title="<?=gettext("add another entry");?>">
+													<span class="glyphicon glyphicon-plus" ></span>
 												</a>
 												<script type="text/javascript">
 												//<![CDATA[
@@ -813,7 +820,7 @@ include("head.inc");
 											<td width="22%" valign="top">&nbsp;</td>
 											<td width="78%">
 												<input name="if" type="hidden" value="<?=$if;?>" />
-												<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
+												<input name="Submit" type="submit" class="formbtn btn btn-primary" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
 											</td>
 											</tr>
 											<tr>
@@ -832,7 +839,7 @@ include("head.inc");
 										</table>
 						    </div>
 						    <div class="table-responsive">
-							    <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="static mappings">
+							    <table class="tabcont table table-striped" width="100%" border="0" cellpadding="0" cellspacing="0" summary="static mappings">
 										<tr>
 											<td colspan="4" valign="top" class="listtopic"><?=gettext("DHCPv6 Static Mappings for this interface.");?></td>
 											<td>&nbsp;</td>
@@ -846,7 +853,7 @@ include("head.inc");
 											<table border="0" cellspacing="0" cellpadding="1" summary="add">
 											<tr>
 											<td valign="middle" width="17"></td>
-											<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+											<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>" alt="add"><span class="glyphicon glyphicon-plus" ></span></a></td>
 											</tr>
 											</table>
 											</td>
@@ -870,8 +877,8 @@ include("head.inc");
 										<td valign="middle" class="list nowrap">
 											<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 											<tr>
-											<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-											<td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&amp;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" alt="delete" /></a></td>
+											<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>" alt="edit"><span class="glyphicon glyphicon-pencil"></span></a></td>
+											<td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')" alt="delete"><span class="glyphicon glyphicon-remove"></span></a></td>
 											</tr>
 											</table>
 										</td>
@@ -885,14 +892,13 @@ include("head.inc");
 											<table border="0" cellspacing="0" cellpadding="1" summary="add">
 											<tr>
 											<td valign="middle" width="17"></td>
-											<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+											<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>" alt="add"><span class="glyphicon glyphicon-plus" ></span></a></td>
 											</tr>
 											</table>
 										</td>
 										</tr>
 										</table>
 									</div>
-					    </div>
 					    <? endif; ?>
                         </form>
 				</div>

src/www/services_dhcpv6_edit.php

@@ -246,8 +246,8 @@ include("head.inc");
 					                <tr>
 					                  <td width="22%" valign="top">&nbsp;</td>
 					                  <td width="78%">
-					                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-					                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+					                    <input name="Submit" type="submit" class="formbtn btn btn-primary" value="<?=gettext("Save");?>" />
+					                    <input type="button" class="formbtn btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
 					                    <?php if (isset($id) && $a_maps[$id]): ?>
 					                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
 					                    <?php endif; ?>

src/www/services_router_advertisements.php

@@ -175,7 +175,7 @@ include("head.inc");
 
 ?>
 
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<body>
 <?php include("fbegin.inc"); ?>
 
 <script type="text/javascript" src="/javascript/row_helper.js">
@@ -202,12 +202,16 @@ include("head.inc");
 //]]>
 </script>
 
-<form action="services_router_advertisements.php" method="post" name="iform" id="iform">
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="router advert">
-<tr><td>
-<?php
+	<section class="page-content-main">
+		<div class="container-fluid">
+			<div class="row">
+
+				<?php if ($input_errors) print_input_errors($input_errors); ?>
+				<?php if ($savemsg) print_info_box($savemsg); ?>
+			    
+			    <section class="col-xs-12">
+
+					<?php
 						/* active tabs */
 						$tab_array = array();
 						$tabscounter = 0;
@@ -232,20 +236,17 @@ include("head.inc");
 							exit;
 						}
 						display_top_tabs($tab_array);
-?>
-</td></tr>
-<tr><td class="tabnavtbl">
-<?php
-$tab_array = array();
-$tab_array[] = array(gettext("DHCPv6 Server"),         false, "services_dhcpv6.php?if={$if}");
-$tab_array[] = array(gettext("Router Advertisements"), true,  "services_router_advertisements.php?if={$if}");
-display_top_tabs($tab_array);
-?>
-</td></tr>
-<tr>
-<td>
-	<div id="mainarea">
-		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
+					?>
+					<?php
+					$tab_array = array();
+					$tab_array[] = array(gettext("DHCPv6 Server"),         false, "services_dhcpv6.php?if={$if}");
+					$tab_array[] = array(gettext("Router Advertisements"), true,  "services_router_advertisements.php?if={$if}");
+					display_top_tabs($tab_array);
+					?>
+					<div class="tab-content content-box col-xs-12">
+						<form action="services_router_advertisements.php" method="post" name="iform" id="iform">
+							<div class="table-responsive">
+								<table class="table table-striped" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 									<tr>
 									<td width="22%" valign="top" class="vncellreq"><?=gettext("Router Advertisements");?></td>
 									<td width="78%" class="vtable">
@@ -300,13 +301,13 @@ display_top_tabs($tab_array);
 										<div><?= htmlentities($subnets_help) ?></div>
 										<table id="maintable" summary="subnets">
 										<tbody>
-<?php
+						<?php
 										$counter = 0;
 										foreach ($pconfig['subnets'] as $subnet) {
 											$address_name = "subnet_address" . $counter;
 											$bits_name = "subnet_bits" . $counter;
 											list($address, $subnet) = explode("/", $subnet);
-?>
+						?>
 											<tr>
 												<td>
 													<input autocomplete="off" name="<?= $address_name ?>" type="text" class="formfldalias" id="<?= $address_name ?>" size="30" value="<?= htmlentities($address) ?>" />
@@ -320,13 +321,13 @@ display_top_tabs($tab_array);
 													</select>
 												</td>
 												<td>
-							<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="" title="<?=gettext("remove this entry"); ?>" /></a>
+													<a onclick="removeRow(this); return false;" href="#" alt="" title="<?=gettext("remove this entry"); ?>"><span class="glyphicon glyphicon-remove"></span></a>
 												</td>
 											</tr>
-<?php
+						<?php
 											$counter += 1;
 										}
-?>
+						?>
 										<tr style="display:none"><td></td></tr>
 										</tbody>
 										</table>
@@ -337,8 +338,8 @@ display_top_tabs($tab_array);
 										//]]>
 										</script>
 										<div id="addrowbutton">
-					<a onclick="javascript:addRowTo('maintable'); add_alias_control(); return false;" href="#"><!--
-					--><img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry"); ?>" /></a>
+											<a onclick="javascript:addRowTo('maintable'); add_alias_control(); return false;" href="#" alt="" title="<?=gettext("add another entry"); ?>" ><!--
+											--><span class="glyphicon glyphicon-plus"></span></a>
 										</div>
 									</td>
 									</tr>
@@ -380,15 +381,18 @@ display_top_tabs($tab_array);
 									<td width="22%" valign="top">&nbsp;</td>
 									<td width="78%">
 										<input name="if" type="hidden" value="<?=$if;?>" />
-				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
+										<input name="Submit" type="submit" class="formbtn btn btn-primary" value="<?=gettext("Save");?>" />
 									</td>
 									</tr>
 								</table>
 							</div>
-</td>
-</tr>
-</table>
-</form>
+						</form>
+					</div>
+				</section>
+			</div>
+		</div>
+	</section>
+
 
 <script type="text/javascript">
 //<![CDATA[