Skip to content

O
OpnSense
Commit a939026c authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

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

parents 5ba49ee3 4d643d5a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 268 additions and 258 deletions
src/www/services_dhcpv6.php
View file @ a939026c
This diff is collapsed.
src/www/services_dhcpv6_edit.php
View file @ a939026c
......@@ -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
View file @ a939026c
......@@ -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[
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023