Advanced button consistency. Ticket #5965

9 files changed, 104 insertions, 56 deletions

diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 3dd4bfa..7aec4b5 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -1443,10 +1443,12 @@ $adv_open = is_aoadv_used($pconfig);
 
 $btnadvanced = new Form_Button(
 	'toggle-advanced',
-	'Advanced options'
+	'Advanced Options',
+	null,
+	'fa-cog'
 );
 
-$btnadvanced->removeClass('btn-primary')->addClass('btn-default');
+$btnadvanced->addClass('btn-info');
 
 if (!$adv_open) {
 	$section->addInput(new Form_StaticText(
diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php
index 03cafa3..a07e4f4 100644
--- a/src/usr/local/www/firewall_schedule_edit.php
+++ b/src/usr/local/www/firewall_schedule_edit.php
@@ -468,13 +468,17 @@ $group = new Form_Group(null);
 
 $group->add(new Form_Button(
 	'btnaddtime',
-	'Add Time'
-))->removeClass('btn-primary')->addClass('btn-default btn-sm');
+	'Add Time',
+	null,
+	'fa-plus'
+))->addClass('btn-success btn-sm');
 
 $group->add(new Form_Button(
 	'btnclrsel',
-	'Clear selection'
-))->removeClass('btn-primary')->addClass('btn-default btn-sm');
+	'Clear selection',
+	null,
+	'fa-undo'
+))->addClass('btn-info btn-sm');
 
 $section->add($group);
 
@@ -650,8 +654,10 @@ if ($getSchedule) {
 
 			$group->add(new Form_Button(
 				'Delete' . $counter,
-				'Delete'
-			))->removeClass('btn-primary')->addClass('btn-xs btn-warning');
+				'Delete',
+				null,
+				'fa-trash'
+			))->addClass('btn-xs btn-warning');
 
 			$group->add(new Form_Input(
 				'schedule' . $counter,
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index 31f29ae..434a35e 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1000,10 +1000,12 @@ if (!is_numeric($pool) && !($act == "newpool")) {
 // DDNS
 $btnadv = new Form_Button(
 	'btnadvdns',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadv->removeClass('btn-primary')->addClass('btn-info btn-sm');
+$btnadv->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Dynamic DNS',
@@ -1048,10 +1050,12 @@ $section->addInput(new Form_Input(
 // Advanced MAC
 $btnadv = new Form_Button(
 	'btnadvmac',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadv->removeClass('btn-primary')->addClass('btn-info btn-sm');
+$btnadv->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'MAC address control',
@@ -1075,10 +1079,12 @@ $section->addInput(new Form_Input(
 // Advanced NTP
 $btnadv = new Form_Button(
 	'btnadvntp',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadv->removeClass('btn-primary')->addClass('btn-info btn-sm');
+$btnadv->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'NTP',
@@ -1100,10 +1106,12 @@ $section->addInput(new Form_IpAddress(
 // Advanced TFTP
 $btnadv = new Form_Button(
 	'btnadvtftp',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadv->removeClass('btn-primary')->addClass('btn-info btn-sm');
+$btnadv->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'TFTP',
@@ -1119,10 +1127,12 @@ $section->addInput(new Form_IpAddress(
 // Advanced LDAP
 $btnadv = new Form_Button(
 	'btnadvldap',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadv->removeClass('btn-primary')->addClass('btn-info btn-sm');
+$btnadv->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'LDAP',
@@ -1141,10 +1151,12 @@ $form->add($section);
 // Advanced Additional options
 $btnadv = new Form_Button(
 	'btnadvopts',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadv->removeClass('btn-primary')->addClass('btn-info btn-sm');
+$btnadv->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Additional BOOTP/DHCP Options',
diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php
index dc4dd92..1bf03c6 100644
--- a/src/usr/local/www/services_dhcp_edit.php
+++ b/src/usr/local/www/services_dhcp_edit.php
@@ -592,14 +592,16 @@ $section->addInput(new Form_Input(
 
 $btndyndns = new Form_Button(
 	'btndyndns',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btndyndns->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btndyndns->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Dynamic DNS',
-	$btndyndns . ' ' . 'Show dynamic DNS settings'
+	$btndyndns
 ));
 
 $section->addInput(new Form_Checkbox(
@@ -638,14 +640,16 @@ $section->addInput(new Form_Input(
 
 $btnntp = new Form_Button(
 	'btnntp',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnntp->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnntp->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'NTP servers',
-	$btnntp . ' ' . 'Show NTP Configuration'
+	$btnntp
 ));
 
 $group = new Form_Group('NTP Servers');
@@ -672,14 +676,16 @@ $section->add($group);
 
 $btntftp = new Form_Button(
 	'btntftp',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btntftp->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btntftp->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'TFTP servers',
-	$btntftp . ' ' . 'Show TFTP Configuration'
+	$btntftp
 ));
 
 $section->addInput(new Form_Input(
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 990182e..dfe611e 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -754,14 +754,16 @@ $section->addInput(new Form_Checkbox(
 
 $btndyndns = new Form_Button(
 	'btndyndns',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btndyndns->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btndyndns->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Dynamic DNS',
-	$btndyndns . ' ' . 'Show dynamic DNS settings'
+	$btndyndns
 ));
 
 $section->addInput(new Form_Checkbox(
@@ -820,14 +822,16 @@ $section->addInput(new Form_Checkbox(
 
 $btnntp = new Form_Button(
 	'btnntp',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnntp->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnntp->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'NTP servers',
-	$btnntp . ' ' . 'Show NTP Configuration'
+	$btnntp
 ));
 
 $group = new Form_Group('NTP Servers');
@@ -854,14 +858,16 @@ $section->add($group);
 
 $btnldap = new Form_Button(
 	'btnldap',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnldap->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnldap->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'LDAP',
-	$btnldap . ' ' . 'Show LDAP Configuration'
+	$btnldap
 ));
 
 $section->addInput(new Form_Input(
@@ -873,14 +879,16 @@ $section->addInput(new Form_Input(
 
 $btnnetboot = new Form_Button(
 	'btnnetboot',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnnetboot->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnnetboot->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Network booting',
-	$btnnetboot . ' ' . 'Show Network booting'
+	$btnnetboot
 ));
 
 $section->addInput(new Form_Checkbox(
@@ -899,14 +907,16 @@ $section->addInput(new Form_Input(
 
 $btnadnl = new Form_Button(
 	'btnadnl',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadnl->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnadnl->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Additional BOOTP/DHCP Options',
-	$btnadnl . ' ' . 'Additional BOOTP/DHCP Options'
+	$btnadnl
 ));
 
 $form->add($section);
diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php
index dc999cf..5356dff 100644
--- a/src/usr/local/www/services_ntpd.php
+++ b/src/usr/local/www/services_ntpd.php
@@ -335,10 +335,12 @@ $section->addInput(new Form_Checkbox(
 // Statistics logging section
 $btnadvstats = new Form_Button(
 	'btnadvstats',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadvstats->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnadvstats->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Statistics Logging',
@@ -369,10 +371,12 @@ $section->addInput(new Form_Checkbox(
 // Leap seconds section
 $btnleap = new Form_Button(
 	'btnleap',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnleap->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnleap->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Leap seconds',
diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php
index 16f5f18..099d607 100644
--- a/src/usr/local/www/services_ntpd_gps.php
+++ b/src/usr/local/www/services_ntpd_gps.php
@@ -374,14 +374,16 @@ $section->addInput(new Form_Input(
 // Statistics logging section
 $btnadvgps = new Form_Button(
 	'btnadvgps',
-	'Advanced'
+	'Advanced',
+	null,
+	'fa-cog'
 );
 
-$btnadvgps->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnadvgps->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'GPS Initialization',
-	$btnadvgps . ' ' . 'Show GPS Initialization commands'
+	$btnadvgps
 ));
 
 $section->addInput(new Form_Textarea(
@@ -399,7 +401,9 @@ $group->add(new Form_Input(
 
 $btncalc = new Form_Button(
 	'btncalc',
-	'Calculate'
+	'Calculate',
+	null,
+	'fa-calculator'
 );
 
 $btncalc->removeClass('btn-primary')->addClass('btn-success btn-sm');
diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php
index 097161e..d37492b 100644
--- a/src/usr/local/www/services_unbound.php
+++ b/src/usr/local/www/services_unbound.php
@@ -367,10 +367,12 @@ $section->addInput(new Form_Checkbox(
 
 $btnadvdns = new Form_Button(
 	'btnadvdns',
-	'Custom options'
+	'Custom options',
+	null,
+	'fa-cog'
 );
 
-$btnadvdns->removeClass('btn-primary')->addClass('btn-default btn-sm');
+$btnadvdns->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Custom options',
diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php
index bd6d8f7..92532dd 100644
--- a/src/usr/local/www/system_gateways_edit.php
+++ b/src/usr/local/www/system_gateways_edit.php
@@ -713,13 +713,15 @@ if (!(!empty($pconfig['latencylow']) || !empty($pconfig['latencyhigh']) ||
 
 	$btnadvanced = new Form_Button(
 		'toggle-advanced',
-		'Advanced options'
+		'Advanced Options',
+		null,
+		'fa-cog'
 	);
 
 	$advdflt = true;
 
 	$btnadvanced->toggles('.advanced-options')->setAttribute('type', 'button');
-	$btnadvanced->removeClass('btn-primary')->addClass('btn-default');
+	$btnadvanced->addClass('btn-info');
 
 	$section->addInput(new Form_StaticText(
 		null,