More icon/button inconsistencies. Ticket #5965

12 files changed, 94 insertions, 54 deletions

diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php
index 1d2886f..1784afc 100644
--- a/src/usr/local/www/diag_confbak.php
+++ b/src/usr/local/www/diag_confbak.php
@@ -204,8 +204,10 @@ $section->addInput(new Form_StaticText(
 
 $section->addInput(new Form_Button(
 	'Submit',
-	gettext("Save")
-));
+	gettext("Save"),
+	null,
+	'fa-save'
+))->addClass('btn-primary');
 
 $form->add($section);
 
@@ -236,7 +238,10 @@ if (is_array($confvers)):
 			<thead>
 				<tr>
 					<th colspan="2">
-						<input type="submit" name="diff" class="btn btn-info btn-xs" value="<?=gettext("Diff"); ?>" />
+						<button type="submit" name="diff" class="btn btn-info btn-xs" value="<?=gettext("Diff"); ?>">
+							<i class="fa fa-exchange icon-embed-btn"></i>
+							<?=gettext("Diff"); ?>
+						</button>
 					</th>
 					<th><?=gettext("Date")?></th>
 					<th><?=gettext("Version")?></th>
diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php
index 8cdc3cb..c47ff71 100755
--- a/src/usr/local/www/diag_dump_states.php
+++ b/src/usr/local/www/diag_dump_states.php
@@ -173,7 +173,12 @@ $section->addInput(new Form_Input(
 	['placeholder' => 'Simple filter such as 192.168, v6, icmp or ESTABLISHED']
 ));
 
-$filterbtn = new Form_Button('filterbtn', 'Filter', null, 'fa-filter');
+$filterbtn = new Form_Button(
+	'filterbtn',
+	'Filter',
+	null,
+	'fa-filter'
+);
 $filterbtn->addClass('btn-primary btn-sm');
 $section->addInput(new Form_StaticText(
 	'',
@@ -181,8 +186,13 @@ $section->addInput(new Form_StaticText(
 ));
 
 if (isset($_POST['filter']) && (is_ipaddr($_POST['filter']) || is_subnet($_POST['filter']))) {
-	$killbtn = new Form_Button('killfilter', 'Kill States');
-	$killbtn->removeClass('btn-primary')->addClass('btn-danger btn-sm');
+	$killbtn = new Form_Button(
+		'killfilter',
+		'Kill States',
+		null,
+		'fa-trash'
+	);
+	$killbtn->addClass('btn-danger btn-sm');
 	$section->addInput(new Form_StaticText(
 		'Kill filtered states',
 		$killbtn
diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php
index be854b6..9efa9d4 100644
--- a/src/usr/local/www/firewall_nat_edit.php
+++ b/src/usr/local/www/firewall_nat_edit.php
@@ -721,10 +721,12 @@ $section->addInput(new Form_Select(
 
 $btnsrcadv = new Form_Button(
 	'srcadv',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnsrcadv->removeClass('btn-primary')->addClass('btn-default');
+$btnsrcadv->addClass('btn-info');
 
 $section->addInput(new Form_StaticText(
 	'Source',
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 7aec4b5..b61b41e 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -1363,8 +1363,10 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) {
 	if ($type == 'src') {
 		$section->addInput(new Form_Button(
 			'btnsrcadv',
-			'Show advanced'
-		))->removeClass('btn-primary');
+			'Show advanced',
+			null,
+			'fa-cog'
+		))->addClass('btn-info');
 	}
 
 	$portValues = ['' => gettext('(other)'), 'any' => gettext('any')];
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index 592dce0..8d78d20 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -1754,10 +1754,12 @@ $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');
+$btnmymac->addClass('btn-success btn-sm');
 
 $group = new Form_Group('MAC controls');
 $group->add($macaddress);
@@ -2557,8 +2559,9 @@ $section->addInput(new Form_Select(
 $section->addInput(new Form_Button(
 	'btnadvppp',
 	'Advanced PPP',
-	isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php'
-))->setHelp('Create a new PPP configuration');
+	isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php',
+	'fa-cog'
+))->addClass('btn-info')->setHelp('Create a new PPP configuration');
 
 $form->add($section);
 
@@ -2679,17 +2682,12 @@ $group->add(new Form_MultiCheckbox(
 
 $section->add($group);
 
-if (isset($pconfig['pppid'])) {
-	$section->addInput(new Form_StaticText(
-		'Advanced and MLPPP',
-		'<a href="/interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) . '" class="navlnk">Click here for additional PPPoE configuration options. Save first if you made changes.</a>'
-	));
-} else {
-	$section->addInput(new Form_StaticText(
-		'Advanced and MLPPP',
-		'<a href="/interfaces_ppps_edit.php" class="navlnk">Click here for additional PPPoE configuration options and for MLPPP configuration.</a>'
-	));
-}
+$section->addInput(new Form_Button(
+	'btnadvppp',
+	'Advanced and MLPPP',
+	isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php',
+	'fa-cog'
+))->addClass('btn-info')->setHelp('Click for additional PPPoE configuration options. Save first if changes have been made.');
 
 $form->add($section);
 
@@ -2741,24 +2739,19 @@ $section->addInput(new Form_Input(
 ))->setHelp('If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. ' .
 			'An idle timeout of zero disables this feature.');
 
-if (isset($pconfig['pppid'])) {
-	if (isset($pconfig['pptp_localip'][1]) || isset($pconfig['pptp_subnet'][1]) || isset($pconfig['pptp_remote'][1])) {
-		$mlppp_text = gettext("There are additional Local and Remote IP addresses defined for MLPPP.") . "<br />";
-	} else {
-		$mlppp_text = "";
-	}
-
-	$section->addInput(new Form_StaticText(
-		'Advanced and MLPPP',
-		$mlppp_text . '<a href="/interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) . '" class="navlnk">Click here for additional PPTP and L2TP configuration options. Save first if you made changes.</a>'
-	));
+if (isset($pconfig['pptp_localip'][1]) || isset($pconfig['pptp_subnet'][1]) || isset($pconfig['pptp_remote'][1])) {
+	$mlppp_text = gettext("There are additional Local and Remote IP addresses defined for MLPPP.") . "<br />";
 } else {
-	$section->addInput(new Form_StaticText(
-		'Advanced and MLPPP',
-		'<a href="/interfaces_ppps_edit.php" class="navlnk">Click here for additional PPTP and L2TP configuration options.</a>'
-	));
+	$mlppp_text = "";
 }
 
+$section->addInput(new Form_Button(
+	'btnadvppp',
+	'Advanced and MLPPP',
+	isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php',
+	'fa-cog'
+))->addClass('btn-info')->setHelp($mlppp_text . 'Click for additional PPTP and L2TP configuration options. Save first if changes have been made.');
+
 $form->add($section);
 
 // Wireless interface
diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php
index d0a35a9..1a15a50 100644
--- a/src/usr/local/www/interfaces_ppps_edit.php
+++ b/src/usr/local/www/interfaces_ppps_edit.php
@@ -819,10 +819,12 @@ $section->add($group);
 
 $btnadvanced = new Form_Button(
 		'btnadvanced',
-		'Show'
+		'Advanced',
+		null,
+		'fa-cog'
 );
 
-$btnadvanced->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnadvanced->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Advanced options',
diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php
index eacd004..b62e057 100644
--- a/src/usr/local/www/pkg_edit.php
+++ b/src/usr/local/www/pkg_edit.php
@@ -1307,10 +1307,22 @@ foreach ($pkg['fields']['field'] as $pkga) {
 
 		// Create form button
 		case "button":
+			$newbtnicon = "fa-save";
+			if ($pkga['buttonicon'] != "") {
+				$newbtnicon = $pkga['buttonicon'];
+			}
+			$newbtnclass = "btn-primary";
+			if ($pkga['buttonclass'] != "") {
+				$newbtnclass = $pkga['buttonclass'];
+			}
+
 			$newbtn = new Form_Button(
 				$pkga['fieldname'],
-				$pkga['fieldname']
+				$pkga['fieldname'],
+				null,
+				$newbtnicon
 			);
+			$newbtn->addClass($newbtnclass);
 
 			if (grouping) {
 				$group->add(new Form_StaticText(
@@ -1498,8 +1510,10 @@ $form->addGlobal(new Form_Input(
 if (!empty($advanced)) {
 	$form->addGlobal(new Form_Button(
 		'showadv',
-		'Show advanced options'
-	))->removeClass('btn-primary')->addClass('btn-default');
+		'Show Advanced Options',
+		null,
+		'fa-cog'
+	))->addClass('btn-info');
 
 	$form->add($advanced);
 }
diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php
index a71b5aa..89ce6ce 100644
--- a/src/usr/local/www/services_captiveportal_mac_edit.php
+++ b/src/usr/local/www/services_captiveportal_mac_edit.php
@@ -246,7 +246,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_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php
index ff86376..f12e1ad 100644
--- a/src/usr/local/www/services_igmpproxy_edit.php
+++ b/src/usr/local/www/services_igmpproxy_edit.php
@@ -261,7 +261,9 @@ foreach ($item as $ww) {
 
 	$group->add(new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
+		'Delete',
+		null,
+		'fa-trash'
 	))->removeClass('btn-primary')->addClass('btn-warning');
 
 	$counter++;
@@ -270,7 +272,9 @@ foreach ($item as $ww) {
 
 $section->addInput(new Form_Button(
 	'addrow',
-	'Add network'
+	'Add network',
+	null,
+	'fa-plus'
 ))->removeClass('btn-primary')->addClass('btn-success addbtn');
 
 $form->add($section);
diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php
index 08eb3df..d3fc0a1 100644
--- a/src/usr/local/www/services_rfc2136_edit.php
+++ b/src/usr/local/www/services_rfc2136_edit.php
@@ -334,8 +334,10 @@ if (isset($id) && $a_rfc2136[$id]) {
 
 	$form->addGlobal(new Form_Button(
 		'force',
-		'Save & Force Update'
-	))->removeClass('btn-primary')->addClass('btn-info');
+		'Save & Force Update',
+		null,
+		'fa-refresh'
+	))->addClass('btn-info');
 }
 
 $form->add($section);
diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php
index afa03c7..c396446 100644
--- a/src/usr/local/www/system_crlmanager.php
+++ b/src/usr/local/www/system_crlmanager.php
@@ -572,8 +572,10 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
 
 		$group->add(new Form_Button(
 			'submit',
-			'Add'
-			))->removeClass('btn-primary')->addClass('btn-success btn-sm');
+			'Add',
+			null,
+			'fa-plus'
+			))->addClass('btn-success btn-sm');
 
 		$section->add($group);
 
diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php
index f9d00dd..01e3af2 100644
--- a/src/usr/local/www/wizard.php
+++ b/src/usr/local/www/wizard.php
@@ -811,8 +811,10 @@ if ($pkg['step'][$stepid]['fields']['field'] != "") {
 			case "submit":
 				$form->addGlobal(new Form_Button(
 					$name,
-					$field['name']
-				));
+					$field['name'],
+					null,
+					'fa-angle-double-right'
+				))->addClass('btn-primary');
 
 				break;
 			case "listtopic":