From 827a3812e1c2cfee1764fc7c8565b1dd0fb1b87a Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 10 Mar 2016 12:52:35 -0500
Subject: More icon/button inconsistencies. Ticket #5965

---
 src/usr/local/www/interfaces.php | 53 +++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

(limited to 'src/usr/local/www/interfaces.php')

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
-- 
cgit v1.1