diff options
author | jim-p <jimp@pfsense.org> | 2016-03-09 14:30:05 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2016-03-09 14:30:55 -0500 |
commit | 37676f4e5c40e5e2ea60a5de36608e956a76fb08 (patch) | |
tree | 2c777eab62447adf0f706f86879791a8b1c11dec /src | |
parent | ea76852be1665670dbf01a2998aa588c2b65ab53 (diff) | |
download | pfsense-37676f4e5c40e5e2ea60a5de36608e956a76fb08.zip pfsense-37676f4e5c40e5e2ea60a5de36608e956a76fb08.tar.gz |
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.
Diffstat (limited to 'src')
38 files changed, 330 insertions, 118 deletions
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); <textarea readonly style="width: 100%; height: 350px;"> <?=$crash_reports?> </textarea> + <br/><br/> <form action="crash_reporter.php" method="post"> - <button class="btn btn-primary" name="Submit" type="submit" value="Yes"><?=gettext("Yes")?> - <?=gettext("Submit this to the developers for inspection")?></button> - <button class="btn btn-default" name="Submit" type="submit" value="No"><?=gettext("No")?> - <?=gettext("Just delete the crash report and take me back to the Dashboard")?></button> + <button class="btn btn-primary" name="Submit" type="submit" value="Yes"> + <i class="fa fa-upload"></i> + <?=gettext("Yes")?> - <?=gettext("Submit this to the developers for inspection")?> + </button> + <button class="btn btn-warning" name="Submit" type="submit" value="No"> + <i class="fa fa-undo"></i> + <?=gettext("No")?> - <?=gettext("Just delete the crash report and take me back to the Dashboard")?> + </button> </form> </div> </div> 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'])):?> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Execute Shell Command')?></h2></div> <div class="panel-body"> <div class="content"> - <input id="txtCommand" name="txtCommand" placeholder="Command" type="text" class="col-sm-4" value="<?=htmlspecialchars($_POST['txtCommand'])?>" /> + <input id="txtCommand" name="txtCommand" placeholder="Command" type="text" class="col-sm-7" value="<?=htmlspecialchars($_POST['txtCommand'])?>" /> <br /><br /> <input type="hidden" name="txtRecallBuffer" value="<?=htmlspecialchars($_POST['txtRecallBuffer']) ?>" /> - <input type="button" class="btn btn-default btn-sm" name="btnRecallPrev" value="<" onclick="btnRecall_onClick( this.form, -1 );" /> - <button type="submit" class="btn btn-default btn-sm" value="EXEC"><?=gettext("Execute"); ?></button> - <input type="button" class="btn btn-default btn-sm" name="btnRecallNext" value=">" onclick="btnRecall_onClick( this.form, 1 );" /> - <input type="button" class="btn btn-default btn-sm" value="<?=gettext("Clear"); ?>" onclick="return Reset_onClick( this.form );" /> + + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm" name="btnRecallPrev" onclick="btnRecall_onClick( this.form, -1 );" title="<?=gettext("Recall Previous Command")?>"> + <i class="fa fa-angle-double-left"></i> + </button> + <button type="submit" class="btn btn-warning btn-sm" value="EXEC" title="<?=gettext("Execute the entered command")?>"> + <i class="fa fa-terminal icon-inverse"></i> + <?=gettext("Execute"); ?> + </button> + <button type="button" class="btn btn-default btn-sm" name="btnRecallNext" onclick="btnRecall_onClick( this.form, 1 );" title="<?=gettext("Recall Next Command")?>"> + <i class="fa fa-angle-double-right"></i> + </a> + <button type="button" class="btn btn-default btn-sm" onclick="return Reset_onClick( this.form );" title="<?=gettext("Clear command entry")?>"> + <i class="fa fa-undo"></i> + <?=gettext("Clear"); ?> + </button> + </div> </div> </div> </div> @@ -262,7 +275,10 @@ if (!isBlank($_POST['txtCommand'])):?> <div class="content"> <input name="dlPath" type="text" id="dlPath" placeholder="File to download" class="col-sm-4" value="<?=htmlspecialchars($_GET['dlPath']);?>"/> <br /><br /> - <button name="submit" type="submit" class="btn btn-default btn-sm" id="download" value="DOWNLOAD"><?=gettext("Download")?></button> + <button name="submit" type="submit" class="btn btn-primary btn-sm" id="download" value="DOWNLOAD"> + <i class="fa fa-download icon-embed-btn"></i> + <?=gettext("Download")?> + </button> </div> </div> </div> @@ -278,7 +294,10 @@ if (!isBlank($_POST['txtCommand'])):?> <div class="content"> <input name="ulfile" type="file" class="btn btn-default btn-sm btn-file" id="ulfile" /> <br /> - <button name="submit" type="submit" class="btn btn-default btn-sm" id="upload" value="UPLOAD"><?=gettext("Upload")?></button> + <button name="submit" type="submit" class="btn btn-primary btn-sm" id="upload" value="UPLOAD"> + <i class="fa fa-upload icon-embed-btn"></i> + <?=gettext("Upload")?> + </button> </div> </div> </div> @@ -325,7 +344,10 @@ if (!isBlank($_POST['txtCommand'])):?> <div class="content"> <textarea id="txtPHPCommand" placeholder="Command" name="txtPHPCommand" rows="9" cols="80"><?=htmlspecialchars($_POST['txtPHPCommand'])?></textarea> <br /> - <input type="submit" class="btn btn-default btn-sm" value="<?=gettext("Execute")?>" /> + <button type="submit" class="btn btn-warning btn-sm" value="<?=gettext("Execute")?>" title="<?=gettext("Execute this PHP Code")?>"> + <i class="fa fa-terminal icon-inverse"></i> + <?=gettext("Execute")?> + </button> <?=gettext("Example"); ?>: <code>print("Hello World!");</code> </div> </div> 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"); </ul> <p><strong><?=gettext("Are you sure you want to proceed?")?></strong></p> <p> - <input name="Submit" type="submit" class="btn btn-sm btn-success" value=" <?=gettext("Yes")?> " /> - <input name="Submit" type="submit" class="btn btn-sm btn-default" value=" <?=gettext("No")?> " /> + <button name="Submit" type="submit" class="btn btn-sm btn-danger" value=" <?=gettext("Yes")?> " title="<?=gettext("Perform a factory reset")?>"> + <i class="fa fa-undo"></i> + <?=gettext("Yes, Factory reset")?> + </button> + <button name="Submit" type="submit" class="btn btn-sm btn-success" value=" <?=gettext("No")?> " title="<?=gettext("Return to the dashboard")?>"> + <i class="fa fa-save"></i> + <?=gettext("No, Keep this configuration")?> + </button> </p> </form> </div> 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() { <?php -$form = new Form; +$form = new Form(false); $section = new Form_Section('Filters'); $section->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"); <div class="content"> <form> <input type="text" class="form-control" id="fbTarget"/> - <input type="button" class="btn btn-default btn-sm" onclick="loadFile();" value="<?=gettext('Load')?>" /> - <input type="button" class="btn btn-default btn-sm" id="fbOpen" value="<?=gettext('Browse')?>" /> - <input type="button" class="btn btn-default btn-sm" onclick="saveFile();" value="<?=gettext('Save')?>" /> + <div class="btn-group"> + <button type="button" class="btn btn-default btn-sm" onclick="loadFile();" value="<?=gettext('Load')?>"> + <i class="fa fa-file-text-o"></i> + <?=gettext('Load')?> + </button> + <button type="button" class="btn btn-default btn-sm" id="fbOpen" value="<?=gettext('Browse')?>"> + <i class="fa fa-list"></i> + <?=gettext('Browse')?> + </button> + <button type="button" class="btn btn-default btn-sm" onclick="saveFile();" value="<?=gettext('Save')?>"> + <i class="fa fa-save"></i> + <?=gettext('Save')?> + </button> + </div> <span class="pull-right"> - <button id="btngoto" class="btn btn-default btn-sm"><?=gettext("GoTo Line #")?></button> <input type="number" id="gotoline" size="6" /> + <button id="btngoto" class="btn btn-default btn-sm"><i class="fa fa-forward"></i><?=gettext("GoTo Line #")?></button> <input type="number" id="gotoline" size="6" /> </span> </form> 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') { <div class="content"> <p><?=gettext('Click "Halt" to halt the system immediately, or "No" to go to the system dashboard. (There will be a brief delay before the dashboard appears.)')?></p> <form action="diag_halt.php" method="post"> - <input type="submit" class="btn btn-danger pull-center" name="save" value="<?=gettext("Halt")?>"> - <a href="/" class="btn btn-default"><?=gettext("No")?></a> + <button type="submit" class="btn btn-danger pull-center" name="save" value="<?=gettext("Halt")?>" title="<?=gettext("Halt the system and power off")?>"> + <i class="fa fa-stop-circle"></i> + <?=gettext("Halt")?> + </button> + <a href="/" class="btn btn-success"> + <i class="fa fa-play"></i> + <?=gettext("No")?> + </a> </form> </div> </div> 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() { <div class="content"> <p><?=gettext('Click "Reboot" to reboot the system immediately, or "No" to go to the system dashboard without rebooting. (There will be a brief delay before the dashboard appears.)')?></p> <form action="diag_reboot.php" method="post"> - <input type="submit" class="btn btn-danger pull-center" name="Submit" value="<?=gettext("Reboot")?>"> - <a href="/" class="btn btn-default"><?=gettext("No")?></a> + <button type="submit" class="btn btn-danger pull-center" name="Submit" value="<?=gettext("Reboot")?>" title="<?=gettext("Reboot the system")?>"> + <i class="fa fa-refresh"></i> + <?=gettext("Reboot")?> + </button> + <a href="/" class="btn btn-success"> + <i class="fa fa-play"></i> + <?=gettext("No")?> + </a> </form> </div> </div> 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; ?> <script type="text/javascript"> diff --git a/src/usr/local/www/diag_smart.php b/src/usr/local/www/diag_smart.php index 03832d7..4de1338 100644 --- a/src/usr/local/www/diag_smart.php +++ b/src/usr/local/www/diag_smart.php @@ -149,8 +149,14 @@ switch ($action) { <input type="hidden" name="device" value="<?=$targetdev?>" /> <input type="hidden" name="action" value="abort" /> <nav class="action-buttons"> - <input type="submit" name="submit" class="btn btn-danger" value="<?=gettext("Abort")?>" /> - <a href="<?=$_SERVER['PHP_SELF']?>" class="btn btn-default"><?=gettext("Back")?></a> + <button type="submit" name="submit" class="btn btn-danger" value="<?=gettext("Abort")?>"> + <i class="fa fa-times icon-embed-btn"></i> + <?=gettext("Abort Test")?> + </button> + <a href="<?=$_SERVER['PHP_SELF']?>" class="btn btn-info"> + <i class="fa fa-undo icon-embed-btn"></i> + <?=gettext("Back")?> + </a> </nav> </form> @@ -178,7 +184,10 @@ switch ($action) { </div> <nav class="action-buttons"> - <a href="<?=$_SERVER['PHP_SELF']?>" class="btn btn-default"><?=gettext("Back")?></a> + <a href="<?=$_SERVER['PHP_SELF']?>" class="btn btn-info"> + <i class="fa fa-undo icon-embed-btn"></i> + <?=gettext("Back")?> + </a> </nav> <?php break; @@ -203,7 +212,10 @@ switch ($action) { </div> <nav class="action-buttons"> - <a href="<?=$_SERVER['PHP_SELF']?>" class="btn btn-default"><?=gettext("Back")?></a> + <a href="<?=$_SERVER['PHP_SELF']?>" class="btn btn-info"> + <i class="fa fa-undo icon-embed-btn"></i> + <?=gettext("Back")?> + </a> </nav> <?php break; @@ -282,8 +294,10 @@ switch ($action) { if (!empty($pconfig['smartmonemail'])) { $form->addGlobal(new Form_Button( 'test', - 'Send test email' - ))->removeClass('btn-primary')->addClass('btn-default'); + 'Send test email', + null, + 'fa-send' + ))->addClass('btn-info'); } print($form); @@ -300,9 +314,11 @@ switch ($action) { $btnview = new Form_Button( 'submit', - 'View' + 'View', + null, + 'fa-file-o' ); - + $btnview->addClass('btn-primary'); $btnview->setAttribute('id'); $section = new Form_Section('Information'); @@ -378,9 +394,11 @@ switch ($action) { $btntest = new Form_Button( 'submit', - 'Test' + 'Test', + null, + 'fa-wrench' ); - + $btntest->addClass('btn-primary'); $btntest->setAttribute('id'); $section = new Form_Section('Perform self-tests'); @@ -449,9 +467,11 @@ switch ($action) { $btnview = new Form_Button( 'submit', - 'View' + 'View', + null, + 'fa-file-o' ); - + $btnview->addClass('btn-primary'); $btnview->setAttribute('id'); $section = new Form_Section('View Logs'); @@ -501,10 +521,12 @@ switch ($action) { // Abort $btnabort = new Form_Button( 'submit', - 'Abort' + 'Abort', + null, + 'fa-times' ); - $btnabort->removeClass('btn-primary')->addClass('btn-danger')->setAttribute('id'); + $btnabort->addClass('btn-danger')->setAttribute('id'); $form = new Form(false); diff --git a/src/usr/local/www/diag_sockets.php b/src/usr/local/www/diag_sockets.php index b03aff2..d03a0f2 100644 --- a/src/usr/local/www/diag_sockets.php +++ b/src/usr/local/www/diag_sockets.php @@ -71,7 +71,10 @@ $showAllText = $showAll ? gettext("Show only listening sockets") : gettext("Show $showAllOption = $showAll ? "" : "?showAll"; ?> -<input class="btn btn-info btn-sm" type="button" value="<?=$showAllText?>" onclick="window.location.href='diag_sockets.php<?=$showAllOption?>'"/> +<button class="btn btn-info btn-sm" type="button" value="<?=$showAllText?>" onclick="window.location.href='diag_sockets.php<?=$showAllOption?>'"> + <i class="fa fa-<?= ($showAll) ? 'minus-circle' : 'plus-circle' ; ?> icon-embed-btn"></i> + <?=$showAllText?> +</button> <br /> <br /> diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index 0efbc47..d46cb93 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -177,13 +177,17 @@ if ($bogons || $urltable || !empty($entries)) { if ($bogons || $urltable) { $group->add(new Form_Button( 'Download', - 'Update' - ))->removeClass('btn-primary')->addClass('btn-success btn-sm'); + 'Update', + null, + 'fa-refresh' + ))->addClass('btn-success btn-sm'); } elseif (!empty($entries)) { $group->add(new Form_Button( 'clearall', - 'Clear Table' - ))->removeClass('btn-primary')->addClass('btn-danger btn-sm'); + 'Clear Table', + null, + 'fa-undo' + ))->addClass('btn-danger btn-sm'); } } @@ -313,7 +317,9 @@ if (empty($entries)) { </td> <td> <?php if (!$bogons && !$urltable): ?> - <a class="btn btn-xs btn-default" data-entry="<?=htmlspecialchars($entry)?>"><?=gettext("Remove")?></a> + <a style="cursor: pointer;" data-entry="<?=htmlspecialchars($entry)?>"> + <i class="fa fa-trash" title="<?= gettext("Remove this entry") ?>"></i> + </a> <?php endif ?> </td> </tr> diff --git a/src/usr/local/www/diag_testport.php b/src/usr/local/www/diag_testport.php index 570289b..763742a 100644 --- a/src/usr/local/www/diag_testport.php +++ b/src/usr/local/www/diag_testport.php @@ -245,7 +245,7 @@ if ($input_errors) { gettext('This test does not function for UDP since there is no way to reliably determine if a UDP port accepts connections in this manner.'), 'warning', false); } -$form = new Form('Test'); +$form = new Form(false); $section = new Form_Section('Test Port'); @@ -296,6 +296,14 @@ $section->addInput(new Form_Select( " For example if you force IPv4 and use a hostname that only returns an AAAA IPv6 IP address, it will not work."); $form->add($section); + +$form->addGlobal(new Form_Button( + 'Submit', + 'Test', + null, + 'fa-wrench' +))->addClass('btn-primary'); + print $form; // If the command succeeded, the user asked to see the output and there is output, then show it. diff --git a/src/usr/local/www/diag_traceroute.php b/src/usr/local/www/diag_traceroute.php index f0b22b0..eb1d762 100644 --- a/src/usr/local/www/diag_traceroute.php +++ b/src/usr/local/www/diag_traceroute.php @@ -155,7 +155,7 @@ if ($do_traceroute) { } } -$form = new Form('Traceroute'); +$form = new Form(false); $section = new Form_Section('Traceroute'); @@ -203,6 +203,14 @@ $section->addInput(new Form_Checkbox( ))->setHelp('By default, traceroute uses UDP but that may be blocked by some routers. Check this box to use ICMP instead, which may succeed. '); $form->add($section); + +$form->addGlobal(new Form_Button( + 'Submit', + 'Traceroute', + null, + 'fa-rss' +))->addClass('btn-primary'); + print $form; /* Show the traceroute results */ diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index 35af5c9..8b52010 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -454,6 +454,7 @@ print($tree); if (count($altq_list_queues) > 0) { ?> <a href="firewall_shaper.php?action=resetall" class="btn btn-sm btn-danger"> + <i class="fa fa-trash icon-embed-btn"></i> <?=gettext('Remove Shaper')?> </a> <?php @@ -476,7 +477,8 @@ if (!$dfltmsg && $sform) { $sform->addGlobal(new Form_Button( 'add', 'Add new Queue', - $url + $url, + 'fa-plus' ))->removeClass('btn-default')->addClass('btn-success'); } @@ -490,7 +492,8 @@ if (!$dfltmsg && $sform) { $sform->addGlobal(new Form_Button( 'delete', $queue ? 'Delete this queue':'Disable shaper on interface', - $url + $url, + 'fa-trash' ))->removeClass('btn-default')->addClass('btn-danger'); } diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 1965b89..24f6bb4 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -425,6 +425,7 @@ display_top_tabs($tab_array); <td class="col-md-1"> <?=$tree?> <a href="firewall_shaper_vinterface.php?pipe=new&action=add" class="btn btn-sm btn-success"> + <i class="fa fa-plus icon-embed-btn"></i> <?=gettext('New Limiter')?> </a> </td> @@ -446,7 +447,8 @@ if ($dfltmsg) { $sform->addGlobal(new Form_Button( 'add', 'Add new Queue', - $url + $url, + 'fa-plus' ))->removeClass('btn-default')->addClass('btn-success'); } @@ -460,7 +462,8 @@ if ($dfltmsg) { $sform->addGlobal(new Form_Button( 'delete', ($queue && ($qname != $pipe)) ? 'Delete this queue':'Delete Limiter', - $url + $url, + 'fa-trash' ))->removeClass('btn-default')->addClass('btn-danger'); } } diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index c2c8730..d1af101 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -415,8 +415,10 @@ $group->add(new Form_IpAddress( $group->add(new Form_Button( 'btnaddtopool', - 'Add to pool' -))->removeClass('btn-primary')->addClass('btn-default'); + 'Add to pool', + null, + 'fa-plus' +))->addClass('btn-success'); $section->add($group); @@ -458,13 +460,17 @@ $group = new Form_Group(''); $group->add(new Form_Button( 'removedisabled', - 'Remove' -))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Remove', + null, + 'fa-trash' +))->addClass('btn-danger btn-sm'); $group->add(new Form_Button( 'removeenabled', - 'Remove' -))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Remove', + null, + 'fa-trash' +))->addClass('btn-danger btn-sm'); $section->add($group); @@ -472,13 +478,17 @@ $group = new Form_Group(''); $group->add(new Form_Button( 'movetoenabled', - 'Move to enabled list >' -))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Move to enabled list', + null, + 'fa-angle-double-right' +))->addClass('btn-info btn-sm'); $group->add(new Form_Button( 'movetodisabled', - '< Move to disabled list' -))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Move to disabled list', + null, + 'fa-angle-double-left' +))->addClass('btn-info btn-sm'); $section->add($group); diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 68165ee..0f36a11 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -887,8 +887,10 @@ if (!is_numeric($pool) && !($act == "newpool")) { $btnaddpool = new Form_Button( 'btnaddpool', 'Add pool', - 'services_dhcp.php?if=' . htmlspecialchars($if) . '&act=newpool' + 'services_dhcp.php?if=' . htmlspecialchars($if) . '&act=newpool', + 'fa-plus' ); + $btnaddpool->addClass('btn-success'); $section->addInput(new Form_StaticText( 'Add', diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index ae743ef..dc4dd92 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -434,7 +434,9 @@ $macaddress = new Form_Input( $btnmymac = new Form_Button( 'btnmymac', - 'Copy My MAC' + 'Copy My MAC', + null, + 'fa-clone' ); $btnmymac->removeClass('btn-primary')->addClass('btn-success btn-sm'); diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 85e518c..55cfe08 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -444,7 +444,9 @@ if (isset($id) && $a_dyndns[$id]) { $form->addGlobal(new Form_Button( 'force', - 'Save & Force Update' + 'Save & Force Update', + null, + 'fa-refresh' ))->removeClass('btn-primary')->addClass('btn-info'); } diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index 516af74..350e9e4 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -164,7 +164,7 @@ if ($savemsg) { print_info_box($savemsg, $class); } -$form = new Form('Send'); +$form = new Form(false); $section = new Form_Section('Wake-on-LAN'); @@ -182,6 +182,13 @@ $section->addInput(new Form_Input( $mac ))->setHelp(gettext('Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx')); +$section->addInput(new Form_Button( + 'Submit', + 'Send', + null, + 'fa-power-off' +))->addClass('btn-primary'); + $form->add($section); print $form; ?> @@ -227,10 +234,12 @@ print $form; </div> <div class="panel-footer"> <a class="btn btn-success" href="services_wol_edit.php"> + <i class="fa fa-plus icon-embed-btn"></i> <?=gettext("Add");?> </a> <a href="services_wol.php?wakeall=true" role="button" class="btn btn-primary"> + <i class="fa fa-power-off icon-embed-btn"></i> <?=gettext("Wake all devices")?> </a> </div> diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index 6013db6..905847e 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -201,7 +201,7 @@ if (!empty($cpzone)): ?> <?php endif; ?> - <th></th> + <th><?=gettext("Actions")?></th> </tr> <?php @@ -237,19 +237,18 @@ if (!empty($cpzone)): ?> echo htmlspecialchars(date("m/d/Y H:i:s", $last_act)); } ?> - </td> <?php - else: + else: ?> - <td colspan="2"> + <td> <?=htmlspecialchars(date("m/d/Y H:i:s", $cpent[0]))?> </td> <?php - endif; + endif; ?> <td> - <a href="?zone=<?=htmlspecialchars($cpzone)?>&order=<?=$_GET['order']?>&showact=<?=htmlspecialchars($_GET['showact'])?>&act=del&id=<?=$cpent[5]?>" class="btn btn-xs btn-danger"><?=gettext("Disconnect")?></a> + <a href="?zone=<?=htmlspecialchars($cpzone)?>&order=<?=$_GET['order']?>&showact=<?=htmlspecialchars($_GET['showact'])?>&act=del&id=<?=$cpent[5]?>"><i class="fa fa-trash" title="<?=gettext("Disconnect this User")?>"></i></a> </td> </tr> <?php diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php index 9c5735f..239d134 100644 --- a/src/usr/local/www/status_carp.php +++ b/src/usr/local/www/status_carp.php @@ -190,8 +190,8 @@ if ($carpcount == 0) { } ?> - <input type="submit" class="btn btn-warning" name="disablecarp" value="<?=($carp_enabled ? gettext("Temporarily Disable CARP") : gettext("Enable CARP"))?>" /> - <input type="submit" class="btn btn-info" name="carp_maintenancemode" id="carp_maintenancemode" value="<?=(isset($config["virtualip_carp_maintenancemode"]) ? gettext("Leave Persistent CARP Maintenance Mode") : gettext("Enter Persistent CARP Maintenance Mode"))?>" /> + <button type="submit" class="btn btn-warning" name="disablecarp" value="<?=($carp_enabled ? gettext("Temporarily Disable CARP") : gettext("Enable CARP"))?>" ><i class="fa fa-<?=($carp_enabled) ? 'ban' : 'check' ; ?> icon-embed-btn"></i><?=($carp_enabled ? gettext("Temporarily Disable CARP") : gettext("Enable CARP"))?></button> + <button type="submit" class="btn btn-info" name="carp_maintenancemode" id="carp_maintenancemode" value="<?=(isset($config["virtualip_carp_maintenancemode"]) ? gettext("Leave Persistent CARP Maintenance Mode") : gettext("Enter Persistent CARP Maintenance Mode"))?>" ><i class="fa fa-wrench icon-embed-btn"></i><?=(isset($config["virtualip_carp_maintenancemode"]) ? gettext("Leave Persistent CARP Maintenance Mode") : gettext("Enter Persistent CARP Maintenance Mode"))?></button> <br /><br /> diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php index a6710bf..2981252 100644 --- a/src/usr/local/www/status_dhcp_leases.php +++ b/src/usr/local/www/status_dhcp_leases.php @@ -518,9 +518,9 @@ foreach ($leases as $data): </div> <?php if ($_GET['all']): ?> - <a class="btn btn-default" href="status_dhcp_leases.php?all=0"><?=gettext("Show active and static leases only")?></a> + <a class="btn btn-info" href="status_dhcp_leases.php?all=0"><i class="fa fa-minus-circle icon-embed-btn"></i><?=gettext("Show active and static leases only")?></a> <?php else: ?> - <a class="btn btn-default" href="status_dhcp_leases.php?all=1"><?=gettext("Show all configured leases")?></a> + <a class="btn btn-info" href="status_dhcp_leases.php?all=1"><i class="fa fa-plus-circle icon-embed-btn"></i><?=gettext("Show all configured leases")?></a> <?php endif; include("foot.inc"); diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index d56eb67..5df098f 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -624,9 +624,9 @@ foreach ($prefixes as $data): </div> <?php if ($_GET['all']): ?> - <a class="btn btn-default" href="status_dhcpv6_leases.php?all=0"><?=gettext("Show active and static leases only")?></a> + <a class="btn btn-info" href="status_dhcpv6_leases.php?all=0"><i class="fa fa-minus-circle icon-embed-btn"></i><?=gettext("Show active and static leases only")?></a> <?php else: ?> - <a class="btn btn-default" href="status_dhcpv6_leases.php?all=1"><?=gettext("Show all configured leases")?></a> + <a class="btn btn-info" href="status_dhcpv6_leases.php?all=1"><i class="fa fa-plus-circle icon-embed-btn"></i><?=gettext("Show all configured leases")?></a> <?php endif; include("foot.inc"); diff --git a/src/usr/local/www/status_filter_reload.php b/src/usr/local/www/status_filter_reload.php index f46e1b0..e1f09f3 100644 --- a/src/usr/local/www/status_filter_reload.php +++ b/src/usr/local/www/status_filter_reload.php @@ -94,10 +94,10 @@ include("head.inc"); <div class="panel-heading"><h2 class="panel-title"><?=gettext("Filter Reload");?></h2></div> <div class="panel-body"> <form action="status_filter_reload.php" method="post" name="filter"> - <input type="submit" class="btn btn-success" value="<?=gettext("Reload Filter")?>" name="reloadfilter" id="reloadfilter" /> + <button type="submit" class="btn btn-success" value="<?=gettext("Reload Filter")?>" name="reloadfilter" id="reloadfilter"><i class="fa fa-refresh icon-embed-btn"></i><?=gettext("Reload Filter")?></button> <?php if ($config['hasync'] && $config['hasync']["synchronizetoip"] != ""): ?> - <input type="submit" class="btn btn-default" value="<?=gettext("Force Config Sync")?>" name="syncfilter" id="syncfilter" /> + <button type="submit" class="btn btn-info" value="<?=gettext("Force Config Sync")?>" name="syncfilter" id="syncfilter"><i class="fa fa-clone icon-embed-btn"></i><?=gettext("Force Config Sync")?></button> <?php endif; ?> diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php index e3d3410..15300b9 100644 --- a/src/usr/local/www/status_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -274,13 +274,15 @@ if (is_array($status)) { <?php if ($ikesa['state'] != 'ESTABLISHED') { ?> - <a href="status_ipsec.php?act=connect&ikeid=<?=$con_id; ?>" class="btn btn-xs btn-success" data-toggle="tooltip" title="<?=gettext("Connect VPN");?>" > + <a href="status_ipsec.php?act=connect&ikeid=<?=$con_id; ?>" class="btn btn-xs btn-success" data-toggle="tooltip" title="<?=gettext("Connect VPN");?>" > + <i class="fa fa-sign-in icon-embed-btn"></i> <?=gettext("Connect VPN")?> </a> <?php } else { ?> <a href="status_ipsec.php?act=ikedisconnect&ikeid=<?=$con_id; ?>" class="btn btn-xs btn-danger" data-toggle="tooltip" title="<?=gettext("Disconnect VPN");?>"> + <i class="fa fa-trash icon-embed-btn"></i> <?=gettext("Disconnect")?> </a><br /> <?php @@ -294,7 +296,8 @@ if (is_array($status)) { if (is_array($ikesa['child-sas']) && (count($ikesa['child-sas']) > 0)) { ?> <div id="btnchildsa-<?=$ikeid?>"> - <a type="button" onclick="show_childsa('childsa-<?=$ikeid?>','btnchildsa-<?=$ikeid?>');" class="btn btn-sm btn-default" /> + <a type="button" onclick="show_childsa('childsa-<?=$ikeid?>','btnchildsa-<?=$ikeid?>');" class="btn btn-sm btn-info" /> + <i class="fa fa-plus-circle icon-embed-btn"></i> <?=gettext('Show child SA entries')?> </a> </div> @@ -390,6 +393,7 @@ if (is_array($status)) { </td> <td> <a href="status_ipsec.php?act=childdisconnect&ikeid=<?=$con_id; ?>&ikesaid=<?=$childsa['uniqueid']; ?>" class="btn btn-xs btn-warning" data-toggle="tooltip" title="<?=gettext('Disconnect Child SA')?>"> + <i class="fa fa-trash icon-embed-btn"></i> <?=gettext("Disconnect")?> </a> </td> @@ -491,6 +495,7 @@ foreach ($a_phase1 as $ph1ent) { </td> <td > <a href="status_ipsec.php?act=connect&ikeid=<?=$ph1ent['ikeid']; ?>" class="btn btn-xs btn-success"> + <i class="fa fa-sign-in icon-embed-btn"></i> <?=gettext("Connect VPN")?> </a> </td> diff --git a/src/usr/local/www/status_ipsec_sad.php b/src/usr/local/www/status_ipsec_sad.php index a831bb6..d2adf5c 100644 --- a/src/usr/local/www/status_ipsec_sad.php +++ b/src/usr/local/www/status_ipsec_sad.php @@ -135,7 +135,7 @@ if (count($sad)) { $args .= "&proto=" . rawurlencode($sa['proto']); $args .= "&spi=" . rawurlencode("0x" . $sa['spi']); ?> - <a class="btn btn-xs btn-danger" href="status_ipsec_sad.php?act=del&<?=$args?>"><?=gettext('Delete')?></a> + <a href="status_ipsec_sad.php?act=del&<?=$args?>"><i class="fa fa-trash" title="<?=gettext("Remove this SPD Entry")?>"></i></a> </td> </tr> diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index 3274b17..452f84c 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -192,8 +192,12 @@ include("head.inc"); ?> if (is_array($server['routes']) && count($server['routes'])): ?> <div id="shroutebut-<?= $i ?>"> - <input type="button" onClick="show_routes('tabroute-<?= $i ?>','shroutebut-<?= $i ?>')" value="<?php echo gettext("Show Routing Table"); ?>" /> - <?= gettext("Display OpenVPN's internal routing table for this server.") ?> - <br /><br /> + <button type="button" class="btn btn-info" onClick="show_routes('tabroute-<?= $i ?>','shroutebut-<?= $i ?>')" value="<?php echo gettext("Show Routing Table"); ?>"> + <i class="fa fa-plus-circle icon-embed-btn"></i> + <?php echo gettext("Show Routing Table"); ?> + </button> + - <?= gettext("Display OpenVPN's internal routing table for this server.") ?> + <br /><br /> </div> <div class="panel panel-default" id="tabroute-<?=$i?>" style="display: none;"> <div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?> <?=gettext("Routing Table"); ?></h2></div> diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index e065e9c..be9466e 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -268,7 +268,7 @@ function build_priv_table() { $privhtml .= '</div>'; $privhtml .= '<nav class="action-buttons">'; - $privhtml .= '<a href="system_groupmanager_addprivs.php?groupid=' . $id . '" class="btn btn-success">' . gettext("Add") . '</a>'; + $privhtml .= '<a href="system_groupmanager_addprivs.php?groupid=' . $id . '" class="btn btn-success"><i class="fa fa-plus icon-embed-btn"></i>' . gettext("Add") . '</a>'; $privhtml .= '</nav>'; return($privhtml); @@ -449,13 +449,17 @@ if ($pconfig['gid'] != 1998) { // all users group $group->add(new Form_Button( 'movetoenabled', - 'Move to "Members" >' - ))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Move to "Members"', + null, + 'fa-angle-double-right' + ))->removeClass('btn-primary')->addClass('btn-info btn-sm'); $group->add(new Form_Button( 'movetodisabled', - '< Move to "Not members' - ))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Move to "Not members', + null, + 'fa-angle-double-left' + ))->removeClass('btn-primary')->addClass('btn-info btn-sm'); $group->setHelp('Hold down CTRL (pc)/COMMAND (mac) key to select multiple items'); $section->add($group); diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 0563287..3d9c67c 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -413,7 +413,7 @@ function build_priv_table() { $privhtml .= '</div>'; $privhtml .= '<nav class="action-buttons">'; - $privhtml .= '<a href="system_usermanager_addprivs.php?userid=' . $id . '" class="btn btn-success">' . gettext("Add") . '</a>'; + $privhtml .= '<a href="system_usermanager_addprivs.php?userid=' . $id . '" class="btn btn-success"><i class="fa fa-plus icon-embed-btn"></i>' . gettext("Add") . '</a>'; $privhtml .= '</nav>'; return($privhtml); @@ -459,7 +459,7 @@ function build_cert_table() { $certhtml .= '</div>'; $certhtml .= '<nav class="action-buttons">'; - $certhtml .= '<a href="system_certmanager.php?act=new&userid=' . $id . '" class="btn btn-success">' . gettext("Add") . '</a>'; + $certhtml .= '<a href="system_certmanager.php?act=new&userid=' . $id . '" class="btn btn-success"><i class="fa fa-plus icon-embed-btn"></i>' . gettext("Add") . '</a>'; $certhtml .= '</nav>'; return($certhtml); @@ -716,13 +716,17 @@ if ($act == "new" || $act == "edit" || $input_errors): $group->add(new Form_Button( 'movetoenabled', - 'Move to "Member of" list >' - ))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Move to "Member of" list', + null, + 'fa-angle-double-right' + ))->removeClass('btn-primary')->addClass('btn-info btn-sm'); $group->add(new Form_Button( 'movetodisabled', - '< Move to "Not member of" list' - ))->removeClass('btn-primary')->addClass('btn-default btn-sm'); + 'Move to "Not member of" list', + null, + 'fa-angle-double-left' + ))->removeClass('btn-primary')->addClass('btn-info btn-sm'); $group->setHelp('Hold down CTRL (pc)/COMMAND (mac) key to select multiple items'); $section->add($group); diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index d4b6567..0ef51b0 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -179,8 +179,10 @@ $section->addInput(new Form_Select( $form->addGlobal(new Form_Button( 'savetest', - 'Save & Test' -))->removeClass('btn-primary')->addClass('btn-default'); + 'Save & Test', + null, + 'fa-wrench' +))->addClass('btn-info'); $form->add($section); print $form; diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index a952093..d2a9f79 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -305,7 +305,7 @@ display_top_tabs($tab_array); <a class="fa fa-anchor" id="Xmove_<?=$i?>" title="<?=gettext("Move checked entries to here")?>"></a> </td> <td> - <button value="toggle_<?=$i?>" name="toggle_<?=$i?>" title="<?=gettext("click to toggle enabled/disabled status")?>" class="btn btn-xs btn-default" type="submit"><?= ($entryStatus == 'disabled' ? 'enable' : 'disable') ?></button> + <button value="toggle_<?=$i?>" name="toggle_<?=$i?>" title="<?=gettext("click to toggle enabled/disabled status")?>" class="btn btn-xs btn-<?= ($entryStatus == 'disabled' ? 'success' : 'warning') ?>" type="submit"><?= ($entryStatus == 'disabled' ? 'Enable' : 'Disable') ?></button> </td> <td id="frd<?=$i?>"> <?php @@ -455,7 +455,7 @@ display_top_tabs($tab_array); <button class="fa fa-anchor button-icon" type="submit" name="movep2_<?=$j?>" value="movep2_<?=$j?>" title="<?=gettext("Move checked P2s here")?>"></button> </td> <td> - <button value="togglep2_<?=$ph2index?>" name="togglep2_<?=$ph2index?>" title="<?=gettext("click to toggle enabled/disabled status")?>" class="btn btn-xs btn-default" type="submit"><?= ($entryStatus == 'disabled'? 'enable' : 'disable') ?></button> + <button value="togglep2_<?=$ph2index?>" name="togglep2_<?=$ph2index?>" title="<?=gettext("click to toggle enabled/disabled status")?>" class="btn btn-xs btn-<?= ($entryStatus == 'disabled'? 'success' : 'warning') ?>" type="submit"><?= ($entryStatus == 'disabled'? 'Enable' : 'Disable') ?></button> </td> <td id="<?=$fr_d?>" onclick="fr_toggle('<?=$j?>', '<?=$fr_prefix?>')"> <?=$ph2ent['mode']?> |