More icon and button consistency fixes. Ticket #5965

21 files changed, 88 insertions, 82 deletions

diff --git a/src/usr/local/pkg/miniupnpd.xml b/src/usr/local/pkg/miniupnpd.xml
index fb11688..80034ea 100644
--- a/src/usr/local/pkg/miniupnpd.xml
+++ b/src/usr/local/pkg/miniupnpd.xml
@@ -3,7 +3,6 @@
 	<title>Services/UPnP &amp; NAT-PMP</title>
 	<name>miniupnpd</name>
 	<version>20100712</version>
-	<savetext>Change</savetext>
 	<include_file>/usr/local/pkg/miniupnpd.inc</include_file>
 	<menu>
 		<name>UPnP &amp; NAT-PMP</name>
diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php
index d8d5a7f..a29dea2 100644
--- a/src/usr/local/www/diag_resetstate.php
+++ b/src/usr/local/www/diag_resetstate.php
@@ -119,14 +119,7 @@ if (isset($config['system']['lb_use_sticky'])) {
 $tab_array[] = array(gettext("Reset States"), true, "diag_resetstate.php");
 display_top_tabs($tab_array);
 
-$resetbtn = new Form_Button(
-	'Submit',
-	'Reset'
-);
-
-$resetbtn->removeClass('btn-primary')->addClass('btn-danger');
-
-$form = new Form($resetbtn);
+$form = new Form(false);
 
 $section = new Form_Section('Select States to Reset');
 
@@ -147,6 +140,14 @@ if (isset($config['system']['lb_use_sticky'])) {
 }
 
 $form->add($section);
+
+$form->addGlobal(new Form_Button(
+	'Submit',
+	'Reset',
+	null,
+	'fa-trash'
+))->addClass('btn-danger');
+
 print $form;
 ?>
 
diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php
index e1dcd95..585d318 100644
--- a/src/usr/local/www/firewall_nat_1to1_edit.php
+++ b/src/usr/local/www/firewall_nat_1to1_edit.php
@@ -392,10 +392,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('Edit NAT 1:1 Entry');
 
diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php
index 2dee79d..be854b6 100644
--- a/src/usr/local/www/firewall_nat_edit.php
+++ b/src/usr/local/www/firewall_nat_edit.php
@@ -657,10 +657,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('Edit Redirect Entry');
 
diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php
index 829b0d0..db2b684 100644
--- a/src/usr/local/www/firewall_nat_out_edit.php
+++ b/src/usr/local/www/firewall_nat_out_edit.php
@@ -439,10 +439,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('Edit Advanced Outbound NAT Entry');
 
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index 8c6f563..592dce0 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -1711,10 +1711,7 @@ if ($savemsg) {
 }
 
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('General Configuration');
 
diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php
index 8657041..b532f55 100644
--- a/src/usr/local/www/interfaces_qinq_edit.php
+++ b/src/usr/local/www/interfaces_qinq_edit.php
@@ -256,10 +256,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('QinQ Configuration');
 
@@ -321,6 +318,7 @@ foreach ($item as $ww) {
 	$member = $item[$counter];
 
 	$group = new Form_Group($counter == 0 ? 'Tag(s)':'');
+	$group->addClass('repeatable');
 
 	$group->add(new Form_Input(
 		'members',
@@ -329,12 +327,25 @@ foreach ($item as $ww) {
 		$ww
 	))->setWidth(6); // Width must be <= 8 to make room for the duplication buttons
 
-$counter++;
+	$group->add(new Form_Button(
+		'deleterow' . $counter,
+		'Delete',
+		null,
+		'fa-trash'
+	))->addClass('btn-warning');
+
+	$counter++;
 
-$group->enableDuplication(null, true); // Buttons are in-line with the input
-$section->add($group);
+	$section->add($group);
 }
 
+$form->addGlobal(new Form_Button(
+	'addrow',
+	'Add Tag',
+	null,
+	'fa-plus'
+))->addClass('btn-success addbtn');
+
 $form->add($section);
 
 print($form);
diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php
index cdbd900..53c6978 100644
--- a/src/usr/local/www/load_balancer_monitor_edit.php
+++ b/src/usr/local/www/load_balancer_monitor_edit.php
@@ -294,10 +294,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('Edit Load Balancer - Monitor Entry');
 
diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php
index d1af101..5f6d220 100644
--- a/src/usr/local/www/load_balancer_pool_edit.php
+++ b/src/usr/local/www/load_balancer_pool_edit.php
@@ -335,10 +335,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('Add/Edit Load Balancer - Pool Entry');
 
diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php
index 81fc672..f7b1637 100644
--- a/src/usr/local/www/services_captiveportal_filemanager.php
+++ b/src/usr/local/www/services_captiveportal_filemanager.php
@@ -179,10 +179,7 @@ display_top_tabs($tab_array, true);
 
 if ($_GET['act'] == 'add') {
 
-	$form = new Form(new Form_Button(
-		'Submit',
-		'Upload'
-	));
+	$form = new Form(false);
 
 	$form->setMultipartEncoding();
 
@@ -201,8 +198,15 @@ if ($_GET['act'] == 'add') {
 		'file'
 	));
 
-
 	$form->add($section);
+
+	$form->addGlobal(new Form_Button(
+		'Submit',
+		'Upload',
+		null,
+		'fa-upload'
+	))->addClass('btn-primary');
+
 	print($form);
 }
 
diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php
index bf5f6b6..b98add5 100644
--- a/src/usr/local/www/services_captiveportal_hostname_edit.php
+++ b/src/usr/local/www/services_captiveportal_hostname_edit.php
@@ -199,10 +199,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('Captive Portal Hostname Settings');
 
diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php
index 2b57d16..0d3f8c6 100644
--- a/src/usr/local/www/services_captiveportal_zones_edit.php
+++ b/src/usr/local/www/services_captiveportal_zones_edit.php
@@ -114,10 +114,7 @@ if ($input_errors) {
 	print_input_errors($input_errors);
 }
 
-$form = new Form(new Form_Button(
-	'submit',
-	'Continue'
-));
+$form = new Form(false);
 
 $section = new Form_Section('Add Captive Portal Zone');
 
@@ -133,6 +130,13 @@ $section->addInput(new Form_Input(
 
 $form->add($section);
 
+$form->addGlobal(new Form_Button(
+	'Submit',
+	'Save & Continue',
+	null,
+	'fa-save'
+))->addClass('btn-primary');
+
 print($form);
 
 include("foot.inc");
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index d211134..31f29ae 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -781,10 +781,7 @@ if ($tabscounter == 0) {
 display_top_tabs($tab_array);
 
 // This form uses a non-standard submit button name
-$form = new Form(new Form_Button(
-	'submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('General Options');
 
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 44c7256..990182e 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -590,10 +590,7 @@ $tab_array[] = array(gettext("DHCPv6 Server"),		 true,	"services_dhcpv6.php?if={
 $tab_array[] = array(gettext("Router Advertisements"), false, "services_router_advertisements.php?if={$if}");
 display_top_tabs($tab_array, false, 'nav nav-tabs');
 
-$form = new Form(new Form_Button(
-	'Submit',
-	'Save'
-));
+$form = new Form();
 
 $section = new Form_Section('DHCPv6 Options');
 
diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php
index 7af494e..db565e0 100644
--- a/src/usr/local/www/services_dnsmasq_edit.php
+++ b/src/usr/local/www/services_dnsmasq_edit.php
@@ -321,7 +321,7 @@ if ($pconfig['aliases']['item']) {
 			'deleterow' . $counter,
 			'Delete',
 			null,
-			'fa-plus'
+			'fa-trash'
 		))->addClass('btn-warning');
 
 		$section->add($group);
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index ed94756..59de63b 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -289,10 +289,7 @@ $tab_array[] = array(gettext("DHCPv6 Server"),		 false, "services_dhcpv6.php?if=
 $tab_array[] = array(gettext("Router Advertisements"), true,  "services_router_advertisements.php?if={$if}");
 display_top_tabs($tab_array, false, 'nav nav-tabs');
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('Advertisements');
 
diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php
index b19a332..7d7bc7c 100644
--- a/src/usr/local/www/status_captiveportal_expire.php
+++ b/src/usr/local/www/status_captiveportal_expire.php
@@ -105,7 +105,7 @@ $tab_array[] = array(gettext("Test Vouchers"), false, "status_captiveportal_test
 $tab_array[] = array(gettext("Expire Vouchers"), true, "status_captiveportal_expire.php?zone={$cpzone}");
 display_top_tabs($tab_array);
 
-$form = new Form('Expire');
+$form = new Form(false);
 
 $section = new Form_Section('Expire Vouchers');
 
@@ -123,6 +123,14 @@ $section->addInput(new Form_Input(
 ));
 
 $form->add($section);
+
+$form->addGlobal(new Form_Button(
+	'Submit',
+	'Expire',
+	null,
+	'fa-trash'
+))->addClass('btn-warning');
+
 print($form);
 
 include("foot.inc");
diff --git a/src/usr/local/www/status_captiveportal_test.php b/src/usr/local/www/status_captiveportal_test.php
index eade69c..8d447cd 100644
--- a/src/usr/local/www/status_captiveportal_test.php
+++ b/src/usr/local/www/status_captiveportal_test.php
@@ -113,7 +113,7 @@ $tab_array[] = array(gettext("Test Vouchers"), true, "status_captiveportal_test.
 $tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
 display_top_tabs($tab_array);
 
-$form = new Form('Test');
+$form = new Form(false);
 
 $section = new Form_Section('Test Vouchers');
 
@@ -131,6 +131,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/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php
index 60dfcd5..de2d595 100644
--- a/src/usr/local/www/status_logs_settings.php
+++ b/src/usr/local/www/status_logs_settings.php
@@ -243,10 +243,7 @@ $tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd");
 $tab_array[] = array(gettext("Settings"), true, "status_logs_settings.php");
 display_top_tabs($tab_array);
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section('General Logging Options');
 
@@ -336,8 +333,10 @@ $section->addInput(new Form_Checkbox(
 
 $section->addInput(new Form_Button(
 	'resetlogs',
-	'Reset Log Files'
-))->addClass('btn-danger btn-xs')->setHelp('Clears all local log files and reinitializes them as empty logs. This also restarts the DHCP daemon. Use the Save button first if you have made any setting changes.');
+	'Reset Log Files',
+	null,
+	'fa-trash'
+))->addClass('btn-danger btn-sm')->setHelp('Clears all local log files and reinitializes them as empty logs. This also restarts the DHCP daemon. Use the Save button first if you have made any setting changes.');
 
 $form->add($section);
 $section = new Form_Section('Remote Logging Options');
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index 788b875..edfff98 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -951,10 +951,7 @@ $form->add($section);
 print $form;
 
 } else if ($act == "csr" || (($_POST['save'] == gettext("Update")) && $input_errors)) {
-	$form = new Form(new Form_Button(
-		'save',
-		'Update'
-	));
+	$form = new Form(false);
 
 	$section = new Form_Section("Complete Signing Request for " . $pconfig['descr']);
 
@@ -997,6 +994,14 @@ print $form;
 	 }
 
 	$form->add($section);
+
+	$form->addGlobal(new Form_Button(
+		'Submit',
+		'Update',
+		null,
+		'fa-save'
+	))->addClass('btn-primary');
+
 	print($form);
 } else {
 ?>
diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php
index 2541def..7bc0d68 100644
--- a/src/usr/local/www/vpn_l2tp.php
+++ b/src/usr/local/www/vpn_l2tp.php
@@ -233,10 +233,7 @@ $tab_array[] = array(gettext("Configuration"), true, "vpn_l2tp.php");
 $tab_array[] = array(gettext("Users"), false, "vpn_l2tp_users.php");
 display_top_tabs($tab_array);
 
-$form = new Form(new Form_Button(
-	'Submit',
-	gettext("Save")
-));
+$form = new Form();
 
 $section = new Form_Section("Enable L2TP");