Fixed table apeparance, headers, button placement and row drag/drop/move

1 files changed, 18 insertions, 13 deletions

diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php
index 3f3b84b..4468708 100755
--- a/src/usr/local/www/pkg.php
+++ b/src/usr/local/www/pkg.php
@@ -317,9 +317,9 @@ if ($savemsg) {
 		}
 	}
 ?>
-		<div id="mainarea">
+		<div id="mainarea" class="panel panel-default">
 			<table id="mainarea" class="table table-striped table-hover table-condensed">
-				<tbody>
+				<thead>
 <?php
 	/* Handle filtering bar A-Z */
 	$include_filtering_inputbox = false;
@@ -374,6 +374,7 @@ if ($savemsg) {
 	}
 ?>
 				<tr>
+
 <?php
 	if ($display_maximum_rows) {
 		$totalpages = ceil(round((count($evaledvar) / $display_maximum_rows), 9));
@@ -393,7 +394,7 @@ if ($savemsg) {
 				$tmppp++;
 			}
 		}
-		echo "<tr><td colspan='" . count($pkg['adddeleteeditpagefields']['columnitem']) . "'>";
+		echo "<tr><th colspan='" . count($pkg['adddeleteeditpagefields']['columnitem']) . "'>";
 		echo "<table width='100%' summary=''>";
 		echo "<tr>";
 		echo "<td align='left'>Displaying page $page of $totalpages</b></td>";
@@ -409,17 +410,20 @@ if ($savemsg) {
 		}
 		echo "</select></td></tr>";
 		echo "</table>";
-		echo "</td></tr>";
+		echo "</th></tr>";
 	}
+	
 	$cols = 0;
 	if ($pkg['adddeleteeditpagefields']['columnitem'] != "") {
 		foreach ($pkg['adddeleteeditpagefields']['columnitem'] as $column) {
-			echo "<td class=\"listhdrr\">" . $column['fielddescr'] . "</td>";
+			echo "<th class=\"listhdrr\">" . $column['fielddescr'] . "</th>";
 			$cols++;
 		}
 	}
 ?>
 				</tr>
+				</thead>
+				<tbody>
 <?php
 	$i = 0;
 	$pagination_counter = 0;
@@ -529,11 +533,10 @@ if ($savemsg) {
 			#Show custom description to delete button if defined
 			$delete_msg=($pkg['adddeleteeditpagefields']['deletetext']?$pkg['adddeleteeditpagefields']['deletetext']:"Delete this item");
 ?>
-								<td><a class="btn btn-xs btn-danger" href="pkg.php?xml=<?=$xml?>&amp;act=del&amp;id=<?=$i?>"><?=gettext("Delete")?></a></td>
+								<td>&nbsp;<a class="btn btn-xs btn-danger" href="pkg.php?xml=<?=$xml?>&amp;act=del&amp;id=<?=$i?>"><?=gettext("Delete")?></a></td>
 							</tr>
-							</tbody>
-						</table>
-					</div>
+						</tbody>
+					</table>
 				</td>
 <?php
 			echo "</tr>\n"; // Pairs with an echo tr some way above
@@ -585,7 +588,7 @@ if ($savemsg) {
 	#Show custom description to add button if defined
 	$add_msg=($pkg['adddeleteeditpagefields']['addtext']?$pkg['adddeleteeditpagefields']['addtext']:"Add a new item");
 ?>
-								<td><a href="pkg_edit.php?xml=<?=$xml?>&amp;id=<?=$i?>" class="btn btn-xs btn-success"><?=gettext('Add')?></a></td>
+								<td><a href="pkg_edit.php?xml=<?=$xml?>&amp;id=<?=$i?>" class="btn btn-sm btn-success"><?=gettext('Add')?></a></td>
 <?php
 	#Show description button and info if defined
 	if ($pkg['adddeleteeditpagefields']['description']) {
@@ -605,13 +608,15 @@ if ($savemsg) {
 	#Show save button only when movable is defined
 	if ($pkg['adddeleteeditpagefields']['movable']) {
 ?>
-				<tr>
-					<td><input class="btn btn-primary" type="button" value="Save" name="Submit" onclick="save_changes_to_xml('<?=$xml?>')" /></td>
-				</tr>
+
+
+
 <?php
 	}
 ?>
 			</table>
+			</div>
+		<input class="btn btn-primary" type="button" value="Save" name="Submit" onclick="save_changes_to_xml('<?=$xml?>')" />
 
 </form>
 <?php