Skip to content

O
OpnSense
Commit 4156a728 authored by Jos Schellevis's avatar Jos Schellevis
Browse files
Options

html updates and fixes

parent fcc15584
Show whitespace changes
Inline Side-by-side
Showing with 212 additions and 216 deletions
src/www/firewall_aliases.php
View file @ 4156a728
...@@ -179,8 +179,6 @@ $main_buttons = array( ...@@ -179,8 +179,6 @@ $main_buttons = array(
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="firewall_aliases.php" method="post" name="iform" id="iform"> <form action="firewall_aliases.php" method="post" name="iform" id="iform">
<input type="hidden" name="tab" value="<?=htmlspecialchars($tab);?>" /> <input type="hidden" name="tab" value="<?=htmlspecialchars($tab);?>" />
...@@ -190,9 +188,7 @@ $main_buttons = array( ...@@ -190,9 +188,7 @@ $main_buttons = array(
<td width="20%" class="listhdrr"><?=gettext("Name"); ?></td> <td width="20%" class="listhdrr"><?=gettext("Name"); ?></td>
<td width="43%" class="listhdrr"><?=gettext("Values"); ?></td> <td width="43%" class="listhdrr"><?=gettext("Values"); ?></td>
<td width="30%" class="listhdr"><?=gettext("Description"); ?></td> <td width="30%" class="listhdr"><?=gettext("Description"); ?></td>
<td width="7%" class="list"> <td width="7%" class="list"></td>
</td>
</tr> </tr>
<?php <?php
asort($a_aliases); asort($a_aliases);
...@@ -268,7 +264,7 @@ $main_buttons = array( ...@@ -268,7 +264,7 @@ $main_buttons = array(
</table> </table>
</div> </div>
<div class="container-fluid"> <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> </div>
</form> </form>
</div> </div>
......
src/www/firewall_nat.php
View file @ 4156a728
...@@ -163,8 +163,10 @@ $main_buttons = array( ...@@ -163,8 +163,10 @@ $main_buttons = array(
?> ?>
<body>
<script type="text/javascript" src="/themes/<?=$g['theme'];?>/assets/javascripts/jquery-sortable.js"></script> <script type="text/javascript" src="/themes/<?=$g['theme'];?>/assets/javascripts/jquery-sortable.js"></script>
<style type="text/css"> <style type="text/css">
body.dragging, body.dragging * { body.dragging, body.dragging * {
cursor: move !important; cursor: move !important;
} }
...@@ -183,12 +185,9 @@ $main_buttons = array( ...@@ -183,12 +185,9 @@ $main_buttons = array(
position: absolute; position: absolute;
/** Define arrowhead **/ /** Define arrowhead **/
} }
</style> </style>
</head>
<body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
...@@ -361,8 +360,7 @@ $main_buttons = array( ...@@ -361,8 +360,7 @@ $main_buttons = array(
<?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> </tbody>
......
src/www/firewall_shaper_layer7.php
View file @ 4156a728
...@@ -209,10 +209,13 @@ if (is_array($layer7_rules_list)) { ...@@ -209,10 +209,13 @@ if (is_array($layer7_rules_list)) {
$tree .= "</ul>"; $tree .= "</ul>";
$output = "<table summary=\"output form\">"; $output = "<table summary=\"output form\">";
$output .= $output_form; $output .= $output_form."</table>";
$closehead = false; $closehead = false;
include("head.inc"); include("head.inc");
?> ?>
<body>
<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <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" src="./tree/tree.js"></script>
...@@ -374,9 +377,6 @@ function removeRow(tbl,row) { ...@@ -374,9 +377,6 @@ function removeRow(tbl,row) {
} }
//]]> //]]>
</script> </script>
</head>
<body>
<? <?
...@@ -418,13 +418,13 @@ include("fbegin.inc"); ...@@ -418,13 +418,13 @@ include("fbegin.inc");
<form action="firewall_shaper_layer7.php" method="post" name="iform" id="iform"> <form action="firewall_shaper_layer7.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<?php if (count($layer7_rules_list) > 0): ?> <?php if (count($layer7_rules_list) > 0): ?>
<tr class="tabcont"><td width="25%" align="left"> <tr class="tabcont">
</td><td width="75%"> </td></tr> <td width="25%" align="left"></td><td width="75%"> </td>
</tr>
<?php endif; ?> <?php endif; ?>
<tr> <tr>
...@@ -439,10 +439,12 @@ include("fbegin.inc"); ...@@ -439,10 +439,12 @@ include("fbegin.inc");
<?php <?php
echo $output; echo $output;
?> ?>
</td>
</tr>
<!-- Layer 7 rules form --> <!-- Layer 7 rules form -->
<?php if($show_proto_form): ?> <?php if($show_proto_form): ?>
<tr><td width="22%" valign="top" class="vncellreq"> <tr>
<td width="22%" valign="top" class="vncellreq">
<div id="addressnetworkport"> <div id="addressnetworkport">
<?=gettext("Rule(s)"); ?> <?=gettext("Rule(s)"); ?>
</div> </div>
...@@ -482,6 +484,7 @@ include("fbegin.inc"); ...@@ -482,6 +484,7 @@ include("fbegin.inc");
<?=gettext("Behaviour"); ?> <?=gettext("Behaviour"); ?>
</div> </div>
</td> </td>
<td></td>
</tr> </tr>
<!-- PHP Code to generate the existing rules --> <!-- PHP Code to generate the existing rules -->
<?php <?php
...@@ -551,26 +554,24 @@ include("fbegin.inc"); ...@@ -551,26 +554,24 @@ include("fbegin.inc");
?> ?>
</tbody> </tbody>
</table> </table>
<a onclick="javascript:addRow('maintable'); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a><br/><br/> <a onclick="javascript:addRow('maintable'); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a><br/><br/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top"> <td width="22%" valign="top">&nbsp;</td>
&nbsp;
</td>
<td width="78%"> <td width="78%">
<input id="submit" name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" /> <input id="submit" name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
<a href="firewall_shaper_layer7.php"> <a href="firewall_shaper_layer7.php">
<input id="cancelbutton" name="cancelbutton" type="button" class="btn btn-default" value="<?=gettext("Cancel"); ?>" /> <input id="cancelbutton" name="cancelbutton" type="button" class="btn btn-default" value="<?=gettext("Cancel"); ?>" />
</a>
<?php if($container): ?> <?php if($container): ?>
<input id="delete" type="submit" class="formbtn" name="delete" value="<?=gettext("Delete"); ?>" /> <a href="firewall_shaper_layer7.php">
<?php endif ?> <input id="delete" onclick="return confirm('Are you sure you want to delete?')" type="submit" class="btn btn-default formbtn" name="delete" value="<?=gettext("Delete"); ?>" />
</a> </a>
<?php endif ?>
</td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
...@@ -582,7 +583,7 @@ include("fbegin.inc"); ...@@ -582,7 +583,7 @@ include("fbegin.inc");
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
src/www/firewall_shaper_queues.php
View file @ 4156a728
...@@ -162,11 +162,12 @@ $shortcut_section = "trafficshaper"; ...@@ -162,11 +162,12 @@ $shortcut_section = "trafficshaper";
$closehead = false; $closehead = false;
include("head.inc"); include("head.inc");
?> ?>
<body>
<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <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" src="./tree/tree.js"></script>
</head>
<body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
......
src/www/firewall_shaper_vinterface.php
View file @ 4156a728
...@@ -337,6 +337,9 @@ $output .= $output_form; ...@@ -337,6 +337,9 @@ $output .= $output_form;
$closehead = false; $closehead = false;
include("head.inc"); include("head.inc");
?> ?>
<body>
<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <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" src="./tree/tree.js"></script>
<script type="text/javascript"> <script type="text/javascript">
...@@ -351,9 +354,6 @@ function show_source_port_range() { ...@@ -351,9 +354,6 @@ function show_source_port_range() {
} }
//]]> //]]>
</script> </script>
</head>
<body>
<?php <?php
if ($queue) if ($queue)
......
src/www/services_dhcp.php
View file @ 4156a728
...@@ -720,10 +720,15 @@ include("head.inc"); ...@@ -720,10 +720,15 @@ include("head.inc");
$tabscounter++; $tabscounter++;
} }
if ($tabscounter == 0) { 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; exit;
} }
display_top_tabs($tab_array); display_top_tabs($tab_array);
...@@ -1152,7 +1157,6 @@ include("head.inc"); ...@@ -1152,7 +1157,6 @@ include("head.inc");
</tbody> </tbody>
</table> </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 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"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
field_counter_js = 3; field_counter_js = 3;
......
src/www/services_dhcp_relay.php
View file @ 4156a728
...@@ -93,6 +93,8 @@ include("head.inc"); ...@@ -93,6 +93,8 @@ include("head.inc");
?> ?>
<body>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function enable_change(enable_over) { function enable_change(enable_over) {
...@@ -108,10 +110,7 @@ function enable_change(enable_over) { ...@@ -108,10 +110,7 @@ function enable_change(enable_over) {
} }
//]]> //]]>
</script> </script>
</head>
<body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
......
src/www/system_hasync.php
View file @ 4156a728
...@@ -106,7 +106,7 @@ include("head.inc"); ...@@ -106,7 +106,7 @@ include("head.inc");
<form action="system_hasync.php" method="post" name="iform" id="iform"> <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> <thead>
<tr> <tr>
<th colspan="2" class="listtopic">State Synchronization Settings (pfsync)</th> <th colspan="2" class="listtopic">State Synchronization Settings (pfsync)</th>
...@@ -152,7 +152,7 @@ include("head.inc"); ...@@ -152,7 +152,7 @@ include("head.inc");
</tbody> </tbody>
</table> </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> <thead>
<tr> <tr>
<th colspan="2" class="listtopic">Configuration Synchronization Settings (XMLRPC Sync)</th> <th colspan="2" class="listtopic">Configuration Synchronization Settings (XMLRPC Sync)</th>
...@@ -343,9 +343,6 @@ include("head.inc"); ...@@ -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. When this option is enabled, this system will automatically sync the Captive Portal configuration to the other HA host when changes are made.
</td> </td>
</tr> </tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr> <tr>
<td width="22%" valign="top">&nbsp;</td> <td width="22%" valign="top">&nbsp;</td>
<td width="78%"> <td width="78%">
......
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