diff options
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/guiconfig.inc | 9 | ||||
-rw-r--r-- | src/usr/local/www/head.inc | 4 | ||||
-rw-r--r-- | src/usr/local/www/jquery/pfSense.js | 10 | ||||
-rw-r--r-- | src/usr/local/www/jquery/pfSenseHelpers.js | 4 | ||||
-rwxr-xr-x | src/usr/local/www/pkg.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_filter_summary.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/system_advanced_sysctl.php | 2 | ||||
-rwxr-xr-x | src/usr/local/www/system_usermanager_settings_test.php | 3 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/captive_portal_status.widget.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/gateways.widget.php | 5 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/log.widget.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/picture.widget.php | 5 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/rss.widget.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/services_status.widget.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/thermal_sensors.widget.php | 5 | ||||
-rw-r--r-- | src/usr/local/www/widgets/widgets/traffic_graphs.widget.php | 2 |
16 files changed, 39 insertions, 26 deletions
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 2ddee11..258dbd2 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -313,7 +313,7 @@ function verify_gzip_file($fname) { // $btnname and btntext describe the optional button and its display text, the default is an 'x' Close button. // Note that there is also a shortcut function print_apply_box here that creates a standard "apply" box for you. // In many cases just substitute that for print_info_box_np() to easily get a warning style "Apply changes" box. -function print_info_box($msg, $class="alert-warning", $btnname = "close", $btntext = "") { +function print_info_box($msg, $class="alert-warning", $btnname = "close", $btntext = "", $btnicon = "", $btnclass = "default") { if (strpos($class, "alert-") !== 0) { $class = 'alert-' . $class; @@ -327,8 +327,11 @@ function print_info_box($msg, $class="alert-warning", $btnname = "close", $btnte if (empty($btntext)) { $btntext = $btnname; } + if (!empty($btnicon)) { + $btnicon = '<i class="fa ' . $btnicon . ' icon-embed-btn"></i>'; + } - $msg .= '<form method="post" class="pull-right"><button type="submit" class="btn btn-default" name="'. $btnname . '" value="' . $btntext . '">' . $btntext . '</button>'; + $msg .= '<form method="post" class="pull-right"><button type="submit" class="btn btn-' . $btnclass . '" name="'. $btnname . '" value="' . $btntext . '">' . $btnicon . $btntext . '</button>'; if ($_POST['if']) { $msg .= "<input type=\"hidden\" name=\"if\" value=\"" . htmlspecialchars($_POST['if']) . "\" />"; @@ -341,7 +344,7 @@ function print_info_box($msg, $class="alert-warning", $btnname = "close", $btnte } function print_apply_box($msg) { - print_info_box($msg, "warning", "apply", gettext("Apply Changes")); + print_info_box($msg, "warning", "apply", gettext("Apply Changes"), 'fa-check', 'success'); } /* diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index cabe37d..995f726 100644 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -661,8 +661,8 @@ if (are_notices_pending()):?> </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal"><?=gettext("Close")?></button> - <button type="button" id="clearallnotices" class="btn btn-primary"><?=gettext("Mark All as Read")?></button> + <button type="button" class="btn btn-info" data-dismiss="modal"><i class="fa fa-undo icon-embed-btn"></i><?=gettext("Close")?></button> + <button type="button" id="clearallnotices" class="btn btn-primary"><i class="fa fa-trash icon-embed-btn"></i><?=gettext("Mark All as Read")?></button> </div> </div> </div> diff --git a/src/usr/local/www/jquery/pfSense.js b/src/usr/local/www/jquery/pfSense.js index c789a25..bd6ee7e 100644 --- a/src/usr/local/www/jquery/pfSense.js +++ b/src/usr/local/www/jquery/pfSense.js @@ -40,8 +40,8 @@ $(function() { { var groups = $('div.form-group.user-duplication-horiz'); var controlsContainer = $('<div class="col-sm-2"></div>'); - var plus = $('<a class="btn btn-sm btn-success">Add</a>'); - var minus = $('<a class="btn btn-sm btn-warning">Delete</a>'); + var plus = $('<a class="btn btn-sm btn-success"><i class="fa fa-plus icon-embed-btn"></i>Add</a>'); + var minus = $('<a class="btn btn-sm btn-warning"><i class="fa fa-trash icon-embed-btn"></i>Delete</a>'); minus.on('click', function(){ $(this).parents('div.form-group').remove(); @@ -69,8 +69,8 @@ $(function() { { var groups = $('div.form-group.user-duplication'); var controlsContainer = $('<div class="col-sm-10 col-sm-offset-2 controls"></div>'); - var plus = $('<a class="btn btn-xs btn-success">Add</a>'); - var minus = $('<a class="btn btn-xs btn-warning">Delete</a>'); + var plus = $('<a class="btn btn-xs btn-success"><i class="fa fa-plus icon-embed-btn"></i>Add</a>'); + var minus = $('<a class="btn btn-xs btn-warning"><i class="fa fa-trash icon-embed-btn"></i>Delete</a>'); minus.on('click', function(){ $(this).parents('div.form-group').remove(); @@ -185,7 +185,7 @@ $(function() { container = self.$tip; timeout = self.timeout; container.one('mouseenter', function(){ - //We entered the actual popover – call off the dogs + //We entered the actual popover - call off the dogs clearTimeout(timeout); //Let's monitor popover content instead container.one('mouseleave', function(){ diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js index 16ddfa2..70151ca 100644 --- a/src/usr/local/www/jquery/pfSenseHelpers.js +++ b/src/usr/local/www/jquery/pfSenseHelpers.js @@ -479,8 +479,8 @@ $('.container .panel-heading a[data-toggle="collapse"]').each(function (idx, el) $('#ruletable > tbody:last').append('<tr>' + '<td class="' + gColor + '" colspan="' + sepcols + '"><input id="newsep" placeholder="' + svbtnplaceholder + '" class="col-md-12" type="text" /></td>' + - '<td class="' + gColor + '" colspan="2"><button class="btn btn-default btn-sm" id="btnnewsep">' + svtxt + '</button>' + - '<button class="btn btn-default btn-sm" id="btncncsep">' + cncltxt + '</button>' + + '<td class="' + gColor + '" colspan="2"><button class="btn btn-primary btn-sm" id="btnnewsep"><i class="fa fa-save icon-embed-btn"></i>' + svtxt + '</button>' + + '<button class="btn btn-info btn-sm" id="btncncsep"><i class="fa fa-undo icon-embed-btn"></i>' + cncltxt + '</button>' + ' ' + ' <a id="sepclrblue" value="bg-info"><i class="fa fa-circle text-info icon-pointer"></i></a>' + ' <a id="sepclrred" value="bg-danger"><i class="fa fa-circle text-danger icon-pointer"></i></a>' + diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index a0d2ad4..a3da23b 100755 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -601,7 +601,7 @@ if ($savemsg) { #Show custom description to add button if defined $add_msg=($pkg['adddeleteeditpagefields']['addtext']?$pkg['adddeleteeditpagefields']['addtext']:gettext("Add a new item")); ?> - <td><a href="pkg_edit.php?xml=<?=$xml?>&id=<?=$i?>" class="btn btn-sm btn-success" title="<?=$add_msg?>"><?=gettext('Add')?></a></td> + <td><a href="pkg_edit.php?xml=<?=$xml?>&id=<?=$i?>" class="btn btn-sm btn-success" title="<?=$add_msg?>"><i class="fa fa-plus icon-embed-btn"></i><?=gettext('Add')?></a></td> <?php #Show description button and info if defined if ($pkg['adddeleteeditpagefields']['description']) { diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php index 3566be2..871fb60 100644 --- a/src/usr/local/www/status_logs_filter_summary.php +++ b/src/usr/local/www/status_logs_filter_summary.php @@ -207,7 +207,7 @@ function stat_block($summary, $stat, $num) { $numentries++; $outstr = $k[$i]; if (is_ipaddr($outstr)) { - print('<tr><td>' . $outstr . '</td>' . '<td>' . $summary[$stat][$k[$i]] . '</td><td><a href="diag_dns.php?host=' . $outstr . '" class="btn btn-xs btn-success" title="' . gettext("Reverse Resolve with DNS") . '">' . gettext("Lookup") . '</a></td></tr>'); + print('<tr><td>' . $outstr . '</td>' . '<td>' . $summary[$stat][$k[$i]] . '</td><td><a href="diag_dns.php?host=' . $outstr . '" class="btn btn-xs btn-primary" title="' . gettext("Reverse Resolve with DNS") . '"><i class="fa fa-search icon-embed-btn"></i>' . gettext("Lookup") . '</a></td></tr>'); } elseif (substr_count($outstr, '/') == 1) { list($proto, $port) = explode('/', $outstr); diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index 76873bb..dd44caf 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -205,7 +205,7 @@ if ($act != "edit"): ?> <th class="col-sm-3"><?=gettext("Tunable Name"); ?></th> <th><?=gettext("Description"); ?></th> <th class="col-sm-1"><?=gettext("Value"); ?></th> - <th><a class="btn btn-xs btn-primary" href="system_advanced_sysctl.php?act=edit"><?=gettext('New'); ?></a></th> + <th><a class="btn btn-xs btn-success" href="system_advanced_sysctl.php?act=edit"><i class="fa fa-plus icon-embed-btn"></i><?=gettext('New'); ?></a></th> </tr> </thead> <?php diff --git a/src/usr/local/www/system_usermanager_settings_test.php b/src/usr/local/www/system_usermanager_settings_test.php index 18238c7..983f22a 100755 --- a/src/usr/local/www/system_usermanager_settings_test.php +++ b/src/usr/local/www/system_usermanager_settings_test.php @@ -74,6 +74,7 @@ if (isset($config['system']['authserver'][0]['host'])) { <html lang="en"> <head> <link rel="stylesheet" href="/bootstrap/css/pfSense.css" /> + <link rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" /> <title><?=gettext("Test Authentication server"); ?></title> </head> <body id="system_usermanager_settings_test" class="no-menu"> @@ -130,7 +131,7 @@ if (!$authcfg) { ?> </pre> - <a href="javascript:window.close();" class="btn btn-primary"><?=gettext("Return")?></a> + <a href="javascript:window.close();" class="btn btn-info"><i class="fa fa-undo icon-embed-btn"></i><?=gettext("Return")?></a> </div> </div> </div> diff --git a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php index ec18c47..dc322cb 100644 --- a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -146,8 +146,8 @@ if ($_GET['order']) { <td><?php if ($cpent[11] && ($cpent[11] > 0)) echo date("m/d/Y H:i:s", $cpent[11]);?></td> <?php endif; ?> <td> - <a href="?order=<?=htmlspecialchars($_GET['order']);?>&showact=<?=$showact;?>&act=del&zone=<?=$cpent[10];?>&id=<?=$cpent[5];?>" class="btn btn-xs btn-danger"> - <?=gettext("delete");?> + <a href="?order=<?=htmlspecialchars($_GET['order']);?>&showact=<?=$showact;?>&act=del&zone=<?=$cpent[10];?>&id=<?=$cpent[5];?>"> + <i class="fa fa-trash" title="<?=gettext("delete");?>"></i> </a> </td> </tr> diff --git a/src/usr/local/www/widgets/widgets/gateways.widget.php b/src/usr/local/www/widgets/widgets/gateways.widget.php index d23e194..dfabae3 100644 --- a/src/usr/local/www/widgets/widgets/gateways.widget.php +++ b/src/usr/local/www/widgets/widgets/gateways.widget.php @@ -134,7 +134,10 @@ if ($_POST) { <input name="display_type" class="radio" type="radio" id="display_type_monitor_ip" value="monitor_ip" <?=$display_type_monitor_ip;?> onchange="updateGatewayDisplays();" /> <span><?=gettext('Monitor IP')?></span> <input name="display_type" class="radio" type="radio" id="display_type_both_ip" value="both_ip" <?=$display_type_both_ip;?> onchange="updateGatewayDisplays();" /> <span><?=gettext('Both')?></span> <br /><br /> - <input id="submit_settings" name="submit_settings" type="submit" onclick="return updatePref();" class="formbtn" value="<?=gettext('Save Settings')?>" /> + <button id="submit_settings" name="submit_settings" type="submit" onclick="return updatePref();" class="btn btn-primary btn-sm" value="<?=gettext('Save Settings')?>"> + <i class="fa fa-save icon-embed-btn"></i> + <?=gettext('Save Settings')?> + </button> </form> </div> diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php index 3b62ab8..1e51267 100644 --- a/src/usr/local/www/widgets/widgets/log.widget.php +++ b/src/usr/local/www/widgets/widgets/log.widget.php @@ -293,7 +293,7 @@ $pconfig['nentriesinterval'] = isset($config['widgets']['filterlogentriesinterva <div class="form-group"> <div class="col-sm-offset-4 col-sm-6"> - <button type="submit" class="btn btn-default"><?=gettext('Save')?></button> + <button type="submit" class="btn btn-primary"><i class="fa fa-save icon-embed-btn"></i><?=gettext('Save')?></button> </div> </div> </form> diff --git a/src/usr/local/www/widgets/widgets/picture.widget.php b/src/usr/local/www/widgets/widgets/picture.widget.php index f40e3df..54f00d8 100644 --- a/src/usr/local/www/widgets/widgets/picture.widget.php +++ b/src/usr/local/www/widgets/widgets/picture.widget.php @@ -80,5 +80,8 @@ if ($_POST) { <form action="/widgets/widgets/picture.widget.php" method="post" enctype="multipart/form-data" class="form-inline"> <label for="pictfile"><?=gettext('New picture:')?> </label> <input id="pictfile" name="pictfile" type="file" class="form-control" /> - <button type="submit" class="btn btn-default"><?=gettext('Upload')?></button> + <button type="submit" class="btn btn-primary btn-xs"> + <i class="fa fa-upload icon-embed-btn"></i> + <?=gettext('Upload')?> + </button> </form> diff --git a/src/usr/local/www/widgets/widgets/rss.widget.php b/src/usr/local/www/widgets/widgets/rss.widget.php index 411d0e2..4be59a1 100644 --- a/src/usr/local/www/widgets/widgets/rss.widget.php +++ b/src/usr/local/www/widgets/widgets/rss.widget.php @@ -187,7 +187,7 @@ if ($config['widgets']['rssfeed']) { <div class="form-group"> <div class="col-sm-offset-3 col-sm-6"> - <button type="submit" class="btn btn-default"><?=gettext('Save')?></button> + <button type="submit" class="btn btn-primary"><i class="fa fa-save icon-embed-btn"></i><?=gettext('Save')?></button> </div> </div> </form> diff --git a/src/usr/local/www/widgets/widgets/services_status.widget.php b/src/usr/local/www/widgets/widgets/services_status.widget.php index 6767b5d..7e1d883 100644 --- a/src/usr/local/www/widgets/widgets/services_status.widget.php +++ b/src/usr/local/www/widgets/widgets/services_status.widget.php @@ -163,8 +163,8 @@ if (count($services) > 0) { <div class="form-group"> <div class="col-sm-offset-3 col-sm-6"> - <button type="submit" class="btn btn-primary"><?=gettext('Save')?></button> - <button id="clearall" type="button" class="btn btn-default"><?=gettext('Clear')?></button> + <button type="submit" class="btn btn-primary"><i class="fa fa-save icon-embed-btn"></i><?=gettext('Save')?></button> + <button id="clearall" type="button" class="btn btn-info"><i class="fa fa-undo icon-embed-btn"></i><?=gettext('Clear')?></button> </div> </div> </form> diff --git a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php index f99e605..587fcac 100644 --- a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php +++ b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php @@ -268,7 +268,10 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) { </tr> <tr> <td class="text-right" colspan="3"> - <input type="submit" id="thermal_sensors_widget_submit" name="thermal_sensors_widget_submit" class="formbtn" value="Save" /> + <button type="submit" id="thermal_sensors_widget_submit" name="thermal_sensors_widget_submit" class="btn btn-primary btn-sm" value="Save"> + <i class="fa fa-save icon-embed-btn"></i> + <?=gettext("Save")?> + </button> </td> </tr> <tr> diff --git a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php index 39cb3f3..ded88be 100644 --- a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -195,7 +195,7 @@ foreach ($ifdescrs as $ifname => $ifdescr): <div class="form-group"> <div class="col-sm-offset-3 col-sm-6"> - <button type="submit" class="btn btn-default"><?=gettext('Save')?></button> + <button type="submit" class="btn btn-primary"><i class="fa fa-save icon-embed-btn"></i><?=gettext('Save')?></button> </div> </div> </form> |