Icon consistency in Repeatable blocks. Ticket #5965

11 files changed, 82 insertions, 41 deletions

diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php
index d859a3f..ae1790a 100755
--- a/src/usr/local/www/firewall_aliases_edit.php
+++ b/src/usr/local/www/firewall_aliases_edit.php
@@ -743,8 +743,10 @@ while ($counter < count($addresses)) {
 
 	$group->add(new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
-	))->removeClass('btn-primary')->addClass('btn-warning');
+		'Delete',
+		null,
+		'fa-trash'
+	))->addClass('btn-warning');
 
 	$section->add($group);
 	$counter++;
@@ -752,8 +754,10 @@ while ($counter < count($addresses)) {
 
 $form->addGlobal(new Form_Button(
 	'addrow',
-	$btn_str[$tab]
-))->removeClass('btn-primary')->addClass('btn-success addbtn');
+	$btn_str[$tab],
+	null,
+	'fa-plus'
+))->addClass('btn-success addbtn');
 
 $form->add($section);
 
@@ -785,6 +789,7 @@ events.push(function() {
 
 		var buttonstr = <?=json_encode($btn_str);?>;
 		$('.btn-success').prop('value', buttonstr[tab]);
+		$('.btn-success').html('<i class="fa fa-plus icon-embed-btn"></i>' + buttonstr[tab]);
 
 		// Set the input field label by tab
 		var labelstr = <?=json_encode($label_str);?>;
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index 0f36a11..d211134 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1210,8 +1210,10 @@ foreach ($pconfig['numberoptions']['item'] as $item) {
 
 	$group->add(new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
-	))->removeClass('btn-primary')->addClass('btn-warning');
+		'Delete',
+		null,
+		'fa-trash'
+	))->addClass('btn-warning');
 
 	$section->add($group);
 
@@ -1220,8 +1222,10 @@ foreach ($pconfig['numberoptions']['item'] as $item) {
 
 $section->addInput(new Form_Button(
 	'addrow',
-	'Add'
-))->removeClass('btn-primary')->addClass('btn-success');
+	'Add',
+	null,
+	'fa-plus'
+))->addClass('btn-success');
 
 $form->add($section);
 
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index b82d000..19cc2eb 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -947,10 +947,12 @@ foreach ($pconfig['numberoptions']['item'] as $item) {
 
 	$btn = new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
+		'Delete',
+		null,
+		'fa-trash'
 	);
 
-	$btn->removeClass('btn-primary')->addClass('btn-warning');
+	$btn->addClass('btn-warning');
 	$group->add($btn);
 	$section->add($group);
 	$counter++;
@@ -959,7 +961,9 @@ foreach ($pconfig['numberoptions']['item'] as $item) {
 
 $btnaddopt = new Form_Button(
 	'addrow',
-	'Add Option'
+	'Add Option',
+	null,
+	'fa-plus'
 );
 
 $btnaddopt->removeClass('btn-primary')->addClass('btn-success btn-sm');
diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php
index 17c892c..7af494e 100644
--- a/src/usr/local/www/services_dnsmasq_edit.php
+++ b/src/usr/local/www/services_dnsmasq_edit.php
@@ -319,8 +319,10 @@ if ($pconfig['aliases']['item']) {
 
 		$group->add(new Form_Button(
 			'deleterow' . $counter,
-			'Delete'
-		))->removeClass('btn-primary')->addClass('btn-warning');
+			'Delete',
+			null,
+			'fa-plus'
+		))->addClass('btn-warning');
 
 		$section->add($group);
 		$counter++;
@@ -329,10 +331,10 @@ if ($pconfig['aliases']['item']) {
 
 $form->addGlobal(new Form_Button(
 	'addrow',
-	'Add host name',
+	'Add Host Name',
 	null,
 	'fa-plus'
-))->removeClass('btn-primary')->addClass('btn-success addbtn');
+))->addClass('btn-success addbtn');
 
 $form->add($section);
 print($form);
diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php
index 5f2818f..dc999cf 100644
--- a/src/usr/local/www/services_ntpd.php
+++ b/src/usr/local/www/services_ntpd.php
@@ -279,16 +279,20 @@ for ($counter=0; $counter < $maxrows; $counter++) {
 
 	$group->add(new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
-	))->removeClass('btn-primary')->addClass('btn-warning');
+		'Delete',
+		null,
+		'fa-trash'
+	))->addClass('btn-warning');
 
 	 $section->add($group);
 }
 
 $section->addInput(new Form_Button(
 	'addrow',
-	'Add'
-))->removeClass('btn-primary')->addClass('btn-success');
+	'Add',
+	null,
+	'fa-plus'
+))->addClass('btn-success');
 
 $section->addInput(new Form_StaticText(
 	null,
diff --git a/src/usr/local/www/services_ntpd_acls.php b/src/usr/local/www/services_ntpd_acls.php
index 08ff080..623d049 100644
--- a/src/usr/local/www/services_ntpd_acls.php
+++ b/src/usr/local/www/services_ntpd_acls.php
@@ -317,8 +317,10 @@ foreach ($networkacl as $item) {
 
 	$group->add(new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
-	))->removeClass('btn-primary')->addClass('btn-warning');
+		'Delete',
+		null,
+		'fa-trash'
+	))->addClass('btn-warning');
 
 	$group->addClass('repeatable');
 	$section->add($group);
@@ -328,8 +330,10 @@ foreach ($networkacl as $item) {
 
 $section->addInput(new Form_Button(
 	'addrow',
-	'Add'
-))->removeClass('btn-primary')->addClass('btn-success');
+	'Add',
+	null,
+	'fa-plus'
+))->addClass('btn-success');
 
 $form->add($section);
 
diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php
index 371cbd7..c381007 100644
--- a/src/usr/local/www/services_pppoe_edit.php
+++ b/src/usr/local/www/services_pppoe_edit.php
@@ -554,8 +554,10 @@ if ($usernames != "") {
 
 		$group->add(new Form_Button(
 			'deleterow' . $counter,
-			'Delete'
-		))->removeClass('btn-primary')->addClass('btn-warning');
+			'Delete',
+			null,
+			'fa-trash'
+		))->addClass('btn-warning');
 
 		$section->add($group);
 
@@ -565,10 +567,12 @@ if ($usernames != "") {
 
 $btnaddrow = new Form_Button(
 	'addrow',
-	'Add user'
+	'Add user',
+	null,
+	'fa-plus'
 );
 
-$btnaddrow->removeClass('btn-primary')->addClass('btn-success');
+$btnaddrow->addClass('btn-success');
 
 $section->addInput(new Form_StaticText(
 	null,
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index ad91cd7..ed94756 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -358,7 +358,9 @@ foreach ($pconfig['subnets'] as $subnet) {
 
 	$group->add(new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
+		'Delete',
+		null,
+		'fa-trash'
 	))->removeClass('btn-primary')->addClass('btn-warning');
 
 	$group->addClass('repeatable');
@@ -370,8 +372,10 @@ foreach ($pconfig['subnets'] as $subnet) {
 
 $section->addInput(new Form_Button(
 	'addrow',
-	'Add'
-))->removeClass('btn-primary')->addClass('btn-success');
+	'Add',
+	null,
+	'fa-plus'
+))->addClass('btn-success');
 
 $form->add($section);
 
diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php
index 37404f4..23fae6d 100644
--- a/src/usr/local/www/services_unbound_acls.php
+++ b/src/usr/local/www/services_unbound_acls.php
@@ -297,8 +297,10 @@ if ($act == "new" || $act == "edit") {
 
 		$group->add(new Form_Button(
 			'deleterow' . $counter,
-			'Delete'
-		))->removeClass('btn-primary')->addClass('btn-warning');
+			'Delete',
+			null,
+			'fa-trash'
+		))->addClass('btn-warning');
 
 		$group->addClass('repeatable');
 		$section->add($group);
@@ -308,8 +310,10 @@ if ($act == "new" || $act == "edit") {
 
 	$form->addGlobal(new Form_Button(
 		'addrow',
-		'Add network'
-	))->removeClass('btn-primary')->addClass('btn-success');
+		'Add Network',
+		null,
+		'fa-plus'
+	))->addClass('btn-success');
 
 	$form->add($section);
 	print($form);
diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php
index 47e3350..3ae8c7f 100644
--- a/src/usr/local/www/services_unbound_host_edit.php
+++ b/src/usr/local/www/services_unbound_host_edit.php
@@ -320,8 +320,10 @@ if ($pconfig['aliases']['item']) {
 
 		$group->add(new Form_Button(
 			'deleterow' . $counter,
-			'Delete'
-		))->removeClass('btn-primary')->addClass('btn-warning');
+			'Delete',
+			null,
+			'fa-trash'
+		))->addClass('btn-warning');
 
 		$section->add($group);
 		$counter++;
@@ -330,7 +332,7 @@ if ($pconfig['aliases']['item']) {
 
 $form->addGlobal(new Form_Button(
 	'addrow',
-	'Add host name',
+	'Add Host Name',
 	null,
 	'fa-plus'
 ))->removeClass('btn-primary')->addClass('btn-success addbtn');
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index a53c9ba..788b875 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -826,8 +826,10 @@ foreach ($pconfig['altnames']['item'] as $item) {
 
 	$group->add(new Form_Button(
 		'deleterow' . $counter,
-		'Delete'
-	))->removeClass('btn-primary')->addClass('btn-warning');
+		'Delete',
+		null,
+		'fa-trash'
+	))->addClass('btn-warning');
 
 	$group->addClass('repeatable');
 
@@ -838,8 +840,10 @@ foreach ($pconfig['altnames']['item'] as $item) {
 
 $section->addInput(new Form_Button(
 	'addrow',
-	'Add'
-))->removeClass('btn-primary')->addClass('btn-success');
+	'Add',
+	null,
+	'fa-plus'
+))->addClass('btn-success');
 
 $form->add($section);
 $section = new Form_Section('External Signing Request');