From 7b685bc5bb8754d7456fb467789ddba92d104da5 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Wed, 26 Feb 2014 05:14:25 +0000
Subject: [PATCH] Unstack list control icons.

---
 app/ivr_menu/ivr_menu_edit.php | 21 +++++++++------------
 app/ivr_menu/ivr_menus.php     | 14 +++++++-------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index ef739f9b98..d42bdf1d3a 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -662,9 +662,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			echo "					<td class='vtable'>\n";
 			echo "						".$field['ivr_menu_option_description']."&nbsp;\n";
 			echo "					</td>\n";
-			echo "					<td nowrap='nowrap'>\n";
-			echo "						<a href='ivr_menu_option_edit.php?id=".$field['ivr_menu_option_uuid']."&ivr_menu_uuid=".$field['ivr_menu_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
-			echo "						<a href='ivr_menu_option_delete.php?id=".$field['ivr_menu_option_uuid']."&ivr_menu_uuid=".$field['ivr_menu_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+			echo "					<td class='list_control_icons'>";
+			echo 						"<a href='ivr_menu_option_edit.php?id=".$field['ivr_menu_option_uuid']."&ivr_menu_uuid=".$field['ivr_menu_uuid']."' alt='edit'>$v_link_label_edit</a>";
+			echo 						"<a href='ivr_menu_option_delete.php?id=".$field['ivr_menu_option_uuid']."&ivr_menu_uuid=".$field['ivr_menu_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
 			echo "					</td>\n";
 			echo "				</tr>\n";
 		}
@@ -825,11 +825,9 @@ for ($c = 0; $c < 1; $c++) {
 	echo $text['description-caller_id_name_prefix']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
+	echo "</table>\n";
 
 	//--- begin: show_advanced -----------------------
-		echo "<tr>\n";
-		echo "<td style='padding: 0px;' colspan='2' class='' valign='top' align='left' nowrap>\n";
-
 		echo "	<div id=\"show_advanced_box\">\n";
 		echo "		<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
 		echo "		<tr>\n";
@@ -845,10 +843,10 @@ for ($c = 0; $c < 1; $c++) {
 		echo "	<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
 
 		echo "<tr>\n";
-		echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
+		echo "<td width=\"30%\" class='vncellreq' valign='top' align='left' nowrap>\n";
 		echo "	".$text['label-invalid_sound'].":\n";
 		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
+		echo "<td width=\"70%\" class='vtable' align='left'>\n";
 		echo "	<input class='formfld' type='text' name='ivr_menu_invalid_sound' maxlength='255' value=\"$ivr_menu_invalid_sound\">\n";
 		echo "<br />\n";
 		echo $text['description-invalid_sound']."\n";
@@ -968,15 +966,14 @@ for ($c = 0; $c < 1; $c++) {
 		echo "	</table>\n";
 		echo "	</div>";
 
-		echo "</td>\n";
-		echo "</tr>\n";
 	//--- end: show_advanced -----------------------
 
+	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
+	echo "<td width=\"30%\" class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-enabled'].":\n";
 	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
+	echo "<td width=\"70%\" class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='ivr_menu_enabled'>\n";
 	echo "	<option value=''></option>\n";
 	if ($ivr_menu_enabled == "true") {
diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php
index cb02c50e37..67fd8c94f2 100644
--- a/app/ivr_menu/ivr_menus.php
+++ b/app/ivr_menu/ivr_menus.php
@@ -116,9 +116,9 @@ else {
 		echo th_order_by('ivr_menu_direct_dial', $text['label-direct_dial'], $order_by[0]['name'], $order_by[0]['order']);
 		echo th_order_by('ivr_menu_enabled', $text['label-enabled'], $order_by[0]['name'], $order_by[0]['order']);
 		echo th_order_by('ivr_menu_description', $text['label-description'], $order_by[0]['name'], $order_by[0]['order']);
-		echo "<td align='right' width='42'>\n";
+		echo "<td class='list_control_icons'>";
 		if (permission_exists('ivr_menu_add')) {
-			echo "	<a href='ivr_menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+			echo "<a href='ivr_menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 		}
 		echo "</td>\n";
 		echo "<tr>\n";
@@ -132,12 +132,12 @@ else {
 				echo "	<td valign='top' class='".$row_style[$c]."'>".$row['ivr_menu_direct_dial']."</td>\n";
 				echo "	<td valign='top' class='".$row_style[$c]."'>".$row['ivr_menu_enabled']."</td>\n";
 				echo "	<td valign='top' class='row_stylebg'>".$row['ivr_menu_description']."&nbsp;</td>\n";
-				echo "	<td valign='top' align='right'>\n";
+				echo "	<td class='list_control_icons'>";
 				if (permission_exists('ivr_menu_edit')) {
-					echo "		<a href='ivr_menu_edit.php?id=".$row['ivr_menu_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+					echo "<a href='ivr_menu_edit.php?id=".$row['ivr_menu_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
 				}
 				if (permission_exists('ivr_menu_delete')) {
-					echo "		<a href='ivr_menu_delete.php?id=".$row['ivr_menu_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+					echo "<a href='ivr_menu_delete.php?id=".$row['ivr_menu_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
 				}
 				echo "	</td>\n";
 				echo "</tr>\n";
@@ -152,9 +152,9 @@ else {
 		echo "	<tr>\n";
 		echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
 		echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
-		echo "		<td width='33.3%' align='right'>\n";
+		echo "		<td class='list_control_icons'>";
 		if (permission_exists('ivr_menu_add')) {
-			echo "			<a href='ivr_menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+			echo 		"<a href='ivr_menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 		}
 		echo "		</td>\n";
 		echo "	</tr>\n";