From 37676f4e5c40e5e2ea60a5de36608e956a76fb08 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 9 Mar 2016 14:30:05 -0500 Subject: Bring some consistency to the way most buttons are displayed (color, icons, etc). Ticket #5965 Still need to review Advanced buttons and Repeatable block buttons. --- src/usr/local/www/crash_reporter.php | 11 ++++- src/usr/local/www/diag_authentication.php | 10 ++++- src/usr/local/www/diag_backup.php | 24 +++++++---- src/usr/local/www/diag_command.php | 38 +++++++++++++---- src/usr/local/www/diag_defaults.php | 10 ++++- src/usr/local/www/diag_dns.php | 14 ++++++- src/usr/local/www/diag_dump_states.php | 4 +- src/usr/local/www/diag_dump_states_sources.php | 10 ++++- src/usr/local/www/diag_edit.php | 19 +++++++-- src/usr/local/www/diag_halt.php | 10 ++++- src/usr/local/www/diag_packet_capture.php | 24 +++++++---- src/usr/local/www/diag_ping.php | 10 ++++- src/usr/local/www/diag_reboot.php | 10 ++++- src/usr/local/www/diag_routes.php | 10 ++++- src/usr/local/www/diag_smart.php | 50 ++++++++++++++++------- src/usr/local/www/diag_sockets.php | 5 ++- src/usr/local/www/diag_tables.php | 16 +++++--- src/usr/local/www/diag_testport.php | 10 ++++- src/usr/local/www/diag_traceroute.php | 10 ++++- src/usr/local/www/firewall_shaper.php | 7 +++- src/usr/local/www/firewall_shaper_vinterface.php | 7 +++- src/usr/local/www/load_balancer_pool_edit.php | 30 +++++++++----- src/usr/local/www/services_dhcp.php | 4 +- src/usr/local/www/services_dhcp_edit.php | 4 +- src/usr/local/www/services_dyndns_edit.php | 4 +- src/usr/local/www/services_wol.php | 11 ++++- src/usr/local/www/status_captiveportal.php | 11 +++-- src/usr/local/www/status_carp.php | 4 +- src/usr/local/www/status_dhcp_leases.php | 4 +- src/usr/local/www/status_dhcpv6_leases.php | 4 +- src/usr/local/www/status_filter_reload.php | 4 +- src/usr/local/www/status_ipsec.php | 9 +++- src/usr/local/www/status_ipsec_sad.php | 2 +- src/usr/local/www/status_openvpn.php | 8 +++- src/usr/local/www/system_groupmanager.php | 14 ++++--- src/usr/local/www/system_usermanager.php | 16 +++++--- src/usr/local/www/system_usermanager_settings.php | 6 ++- src/usr/local/www/vpn_ipsec.php | 4 +- 38 files changed, 330 insertions(+), 118 deletions(-) (limited to 'src') diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index cfffd0d..df650bf 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -160,9 +160,16 @@ exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors); +

- - + +
diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php index 6adb424..5e6813a 100644 --- a/src/usr/local/www/diag_authentication.php +++ b/src/usr/local/www/diag_authentication.php @@ -112,7 +112,7 @@ if ($savemsg) { print_info_box($savemsg, 'success', false); } -$form = new Form('Test'); +$form = new Form(false); $section = new Form_Section('Authentication Test'); @@ -144,6 +144,14 @@ $section->addInput(new Form_Input( )); $form->add($section); + +$form->addGlobal(new Form_Button( + 'Submit', + 'Test', + null, + 'fa-wrench' +))->addClass('btn-primary'); + print $form; include("foot.inc"); diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index d499442..5b49019 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -664,8 +664,10 @@ $group = new Form_Group(''); // Note: ID attribute of each element created is to be unique. Not being used, suppressing it. $group->add(new Form_Button( 'Submit', - 'Download configuration as XML' -))->setAttribute('id'); + 'Download configuration as XML', + null, + 'fa-download' +))->setAttribute('id')->addClass('btn-primary'); $section->add($group); $form->add($section); @@ -710,8 +712,10 @@ $group = new Form_Group(''); // Note: ID attribute of each element created is to be unique. Not being used, suppressing it. $group->add(new Form_Button( 'Submit', - 'Restore Configuration' -))->setHelp('The firewall will reboot after restoring the configuration.')->removeClass('btn-primary')->addClass('btn-danger restore')->setAttribute('id'); + 'Restore Configuration', + null, + 'fa-undo' +))->setHelp('The firewall will reboot after restoring the configuration.')->addClass('btn-danger restore')->setAttribute('id'); $section->add($group); @@ -725,8 +729,10 @@ if (($config['installedpackages']['package'] != "") || (is_subsystem_dirty("pack // Note: ID attribute of each element created is to be unique. Not being used, suppressing it. $group->add(new Form_Button( 'Submit', - 'Reinstall Packages' - ))->setHelp('Click this button to reinstall all system packages. This may take a while.')->removeClass('btn-primary')->addClass('btn-success')->setAttribute('id'); + 'Reinstall Packages', + null, + 'fa-retweet' + ))->setHelp('Click this button to reinstall all system packages. This may take a while.')->addClass('btn-success')->setAttribute('id'); $section->add($group); } @@ -736,8 +742,10 @@ if (($config['installedpackages']['package'] != "") || (is_subsystem_dirty("pack // Note: ID attribute of each element created is to be unique. Not being used, suppressing it. $group->add(new Form_Button( 'Submit', - 'Clear Package Lock' - ))->setHelp('Click this button to clear the package lock if a package fails to reinstall properly after an upgrade.')->removeClass('btn-primary')->addClass('btn-warning')->setAttribute('id'); + 'Clear Package Lock', + null, + 'fa-wrench' + ))->setHelp('Click this button to clear the package lock if a package fails to reinstall properly after an upgrade.')->addClass('btn-warning')->setAttribute('id'); $section->add($group); } diff --git a/src/usr/local/www/diag_command.php b/src/usr/local/www/diag_command.php index df5e3a7..e279286 100644 --- a/src/usr/local/www/diag_command.php +++ b/src/usr/local/www/diag_command.php @@ -245,13 +245,26 @@ if (!isBlank($_POST['txtCommand'])):?>

- +

- - - - " onclick="return Reset_onClick( this.form );" /> + +
+ + + +
@@ -262,7 +275,10 @@ if (!isBlank($_POST['txtCommand'])):?>


- +
@@ -278,7 +294,10 @@ if (!isBlank($_POST['txtCommand'])):?>

- +
@@ -325,7 +344,10 @@ if (!isBlank($_POST['txtCommand'])):?>

- " /> + : print("Hello World!");
diff --git a/src/usr/local/www/diag_defaults.php b/src/usr/local/www/diag_defaults.php index d8233a1..3ab3362 100755 --- a/src/usr/local/www/diag_defaults.php +++ b/src/usr/local/www/diag_defaults.php @@ -102,8 +102,14 @@ include("head.inc");

- " /> - " /> + +

diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php index e74ebba..7b1fb84 100755 --- a/src/usr/local/www/diag_dns.php +++ b/src/usr/local/www/diag_dns.php @@ -219,7 +219,7 @@ if ($createdalias) { print_info_box(gettext("Alias was created/updated successfully."), 'success', false); } -$form = new Form('Lookup'); +$form = new Form(false); $section = new Form_Section('DNS Lookup'); $section->addInput(new Form_Input( @@ -233,11 +233,21 @@ $section->addInput(new Form_Input( if (!empty($resolved)) { $form->addGlobal(new Form_Button( 'create_alias', - 'Add alias' + 'Add alias', + null, + 'fa-plus' ))->removeClass('btn-primary')->addClass('btn-success'); } $form->add($section); + +$form->addGlobal(new Form_Button( + 'Submit', + 'Lookup', + null, + 'fa-search' +))->addClass('btn-primary'); + print $form; if (!$input_errors && $type) { diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index d30533c..8cdc3cb 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -173,8 +173,8 @@ $section->addInput(new Form_Input( ['placeholder' => 'Simple filter such as 192.168, v6, icmp or ESTABLISHED'] )); -$filterbtn = new Form_Button('filterbtn', 'Filter', null); -$filterbtn->removeClass('btn-primary')->addClass('btn-default btn-sm'); +$filterbtn = new Form_Button('filterbtn', 'Filter', null, 'fa-filter'); +$filterbtn->addClass('btn-primary btn-sm'); $section->addInput(new Form_StaticText( '', $filterbtn diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php index 4aab13d..70e8edd 100644 --- a/src/usr/local/www/diag_dump_states_sources.php +++ b/src/usr/local/www/diag_dump_states_sources.php @@ -122,7 +122,7 @@ events.push(function() { addInput(new Form_Input( @@ -133,6 +133,14 @@ $section->addInput(new Form_Input( )); $form->add($section); + +$form->addGlobal(new Form_Button( + 'Submit', + 'Filter', + null, + 'fa-filter' +))->addClass('btn-primary'); + print $form; ?> diff --git a/src/usr/local/www/diag_edit.php b/src/usr/local/www/diag_edit.php index eb751b0..c520805 100644 --- a/src/usr/local/www/diag_edit.php +++ b/src/usr/local/www/diag_edit.php @@ -141,11 +141,22 @@ require("head.inc");
- - - +
+ + + +
- +
diff --git a/src/usr/local/www/diag_halt.php b/src/usr/local/www/diag_halt.php index 10e30dc..3b1b01c 100755 --- a/src/usr/local/www/diag_halt.php +++ b/src/usr/local/www/diag_halt.php @@ -102,8 +102,14 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {

- "> - + + + + +
diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php index a934361..d31c335 100644 --- a/src/usr/local/www/diag_packet_capture.php +++ b/src/usr/local/www/diag_packet_capture.php @@ -393,25 +393,33 @@ $processisrunning = ($processcheck != ""); if (($action == gettext("Stop") or $action == "") and $processisrunning != true) { $form->addGlobal(new Form_Button( 'startbtn', - 'Start' - ))->removeClass('btn-primary')->addClass('btn-success'); + 'Start', + null, + 'fa-play-circle' + ))->addClass('btn-success'); } else { $form->addGlobal(new Form_Button( 'stopbtn', - 'Stop' - ))->removeClass('btn-primary')->addClass('btn-warning'); + 'Stop', + null, + 'fa-stop-circle' + ))->addClass('btn-warning'); } if (file_exists($fp.$fn) and $processisrunning != true) { $form->addGlobal(new Form_Button( 'viewbtn', - 'View Capture' - ))->removeClass('btn-primary'); + 'View Capture', + null, + 'fa-file-text-o' + ))->addClass('btn-primary'); $form->addGlobal(new Form_Button( 'downloadbtn', - 'Download Capture' - ))->removeClass('btn-primary'); + 'Download Capture', + null, + 'fa-download' + ))->addClass('btn-primary'); $section->addInput(new Form_StaticText( 'Last capture', diff --git a/src/usr/local/www/diag_ping.php b/src/usr/local/www/diag_ping.php index c35ee7e..e5756b6 100644 --- a/src/usr/local/www/diag_ping.php +++ b/src/usr/local/www/diag_ping.php @@ -167,7 +167,7 @@ if ($input_errors) { print_input_errors($input_errors); } -$form = new Form('Ping'); +$form = new Form(false); $section = new Form_Section('Ping'); @@ -201,6 +201,14 @@ $section->addInput(new Form_Select( ))->setHelp('Select the maximum number of pings'); $form->add($section); + +$form->addGlobal(new Form_Button( + 'Submit', + 'Ping', + null, + 'fa-rss' +))->addClass('btn-primary'); + print $form; if ($do_ping && !empty($result) && !$input_errors) { diff --git a/src/usr/local/www/diag_reboot.php b/src/usr/local/www/diag_reboot.php index be3a2dd..bfdf873 100755 --- a/src/usr/local/www/diag_reboot.php +++ b/src/usr/local/www/diag_reboot.php @@ -143,8 +143,14 @@ events.push(function() {

- "> - + + + + +
diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index 3cb7f63..d94b416 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -99,7 +99,7 @@ $shortcut_section = "routing"; include('head.inc'); -$form = new Form('Update'); +$form = new Form(false); $form->addGlobal(new Form_Input( 'isAjax', null, @@ -132,6 +132,14 @@ $section->addInput(new Form_Input( ))->setHelp('Use a regular expression to filter IP address or hostnames'); $form->add($section); + +$form->addGlobal(new Form_Button( + 'Submit', + 'Update', + null, + 'fa-refresh' +))->addClass('btn-primary'); + print $form; ?>