4 files changed, 35 insertions, 20 deletions

diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js
index db7c26c..fb810c6 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/jquery/pfSenseHelpers.js
@@ -341,6 +341,21 @@ function add_row() {
 			}
 		});
 	}
+
+	// Now that we are no longer cloning the event handlers, we need to remove and re-add after a new row
+	// has been added to the table
+	$('[id^=delete]').unbind();
+	$('[id^=delete]').click(function(event) {
+		if($('.repeatable').length > 1) {
+			if((typeof retainhelp) == "undefined")
+				moveHelpText(event.target.id);
+
+			delete_row(event.target.id);
+		}
+		else
+			alert('You may not delete the last row!');
+	});
+
 }
 
 // These are action buttons, not submit buttons
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 0ebf441..70cddb5 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -599,19 +599,19 @@ $group->add($f2);
 $section->add($group);
 
 $f1 = new Form_Input(
-	'prefix_from',
+	'prefixrange_from',
 	null,
 	'text',
-	$pconfig['prefix_from']
+	$pconfig['prefixrange_from']
 );
 
 $f1->setHelp('To');
 
 $f2 = new Form_Input(
-	'prefix_to',
+	'prefixrange_to',
 	null,
 	'text',
-	$pconfig['prefix_to']
+	$pconfig['prefixrange_to']
 );
 
 $f2->setHelp('From');
diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php
index 927600c..0eead55 100644
--- a/src/usr/local/www/services_unbound.php
+++ b/src/usr/local/www/services_unbound.php
@@ -472,6 +472,7 @@ foreach ($a_hosts as $hostent):
 						Alias for <?=$hostent['host'] ? $hostent['host'] . '.' . $hostent['domain'] : $hostent['domain']?>
 					</td>
 					<td>
+						<i class="fa fa-angle-double-right text-info"></i>
 						<?=htmlspecialchars($alias['description'])?>
 					</td>
 					<td>
diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php
index 29ebc3c..7a4d696 100644
--- a/src/usr/local/www/services_unbound_host_edit.php
+++ b/src/usr/local/www/services_unbound_host_edit.php
@@ -282,12 +282,17 @@ $form->add($section);
 
 $section = new Form_Section('Additional names for this host');
 
+if(!$pconfig['aliases']['item']) {
+	$pconfig['aliases']['item'] = array('host' => "");
+}
+
 if( $pconfig['aliases']['item']) {
 	$counter = 0;
 	$last = count($pconfig['aliases']['item']) - 1;
 
 	foreach($pconfig['aliases']['item'] as $item) {
 		$group = new Form_Group(null);
+		$group->addClass('repeatable');
 
 		$group->add(new Form_Input(
 			'aliashost' . $counter,
@@ -310,28 +315,22 @@ if( $pconfig['aliases']['item']) {
 			$item['description']
 		))->setHelp($counter == $last ? 'Description':null);
 
-		$btn = new Form_Button(
-			'btn' . $counter,
-			'Delete',
-			'services_unbound_host_edit.php?act=delopt' . '&id=' . $counter
-		);
+		$group->add(new Form_Button(
+			'deleterow' . $counter,
+			'Delete'
+		))->removeClass('btn-primary')->addClass('btn-warning');
 
-		$btn->removeClass('btn-primary')->addClass('btn-danger btn-sm');
-		$group->add($btn);
 		$section->add($group);
 		$counter++;
 	}
 }
 
-$btnaddopt = new Form_Button(
-	'btnaddopt',
-	'Add Host name',
-	'services_unbound_host_edit.php?act=addopt'
-);
-
-$btnaddopt->removeClass('btn-primary')->addClass('btn-success btn-sm');
-
-$section->addInput($btnaddopt);
+$form->addGlobal(new Form_Button(
+	'addrow',
+	'Add host name',
+	null,
+	'fa-plus'
+))->removeClass('btn-primary')->addClass('btn-success addbtn');
 
 $form->add($section);
 print($form);