More icon/button inconsistencies. Ticket #5965

1 files changed, 13 insertions, 15 deletions

diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index ad2ec7a..e88454a 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -749,10 +749,11 @@ class altq_root_queue {
 		$form .= '	<dt>';
 		$form .= '	<dd>';
 
-		$form .= '<a class="btn btn-default btn-xs" href="firewall_shaper_queues.php?interface=';
+		$form .= '<a class="btn btn-danger btn-xs" href="firewall_shaper_queues.php?interface=';
 		$form .= $this->GetInterface() . '&amp;queue=';
 		$form .= $this->GetQname() . '&amp;action=delete">';
-		$form .= gettext("Disable shaper on interface") . '</a>';
+		$form .= '<i class="fa fa-trash icon-embed-btn"></i>';
+		$form .= gettext("Remove shaper from this interface") . '</a>';
 
 		$form .= '	</dd>';
 
@@ -768,10 +769,7 @@ class altq_root_queue {
 	 */
 	function build_form() {
 
-		$sform = new Form(new Form_Button(
-			'Submit',
-			'Save'
-		));
+		$sform = new Form();
 
 		$sform->setAction("firewall_shaper.php");
 
@@ -1354,10 +1352,7 @@ class priq_queue {
 
 	function build_form() {
 
-		$sform = new Form(new Form_Button(
-			'Submit',
-			'Save'
-		));
+		$sform = new Form();
 
 		$sform->setAction("firewall_shaper.php");
 
@@ -1524,7 +1519,8 @@ class priq_queue {
 			$form .= '<a class="btn btn-danger btn-xs" href="firewall_shaper_queues.php?interface=';
 			$form .= $this->GetInterface() . '&amp;queue=';
 			$form .= $this->GetQname() . '&amp;action=delete">';
-			$form .= gettext("Delete queue from interface") . '</a>';
+			$form .= '<i class="fa fa-trash icon-embed-btn"></i>';
+			$form .= gettext("Delete Queue from this Interface") . '</a>';
 
 			$form .= '	</dd>';
 
@@ -3757,7 +3753,7 @@ var addBwRowTo = (function() {
 	cell1.innerHTML = "<input type='hidden' value='" + totalrows +"' name='bandwidth_row-" + totalrows + "' /><input type='text' class='form-control' name='bandwidth" + totalrows + "' id='bandwidth" + totalrows + "' />";
 	cell2.innerHTML = "<input type='hidden' value='" + totalrows +"' name='bwtype_row-" + totalrows + "' /><select class='form-control' name='bwtype" + totalrows + "'>{$bwopt}</select>";
 	cell3.innerHTML = "<input type='hidden' value='" + totalrows +"' name='bwsched_row-" + totalrows + "' /><select class='form-control' name='bwsched" + totalrows + "'>{$schedules}</select>";
-	cell4.innerHTML = '<a class="btn btn-default" onclick="removeBwRow(this); return false;" href="#">Remove</a>';
+	cell4.innerHTML = '<a class="btn btn-warning" onclick="removeBwRow(this); return false;" href="#"><i class="fa fa-trash icon-embed-btn"></i>Delete</a>';
 
 	});
 })();
@@ -3846,14 +3842,15 @@ EOD;
 				$form .= "</select>";
 				$form .= "</td>";
 				$form .= '<td>';
-				$form .= '<a class="btn btn-default" onclick="removeBwRow(this); return false;">' . gettext('Remove') . '</a>';
+				$form .= '<a class="btn btn-warning" onclick="removeBwRow(this); return false;"><i class="fa fa-trash icon-embed-btn"></i>' . gettext('Delete') . '</a>';
 				$form .= "</td></tr>";
 			}
 		}
 		$form .= "</tbody></table></div><br />";
 
 		$form .= '<a class="btn btn-sm btn-success" onclick="javascript:addBwRowTo(\'maintable\'); return false;" >';
-		$form .= gettext("Add another schedule") . "</a>";
+		$form .= '<i class="fa fa-plus icon-embed-btn"></i>';
+		$form .= gettext("Add Schedule") . "</a>";
 
 		return($form);
 	}
@@ -4688,7 +4685,8 @@ function build_iface_without_this_queue($iface, $qname) {
 	$form .= '<a class="btn btn-info btn-xs" href="firewall_shaper_queues.php?interface=';
 	$form .= $iface . '&amp;queue=';
 	$form .= $qname . '&amp;action=add">';
-	$form .= gettext("Clone shaper on the I/F") . '</a>';
+	$form .= '<i class="fa fa-clone icon-embed-btn"></i>';
+	$form .= gettext("Clone Shaper to this Interface") . '</a>';
 	$form .= '	</dd>';
 
 	$form .= '</dl>';