Administration Area changes - work in progress

2025-08-06 14:46:56 +02:00 · 2008-12-09 15:19:03 +00:00
parent bacdbdf181
commit 9b1917f2fa
25 changed files with 1127 additions and 191 deletions
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2008-12-06 23:00:19 $
-|     $Author: e107steved $
+|     $Revision: 1.8 $
+|     $Date: 2008-12-09 15:19:02 $
+|     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -27,7 +27,7 @@ require_once(e_HANDLER."form_handler.php");
 require_once(e_HANDLER."userclass_class.php");
 $rs = new form;

-if (isset($_POST['delete'])) 
+if (isset($_POST['delete']))
 {
 	$image = $tp->toDB($_POST['filename']);
 	@unlink(e_FILE."public/avatars/".$image);
@@ -38,25 +38,22 @@ if (isset($_POST['delete']))
 }


-if (isset($_POST['deleteall'])) 
+if (isset($_POST['deleteall']))
 {
 	$handle = opendir(e_FILE."public/avatars/");
-	while ($file = readdir($handle)) 
-	{
-		if ($file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db') 
-		{
+	while ($file = readdir($handle)) {
+		if ($file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db') {
 			$dirlist[] = $file;
 		}
 	}
 	closedir($handle);
-	$count = 0;
 	$imgList = '';
-	while (list($key, $image_name) = each($dirlist)) 
+	$count = 0;
+	while (list($key, $image_name) = each($dirlist))
 	{
-		if (!$sql->db_Select("user", "*", "user_image='-upload-{$image_name}' OR user_sess='{$image_name}'")) 
-		{
+		if (!$sql->db_Select("user", "*", "user_image='-upload-$image_name' OR user_sess='$image_name'")) {
 			unlink(e_FILE."public/avatars/".$image_name);
-			$count ++;
+			$count++;
 			$imgList .= '[!br!]'.$image_name;
 		}
 	}
@@ -66,18 +63,18 @@ if (isset($_POST['deleteall']))
 }


-if (isset($_POST['avdelete'])) 
+if (isset($_POST['avdelete']))
 {
 	require_once(e_HANDLER."avatar_handler.php");
 	$avList = array();
 	foreach($_POST['avdelete'] as $key => $val)
 	{
 		$key = intval($key); // We only need the key
-		if ($sql->db_Select("user", 'user_id, user_name, user_image', "user_id='{$key}'")) 
+		if ($sql->db_Select("user", 'user_id, user_name, user_image', "user_id='{$key}'"))
 		{
 			$row = $sql->db_Fetch();
 			$avname=avatar($row['user_image']);
-			if (strpos($avname,"http://")===FALSE) 
+			if (strpos($avname,"http://")===FALSE)
 			{ // Internal file, so unlink it
 				@unlink($avname);
 			}
@@ -91,7 +88,7 @@ if (isset($_POST['avdelete']))
 	$_POST['check_avatar_sizes'] = TRUE;	// Force size recheck after doing one or more deletes
 }

-if (isset($_POST['update_options'])) 
+if (isset($_POST['update_options']))
 {
 	unset($temp);
 	$temp['image_post'] = intval($_POST['image_post']);
@@ -112,84 +109,102 @@ if (isset($_POST['update_options']))
 	}
 }

-
-if (isset($message)) 
+//FIXME - better message handler, no tablerender for sys-messages anymore
+if (isset($message))
 {
 	$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
 }


-if (isset($_POST['show_avatars'])) 
+if (isset($_POST['show_avatars']))
 {
 	$handle = opendir(e_FILE."public/avatars/");
-	while ($file = readdir($handle)) {
-		if ($file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db' && !is_dir($file)) 
+	while ($file = readdir($handle))
+	{
+		if ($file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db' && !is_dir($file))
 		{
 			$dirlist[] = $file;
 		}
 	}
 	closedir($handle);

-	$text = "<div style='text-align:center'>\n";
+	$text = '';

-	if (!is_array($dirlist)) 
+	if (!is_array($dirlist))
 	{
 		$text .= IMALAN_29;
-	} 
-	else 
+	}
+	else
 	{
-		while (list($key, $image_name) = each($dirlist)) 
+		$count = 0;
+		while (list($key, $image_name) = each($dirlist))
 		{
 			$users = IMALAN_21." | ";
-			if ($sql->db_Select("user", "*", "user_image='-upload-$image_name' OR user_sess='$image_name'")) {
-				while ($row = $sql->db_Fetch()) {
-					extract($row);
+			if ($sql->db_Select("user", "*", "user_image='-upload-$image_name' OR user_sess='$image_name'"))
+			{
+				/*
+				//Is it possible?! I don't think so
+				while ($row = $sql->db_Fetch())
+				{
+					extract($row); //FIXME - kill this!!!
 					$users .= "<a href='".e_BASE."user.php?id.$user_id'>$user_name</a> <span class='smalltext'>(".($user_sess == $image_name ? IMALAN_24 : IMALAN_23).")</span> | ";
-				}
+				}*/
+				$row = $sql->db_Fetch();
+				$users .= "<a href='".e_BASE."user.php?id.{$row['user_id']}'>{$row['user_name']}</a> <span class='smalltext'>(".($row['user_sess'] == $image_name ? IMALAN_24 : IMALAN_23).")</span>";
 			} else {
-				$users = IMALAN_22;
+				$users = '<span class="warning">'.IMALAN_22.'</span>';
 			}

-			$text .= "<div class='spacer'>
+			//File info
+			$users = "<a class='e-tooltip' href='#' alt='".IMALAN_66.": {$image_name}' title='".IMALAN_66.": {$image_name}'><img src='".e_IMAGE_ABS."admin_images/docs_16.png' /></a> ".$users;
+
+			// Control over the image size (design)
+			$image_size = getimagesize(e_FILE."public/avatars/".$image_name);
+
+			//Friendly UI - click text to select a form element
+			$img_src = "<label for='image-action-{$count}' title='".IMALAN_56."'><img src='".e_FILE_ABS."public/avatars/{$image_name}' alt='{$image_name}' /></label>";
+			if ($image_size[0] > $pref['im_width'] || $image_size[1] > $pref['im_height'])
+			{
+				$img_src = "<a class='image-preview' href='".e_FILE_ABS."public/avatars/{$image_name}'>".IMALAN_57."</a>";
+			}
+
+			$text .= "
+			<div class='image-box f-left center' style='width: ".(intval($pref['im_width'])+40)."px; height: ".(intval($pref['im_height'])+100)."px;'>
+				<div class='spacer'>
 				<form method='post' action='".e_SELF."'>
-				<table style='".ADMIN_WIDTH."' class='fborder'>
-				<tr>
-				<td class='fcaption'>$image_name</td>
-				</tr>
-				<tr>
-				<td class='forumheader3'><img src='".e_FILE."public/avatars/".$image_name."' alt='' /><br />
-				<input type='hidden' name='filename' value='".$image_name."' />
-				<input class='button' type='submit' name='delete' value='".LAN_DELETE."' />
-				</td>
-				</tr>
-				<tr>
-				<td class='forumheader3'>$users</td>
-				</tr>
-				</table>
+				<div class='image-users'>{$users}</div>
+				<div class='image-preview'>{$img_src}</div>
+				<div class='image-delete'>
+					<input type='checkbox' class='checkbox' id='image-action-{$count}' name='filename[]' value='{$image_name}' />
+				</div>
 				</form>
-				</div>";
+				</div>
+			</div>
+			";
+
+			$count++;
 		}

-		$text .= "<div class='spacer'>
+		//FIXME add multi delete for better user experience (not working yet), make check/uncheck-all work
+		$text .= "
+			<div class='spacer clear'>
 			<form method='post' action='".e_SELF."'>
-			<table style='".ADMIN_WIDTH."' class='fborder'>
-			<tr>
-			<td class='forumheader'>
-			<input class='button' type='submit' name='deleteall' value='".IMALAN_25."' />
-			</td>
-			</tr>
-			</table>
+			<div class='buttons-bar'>
+				<button class='delete' type='submit' name='deleteall'><span>".IMALAN_25."</span></button>
+				<button class='delete' type='submit' name='delete_multi'><span>".IMALAN_58."</span></button>
+				<button class='action' type='button' name='check_all'><span>".IMALAN_59."</span></button>
+				<button class='action' type='button' name='uncheck_all'><span>".IMALAN_60."</span></button>
+			</div>
 			</form>
 			</div>";

 	}

-	$text .= "</div>";

 	$ns->tablerender(IMALAN_18, $text);
 }

-if (isset($_POST['check_avatar_sizes'])) 
+if (isset($_POST['check_avatar_sizes']))
 {
 	// Set up to track what we've done
 	//
@@ -199,32 +214,44 @@ if (isset($_POST['check_avatar_sizes']))
 	$iAVnotfound = 0;
 	$iAVtoobig   = 0;
 	require_once(e_HANDLER."avatar_handler.php");
-	$text = "<div style='text-align:center'>\n";
-	$text .= "<div class='spacer'>
-		<form method='post' action='".e_SELF."'>
-		<table style='".ADMIN_WIDTH."' class='fborder'>
-		<tr>
-		<td class='forumheader3'>".$pref['im_width']."</td>
-		<td class='forumheader3'>".IMALAN_38."</td>
-		</tr>
-		<tr>
-		<td class='forumheader3'>".$pref['im_height']."</td>
-		<td class='forumheader3'>".IMALAN_39."</td>
-		</tr>";
-	
+
+	$text = "
+	<form method='post' action='".e_SELF."'>
+		<fieldset id='bad-avatar-table'>
+			<legend class='e-hideme'>".CACLAN_3."</legend>
+			<table cellpadding='0' cellspacing='0' class='adminlist'>
+				<colgroup span='3'>
+					<col style='width:10%'></col>
+					<col style='width:20%'></col>
+					<col style='width:25%'></col>
+					<col style='width:45%'></col>
+				</colgroup>
+				<thead>
+					<tr>
+						<th class='center'>".IMALAN_61."</th>
+						<th class='center'>".IMALAN_64."</th>
+						<th class='center'>".IMALAN_62."</th>
+						<th class='center last'>".IMALAN_63."</th>
+					</tr>
+				</thead>
+				<tbody>
+	";
+
+
 	//
 	// Loop through avatar field for every user
 	//
 	$iUserCount = $sql->db_Count("user");
 	if ($sql->db_Select("user", "*", "user_image!=''")) {
-		while ($row = $sql->db_Fetch()) 
+		while ($row = $sql->db_Fetch())
 		{
-			extract($row);
+			extract($row); //FIXME - kill this!!!
+
 	//
 	// Check size
 	//
 			$avname=avatar($user_image);
-			if (strpos($avname,"http://")!==FALSE) 
+			if (strpos($avname,"http://")!==FALSE)
 			{
 				$iAVexternal++;
 				$bAVext=TRUE;
@@ -242,7 +269,7 @@ if (isset($_POST['check_avatar_sizes']))
 			} else {
 				$imageWidth = $image_stats[0];
 				$imageHeight = $image_stats[1];
-				if ( ($imageHeight > $pref['im_height']) || ($imageWidth>$pref['im_width']) )
+				if ( ($imageHeight > $pref['im_height']) || ($imageWidth > $pref['im_width']) )
 				{ // Too tall or too wide
 					$iAVtoobig++;
 					if ($imageWidth > $pref['im_width']) {
@@ -257,52 +284,89 @@ if (isset($_POST['check_avatar_sizes']))
 					}
 				}
 			}
-	
-	// 
+
+	//
 	// If not found or too big, allow delete
 	//
 			if (strlen($sBadImage))
 			{
-				$sBadImage .=" [".$avname."]"; // Show all files that have a problem
+				//$sBadImage .=" [".$avname."]"; // Show all files that have a problem
+				//FIXME <button class='delete' type='submit' name='avdelete[$user_id]'><span>".($bAVext ? IMALAN_44 : IMALAN_43)."</span></button>
 				$text .= "
 				<tr>
-				<td class='forumheader3'>
-				<input class='button' type='submit' name='avdelete[$user_id]' value='".($bAVext ? IMALAN_44 : IMALAN_43)."' />
-				</td>
-				<td class='forumheader3'>".IMALAN_51."<a href='".e_BASE."user.php?id.".$user_id."'>".$user_name."</a> ".$sBadImage."</td>
+					<td class='options center'>
+						<input class='checkbox' type='checkbox' name='avdelete[]' id='avdelete-{$user_id}' value='{$user_id}' />
+					</td>
+					<td>
+						<label for='avdelete-{$user_id}' title='".IMALAN_56."'>".IMALAN_51."</label><a href='".e_BASE."user.php?id.".$user_id."'>".$user_name."</a>
+					</td>
+					<td>".$sBadImage."</td>
+					<td>".$avname."</td>
 				</tr>";
 			}
+			else
+			{
+				//Nothing found
+				$text .="
+				<tr>
+					<td colspan='4' class='center'>".IMALAN_65."</td>
+				</tr>";
+
+			}
 		}
 	}
 	//
 	// Done, so show stats
 	//
 	$text .= "
-		<tr>
-		<td class='forumheader3'>".$iAVnotfound."</td>
-		<td class='forumheader3'>".IMALAN_45."</td>
-		</tr>
-		<tr>
-		<td class='forumheader3'>".$iAVtoobig."</td>
-		<td class='forumheader3'>".IMALAN_46."</td>
-		</tr>
-		<tr>
-		<td class='forumheader3'>".$iAVinternal."</td>
-		<td class='forumheader3'>".IMALAN_47."</td>
-		</tr>
-		<tr>
-		<td class='forumheader3'>".$iAVexternal."</td>
-		<td class='forumheader3'>".IMALAN_48."</td>
-		</tr>
-		<tr>
-		<td class='forumheader3'>".($iAVexternal+$iAVinternal)." (".(int)(100.0*(($iAVexternal+$iAVinternal)/$iUserCount)).'%, '.$iUserCount." ".IMALAN_50.")</td>
-		<td class='forumheader3'>".IMALAN_49."</td>
-		</tr>
-		</table>
-		</form>
-		</div>";
+				</tbody>
+			</table>
+			<div class='buttons-bar'>
+				<button class='action' type='button' name='check_all'><span>".IMALAN_59."</span></button>
+				<button class='action' type='button' name='uncheck_all'><span>".IMALAN_60."</span></button>
+				<button class='delete' type='submit' name='delete'><span>".IMALAN_58."</span></button>
+			</div>
+		</fieldset>
+	</form>

-	$text .= "</div>";
+	<table cellpadding='0' cellspacing='0' class='admininfo'>
+	<colgroup span='2'>
+		<col style='width:20%'></col>
+		<col style='width:80%'></col>
+	</colgroup>
+	<tbody>
+	<tr>
+	<td class='label'>".IMALAN_38."</td>
+	<td class='control'>".$pref['im_width']."</td>
+	</tr>
+	<tr>
+	<td class='label'>".IMALAN_39."</td>
+	<td class='control'>".$pref['im_height']."</td>
+	</tr>
+
+	<tr>
+	<td class='label'>".IMALAN_45."</td>
+	<td class='control'>".$iAVnotfound."</td>
+	</tr>
+	<tr>
+	<td class='label'>".IMALAN_46."</td>
+	<td>".$iAVtoobig."</td>
+	</tr>
+	<tr class='control'>
+	<td class='label'>".IMALAN_47."</td>
+	<td>".$iAVinternal."</td>
+	</tr>
+	<tr>
+	<td class='label'>".IMALAN_48."</td>
+	<td class='control'>".$iAVexternal."</td>
+	</tr>
+	<tr>
+	<td class='label'>".IMALAN_49."</td>
+	<td class='control'>".($iAVexternal+$iAVinternal)." (".(int)(100.0*(($iAVexternal+$iAVinternal)/$iUserCount)).'%, '.$iUserCount." ".IMALAN_50.")</td>
+	</tr>
+	</tbody>
+	</table>
+	";

 	$ns->tablerender(IMALAN_37, $text);
 }
@@ -314,7 +378,7 @@ if(function_exists('gd_info'))
 }
 else
 {
-	$gd_version = "<span style='color:red'> ".IMALAN_55."</span>";
+	$gd_version = "<span class='error'> ".IMALAN_55."</span>";
 }

 $IM_NOTE = "";
@@ -323,7 +387,7 @@ if($pref['im_path'] != "")
  $im_file = $pref['im_path'].'convert';
 	if(!file_exists($im_file))
 	{
-		$IM_NOTE = "<br /><span style='color:red'>".IMALAN_52."</span>";
+		$IM_NOTE = "<span class='error'>".IMALAN_52."</span>";
 	}
 	else
 	{
@@ -331,100 +395,103 @@ if($pref['im_path'] != "")
 		$tmp = `$cmd`;
 		if(strpos($tmp, "ImageMagick") === FALSE)
 		{
-			$IM_NOTE = "<br /><span style='color:red'>".IMALAN_53."</span>";
+			$IM_NOTE = "<span class='error'>".IMALAN_53."</span>";
 		}
 	}
 }

-$text = "<div style='text-align:center'>
+$text = "
 	<form method='post' action='".e_SELF."'>
-	<table style='".ADMIN_WIDTH."' class='fborder'>
+		<fieldset id='image-settings-form'>
+			<legend class='e-hideme'>".IMALAN_7."</legend>
+			<table cellpadding='0' cellspacing='0' class='adminform'>
+				<colgroup span='2'>
+					<col style='width:250px'></col>
+					<col></col>
+				</colgroup>
+				<tbody>
+					<tr>
+						<td class='label'>
+							".IMALAN_1."
+						</td>
+						<td class='control'>". ($pref['image_post'] ? "<input class='checkbox' type='checkbox' name='image_post' value='1' checked='checked' />" : "<input type='checkbox' name='image_post' value='1' />")."
+							<div class='smalltext field-help'>".IMALAN_2."</div>
+						</td>
+					</tr>
+					<tr>
+						<td class='label'>
+							".IMALAN_10."
+						</td>
+						<td class='control'>".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."
+							<div class='smalltext field-help'>".IMALAN_11."</div>
+						</td>
+					</tr>

-	<tr>
-	<td style='width:75%' class='forumheader3'>
-	".IMALAN_1."<br />
-	<span class='smalltext'>".IMALAN_2."</span>
-	</td>
-	<td style='width:25%;text-align:center' class='forumheader3' >". ($pref['image_post'] ? "<input type='checkbox' name='image_post' value='1' checked='checked' />" : "<input type='checkbox' name='image_post' value='1' />")."
-	</td>
-	</tr>
+					<tr>
+						<td class='label'>
+							".IMALAN_12."
+						</td>
+						<td class='control'>
+							<select name='image_post_disabled_method' class='tbox select'>". ($pref['image_post_disabled_method'] == "0" ? "<option value='1' selected='selected'>".IMALAN_14."</option>" : "<option value='0'>".IMALAN_14."</option>"). ($pref['image_post_disabled_method'] == "1" ? "<option value='1' selected='selected'>".IMALAN_15."</option>" : "<option value='1'>".IMALAN_15."</option>")."
+							</select>
+							<div class='smalltext field-help'>".IMALAN_13."</div>
+						</td>
+					</tr>

+					<tr>
+						<td class='label'>".IMALAN_3."<br/><em>".IMALAN_54." {$gd_version}</em></td>
+						<td class='control'>
+							<select name='resize_method' class='tbox'>". ($pref['resize_method'] == "gd1" ? "<option selected='selected'>gd1</option>" : "<option>gd1</option>"). ($pref['resize_method'] == "gd2" ? "<option selected='selected'>gd2</option>" : "<option>gd2</option>"). ($pref['resize_method'] == "ImageMagick" ? "<option selected='selected'>ImageMagick</option>" : "<option>ImageMagick</option>")."
+							</select>
+							<div class='smalltext field-help'>".IMALAN_4."</div>
+						</td>
+					</tr>

-	<tr>
-	<td style='width:75%' class='forumheader3'>
-	".IMALAN_10."<br />
-	<span class='smalltext'>".IMALAN_11."</span>
-	</td>
-	<td style='width:25%;text-align:center' class='forumheader3' >".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."</td>
-	</tr>
+					<tr>
+						<td class='label'>".IMALAN_5."<div class='label-note'>{$IM_NOTE}</em></td>
+						<td class='control'>
+							<input class='tbox input-text' type='text' name='im_path' size='40' value=\"".$pref['im_path']."\" maxlength='200' />
+							<div class='smalltext field-help'>".IMALAN_6."</div>
+						</td>
+					</tr>

-	<tr>
-	<td style='width:75%' class='forumheader3'>
-	".IMALAN_12."<br />
-	<span class='smalltext'>".IMALAN_13."</span>
-	</td>
-	<td style='width:25%;text-align:center' class='forumheader3' >
-	<select name='image_post_disabled_method' class='tbox'>". 
-	($pref['image_post_disabled_method'] == "0" ? "<option value='0' selected='selected'>".IMALAN_14."</option>" : "<option value='0'>".IMALAN_14."</option>"). 
-	($pref['image_post_disabled_method'] == "1" ? "<option value='1' selected='selected'>".IMALAN_19."</option>" : "<option value='1'>".IMALAN_19."</option>").
-	($pref['image_post_disabled_method'] == "2" ? "<option value='2' selected='selected'>".IMALAN_15."</option>" : "<option value='2'>".IMALAN_15."</option>")."
-	</select></td>
-	</tr>
+					<tr>
+						<td class='label'>".IMALAN_34."
+						</td>
+						<td class='control'>".($pref['enable_png_image_fix'] ? "<input type='checkbox' name='enable_png_image_fix' value='1' checked='checked' />" : "<input type='checkbox' name='enable_png_image_fix' value='1' />")."
+							<div class='smalltext field-help'>".IMALAN_35."</div>
+						</td>
+					</tr>

-	<tr>
-	<td style='width:75%' class='forumheader3'>".IMALAN_3."<br /><span class='smalltext'>".IMALAN_4."</span><br />".IMALAN_54." {$gd_version}</td>
-	<td style='width:25%;text-align:center' class='forumheader3' >
-	<select name='resize_method' class='tbox'>". ($pref['resize_method'] == "gd1" ? "<option selected='selected'>gd1</option>" : "<option>gd1</option>"). ($pref['resize_method'] == "gd2" ? "<option selected='selected'>gd2</option>" : "<option>gd2</option>"). ($pref['resize_method'] == "ImageMagick" ? "<option selected='selected'>ImageMagick</option>" : "<option>ImageMagick</option>")."
-	</select>
-	</td>
-	</tr>
+					<tr>
+						<td class='label'>".IMALAN_16."</td>
+						<td class='control'>
+							<button class='action' type='submit' name='show_avatars'><span>".IMALAN_17."</span></button>
+						</td>
+					</tr>

-	<tr>
-	<td style='width:75%' class='forumheader3'>".IMALAN_5."<br /><span class='smalltext'>".IMALAN_6."</span></td>
-	<td style='width:25%;text-align:center' class='forumheader3' >
-	<input class='tbox' type='text' name='im_path' size='40' value=\"".$pref['im_path']."\" maxlength='200' />
-	{$IM_NOTE}
-	</td></tr>
-
-	<tr>
-	<td style='width:75%' class='forumheader3'>".IMALAN_34."<br />
-	<span class='smalltext'>".IMALAN_35."</span>
-	</td>
-	<td style='width:25%;text-align:center' class='forumheader3' >".($pref['enable_png_image_fix'] ? "<input type='checkbox' name='enable_png_image_fix' value='1' checked='checked' />" : "<input type='checkbox' name='enable_png_image_fix' value='1' />")."
-	</td>
-	</tr>
-
-	<tr>
-	<td style='width:75%' class='forumheader3'>".IMALAN_16."</td>
-	<td style='width:25%;text-align:center' class='forumheader3'  >
-	<input class='button' type='submit' name='show_avatars' value='".IMALAN_17."' />
-	</td></tr>
-
-	<tr>
-	<td style='width:75%' class='forumheader3'>".IMALAN_36."</td>
-	<td style='width:25%;text-align:center' class='forumheader3'  >
-	<input class='button' type='submit' name='check_avatar_sizes' value='".IMALAN_17."' />
-	</td></tr>
-
-	<tr>
-	<td colspan='2' style='text-align:center' class='forumheader'>
-	<input class='button' type='submit' name='update_options' value='".IMALAN_8."' />
-	</td>
-	</tr>
-
-
-
-
-	</table></form></div>";
+					<tr>
+						<td class='label'>".IMALAN_36."</td>
+						<td class='control'>
+							<button class='action' type='submit' name='check_avatar_sizes'><span>".IMALAN_17."</span></button>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			<div class='buttons-bar center'>
+				<button class='update' type='submit' name='update_options'><span>".IMALAN_8."</span></button>
+			</div>
+		</fieldset>
+	</form>";
 $ns->tablerender(IMALAN_7, $text);


 require_once("footer.php");
-
-
+/*
+XXX - remove this odd thing?!

 $pref['resize_method'] = $_POST['resize_method'];
 $pref['im_path'] = $_POST['im_path'];

-
-?>
+*/
+?>
--- a/e107_languages/English/admin/lan_image.php
+++ b/e107_languages/English/admin/lan_image.php
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_image.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2008-12-05 22:01:25 $
-|     $Author: e107steved $
+|     $Revision: 1.5 $
+|     $Date: 2008-12-09 15:19:03 $
+|     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 define("IMALAN_1", "Enable image display");
@@ -67,4 +67,27 @@ define("IMALAN_53", "Path to ImageMagick appears to be correct, but convert file
 define("IMALAN_54", "GD version installed:");
 define('IMALAN_55', 'Not installed');

+//v0.8
+
+//uploaded avatar list
+define('IMALAN_56', 'Click to select');
+define('IMALAN_57', 'Image too big - click to enlarge');
+define('IMALAN_58', 'Delete checked');
+define('IMALAN_59', 'Check All');
+define('IMALAN_60', 'Uncheck All');
+define('IMALAN_66', 'Filename');
+
+//avatar check
+define('IMALAN_61', 'Options');
+define('IMALAN_62', 'Reason');
+define('IMALAN_63', 'URL');
+define('IMALAN_64', 'User');
+define('IMALAN_65', 'Nothing found');
+
+/*
+define('IMALAN_60', '');
+define('IMALAN_60', '');
+define('IMALAN_60', '');
+define('IMALAN_60', '');
+ */
 ?>
--- a/e107_themes/_blank/admin_style.css
+++ b/e107_themes/_blank/admin_style.css
@@ -0,0 +1,299 @@
+/* E107 CORE CSS *********************************************************************************************/
+.searchhighlight{text-decoration: underline; color:#FF0000; font-weight:bold; }
+
+
+/*
+ * e107 v0.800 - new class definitions
+ */
+ 
+/* Core Formatting */
+.left		{ text-align: left }
+.right		{ text-align: right }
+.center		{ text-align: center }
+.f-left		{ float: left }
+.f-right	{ float: right }
+.top		{ vertical-align: top }
+.middle		{ vertical-align: middle }
+.bottom		{ vertical-align: bottom }
+.clear		{ clear: both }
+.clear-l	{ clear: right }
+.clear-r	{ clear: left }
+.smalltext	{ font-size: 11px; }
+
+/* Core Icons */
+.icon		{ border: 0 }
+.icon.action { vertical-align: middle }
+.S16		{ width: 16px; height: 16px }
+.S32		{ width: 32px; height: 32px }
+.S64		{ width: 64px; height: 64px }
+.S128		{ width: 128px; height: 128px }
+/*******************************************************************************************************************/
+
+/* RESET CSS *********************************************************************************************/
+/* Global */
+* 			{ margin:0; padding:0; }
+body		{ font:12px/1.5em Arial, Helvetica, sans-serif;  }
+img         { border:0; vertical-align:top; }
+a			{ text-decoration:underline; }
+a:hover		{ text-decoration:underline; }
+a img		{ border:0; }
+:focus		{ outline:0; }
+
+/* Headings */
+h1          { font-size:20px; font-weight:normal; line-height:1.3; }
+h2          { font-size:18px; font-weight:normal; line-height:1.34; }
+h3          { font-size:16px; font-weight:bold; line-height:1.375; }
+h4          { font-size:14px; font-weight:bold; }
+h5          { font-size:12px; font-weight:bold; }
+h6          { font-size:11px; font-weight:bold; }
+
+/* Forms */
+form        { display:inline; }
+fieldset    { border:0; }
+input, select{ vertical-align:middle; }
+textarea	{ overflow:auto; }
+
+/* Table */
+table       { border:0; border-spacing:0; empty-cells:show; font-size:100%; }
+th          { vertical-align:top; text-align:left; font-weight:normal; }
+td          { vertical-align:top; }
+
+/* Content */
+address     { font-style:normal; }
+cite        { font-style:normal; }
+q,
+blockquote  { quotes:none; }
+q:before, 
+q:after     { content:''; }
+small,big   { font-size:1em; }
+sup         { font-size:1em; vertical-align:top; }
+
+/* Lists */
+ul,ol       { list-style:none; }
+
+/* Tools */
+.no-display { display:none; }
+.no-margin  { margin:0 !important; }
+.no-padding { padding:0 !important; }
+.no-bg      { background:none !important; }
+.clear		{ clear: both; }
+
+/*******************************************************************************************************************/
+
+/* E107 CORE ADMIN CSS *********************************************************************************************/
+
+
+/******** Decorate JS */
+/* Admin List Table */ 
+.adminlist-table {} /* fieldset */
+.adminlist { width:100%;  border:1px solid #ddd;}
+.adminlist th { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; font-weight: bold; white-space:nowrap; }
+.adminlist td { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; }
+.adminlist th.last,
+.adminlist td.last { border-right: 0px solid;}
+.adminlist tr.last td{ border-bottom: 0px solid;}
+.adminlist thead { background-color:#f2f2f2; }
+
+.adminlist tbody {}
+.adminlist tfoot {}
+.adminlist tr.first {}
+.adminlist tr.last {}
+.adminlist tr.odd {}
+.adminlist tr.even { background-color:#f6f6f6; }
+
+/* Form elements */ 
+input.input-text,
+textarea,
+select {
+    border-width:1px;
+    border-style:solid;
+    border-color:#aaa #c8c8c8 #c8c8c8 #aaa;
+    background:#fff;
+    font:12px arial, helvetica, sans-serif;
+}
+select  { min-height:17px; /* to set the height for empty selects */ }
+input.input-text, textarea      { padding:2px; }
+
+/* custom fields CSS */
+#image-settings-form  input.input-text { width: 300px; }
+
+
+.inline-help { width: 280px; }
+	
+/* form used for settings */
+.adminform  { width:100%;  border:1px solid #ddd;}
+.adminform col.label { width: 250px; }
+
+.adminform td { padding: 5px; text-align: left}
+
+.adminform .select { width: 280px;}
+.adminform .input-text { width: 274px;}
+.adminform td.control textarea { width: 274px;}
+
+.adminform td.label { }
+.adminform td.control { }
+
+.field-help { width: 280px; }
+.label-note { font-style: italic; }
+
+/* form used for content edit */
+.adminedit  { width:100%;  border:1px solid #ddd;}
+.adminedit td { padding: 5px; text-align: left}
+
+.adminedit .select { width: 280px; }
+.adminedit .input-text { width: 274px;}
+.adminedit td.control textarea { width: 274px;}
+
+.adminedit td.label {}
+.adminedit td.control {}
+
+
+/* Admin Info Table */ 
+.admininfo  { width:100%;  border:1px solid #ddd;}
+.admininfo td { padding: 1px 5px; text-align: left}
+
+.admininfo td.label { border-right:1px solid #ddd; }
+.admininfo td.control {}
+
+.info-bar { padding: 5px 0px; }
+
+/* Images and avatars */
+.image-box {border:1px solid #ddd; margin-right: 10px;  position: relative; margin-bottom: 10px; }
+.image-box .spacer { }
+.image-box .image-name { padding: 5px; }
+.image-box .image-delete { position: absolute ; bottom: 10px; text-align: center; width: 100%}
+.image-box .image-users {padding: 5px;}
+.image-box .image-preview {padding: 5px;}
+
+/******** Prepare for Image Preview JS */
+.image-preview {}
+
+/******** Tabs JS */
+.admintabs ul.e-tabs { border-bottom: 1px solid #DDDDDD; height: 31px; }
+.admintabs ul.e-tabs li { border: 1px solid #DDDDDD; display: block; float: left; line-height: 30px; padding: 0px 7px; margin-right: 3px; background-color: #F9F9F9 }
+.admintabs fieldset { clear: both ; border: 1px solid #DDDDDD; padding: 10px; border-top: 0px none; }
+.admintabs ul.e-tabs li.active { border-bottom: 1px solid #FFFFFF; background-color: #FFFFFF}
+
+/******** SyS Messages / Message text formatting */
+.s-message {}
+.s-message .error-box {}
+.warning { color: #FF6600}
+.success {}
+.error { color: #FF0000}
+.info {}
+.validate-result {} /* validate result inline message */
+
+/******** Tooltip info */
+.e-info {}
+
+button { 
+  border:0; 
+  cursor:pointer; 
+  font:bold 12px arial, helvetica, sans-serif;  
+  padding:0 10px 0 0; 
+  text-align:center;
+  color:#0b333c; 
+}
+button span { 
+  position:relative; 
+  display:block; 
+  white-space:nowrap; 
+  padding:0 0 0 11px; 
+  height:22px; line-height:22px;  color:#0b333c;
+}
+
+/*blue buttons*/
+button 					{ background:url(images/btn_right.gif) right no-repeat;  }
+button span 			{ background:url(images/btn_left.gif) left no-repeat;  }
+
+button:hover,
+button:focus 			{ background:url(images/btn_over_right.gif) right no-repeat; }
+button:hover span, 
+button:focus span 		{ background:url(images/btn_over_left.gif) left no-repeat; } 
+
+
+button:active			{ background:url(images/btn_active_right.gif) right no-repeat; }
+button:active	span	{ background:url(images/btn_active_left.gif) left no-repeat; }
+
+button::-moz-focus-inner { border: none; } /*To all who have a problem with 1px spans offset in firefox, the following sentence will solve this problem: */
+
+button.delete span			{ padding-left: 30px; }
+button.delete span			{ background-image:url(images/btn_remove_left.gif); }
+button.delete:hover span,
+button.delete:focus span 	{ background-image:url(images/btn_remove_over_left.gif) } 
+button.delete:active span	{ background-image:url(images/btn_remove_active_left.gif)}
+
+button.submit span			{}
+button.submit span			{}
+button.submit:hover span,
+button.submit:focus span 	{} 
+button.submit:active span	{}
+
+button.update span			{ padding-left: 30px; }
+button.update span			{ background-image:url(images/btn_update_left.gif); }
+button.update:hover span,
+button.update:focus span 	{ background-image:url(images/btn_update_over_left.gif)}
+button.update:active span	{ background-image:url(images/btn_update_active_left.gif)}
+
+button.create span			{ padding-left: 30px; }
+button.create span			{}
+button.create:hover span,
+button.create:focus span 	{} 
+button.create:active span	{}
+
+button.edit span			{ padding-left: 30px; }
+button.edit span			{}
+button.edit:hover span,
+button.edit:focus span 		{} 
+button.edit:active span		{}
+
+
+.buttons-bar { padding: 10px 0px; }
+.buttons-bar button { margin-right: 10px; }
+.buttons-bar button.f-right { margin-right: 0px; }
+
+
+/*******************************************************************************************************************/
+
+
+/* THEME SPECIFIC CSS *********************************************************************************************/
+/******** Page Base */
+.admin-wrapper { min-width: 950px; }
+.admin-header { padding: 20px 15px 0; }
+.admin-header-content {border: 1px solid #DDDDDD;}
+.admin-page-body { padding: 20px 15px 0; }
+.admin-footer {}
+
+/******** Layout */
+.col-left { float:left; width: 220px;}
+.col-main { margin-left: 220px; padding: 0 0 0 20px;}
+.inner-wrapper { float:left; width:100%; }
+
+/******** Horizontal navigation ADMIN_NAV_ALT */
+.admin-navigation { border: 1px solid #DDDDDD;}
+
+
+/******** Side Navigation 
+	- Admin Navigation
+	- Plugin Navigation
+*/
+ul.plugin-navigation { }
+ul.plugin-navigation a { text-decoration: none; }
+
+ul.plugin-navigation li { padding: 0px 10px 0px; }
+ul.plugin-navigation a.link {}
+ul.plugin-navigation a.link-active {font-weight: bold;}
+
+ul.plugin-navigation ul.sub-nav {}
+ul.plugin-navigation ul.sub-nav li { padding: 0px 10px 0px; }
+ul.plugin-navigation ul.sub-nav a.link {}
+ul.plugin-navigation ul.sub-nav a.link-active {font-weight: bold;}
+
+
+/******** Block Elements */
+.block { border: 1px solid #DDDDDD; margin-bottom: 10px;}
+.block-text { padding: 10px 10px 10px; }
+.block h4 { padding: 5px 10px 5px; border-bottom: 1px solid #DDDDDD; }
+.page-info { border: 1px solid #DDDDDD; margin-bottom: 10px; }
+.page-info p { padding: 10px; }
+
--- a/e107_themes/_blank/admin_template.php
+++ b/e107_themes/_blank/admin_template.php
@@ -0,0 +1,125 @@
+<?php
+/*
+ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     <20>Steve Dunstan 2001-2002
+|     http://e107.org
+|     jalist@e107.org
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
+|     $Revision: 1.1 $
+|     $Date: 2008-12-09 15:19:03 $
+|     $Author: secretr $
+----------------------------------------------------------------------------+
+*/
+
+if (!defined('e107_INIT')) { exit; }
+
+define("ADLINK_COLS",5);
+
+
+$ADMIN_HEADER = "
+<div class='admin-wrapper'>
+	<div class='admin-header'>
+		<div class='admin-header-content'>
+			{ADMIN_LOGO}
+			{ADMIN_LOGGED}
+			{ADMIN_SEL_LAN}
+			{ADMIN_USERLAN}
+		</div>
+		<div style='height: 20px;'><!-- --></div>
+		<div class='admin-navigation'>
+			{FS_ADMIN_ALT_NAV}
+			<div class='clear'><!-- --></div>
+		</div>
+	</div>
+	<div class='admin-page-body'>
+		<div class='col-2-left'>
+			<div class='col-left'>
+				{ADMIN_LANG}
+				{SETSTYLE=admin_menu}
+				{ADMIN_NAV}
+				{ADMIN_MENU}
+				{SETSTYLE=bla}
+				{ADMIN_PWORD}
+				{ADMIN_STATUS=request}
+				{ADMIN_LATEST=request}
+				{ADMIN_LOG=request}
+				{ADMIN_MSG}
+				{ADMIN_PLUGINS}
+				
+				{ADMIN_PRESET}
+				{ADMIN_UPDATE}
+				{SETSTYLE=site_info}
+				
+				{ADMIN_HELP}
+				{ADMIN_SITEINFO}
+				{ADMIN_DOCS}
+				{SETSTYLE=bla}
+			</div>
+			<div class='col-main'>
+				<div class='inner-wrapper'>
+";
+
+$ADMIN_FOOTER = "
+				</div>
+			</div>
+			<div class='clear'><!-- --></div>
+		</div>
+	</div>
+	<div class='admin-footer'>
+		{ADMIN_CREDITS}
+	</div>
+</div>
+";
+
+/* REEDIT
+
+ * function show_admin_menu() in e107_admin/header.php
+
+*/
+
+$BUTTONS_START = '
+<ul class="plugin-navigation">
+';
+$BUTTON = '
+	<li>
+		<a class="link" {ONCLICK}>&raquo;&nbsp;{LINK_TEXT}</a>
+	</li>
+';
+$BUTTON_OVER = '
+	<li>
+		<a class="link-active" {ONCLICK}>&raquo;&nbsp;{LINK_TEXT}</a>
+	</li>
+';
+$SUB_BUTTONS_START = '
+<ul class="plugin-navigation">	
+	<li>
+		<a class="link" onclick="expandit(\'{SUB_HEAD_ID}\');" >&raquo;&nbsp;{SUB_HEAD}</a>
+		<ul class="sub-nav" id="{SUB_HEAD_ID}" style="display: none">
+';
+$SUB_BUTTON = '
+			<li>
+				<a class="link" href="{LINK_URL}">&raquo;&nbsp;{LINK_TEXT}</a>
+			</li>
+';
+$SUB_BUTTON_OVER = '
+			<li>
+				<a class="link-active" href="{LINK_URL}">&raquo;&nbsp;{LINK_TEXT}</a>
+			</li>
+';
+$SUB_BUTTONS_END = '
+		</ul>
+	</li>
+</ul>
+';
+$BUTTONS_END = '
+</ul>
+';
+
+
+?>
--- a/e107_themes/_blank/fs_admin_alt_nav.sc
+++ b/e107_themes/_blank/fs_admin_alt_nav.sc
@@ -0,0 +1,170 @@
+if (ADMIN) {
+	global $sql, $pref, $tp;
+	parse_str($parm);
+	require(e_ADMIN.'ad_links.php');
+	require_once(e_HANDLER.'admin_handler.php');
+
+	function adnav_cat_fs($cat_title, $cat_link, $cat_img, $cat_id=FALSE) {
+		$cat_link = ($cat_link ? $cat_link : "javascript:void(0);");
+
+		$text = '<a class="menuButton" href="'.$cat_link.'" style="background-image: url('.$cat_img.'); background-repeat: no-repeat;  background-position: 10px 50%" ';
+
+		if ($cat_id) {
+			//$text .= 'onclick="return buttonClick(event, \''.$cat_id.'\');" onmouseover="buttonMouseover(event, \''.$cat_id.'\');"';
+		}
+
+		$text .= '>'.$cat_title.'</a>';
+		return $text;
+	}
+
+
+	function adnav_main_fs($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') {
+		$text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' ";
+
+		if ($cat_id) {
+			//$text .= "onclick=\"return false;\" onmouseover=\"menuItemMouseover(event, '".$cat_id."');\"";
+		}
+
+		$text .= ">".$cat_img.$cat_title;
+
+		if ($cat_id) {
+			$text .= "";
+		}
+
+		$text .= "</a>";
+		return $text;
+	}
+
+/*
+	$text .= "<div style='width: 100%'><table border='0' cellspacing='0' cellpadding='0' style='width: 100%'>
+	<tr><td>
+	<div class='menuBar' style='width: 100%'>";
+*/
+	$text .= '
+		<div id="nav">
+			<ul class="level1" id="nav-links">
+	';
+
+	if (defined('FS_ADMIN_START_SEPARATOR') && FS_ADMIN_START_SEPARATOR != false) {
+		$text .= "
+		<li class='fs-linkSep'>".FS_ADMIN_START_SEPARATOR."</li>";
+	}
+
+	$text .= '
+		<li>'.adnav_cat_fs(ADLAN_151, e_ADMIN."admin.php", E_16_NAV_MAIN).'</li>
+	';
+
+	if (defined('FS_ADMIN_LINK_SEPARATOR')) {
+		$text .= "
+		<li class='fs-linkSep'>".FS_ADMIN_LINK_SEPARATOR."</li>";
+	}
+
+	$sepBr = 1;
+	for ($i = 1; $i < 5; $i++) {
+		$ad_tmpi = 0;
+		$ad_links_array = asortbyindex($array_functions, 1);
+		$text .= '<li>';
+		$nav_main = adnav_cat_fs($admin_cat['title'][$i], '', $admin_cat['img'][$i], $admin_cat['id'][$i]);
+
+		$ad_texti = '<ul id="'.$admin_cat["id"][$i].'" class="menu">
+		';
+
+		while(list($key, $nav_extract) = each($ad_links_array)){
+			if($nav_extract[4]==$i){
+				if(getperms($nav_extract[3])){
+					$ad_texti .= '<li>'.adnav_main_fs($nav_extract[1], $nav_extract[0], $nav_extract[5]).'</li>';
+					$ad_tmpi = 1;
+				}
+			}
+		}
+		$ad_texti .= '</ul>';
+		if ($ad_tmpi == 1) {
+			$text .= $nav_main;
+			$text .= $ad_texti;
+		}
+		$text .='</li>';
+
+		if (defined('FS_ADMIN_LINK_SEPARATOR')) {
+			if ($sepBr < 4 ) {
+				$text .= "
+				<li class='fs-linkSep'>".FS_ADMIN_LINK_SEPARATOR."</li>";
+			}
+		}
+		$sepBr++;
+	}
+
+	$render_plugins = FALSE;
+	if($sql -> db_Select("plugin", "*", "plugin_installflag=1 ORDER BY plugin_path")){
+		while($row = $sql -> db_Fetch()){
+			if(getperms('P'.$row['plugin_id'])){
+				include_once(e_PLUGIN.$row['plugin_path']."/plugin.php");
+				if($eplug_conffile){
+					$eplug_name = $tp->toHTML($eplug_name,FALSE,"defs");
+					$plugin_icon = $eplug_icon_small ? "<img src='".e_PLUGIN_ABS.$eplug_icon_small."' alt='".$eplug_caption."' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />" : E_16_PLUGIN;
+					$plugin_array[ucfirst($eplug_name)] = adnav_main_fs($eplug_name, e_PLUGIN.$row['plugin_path']."/".$eplug_conffile, $plugin_icon);
+				}
+				unset($eplug_conffile, $eplug_name, $eplug_caption, $eplug_icon_small);
+				$render_plugins = TRUE;
+				$active_plugs = TRUE;
+			}
+		}
+		ksort($plugin_array, SORT_STRING);
+		$plugs_text = '';
+		foreach ($plugin_array as $plugin_compile) {
+			$plugs_text .= $plugin_compile;
+		}
+	}
+
+	if (getperms('Z')) {
+		$pclass_extended = $active_plugs ? 'header' : '';
+		$plugin_text = adnav_main_fs(ADLAN_98, e_ADMIN.'plugin.php', E_16_PLUGMANAGER, FALSE, $pclass_extended);
+		$render_plugins = TRUE;
+	}
+
+	if ($render_plugins) {
+		if (defined('FS_ADMIN_LINK_SEPARATOR')) {
+			$text .= "
+			<li class='fs-linkSep'>".FS_ADMIN_LINK_SEPARATOR."</li>";
+		}
+		$text .= '<li>';
+		$text .= adnav_cat_fs(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu');
+		$text .= "<ul id='plugMenu' class='menu'>";
+		$text .= '<li>'.$plugin_text.$plugs_text.'</li>';
+		$text .= "</ul>";
+		$text .='</li>';
+	}
+
+	if (defined('FS_ADMIN_LINK_SEPARATOR')) {
+		$text .= "
+		<li class='fs-linkSep'>".FS_ADMIN_LINK_SEPARATOR."</li>";
+	}
+
+	$text .= '<li>';
+	$text .= adnav_cat_fs(ADLAN_CL_8, '', E_16_NAV_DOCS, 'docsMenu');
+	$text .= "<ul id='docsMenu' class='menu'>";
+	if (!$handle=opendir(e_DOCS.e_LANGUAGE."/")) {
+		$handle=opendir(e_DOCS."English/");
+	}
+	$i=1;
+	while ($file = readdir($handle)) {
+		if ($file != "." && $file != ".." && $file != "CVS") {
+			$text .= '<li>'.adnav_main_fs(str_replace("_", " ", $file), e_ADMIN."docs.php?".$i, E_16_DOCS).'</li>';
+			$i++;
+		}
+	}
+	closedir($handle);
+	$text .= "</ul>";
+	$text .='</li>';
+/*
+	if ($exit != 'off') {
+		$text .= '<li>'.adnav_cat_fs(ADLAN_53, e_BASE.'index.php', E_16_NAV_LEAV).'</li>';
+		$text .= '<li>'.adnav_cat_fs(ADLAN_46, e_ADMIN.'admin.php?logout', E_16_NAV_LGOT).'</li>';
+	}
+*/
+	$text .= '
+			</ul>
+		</div>
+	';
+
+	return $text;
+}
--- a/e107_themes/_blank/ie_all.css
+++ b/e107_themes/_blank/ie_all.css
@@ -0,0 +1,14 @@
+
+.col-main		{ zoom: 1 }
+button			{ width:auto; margin-left:5px; overflow:visible; }
+
+input.checkbox,
+input.radio { width:13px; height:13px; }
+
+button { 
+  width:auto; 
+  overflow:visible; 
+}
+button span { 
+  margin-top:1px; 
+}
--- a/e107_themes/_blank/images/btn_active_left.gif
+++ b/e107_themes/_blank/images/btn_active_left.gif
--- a/e107_themes/_blank/images/btn_active_right.gif
+++ b/e107_themes/_blank/images/btn_active_right.gif
--- a/e107_themes/_blank/images/btn_left.gif
+++ b/e107_themes/_blank/images/btn_left.gif
--- a/e107_themes/_blank/images/btn_over_left.gif
+++ b/e107_themes/_blank/images/btn_over_left.gif
--- a/e107_themes/_blank/images/btn_over_right.gif
+++ b/e107_themes/_blank/images/btn_over_right.gif
--- a/e107_themes/_blank/images/btn_remove_active_left.gif
+++ b/e107_themes/_blank/images/btn_remove_active_left.gif
--- a/e107_themes/_blank/images/btn_remove_left.gif
+++ b/e107_themes/_blank/images/btn_remove_left.gif
--- a/e107_themes/_blank/images/btn_remove_over_left.gif
+++ b/e107_themes/_blank/images/btn_remove_over_left.gif
--- a/e107_themes/_blank/images/btn_remove_right.gif
+++ b/e107_themes/_blank/images/btn_remove_right.gif
--- a/e107_themes/_blank/images/btn_right.gif
+++ b/e107_themes/_blank/images/btn_right.gif
--- a/e107_themes/_blank/images/btn_update_active_left.gif
+++ b/e107_themes/_blank/images/btn_update_active_left.gif
--- a/e107_themes/_blank/images/btn_update_left.gif
+++ b/e107_themes/_blank/images/btn_update_left.gif
--- a/e107_themes/_blank/images/btn_update_over_left.gif
+++ b/e107_themes/_blank/images/btn_update_over_left.gif
--- a/e107_themes/_blank/menu/menu.css
+++ b/e107_themes/_blank/menu/menu.css
@@ -0,0 +1,116 @@
+#nav li.fs-linkSep { width: 2px; margin: 0px; height: 38px; background: url(../images/a01_bar-Sep.png) 0 0 no-repeat; }
+
+#nav, #nav ul { /* all lists */
+	padding: 0px;
+	margin: 0px;
+	list-style: none;
+	line-height: 38px;
+	padding: 0px 0px;
+}
+
+
+#nav a {
+	padding: 0px 15px 0px 36px;
+	vertical-align: middle;
+	display: block;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	text-align: center;
+	font-size: 12px;
+	color: #13394E;
+	font-weight: bold;
+	text-decoration: none;
+	
+}
+
+#nav a:hover {
+	/* background-position: 0 -44px; */
+	color: #CB0000;
+}
+
+#nav li.sub a:hover,
+#nav li.sub.sfhover a,
+#nav li.sub:hover a {
+
+	/* background-position: 0 -88px; */
+}
+
+#nav li { /* all list items */
+	float: left;
+	/* width: 158px;  width needed or else Opera goes nuts */
+}
+ul.sub {border-top: 1px solid #CCCCCC;}
+#nav li ul { /* second-level lists */
+	position: absolute;
+	z-index: 10;
+	width: 180px;
+	
+	left: -9999px; /* using left instead of display to hide menus because display: none isn't read by screen readers */
+}
+
+#nav li li a,
+#nav li:hover li a,
+#nav li.sfhover li a {
+	text-align: left;
+	background-image: none;
+	background-color: #FBFEF1;
+	line-height: 28px;
+	font-size: 11px;
+	font-weight: bold;
+	padding-left: 10px;
+	padding-right: 0px;
+	border-left: 1px solid #B8DF30;
+	border-right: 1px solid #B8DF30;
+	border-bottom: 1px solid #B8DF30;
+	width: 188px;
+	w\idth : 188px;
+	text-transform: none;
+	color: #13394E;
+}
+
+#nav .menuItem img { width: 16px; height: 16px; padding: 6px 0px; margin-right: 10px; }
+#nav li li a.sub,
+#nav li:hover li a.sub,
+#nav li.sfhover li a.sub {
+	/* background-image: url(../images/1008-links_sub.gif) !important ; background-repeat: no-repeat; background-position:95% 50%; */
+}
+#nav li li a.sub:hover,
+#nav li:hover li a.sub:hover,
+#nav li.sfhover li a.sub:hover {
+	/* background-image: url(../images/0708_link_sub_over.png) !important ; background-repeat: no-repeat; background-position: 100% 50%; */
+}
+
+
+#nav li li a:hover{
+	background-color: #DDF098;
+	color: #990000
+}
+
+
+
+#nav li ul ul { /* third-and-above-level lists */
+	margin: -29px 0 0 180px;
+}
+
+#nav li:hover ul ul, 
+#nav li:hover ul ul ul, 
+#nav li:hover ul ul ul ul, 
+#nav li:hover ul ul ul ul ul,
+#nav li.sfhover ul ul, 
+#nav li.sfhover ul ul ul,
+#nav li.sfhover ul ul ul ul,
+#nav li.sfhover ul ul ul ul ul {
+	left: -999em;
+}
+
+#nav li:hover ul, 
+#nav li li:hover ul, 
+#nav li li li:hover ul,
+#nav li li li li:hover ul,
+#nav li li li li li:hover ul,
+#nav li.sfhover ul, 
+#nav li li.sfhover ul, 
+#nav li li li.sfhover ul,
+#nav li li li li.sfhover ul,
+#nav li li li li li.sfhover ul { /* lists nested under hovered list items */
+	left: auto;
+}
--- a/e107_themes/_blank/menu/menu.js
+++ b/e107_themes/_blank/menu/menu.js
@@ -0,0 +1,16 @@
+sfHover = function() {
+	var sfEls = document.getElementById("nav").getElementsByTagName("LI");
+	for (var i=0; i<sfEls.length; i++) {
+		sfEls[i].onmouseover=function() {
+			if(this.className != 'fs-linkSep') 
+			this.className+=" sfhover";
+		}
+		sfEls[i].onmouseout=function() {
+			this.className=this.className.replace(new RegExp(" sfhover\\b"), "");
+		}
+	}
+}
+if (window.attachEvent) window.attachEvent("onload", sfHover);
+
+
+
--- a/e107_themes/_blank/style.css
+++ b/e107_themes/_blank/style.css
@@ -0,0 +1,2 @@
+/* CSS Document */
+
--- a/e107_themes/_blank/theme.php
+++ b/e107_themes/_blank/theme.php
@@ -0,0 +1,82 @@
+<?php
+
+$THEME_CORE_JSLIB = array(
+	'jslib/core/decorate.js' => 'all',
+	'jslib/core/tabs.js' => 'admin'
+);
+
+$register_sc[]='FS_ADMIN_ALT_NAV';
+$no_core_css = TRUE;
+
+function theme_head() {
+	$ret = '';
+	$ret .= ' 
+		<link rel="stylesheet" href="'.THEME_ABS.'menu/menu.css" type="text/css" media="all" />
+		<!--[if IE]>
+		<link rel="stylesheet" href="'.THEME_ABS.'ie_all.css" type="text/css" media="all" />
+		<![endif]-->
+		<!--[if lte IE 7]>
+			<script type="text/javascript" src="'.THEME_ABS.'menu/menu.js"></script>
+		<![endif]-->
+	';
+	
+    $ret .= "
+    <script type='text/javascript'>
+       /**
+    	* Decorate all tables having e-list class
+    	* TODO: add 'e-list' class to all list core tables, allow theme decorate. 
+    	*/
+        e107.runOnLoad( function() {
+            \$\$('table.adminlist').each(function(element) {
+            	e107Utils.Decorate.table(element, {tr_td: 'first last'});
+            });
+			\$\$('div.admintabs').each(function(element) {
+            	new e107Widgets.Tabs(element);
+            });
+
+        }, document, true);
+		
+    </script>";
+	return $ret;
+}
+
+function tablestyle($caption, $text){
+	global $style;
+	switch($style) {
+
+	case 'admin_menu' :
+		echo '
+			<div class="block">
+				<h4>'.$caption.'</h4>
+				'.$text.'
+			</div>
+		';
+	break;
+
+	case 'site_info' :
+		echo '
+			<div class="block">
+				<h4>'.$caption.'</h4>
+				<div class="block-text">
+					'.$text.'
+				</div>
+			</div>
+		';
+	break;
+	default:
+		echo '
+			<div class="block">
+				<h4>'.$caption.'</h4>
+				<div class="block-text">
+					'.$text.'
+				</div>
+			</div>
+		';
+	break;
+	}
+}
+
+$HEADER = '';
+$FOOTER = '';
+
+?>
--- a/e107_themes/_blank/theme.xml
+++ b/e107_themes/_blank/theme.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<e107Theme name="blank" version="0.1" date="2008-12-01" compatibility="0.8">
+	<author name ="Desislav Yosifov [SonicE]" email="support@free-source.net" url="http://free-source.net"/>
+	<description>Blank e107 admin theme</description>
+	<compliance xhtml="true" css="true"/>
+	<layouts>
+		<layout name='3_column' title='3 Columns' preview='preview.jpg' previewFull='preview_full.png' requiredPlugins='chatbox' default='true' >
+		<menuPresets>
+				<area id='1' >
+                	<menu name='login' />
+					<menu name='compliance' />
+				</area>
+				<area id='2'>
+					<menu name='online' userclass='E_UC_ADMIN' />
+					<menu name='powered_by' />
+					<menu name='sitebutton' />
+				</area>
+			</menuPresets>
+		</layout>
+		<layout name='2_column' title='2 Columns' preview='preview.jpg' previewFull='preview_full.png' />
+	</layouts>
+</e107Theme>
--- a/e107_themes/e107v4a/theme.xml
+++ b/e107_themes/e107v4a/theme.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <e107Theme name="e107.v4" version="3.0" date="2003-06-11" compatibility="0.8">
 	<author name ="Steve Dunstan [jalist]" email="jalist@e107.org" url="http://e107.org"/>
 	<description>Classic e107 theme</description>