Skip to content

O
OpnSense
Commit aac98668 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

src: second part of restyle done 

(cherry picked from commit 9989097d)
parent eed12b6e
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 124 deletions
src/www/diag_authentication.php
View file @ aac98668
...@@ -86,55 +86,48 @@ include("head.inc"); ...@@ -86,55 +86,48 @@ include("head.inc");
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<form id="iform" name="iform" method="post">
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if (isset($savemsg)) print_info_box($savemsg);?> <?php if (isset($savemsg)) print_info_box($savemsg);?>
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors);?> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors);?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box tab-content">
<header class="content-box-head container-fluid"> <form id="iform" name="iform" method="post">
<h3><?= gettext('Test a server') ?></h3> <table class="table table-striped __nomb">
</header> <tbody>
<div class="content-box-main"> <tr>
<div class="table-responsive"> <td width="22%"><?=gettext("Authentication Server"); ?></td>
<table class="table table-striped __nomb"> <td width="78%">
<tbody> <select name="authmode" id="authmode" class="form-control" >
<tr>
<td><?=gettext("Authentication Server"); ?></td>
<td>
<select name="authmode" id="authmode" class="form-control" >
<?php <?php
foreach (auth_get_authserver_list() as $auth_server_id => $auth_server):?> foreach (auth_get_authserver_list() as $auth_server_id => $auth_server):?>
<option value="<?=$auth_server_id;?>" <?=$auth_server['name'] == $pconfig['authmode'] ? "selected=\"selected\"" : "";?>> <option value="<?=$auth_server_id;?>" <?=$auth_server['name'] == $pconfig['authmode'] ? "selected=\"selected\"" : "";?>>
<?=htmlspecialchars($auth_server['name']);?> <?=htmlspecialchars($auth_server['name']);?>
</option> </option>
<?php <?php
endforeach; ?> endforeach; ?>
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><?=gettext("Username"); ?></td> <td width="22%"><?=gettext("Username"); ?></td>
<td><input type="text" name="username" value="<?=htmlspecialchars($pconfig['username']);?>"></td> <td width="78%"><input type="text" name="username" value="<?=htmlspecialchars($pconfig['username']);?>"></td>
</tr> </tr>
<tr> <tr>
<td><?=gettext("Password"); ?></td> <td width="22%"><?=gettext("Password"); ?></td>
<td><input type="password" name="password" value="<?=htmlspecialchars($pconfig['password']);?>"></td> <td width="78%"><input type="password" name="password" value="<?=htmlspecialchars($pconfig['password']);?>"></td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td width="22%">&nbsp;</td>
<td><input id="save" name="save" type="submit" class="btn btn-primary" value="<?=gettext("Test");?>" /></td> <td width="78%"><input id="save" name="save" type="submit" class="btn btn-primary" value="<?=gettext("Test");?>" /></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </form>
</div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
</form>
<?php include('foot.inc');?> <?php include('foot.inc');?>
src/www/firewall_virtual_ip.php
View file @ aac98668
...@@ -357,7 +357,9 @@ $main_buttons = array( ...@@ -357,7 +357,9 @@ $main_buttons = array(
?> ?>
<?php ?> <?php ?>
<tr> <tr>
<td colspan="5"></td> <td colspan="5">
<?=sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %shere%s.'),'<a href="carp_status.php">','</a>')?></span>
</td>
<td> <td>
<a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected virtual IPs to end");?>" class="act_move btn btn-default btn-xs"> <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected virtual IPs to end");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
...@@ -370,11 +372,6 @@ $main_buttons = array( ...@@ -370,11 +372,6 @@ $main_buttons = array(
</a> </a>
</td> </td>
</tr> </tr>
<tr>
<td colspan="6">
<?=sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %shere%s.'),'<a href="carp_status.php">','</a>')?></span>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</form> </form>
......
src/www/interfaces_assign.php
View file @ aac98668
...@@ -448,12 +448,9 @@ include("head.inc"); ...@@ -448,12 +448,9 @@ include("head.inc");
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="2">
<?= gettext('Interfaces that are configured as members of a LAGG interface will not be shown.') ?> <?= gettext('Interfaces that are configured as members of a LAGG interface will not be shown.') ?>
</td> </td>
</tr>
<tr>
<td colspan="2"></td>
<td> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" /> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
</td> </td>
......
src/www/services_dhcp_relay.php
View file @ aac98668
...@@ -110,10 +110,10 @@ include("head.inc"); ...@@ -110,10 +110,10 @@ include("head.inc");
<div class="content-box"> <div class="content-box">
<form method="post" name="iform" id="iform"> <form method="post" name="iform" id="iform">
<?php <?php
if ($dhcpd_enabled): ?> if ($dhcpd_enabled) {
<p><?= gettext('DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.') ?></p> print_content_box(gettext('DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.'));
<?php } else {
else: ?> ?>
<div> <div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
...@@ -178,7 +178,7 @@ include("head.inc"); ...@@ -178,7 +178,7 @@ include("head.inc");
</table> </table>
</div> </div>
</div> </div>
<?php endif; ?> <?php } ?>
</form> </form>
</div> </div>
</section> </section>
......
src/www/system_advanced_admin.php
View file @ aac98668
...@@ -563,9 +563,6 @@ include("head.inc"); ...@@ -563,9 +563,6 @@ include("head.inc");
</div> </div>
</td> </td>
</tr> </tr>
<tr>
<td colspan="2" class="list" height="12">&nbsp;</td>
</tr>
<tr> <tr>
<td width="22%" valign="top">&nbsp;</td> <td width="22%" valign="top">&nbsp;</td>
<td width="78%"><input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" /></td> <td width="78%"><input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" /></td>
......
src/www/system_authservers.php
View file @ aac98668
...@@ -680,15 +680,6 @@ else : ...@@ -680,15 +680,6 @@ else :
<th width="10%" class="list"></th> <th width="10%" class="list"></th>
</tr> </tr>
</thead> </thead>
<tfoot>
<tr>
<td colspan="4">
<p>
<?=gettext("Additional authentication servers can be added here.");?>
</p>
</td>
</tr>
</tfoot>
<tbody> <tbody>
<?php <?php
$i = 0; $i = 0;
...@@ -715,6 +706,11 @@ endif; ?> ...@@ -715,6 +706,11 @@ endif; ?>
<?php <?php
$i++; $i++;
endforeach;?> endforeach;?>
<tr>
<td colspan="4">
<?=gettext("Additional authentication servers can be added here.");?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</form> </form>
......
src/www/system_certmanager.php
View file @ aac98668
...@@ -1309,8 +1309,7 @@ $( document ).ready(function() { ...@@ -1309,8 +1309,7 @@ $( document ).ready(function() {
endforeach; ?> endforeach; ?>
<tr> <tr>
<td>&nbsp;</td> <td colspan="4"><?=gettext("Note: You can only delete a certificate if it is not currently in use.");?></td>
<td colspan="3"><?=gettext("Note: You can only delete a certificate if it is not currently in use.");?></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/www/system_crlmanager.php
View file @ aac98668
...@@ -613,15 +613,6 @@ include("head.inc"); ...@@ -613,15 +613,6 @@ include("head.inc");
<td></td> <td></td>
</tr> </tr>
</thead> </thead>
<tfoot>
<tr>
<td colspan="5">
<p>
<?=gettext("Additional Certificate Revocation Lists can be added here.");?>
</p>
</td>
</tr>
</tfoot>
<tbody> <tbody>
<?php <?php
// Map CRLs to CAs // Map CRLs to CAs
...@@ -687,9 +678,13 @@ include("head.inc"); ...@@ -687,9 +678,13 @@ include("head.inc");
<?php <?php
endforeach; endforeach;
endif; ?> endif; ?>
<tr><td colspan="5">&nbsp;</td></tr>
<?php <?php
endforeach; ?> endforeach; ?>
<tr>
<td colspan="5">
<?=gettext("Additional Certificate Revocation Lists can be added here.");?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</form> </form>
......
src/www/system_gateway_groups.php
View file @ aac98668
...@@ -214,15 +214,12 @@ $( document ).ready(function() { ...@@ -214,15 +214,12 @@ $( document ).ready(function() {
</tr> </tr>
<?php $i++; <?php $i++;
endforeach; ?> endforeach; ?>
</tbody>
<tfoot>
<tr class="hidden-xs"> <tr class="hidden-xs">
<td colspan="5"> <td colspan="5">
<b><?=gettext("Note:");?></b>
<?=gettext("Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, or policy-based routing. Without rules directing traffic into the Gateway Groups, they will not be used.");?> <?=gettext("Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, or policy-based routing. Without rules directing traffic into the Gateway Groups, they will not be used.");?>
</td> </td>
</tr> </tr>
</tfoot> </tbody>
</table> </table>
</div> </div>
</form> </form>
......
src/www/system_groupmanager.php
View file @ aac98668
...@@ -519,12 +519,10 @@ $( document ).ready(function() { ...@@ -519,12 +519,10 @@ $( document ).ready(function() {
</tr> </tr>
<tr class="hidden-xs"> <tr class="hidden-xs">
<td colspan="4"> <td colspan="4">
<p class="col-xs-12 col-sm-10">
<?=gettext('Additional webConfigurator groups can be added here. ' . <?=gettext('Additional webConfigurator groups can be added here. ' .
'Group permissions can be assigned which are inherited by users who are members of the group. ' . 'Group permissions can be assigned which are inherited by users who are members of the group. ' .
'An icon that appears grey indicates that it is a system defined object. ' . 'An icon that appears grey indicates that it is a system defined object. ' .
'Some system object properties can be modified but they cannot be deleted.');?> 'Some system object properties can be modified but they cannot be deleted.');?>
</p>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
......
src/www/system_routes.php
View file @ aac98668
...@@ -321,7 +321,6 @@ endif; ?> ...@@ -321,7 +321,6 @@ endif; ?>
</tr> </tr>
<tr> <tr>
<td colspan="7"> <td colspan="7">
<strong><?= gettext('Note:') ?></strong><br/>
<?=gettext("Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?> <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?>
</td> </td>
</tr> </tr>
......
src/www/system_usermanager.php
View file @ aac98668
...@@ -978,10 +978,22 @@ $( document ).ready(function() { ...@@ -978,10 +978,22 @@ $( document ).ready(function() {
$i++; $i++;
endforeach; endforeach;
?> ?>
</tbody>
<tfoot>
<tr> <tr>
<td colspan="3"></td> <td colspan="3">
<table>
<tr>
<td></td>
<td width="20px"></td>
<td width="20px"><span class="glyphicon glyphicon-user text-danger"></span></td>
<td width="200px"><?= gettext('System Administrator') ?></td>
<td width="20px"><span class="glyphicon glyphicon-user text-muted"></span></td>
<td width="200px"><?= gettext('Disabled User') ?></td>
<td width="20px"><span class="glyphicon glyphicon-user text-info"></span></td>
<td width="200px"><?= gettext('Normal User') ?></td>
<td></td>
</tr>
</table>
</td>
<td> <td>
<a href="system_usermanager.php?act=new" class="btn btn-default btn-xs" <a href="system_usermanager.php?act=new" class="btn btn-default btn-xs"
title="<?=gettext("add user");?>" data-toggle="tooltip"> title="<?=gettext("add user");?>" data-toggle="tooltip">
...@@ -1002,7 +1014,6 @@ $( document ).ready(function() { ...@@ -1002,7 +1014,6 @@ $( document ).ready(function() {
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<p class="col-xs-12 col-sm-10">
<?=gettext("Additional users can be added here. User permissions for accessing " . <?=gettext("Additional users can be added here. User permissions for accessing " .
"the webConfigurator can be assigned directly or inherited from group memberships. " . "the webConfigurator can be assigned directly or inherited from group memberships. " .
"An icon that appears grey indicates that it is a system defined object. " . "An icon that appears grey indicates that it is a system defined object. " .
...@@ -1010,27 +1021,9 @@ $( document ).ready(function() { ...@@ -1010,27 +1021,9 @@ $( document ).ready(function() {
<br /><br /> <br /><br />
<?=gettext("Accounts created here are also used for other parts of the system " . <?=gettext("Accounts created here are also used for other parts of the system " .
"such as OpenVPN, IPsec, and Captive Portal.");?> "such as OpenVPN, IPsec, and Captive Portal.");?>
</p>
</td> </td>
</tr> </tr>
<tr> </tbody>
<td colspan="4">
<table>
<tr>
<td></td>
<td width="20px"></td>
<td width="20px"><span class="glyphicon glyphicon-user text-danger"></span></td>
<td width="200px"><?= gettext('System Administrator') ?></td>
<td width="20px"><span class="glyphicon glyphicon-user text-muted"></span></td>
<td width="200px"><?= gettext('Disabled User') ?></td>
<td width="20px"><span class="glyphicon glyphicon-user text-info"></span></td>
<td width="200px"><?= gettext('Normal User') ?></td>
<td></td>
</tr>
</table>
</td>
</tr>
</tfoot>
</table> </table>
</form> </form>
<?php <?php
......
src/www/vpn_ipsec_keys.php
View file @ aac98668
...@@ -172,7 +172,9 @@ foreach ($config['ipsec']['mobilekey'] as $secretent) : ...@@ -172,7 +172,9 @@ foreach ($config['ipsec']['mobilekey'] as $secretent) :
<?php $i++; <?php $i++;
endforeach; ?> endforeach; ?>
<tr> <tr>
<td colspan="2"></td> <td colspan="2">
<?=gettext("PSK for any user can be set by using an identifier of any/ANY") ?>
</td>
<td> <td>
<a href="vpn_ipsec_keys_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a> <a href="vpn_ipsec_keys_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
</td> </td>
...@@ -180,12 +182,6 @@ endforeach; ?> ...@@ -180,12 +182,6 @@ endforeach; ?>
</table> </table>
</div> </div>
</form> </form>
<div class="container-fluid">
<span class="text-danger">
<strong><?=gettext("Note"); ?>:<br /></strong>
</span>
<?=gettext("PSK for any user can be set by using an identifier of any/ANY");?>
</div>
</div> </div>
</section> </section>
</div> </div>
......
src/www/vpn_l2tp.php
View file @ aac98668
...@@ -374,7 +374,6 @@ include("head.inc"); ...@@ -374,7 +374,6 @@ include("head.inc");
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<strong class="text-danger"><?=gettext("Note:");?></strong><br />
<?=gettext("Don't forget to add a firewall rule to permit traffic from L2TP clients!");?> <?=gettext("Don't forget to add a firewall rule to permit traffic from L2TP clients!");?>
</td> </td>
</tr> </tr>
......
src/www/vpn_pppoe_edit.php
View file @ aac98668
...@@ -558,10 +558,8 @@ legacy_html_escape_form_data($pconfig); ...@@ -558,10 +558,8 @@ legacy_html_escape_form_data($pconfig);
</td> </td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td colspan="2">
<td width="78%"> <?=gettext("Don't forget to add a firewall rule to permit traffic from PPPoE clients."); ?>
<span class="text-danger"><strong><?=gettext("Note"); ?>:<br /></strong></span>
<?=gettext("don't forget to add a firewall rule to permit " ."traffic from PPPoE clients!"); ?>
</td> </td>
</tr> </tr>
</table> </table>
......
src/www/vpn_pptp.php
View file @ aac98668
...@@ -451,9 +451,8 @@ include("head.inc"); ...@@ -451,9 +451,8 @@ include("head.inc");
</td> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td colspan="2"><?= gettext("Don't forget to add a firewall rule to permit traffic from PPTP clients.") ?></td>
<td><?=sprintf(gettext("Note: don't forget to %sadd a firewall rule%s to permit traffic from PPTP clients!"),'<a href="firewall_rules.php?if=pptp">','</a>') ?></td> </tr>
</tr>
</table> </table>
</div> </div>
</form> </form>
......
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