Skip to content

O
OpnSense
Commit 21aea245 authored by Jos Schellevis's avatar Jos Schellevis
Browse files
Options

Code cleanups and gui enhancements

parent d24b90a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 924 additions and 1174 deletions
src/www/guiconfig.inc
View file @ 21aea245
......@@ -940,7 +940,7 @@ function display_top_tabs(& $tab_array, $no_drop_down = false) {
// then show a select item dropdown menubox.
if($tabcharcount > $tab_array_char_limit) {
echo "<h2>".gettext("Currently viewing: ")."</h2>";
echo "<select class=\"selectpicker\" name=\"TabSelect\" onchange=\"tabs_will_go(this)\" data-live-search=\"true\" data-style=\"btn-primary\">\n";
echo "<select class=\"selectpicker\" name=\"TabSelect\" onchange=\"tabs_will_go(this)\" data-live-search=\"true\" data-style=\"btn-default\">\n";
foreach ($tab_array as $ta) {
if($ta[1]=="true")
$selected = " selected=\"selected\"";
......
src/www/head.inc
View file @ 21aea245
......@@ -27,7 +27,7 @@ $pagetitle = gentitle( $pgtitle );
<link href="/themes/<?=$g['theme'];?>/build/css/main.css" media="screen, projection" rel="stylesheet">
<!-- Stylesheet for fancy select/dropdown -->
<link rel="stylesheet" type="text/css" href="/themes/<?=$g['theme'];?>/build/css/bootstrap-select.min.css">
<link rel="stylesheet" type="text/css" href="/themes/<?=$g['theme'];?>/build/css/bootstrap-select.css">
<!-- Favicon -->
<link href="/themes/<?=$g['theme'];?>/assets/images/favicon.png" rel="shortcut icon">
......@@ -80,6 +80,11 @@ $pagetitle = gentitle( $pgtitle );
(function ($) {
$("input").attr("autocomplete","off");
})(jQuery);
jQuery(function () {
jQuery('[data-toggle="tooltip"]').tooltip()
})
//]]>
</script>
<? endif; ?>
......
src/www/system.php
View file @ 21aea245
......@@ -341,7 +341,7 @@ include("head.inc");
</td>
<td>
<?php if ($multiwan): ?>
<select name='<?=$fldname;?>'>
<select name='<?=$fldname;?>' class='selectpicker' data-style='btn-default'>
<?php
$gwname = "none";
$dnsgw = "dns{$dnscounter}gw";
......@@ -412,7 +412,7 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Time zone"); ?></td>
<td width="78%" class="vtable">
<select name="timezone" id="timezone">
<select name="timezone" id="timezone" class="selectpicker" data-style="btn-default" data-live-search="true">
<?php foreach ($timezonelist as $value): ?>
<?php if(strstr($value, "GMT")) continue; ?>
<option value="<?=htmlspecialchars($value);?>" <?php if ($value == $pconfig['timezone']) echo "selected=\"selected\""; ?>>
......@@ -454,7 +454,7 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?php echo gettext("Language");?></td>
<td width="78%" class="vtable">
<select name="language">
<select name="language" class="selectpicker" data-style="btn-default" data-width="auto">
<?php
foreach(get_locale_list() as $lcode => $ldesc) {
$selected = ' selected="selected"';
......@@ -483,7 +483,7 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell">&nbsp;</td>
<td width="78%" class="vtable">
<select name="theme">
<select name="theme" class="selectpicker" data-style="btn-default" data-width="auto">
<?php
$files = return_dir_as_array("/usr/local/www/themes/");
foreach($files as $f):
......
src/www/system_advanced_admin.php
View file @ 21aea245
......@@ -291,19 +291,15 @@ include("head.inc");
<div class="row">
<?php
if ($input_errors) print_input_errors($input_errors);
if ($savemsg) print_info_box($savemsg);
if ($input_errors) print_input_errors($input_errors);
if ($savemsg) print_info_box($savemsg);
?>
<section class="col-xs-12">
<? include('system_advanced_tabs.php'); ?>
<div class="content-box tab-content">
<form action="system_advanced_admin.php" method="post" name="iform" id="iform">
<div class="table-responsive">
<form action="system_advanced_admin.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
<thead>
<tr>
......@@ -338,7 +334,7 @@ include("head.inc");
<tr id="ssl_opts">
<td width="22%" valign="top" class="vncell"><?=gettext("SSL Certificate"); ?></td>
<td width="78%" class="vtable">
<select name="ssl-certref" id="ssl-certref" class="formselect">
<select name="ssl-certref" id="ssl-certref" class="formselect selectpicker" data-style="btn-default">
<?php
foreach($a_cert as $cert):
$selected = "";
......@@ -485,16 +481,11 @@ include("head.inc");
"More information on BEAST is available from <a target='_blank' href='https://en.wikipedia.org/wiki/Transport_Layer_Security#BEAST_attack'>Wikipedia</a>."); ?>
</td>
</tr>
</tbody>
</table>
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
<thead>
<tr>
<th colspan="2" valign="top" class="listtopic"><?=gettext("Secure Shell"); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Secure Shell Server"); ?></td>
<td width="78%" class="vtable">
......@@ -526,25 +517,18 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("SSH port"); ?></td>
<td width="78%" class="vtable">
<input name="sshport" type="text" id="sshport" value="<?php echo $pconfig['sshport']; ?>" />
<br />
<span class="vexpl"><?=gettext("Note: Leave this blank for the default of 22."); ?></span>
<input name="sshport" type="text" class="form-control" id="sshport" value="<?php echo $pconfig['sshport']; ?>"/>
<?=gettext("Leave this blank for the default of 22."); ?>
</td>
</tr>
<tr>
<td colspan="2" class="list" height="12">&nbsp;</td>
</tr>
</tbody>
</table>
<table border="0" cellpadding="0" cellspacing="0" class="table table-striped">
<thead>
<tr>
<th colspan="2" valign="top" class="listtopic"><?=gettext("Serial Communications"); ?></th>
</tr>
</thead>
<tbody>
<?php if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))): ?>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Serial Terminal"); ?></td>
......@@ -558,7 +542,7 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Serial Speed")?></td>
<td width="78%" class="vtable">
<select name="serialspeed" id="serialspeed" class="formselect">
<select name="serialspeed" id="serialspeed" class="formselect selectpicker">
<option value="115200" <?php if ($pconfig['serialspeed'] == "115200") echo "selected=\"selected\"";?>>115200</option>
<option value="57600" <?php if ($pconfig['serialspeed'] == "57600") echo "selected=\"selected\"";?>>57600</option>
<option value="38400" <?php if ($pconfig['serialspeed'] == "38400") echo "selected=\"selected\"";?>>38400</option>
......@@ -573,7 +557,7 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Primary Console")?></td>
<td width="78%" class="vtable">
<select name="primaryconsole" id="primaryconsole" class="formselect">
<select name="primaryconsole" id="primaryconsole" class="formselect selectpicker">
<option value="serial" <?php if ($pconfig['primaryconsole'] == "serial") echo "selected=\"selected\"";?>>Serial Console</option>
<option value="video" <?php if ($pconfig['primaryconsole'] == "video") echo "selected=\"selected\"";?>>VGA Console</option>
</select>
......@@ -581,17 +565,9 @@ include("head.inc");
</td>
</tr>
<?php endif; ?>
</tbody>
</table>
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped __nomb">
<thead>
<tr>
<tr>
<th colspan="2" valign="top" class="listtopic"><?=gettext("Console Options"); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Console menu"); ?></td>
......@@ -611,24 +587,18 @@ include("head.inc");
</tr>
</tbody>
</table>
</div>
</form>
</form>
</div>
</section>
</div>
</div>
</section>
<script type="text/javascript">
//<![CDATA[
prot_change();
//]]>
</script>
<script type="text/javascript">
//<![CDATA[
prot_change();
//]]>
</script>
<?php
if ($restart_webgui)
......
src/www/system_advanced_firewall.php
View file @ 21aea245
This diff is collapsed.
src/www/system_advanced_misc.php
View file @ 21aea245
This diff is collapsed.
src/www/system_advanced_network.php
View file @ 21aea245
This diff is collapsed.
src/www/system_advanced_notifications.php
View file @ 21aea245
......@@ -159,26 +159,21 @@ include("head.inc");
<!-- row -->
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<form action="system_advanced_notifications.php" method="post">
<?php
if ($input_errors) print_input_errors($input_errors);
if ($savemsg) print_info_box($savemsg);
?>
</form>
</form>
<section class="col-xs-12">
<? include('system_advanced_tabs.php'); ?>
<div class="content-box tab-content">
<form action="system_advanced_notifications.php" method="post" name="iform">
<div class="table-responsive">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
<!-- GROWL -->
......@@ -197,21 +192,21 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Registration Name"); ?></td>
<td width="78%" class="vtable">
<input name='name' value='<?php echo $pconfig['name']; ?>' /><br />
<input name='name' type='text' value='<?php echo $pconfig['name']; ?>' /><br />
<?=gettext("Enter the name to register with the Growl server (default: PHP-Growl)."); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Notification Name"); ?></td>
<td width="78%" class="vtable">
<input name='notification_name' value='<?php echo $pconfig['notification_name']; ?>' /><br />
<input name='notification_name' type='text' value='<?php echo $pconfig['notification_name']; ?>' /><br />
<?=sprintf(gettext("Enter a name for the Growl notifications (default: %s growl alert)."), $g['product_name']); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("IP Address"); ?></td>
<td width="78%" class="vtable">
<input name='ipaddress' value='<?php echo $pconfig['ipaddress']; ?>' /><br />
<input name='ipaddress' type='text' value='<?php echo $pconfig['ipaddress']; ?>' /><br />
<?=gettext("This is the IP address that you would like to send growl notifications to."); ?>
</td>
</tr>
......@@ -227,20 +222,14 @@ include("head.inc");
&nbsp;
</td>
<td>
<input type='submit' id='test_growl' name='test_growl' value='<?=gettext("Test Growl"); ?>' class="btn btn-default" />
<input type='submit' id='test_growl' name='test_growl' value='<?=gettext("Test Growl"); ?>' class="btn btn-primary" />
<br /><?= gettext("NOTE: A test notification will be sent even if the service is marked as disabled.") ?>
</td>
</tr>
</table>
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
<!-- SMTP -->
<thead>
<tr>
<th colspan="2" valign="top" class="listtopic"><?=gettext("SMTP E-Mail"); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Disable SMTP Notifications"); ?></td>
<td width="78%" class="vtable">
......@@ -251,14 +240,14 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("E-Mail server"); ?></td>
<td width="78%" class="vtable">
<input name='smtpipaddress' value='<?php echo $pconfig['smtpipaddress']; ?>' /><br />
<input name='smtpipaddress' type='text' value='<?php echo $pconfig['smtpipaddress']; ?>' /><br />
<?=gettext("This is the FQDN or IP address of the SMTP E-Mail server to which notifications will be sent."); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("SMTP Port of E-Mail server"); ?></td>
<td width="78%" class="vtable">
<input name='smtpport' value='<?php echo $pconfig['smtpport']; ?>' /><br />
<input name='smtpport' type='text' value='<?php echo $pconfig['smtpport']; ?>' /><br />
<?=gettext("This is the port of the SMTP E-Mail server, typically 25, 587 (submission) or 465 (smtps)"); ?>
</td>
</tr>
......@@ -302,25 +291,17 @@ include("head.inc");
&nbsp;
</td>
<td>
<input type='submit' id='test_smtp' name='test_smtp' value='<?=gettext("Test SMTP"); ?>' class="btn btn-default" />
<input type='submit' id='test_smtp' name='test_smtp' value='<?=gettext("Test SMTP"); ?>' class="btn btn-primary" />
<br /><?= gettext("NOTE: A test message will be sent even if the service is marked as disabled.") ?>
</td>
</tr>
<tr>
<td colspan="2" class="list" height="12">&nbsp;</td>
</tr>
</tbody>
</table>
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
<!-- System Sounds -->
<thead>
<tr>
<th colspan="2" valign="top" class="listtopic"><?=gettext("System Sounds"); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Startup/Shutdown Sound"); ?></td>
<td width="78%" class="vtable">
......@@ -343,9 +324,6 @@ include("head.inc");
</tr>
</tbody>
</table>
</div>
</form>
</div>
</section>
......
src/www/system_advanced_sysctl.php
View file @ 21aea245
......@@ -122,131 +122,116 @@ include("head.inc");
<!-- row -->
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<form action="system_advanced_sysctl.php" method="post">
<?php
if ($input_errors) print_input_errors($input_errors);
if ($savemsg) print_info_box($savemsg);
if (is_subsystem_dirty('sysctl') && ($act != "edit" ))
print_info_box_np(gettext("The firewall tunables have changed. You must apply the configuration to take affect."));
?>
</form>
<?php
if ($input_errors) print_input_errors($input_errors);
if ($savemsg) print_info_box($savemsg);
if (is_subsystem_dirty('sysctl') && ($act != "edit" ))
print_info_box_np(gettext("The firewall tunables have changed. You must apply the configuration to take affect."));
?>
</form>
<section class="col-xs-12">
<? include('system_advanced_tabs.php'); ?>
<div class="content-box tab-content">
<?php if ($act != "edit" ): ?>
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
<thead>
<tr>
<th width="20%"><?=gettext("Tunable Name"); ?></th>
<th width="60%"><?=gettext("Description"); ?></th>
<th width="20%" colspan="2"><?=gettext("Value"); ?></th>
</tr>
</thead>
<tbody>
<?php $i = 0; foreach ($config['sysctl']['item'] as $tunable): ?>
<div class="table-responsive">
<?php if ($act != "edit" ): ?>
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
<thead>
<tr>
<th width="20%"><?=gettext("Tunable Name"); ?></th>
<th width="60%"><?=gettext("Description"); ?></th>
<th width="20%" colspan="2"><?=gettext("Value"); ?></th>
</tr>
</thead>
<tbody>
<?php $i = 0; foreach ($config['sysctl']['item'] as $tunable): ?>
<tr>
<td class="listlr" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
<?php echo $tunable['tunable']; ?>
</td>
<td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
<?php echo $tunable['descr']; ?>
</td>
<td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
<?php echo $tunable['value']; ?>
<?php
if($tunable['value'] == "default")
echo "(" . get_default_sysctl_value($tunable['tunable']) . ")";
?>
</td>
<td class="list nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="edit delete">
<tr>
<td valign="middle">
<a href="system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<td class="listlr" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
<?php echo $tunable['tunable']; ?>
</td>
<td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
<?php echo $tunable['descr']; ?>
</td>
<td valign="middle">
<a href="system_advanced_sysctl.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry?"); ?>')" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span>
</a>
<td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
<?php echo $tunable['value']; ?>
<?php
if($tunable['value'] == "default")
echo "(" . get_default_sysctl_value($tunable['tunable']) . ")";
?>
</td>
<td class="list nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="edit delete">
<tr>
<td valign="middle">
<a href="system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs">
<span data-toggle="tooltip" data-placement="left" title="<?=gettext("Edit Tunable"); ?>" class="glyphicon glyphicon-pencil"></span>
</a>
</td>
<td valign="middle">
<a href="system_advanced_sysctl.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry?"); ?>')" class="btn btn-default btn-xs">
<span data-toggle="tooltip" data-placement="left" title="<?=gettext("Delete Tunable"); ?>" class="glyphicon glyphicon-remove"></span>
</a>
</td>
</tr>
</table>
</td>
</tr>
<?php $i++; endforeach; ?>
<tr>
<td colspan="4">
<a href="system_advanced_sysctl.php?act=edit" class="btn btn-primary pull-right">
<span class="glyphicon glyphicon-plus"></span>
</a>
</td>
</tr>
</table>
</td>
</tr>
<?php $i++; endforeach; ?>
<tr>
<td colspan="4">
<a href="system_advanced_sysctl.php?act=edit" class="btn btn-primary pull-right">
<span class="glyphicon glyphicon-plus"></span>
</a>
</td>
</tr>
</tbody>
</table>
<?php else: ?>
<form action="system_advanced_sysctl.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="edit system tunable" class="table table-striped">
<thead>
<tr>
<th colspan="2" valign="top" class="listtopic"><?=gettext("Edit system tunable"); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Tunable"); ?></td>
<td width="78%" class="vtable">
<input size="65" name="tunable" value="<?php echo $pconfig['tunable']; ?>" />
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Description"); ?></td>
<td width="78%" class="vtable">
<textarea name="descr"><?php echo $pconfig['descr']; ?></textarea>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Value"); ?></td>
<td width="78%" class="vtable">
<input size="65" name="value" value="<?php echo $pconfig['value']; ?>" />
</td>
</tr>
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input id="submit" name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
<?php if (isset($id) && $a_tunable[$id]): ?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
<?php endif; ?>
</td>
</tr>
</tbody>
</table>
</form>
<?php endif; ?>
</div>
</tbody>
</table>
<?php else: ?>
<form action="system_advanced_sysctl.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="edit system tunable" class="table table-striped">
<thead>
<tr>
<th colspan="2" valign="top" class="listtopic"><?=gettext("Edit system tunable"); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Tunable"); ?></td>
<td width="78%" class="vtable">
<input size="65" name="tunable" type="text" value="<?php echo $pconfig['tunable']; ?>" />
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Description"); ?></td>
<td width="78%" class="vtable">
<textarea name="descr"><?php echo $pconfig['descr']; ?></textarea>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Value"); ?></td>
<td width="78%" class="vtable">
<input size="65" name="value" type="text" value="<?php echo $pconfig['value']; ?>" />
</td>
</tr>
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input id="submit" name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
<?php if (isset($id) && $a_tunable[$id]): ?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
<?php endif; ?>
</td>
</tr>
</tbody>
</table>
</form>
<?php endif; ?>
</div>
</section>
</div>
......
src/www/system_camanager.php
View file @ 21aea245
......@@ -381,7 +381,7 @@ function method_change() {
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td>
<td width="78%" class="vtable">
<select name='method' id='method' class="formselect" onchange='method_change()'>
<select name='method' id='method' class="formselect selectpicker" data-style="btn-default" onchange='method_change()'>
<?php
foreach($ca_methods as $method => $desc):
$selected = "";
......@@ -662,12 +662,12 @@ function method_change() {
</table>
</td>
<td valign="middle" class="list nowrap">
<a href="system_camanager.php?act=edit&amp;id=<?=$i;?>" title="<?=gettext("edit CA");?>" alt="<?=gettext("edit CA");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="system_camanager.php?act=exp&amp;id=<?=$i;?>" title="<?=gettext("export CA cert");?>" alt="<?=gettext("export CA cert");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-download"></span></a>
<a href="system_camanager.php?act=edit&amp;id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit CA");?>" alt="<?=gettext("edit CA");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="system_camanager.php?act=exp&amp;id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("export CA cert");?>" alt="<?=gettext("export CA cert");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-download"></span></a>
<?php if ($ca['prv']): ?>
<a href="system_camanager.php?act=expkey&amp;id=<?=$i;?>" title="<?=gettext("export CA private key");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-download"></span></a>
<a href="system_camanager.php?act=expkey&amp;id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("export CA private key");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-download"></span></a>
<?php endif; ?>
<a href="system_camanager.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and its CRLs, and unreference any associated certificates?");?>')" title="<?=gettext("delete ca");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
<a href="system_camanager.php?act=del&amp;id=<?=$i;?>" data-toggle="tooltip" data-placement="left" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and its CRLs, and unreference any associated certificates?");?>')" title="<?=gettext("delete ca");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
</td>
</tr>
<?php
......
src/www/system_certmanager.php
View file @ 21aea245
......@@ -1151,17 +1151,17 @@ function internalca_change() {
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
<a href="system_certmanager.php?act=exp&amp;id=<?=$i;?>" class="btn btn-default btn-xs" title="<?=gettext("export ca");?>">
<a href="system_certmanager.php?act=exp&amp;id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("export ca");?>">
<span class="glyphicon glyphicon-download"></span>
</a>
</td>
<td>
<a href="system_certmanager.php?act=key&amp;id=<?=$i;?>" class="btn btn-default btn-xs" title="<?=gettext("export key");?>">
<a href="system_certmanager.php?act=key&amp;id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("export key");?>">
<span class="glyphicon glyphicon-download"></span>
</a>
</td>
<td>
<a href="system_certmanager.php?act=p12&amp;id=<?=$i;?>" class="btn btn-default btn-xs" title="<?=gettext("export ca cert+user cert+user cert key in .p12 format");?>">
<a href="system_certmanager.php?act=p12&amp;id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("export ca cert+user cert+user cert key in .p12 format");?>">
<span class="glyphicon glyphicon-download"></span>
</a>
</td>
......
src/www/system_crlmanager.php
View file @ 21aea245
......@@ -567,9 +567,9 @@ include("head.inc");
</td>
<td class="list">
<?php if ($cainternal == "YES"): ?>
<a href="system_crlmanager.php?act=new&amp;caref=<?php echo $ca['refid']; ?>" title="<?php printf(gettext("Add or Import CRL for %s"),$ca['descr']);?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
<a href="system_crlmanager.php?act=new&amp;caref=<?php echo $ca['refid']; ?>" data-toggle="tooltip" data-placement="left" title="<?php printf(gettext("Add or Import CRL for %s"),$ca['descr']);?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
<?php else: ?>
<a href="system_crlmanager.php?act=new&amp;caref=<?php echo $ca['refid']; ?>&amp;importonly=yes" title="<?php printf(gettext("Import CRL for %s"),$ca['descr']);?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
<a href="system_crlmanager.php?act=new&amp;caref=<?php echo $ca['refid']; ?>&amp;importonly=yes" data-toggle="tooltip" data-placement="left" title="<?php printf(gettext("Import CRL for %s"),$ca['descr']);?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
<?php endif; ?>
</td>
</tr>
......@@ -587,21 +587,21 @@ include("head.inc");
<td class="listr"><?php echo ($internal) ? count($tmpcrl['cert']) : "Unknown (imported)"; ?></td>
<td class="listr"><?php echo ($inuse) ? "YES" : "NO"; ?></td>
<td valign="middle" class="list nowrap">
<a href="system_crlmanager.php?act=exp&amp;id=<?=$tmpcrl['refid'];?>" class="btn btn-default">
<span class="glyphicon glyphicon-export" title="<?=gettext("Export CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
<a href="system_crlmanager.php?act=exp&amp;id=<?=$tmpcrl['refid'];?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-export" data-toggle="tooltip" data-placement="left" title="<?=gettext("Export CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
</a>
<?php if ($internal): ?>
<a href="system_crlmanager.php?act=edit&amp;id=<?=$tmpcrl['refid'];?>" class="btn btn-default">
<span class="glyphicon glyphicon-edit" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
<a href="system_crlmanager.php?act=edit&amp;id=<?=$tmpcrl['refid'];?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-edit" data-toggle="tooltip" data-placement="left" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
</a>
<?php else: ?>
<a href="system_crlmanager.php?act=editimported&amp;id=<?=$tmpcrl['refid'];?>" class="btn btn-default">
<span class="glyphicon glyphicon-edit" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
<a href="system_crlmanager.php?act=editimported&amp;id=<?=$tmpcrl['refid'];?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-edit" data-toggle="tooltip" data-placement="left" title="<?=gettext("Edit CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
</a>
<?php endif; ?>
<?php if (!$inuse): ?>
<a href="system_crlmanager.php?act=del&amp;id=<?=$tmpcrl['refid'];?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Revocation List?") . ' (' . htmlspecialchars($tmpcrl['descr']) . ')';?>')" class="btn btn-default">
<span class="glyphicon glyphicon-remove" title="<?=gettext("Delete CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
<a href="system_crlmanager.php?act=del&amp;id=<?=$tmpcrl['refid'];?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Revocation List?") . ' (' . htmlspecialchars($tmpcrl['descr']) . ')';?>')" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove" data-toggle="tooltip" data-placement="left" title="<?=gettext("Delete CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>"></span>
</a>
<?php endif; ?>
</td>
......
src/www/system_hasync.php
View file @ 21aea245
This diff is collapsed.
src/www/themes/opnsense/assets/stylesheets/bootstrap-select/less/variables.less
View file @ 21aea245
......@@ -2,6 +2,6 @@
@color-blue-hover: rgba(100, 177, 216, 0.4);
@color-grey-arrow: rgba(204, 204, 204, 0.2);
@width-default: 220px; // 3 960px-grid columns
@width-default: 348px; // 3 960px-grid columns
@zindex-select-dropdown: 1035; // must be lower than a modal background (1040) but higher than the fixed navbar (1030)
src/www/themes/opnsense/assets/stylesheets/bootstrap/_variables.scss
View file @ 21aea245
......@@ -149,8 +149,8 @@ $table-border-color: #eee !default;
$btn-font-weight: normal !default;
$btn-default-color: #757575 !default;
$btn-default-bg: #F7F7F7 !default;
$btn-default-color: #444 !default;
$btn-default-bg: #FFFFFF !default;
$btn-default-border: #e5e5e5 !default;
$btn-primary-color: #fff !default;
......
src/www/themes/opnsense/build/css/bootstrap-select.css
View file @ 21aea245
/*!
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
*/
.bootstrap-select {
/*width: 220px\9; IE8 and below*/
width: 220px \0;
......@@ -24,7 +17,7 @@
width: auto !important;
}
.bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) {
width: 220px;
width: 348px;
}
.bootstrap-select .btn:focus {
outline: thin dotted #333333 !important;
......@@ -94,9 +87,7 @@
.bootstrap-select.btn-group .dropdown-menu {
min-width: 100%;
z-index: 1035;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
box-sizing: border-box;
}
.bootstrap-select.btn-group .dropdown-menu.inner {
position: static;
......@@ -104,8 +95,7 @@
padding: 0;
margin: 0;
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
box-shadow: none;
}
.bootstrap-select.btn-group .dropdown-menu li {
position: relative;
......@@ -143,13 +133,10 @@
padding: 3px 5px;
background: #f5f5f5;
border: 1px solid #e3e3e3;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
pointer-events: none;
opacity: 0.9;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
box-sizing: border-box;
}
.bootstrap-select.btn-group .no-results {
padding: 3px;
......@@ -231,9 +218,7 @@
.bs-actionsbox {
float: left;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
box-sizing: border-box;
}
.bs-actionsbox .btn-group button {
width: 50%;
......@@ -254,4 +239,3 @@
height: 100% !important;
opacity: 0;
}
/*# sourceMappingURL=bootstrap-select.css.map */
\ No newline at end of file
src/www/themes/opnsense/build/css/bootstrap-select.min.css deleted 100644 → 0
View file @ d24b90a9
/*!
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
*/.bootstrap-select{width:220px \0}.bootstrap-select>.btn{width:100%;padding-right:25px}.error .bootstrap-select .btn{border:1px solid #b94a48}.control-group.error .bootstrap-select .dropdown-toggle{border-color:#b94a48}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .btn:focus{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none}.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.btn-group:not(.input-group-btn),.bootstrap-select.btn-group[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.btn-group.dropdown-menu-right,.bootstrap-select.btn-group[class*=col-].dropdown-menu-right,.row-fluid .bootstrap-select.btn-group[class*=col-].dropdown-menu-right{float:right}.form-search .bootstrap-select.btn-group,.form-inline .bootstrap-select.btn-group,.form-horizontal .bootstrap-select.btn-group,.form-group .bootstrap-select.btn-group{margin-bottom:0}.form-group-lg .bootstrap-select.btn-group.form-control,.form-group-sm .bootstrap-select.btn-group.form-control{padding:0}.form-inline .bootstrap-select.btn-group .form-control{width:100%}.input-append .bootstrap-select.btn-group{margin-left:-1px}.input-prepend .bootstrap-select.btn-group{margin-right:-1px}.bootstrap-select.btn-group>.disabled{cursor:not-allowed}.bootstrap-select.btn-group>.disabled:focus{outline:0!important}.bootstrap-select.btn-group .btn .filter-option{display:inline-block;overflow:hidden;width:100%;text-align:left}.bootstrap-select.btn-group .btn .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.bootstrap-select.btn-group[class*=col-] .btn{width:100%}.bootstrap-select.btn-group .dropdown-menu{min-width:100%;z-index:1035;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .dropdown-menu.inner{position:static;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select.btn-group .dropdown-menu li{position:relative}.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) a:hover small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) a:focus small,.bootstrap-select.btn-group .dropdown-menu li.active:not(.disabled) a small{color:rgba(100,177,216,.4)}.bootstrap-select.btn-group .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select.btn-group .dropdown-menu li a{cursor:pointer}.bootstrap-select.btn-group .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select.btn-group .dropdown-menu li a span.check-mark{display:none}.bootstrap-select.btn-group .dropdown-menu li a span.text{display:inline-block}.bootstrap-select.btn-group .dropdown-menu li small{padding-left:.5em}.bootstrap-select.btn-group .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .no-results{padding:3px;background:#f5f5f5;margin:0 5px}.bootstrap-select.btn-group.fit-width .btn .filter-option{position:static}.bootstrap-select.btn-group.fit-width .btn .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a span.check-mark{position:absolute;display:inline-block;right:15px;margin-top:5px}.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select.show-menu-arrow.open>.btn{z-index:1036}.bootstrap-select.show-menu-arrow .dropdown-toggle:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before{bottom:auto;top:-3px;border-bottom:0;border-top-width:7px;border-top-style:solid;border-top-color:rgba(204,204,204,.2)}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after{bottom:auto;top:-3px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:before,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:after{display:block}.bs-searchbox,.bs-actionsbox{padding:4px 8px}.bs-actionsbox{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox input.form-control{margin-bottom:0;width:100%}.mobile-device{position:absolute;top:0;left:0;display:block!important;width:100%;height:100%!important;opacity:0}
\ No newline at end of file
src/www/themes/opnsense/build/css/main.css
View file @ 21aea245
......@@ -2783,27 +2783,27 @@ select[multiple].input-lg,
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
color: #757575;
background-color: #F7F7F7;
color: #444;
background-color: #FFFFFF;
border-color: #e5e5e5; }
.btn:hover, .btn:focus, .btn:active, .btn.active, .open > .btn.dropdown-toggle {
color: #757575;
background-color: #dedede;
color: #444;
background-color: #e6e6e6;
border-color: #c6c6c6; }
.btn:active, .btn.active, .open > .btn.dropdown-toggle {
background-image: none; }
.btn.disabled, .btn.disabled:hover, .btn.disabled:focus, .btn.disabled:active, .btn.disabled.active, .btn[disabled], .btn[disabled]:hover, .btn[disabled]:focus, .btn[disabled]:active, .btn[disabled].active, fieldset[disabled] .btn, fieldset[disabled] .btn:hover, fieldset[disabled] .btn:focus, fieldset[disabled] .btn:active, fieldset[disabled] .btn.active {
background-color: #F7F7F7;
background-color: #FFFFFF;
border-color: #e5e5e5; }
.btn .badge {
color: #F7F7F7;
background-color: #757575; }
color: #FFFFFF;
background-color: #444; }
.btn:focus, .btn:active:focus, .btn.active:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; }
.btn:hover, .btn:focus {
color: #757575;
color: #444;
text-decoration: none; }
.btn:active, .btn.active {
outline: 0;
......@@ -2819,21 +2819,21 @@ select[multiple].input-lg,
box-shadow: none; }
.btn-default {
color: #757575;
background-color: #F7F7F7;
color: #444;
background-color: #FFFFFF;
border-color: #e5e5e5; }
.btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
color: #757575;
background-color: #dedede;
color: #444;
background-color: #e6e6e6;
border-color: #c6c6c6; }
.btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
background-image: none; }
.btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active {
background-color: #F7F7F7;
background-color: #FFFFFF;
border-color: #e5e5e5; }
.btn-default .badge {
color: #F7F7F7;
background-color: #757575; }
color: #FFFFFF;
background-color: #444; }
.btn-primary {
color: #fff;
......
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