From 584e0aac1322cd43f67f31f0b03bec024af9b338 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 28 Mar 2009 09:06:23 +0000
Subject: [PATCH] Table to div container converted

---
 inc/modules/admin/admin-inc.php | 38 ++++++++++++++-------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 82b3c4202c..3f4ea64a52 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -338,8 +338,8 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 	// Build main menu
 	$result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result_main) > 0) {
-		$OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
-<tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
+		$OUT = "<div style=\"height:7px\" class=\"seperator\">&nbsp;</div>\n";
+		$OUT .= "<ul class=\"admin_menu_main\">\n";
 		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 		while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
 			if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) {
@@ -355,9 +355,8 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 					$GLOBALS['menu']['title'][$menu]      = $title;
 					$GLOBALS['menu']['description'][$menu] = $descr;
 				}
-				$OUT .= "<tr>
-	<td class=\"admin_menu\" colspan=\"2\">
-		<div class=\"nobr\">&nbsp;<strong>&middot;</strong>&nbsp;";
+				$OUT .= "<li class=\"admin_menu\">
+		<div class=\"nobr\"><strong>&middot;</strong>&nbsp;";
 
 				if (($menu == $act) && (empty($wht))) {
 					$OUT .= "<strong>";
@@ -373,8 +372,8 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 					$OUT .= "</a>]";
 				}
 
-				$OUT .= "</div></td>
-</tr>\n";
+				$OUT .= "</div>
+</li>\n";
 
 				// Check for menu entries
 				$result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC",
@@ -387,10 +386,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 				if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
 					$GLOBALS['menu']['description'] = array();
 					$GLOBALS['menu']['title'] = array(); $SUB = true;
-					$OUT .= "<tr>
-	<td width=\"10\" class=\"seperator\">&nbsp;</td>
-	<td class=\"admin_menu\">
-		<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
+					$OUT .= "<ul class=\"admin_menu_sub\">\n";
 					// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 					while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
 						// Filename
@@ -410,9 +406,8 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 							// Insert compiled title and description
 							$GLOBALS['menu']['title'][$wht_sub]      = $title_what;
 							$GLOBALS['menu']['description'][$wht_sub] = $desc_what;
-							$OUT .= "<tr>
-	<td class=\"admin_menu\" colspan=\"2\">
-		<div class=\"nobr\">&nbsp;<strong>--&gt;</strong>&nbsp;";
+							$OUT .= "<li class=\"admin_menu\">
+		<div class=\"nobr\"><strong>--&gt;</strong>&nbsp;";
 							if ($readable === true) {
 								if ($wht == $wht_sub) {
 									$OUT .= "<strong>";
@@ -420,7 +415,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 									$OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht_sub."\">";
 								}
 							} else {
-								$OUT .= "<i class=\"admin_note\">";
+								$OUT .= "<em class=\"admin_note\">";
 							}
 
 							$OUT .= $title_what;
@@ -434,25 +429,24 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
 							} else {
 								$OUT .= "</em>";
 							}
-							$OUT .= "</div></td>
-</tr>\n";
+							$OUT .= "</div>
+</li>\n";
 						}
 					}
 
 					// Free memory
 					SQL_FREERESULT($result_what);
-					$OUT .= "    </table>
-	</td>
-</tr>\n";
+					$OUT .= "	</ul>
+</li>\n";
 				}
 
-				$OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
+				$OUT .= "<li style=\"height:7px\" class=\"seperator\">&nbsp;</li>\n";
 			}
 		}
 
 		// Free memory
 		SQL_FREERESULT($result_main);
-		$OUT .= "</table>\n";
+		$OUT .= "</ul>\n";
 	}
 
 	// Is there a cache instance again?
-- 
2.39.2