3 files changed, 289 insertions, 180 deletions
diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php
index af319680c3..d46f61fedd 100644
--- a/phpBB/admin/admin_styles.php
+++ b/phpBB/admin/admin_styles.php
@@ -8,10 +8,10 @@ if ( !empty($setmodules) )
 	}
 
 	$filename = basename(__FILE__);
-	$module['Styles']['Edit_Styles'] = $filename . "$SID&amp;mode=newstyle";
-	$module['Styles']['Edit_Templates'] = $filename . "$SID&amp;mode=edittemplate";
-	$module['Styles']['Edit_Themes'] = $filename . "$SID&amp;mode=newstyle";
-	$module['Styles']['Edit_Imagesets'] = $filename . "$SID&amp;mode=editimageset";
+	$module['Styles']['Edit_Style'] = $filename . "$SID&amp;mode=newstyle";
+	$module['Styles']['Edit_Template'] = $filename . "$SID&amp;mode=edittemplate";
+	$module['Styles']['Edit_Theme'] = $filename . "$SID&amp;mode=edittheme";
+	$module['Styles']['Edit_Imageset'] = $filename . "$SID&amp;mode=editimageset";
 
 	return;
 }
@@ -50,187 +50,298 @@ closedir($dp);
 //
 $mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
 
-if ( $mode == 'editimageset' )
+switch ( $mode )
 {
-	$imgroot = ( isset($HTTP_POST_VARS['imgroot']) ) ? $HTTP_POST_VARS['imgroot']  : 'subSilver';
+	case 'editimageset':
+		$imgroot = ( isset($HTTP_POST_VARS['imgroot']) ) ? $HTTP_POST_VARS['imgroot']  : 'subSilver';
 
-	if ( isset($HTTP_POST_VARS['img_root']) )
-	{
-		$sql = "SELECT * 
+		if ( isset($HTTP_POST_VARS['img_root']) )
+		{
+			$sql = "SELECT * 
+				FROM " . STYLES_IMAGE_TABLE . " 
+				WHERE imageset_path LIKE '" . $HTTP_POST_VARS['imgroot'] . "'";
+			$result = $db->sql_query($sql);
+
+			$images = $db->sql_fetchrow($result);
+		}
+		if ( isset($HTTP_POST_VARS['img_addconfig']) )
+		{
+		}
+		else if ( isset($HTTP_POST_VARS['img_addlocal']) )
+		{
+		}
+
+		$imageset = array('imageset_path', 'post_new', 'post_locked', 'post_pm', 'reply_new', 'reply_pm', 'reply_locked', 'icon_profile', 'icon_pm', 'icon_delete', 'icon_ip', 'icon_quote', 'icon_search', 'icon_edit', 'icon_email', 'icon_www', 'icon_icq', 'icon_aim', 'icon_yim', 'icon_msnm', 'icon_no_email', 'icon_no_www', 'icon_no_icq', 'icon_no_aim', 'icon_no_yim', 'icon_no_msnm', 'goto_post', 'goto_post_new', 'goto_post_latest', 'goto_post_newest', 'forum', 'forum_new', 'forum_locked', 'folder', 'folder_new', 'folder_hot', 'folder_hot_new', 'folder_locked', 'folder_locked_new', 'folder_sticky', 'folder_sticky_new', 'folder_announce', 'folder_announce_new', 'topic_watch', 'topic_unwatch', 'poll_left', 'poll_center', 'poll_right', 'rating');
+
+		$sql = "SELECT imageset_name, imageset_path
 			FROM " . STYLES_IMAGE_TABLE . " 
-			WHERE imageset_path LIKE '" . $HTTP_POST_VARS['imgroot'] . "'";
+			ORDER BY imageset_name";
 		$result = $db->sql_query($sql);
 
-		$images = $db->sql_fetchrow($result);
-	}
-	if ( isset($HTTP_POST_VARS['img_addconfig']) )
-	{
-	}
-	else if ( isset($HTTP_POST_VARS['img_addlocal']) )
-	{
-	}
+		$imgroot_options = '';
+		while ( $row = $db->sql_fetchrow($result) )
+		{
+			$selected = ( $imgroot == $row['imageset_path'] ) ? ' selected="selected"' : '';
+			$imgroot_options .= '<option name="' . $row['imageset_path'] . '"' . $selected . '>' . $row['imageset_path'] . '</option>';
+		}
 
-	$imageset = array('imageset_path', 'post_new', 'post_locked', 'post_pm', 'reply_new', 'reply_pm', 'reply_locked', 'icon_profile', 'icon_pm', 'icon_delete', 'icon_ip', 'icon_quote', 'icon_search', 'icon_edit', 'icon_email', 'icon_www', 'icon_icq', 'icon_aim', 'icon_yim', 'icon_msnm', 'icon_no_email', 'icon_no_www', 'icon_no_icq', 'icon_no_aim', 'icon_no_yim', 'icon_no_msnm', 'goto_post', 'goto_post_new', 'goto_post_latest', 'goto_post_newest', 'forum', 'forum_new', 'forum_locked', 'folder', 'folder_new', 'folder_hot', 'folder_hot_new', 'folder_locked', 'folder_locked_new', 'folder_sticky', 'folder_sticky_new', 'folder_announce', 'folder_announce_new', 'topic_watch', 'topic_unwatch', 'poll_left', 'poll_center', 'poll_right', 'rating');
+		$imgname_options = '';
+		$dp = opendir($phpbb_root_path . 'imagesets/' . $imgroot . '/');
+		while ( $file = readdir($dp) )
+		{
+			if ( preg_match('#\.(gif|png|jpg|jpeg)$#', $file) && is_file($phpbb_root_path . 'imagesets/' . $imgroot . '/' . $file) )
+			{
+				$selected = ( $imgname == $file ) ? ' selected="selected"' : '';
+				$imgname_options .= '<option value="' . $file . '"' . $selected . '>' . $file . '</option>';
+			}
+		}
+		closedir($dp);
 
-	$sql = "SELECT imageset_name, imageset_path
-		FROM " . STYLES_IMAGE_TABLE . " 
-		ORDER BY imageset_name";
-	$result = $db->sql_query($sql);
+		//
+		// Output page
+		//
+		page_header($lang['Styles']);
 
-	$imgroot_options = '';
-	while ( $row = $db->sql_fetchrow($result) )
-	{
-		$selected = ( $imgroot == $row['imageset_path'] ) ? ' selected="selected"' : '';
-		$imgroot_options .= '<option name="' . $row['imageset_path'] . '"' . $selected . '>' . $row['imageset_path'] . '</option>';
-	}
+		echo '<form method="post" action="admin_styles.' . $phpEx . '?mode=editimageset">';
 
-	$imgname_options = '';
-	$dp = opendir($phpbb_root_path . 'imagesets/' . $imgroot . '/');
-	while ( $file = readdir($dp) )
-	{
-		if ( preg_match('#\.(gif|png|jpg|jpeg)$#', $file) && is_file($phpbb_root_path . 'imagesets/' . $imgroot . '/' . $file) )
+		echo '<h2>Edit Imageset</h2>';
+
+		echo '<p>Template set: <select name="imgroot">' . $imgroot_options . '</select>&nbsp; <input class="liteoption" type="submit" name="img_root" value="Select" /></p>';
+
+		echo '<p>Use this panel to edit or remove imagesets from the database.</p>';
+
+		echo '<table cellspacing="1" cellpadding="2" border="0" align="center" bgcolor="#98AAB1">';
+		echo '<tr>';
+		echo '<td class="cat" colspan="6" height="28" align="center"><span class="gen">Available images: <select name="imageset">' . $imgname_options . '</select></span></td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<th height="25">Image</th><th>Source</th><th>Width</th><th>Height</th><th>Border</th><th>&nbsp;</th>';
+		echo '</tr>';
+		
+		for($i = 0; $i < count($imageset); $i++)
 		{
-			$selected = ( $imgname == $file ) ? ' selected="selected"' : '';
-			$imgname_options .= '<option value="' . $file . '"' . $selected . '>' . $file . '</option>';
+			$class = ( !($i%2) ) ? 'row1' : 'row2';
+
+			echo '<tr>';
+			echo '<td class="' . $class . '" height="25"><span class="gen">' . ucfirst(str_replace('_', ' ', $imageset[$i])) . '</span></td>';
+			echo '<td class="' . $class . '"><input class="text" type="text" name="src[' . $imageset[$i] . ']" value="' . ( ( !empty($images[$imageset[$i]]) ) ? $images[$imageset[$i]] : '' ) . '" size="20" maxsize="30" /></td>';
+			echo '<td class="' . $class . '"><input class="text" type="text" name="width[' . $imageset[$i] . ']" size="3" maxsize="3" /></td>';
+			echo '<td class="' . $class . '"><input class="text" type="text" name="height[' . $imageset[$i] . ']" size="3" maxsize="3" /></td>';
+			echo '<td class="' . $class . '"><input class="text" type="text" name="border[' . $imageset[$i] . ']" size="2" maxsize="2" /></td>';
+			echo '<td class="' . $class . '"><input class="liteoption" type="submit" value="Update" onclick="this.form.' . $imageset[$i] . '.value=this.form.imageset.options[this.form.imageset.selectedIndex].value;return false" />&nbsp;<input class="liteoption" type="submit" value="Clear" onclick="this.form.' . $imageset[$i] . '.value=\'\';return false" />&nbsp;</td>';
+			echo '</tr>';
 		}
-	}
-	closedir($dp);
 
-	//
-	// Output page
-	//
-	page_header($lang['Styles']);
+		echo '<td class="cat" colspan="6" height="28" align="center"><input class="liteoption" type="submit" name="img_update" value="Update set" /> &nbsp; <input class="liteoption" type="submit" name="img_delete" value="Delete set" /> &nbsp; <input class="liteoption" type="reset" value="Undo" /></td>';
+		echo '</tr>';
+		echo '</table>';
+		echo '</form>';
+		page_footer();
 
-	echo '<form method="post" action="admin_styles.' . $phpEx . '?mode=editimageset">';
+		break;
 
-	echo '<h2>Edit Imageset</h2>';
+	case 'edittemplate':
 
-	echo '<p>Template set: <select name="imgroot">' . $imgroot_options . '</select>&nbsp; <input class="liteoption" type="submit" name="img_root" value="Select" /></p>';
+		$tplcols = ( isset($HTTP_POST_VARS['tplcols']) ) ? max(60, intval($HTTP_POST_VARS['tplcols'])) : 90;
+		$tplrows = ( isset($HTTP_POST_VARS['tplrows']) ) ? max(4, intval($HTTP_POST_VARS['tplrows'])) : 30;
+		$tplname = ( isset($HTTP_POST_VARS['tplname']) ) ? $HTTP_POST_VARS['tplname']  : '';
+		$tplroot = ( isset($HTTP_POST_VARS['tplroot']) ) ? $HTTP_POST_VARS['tplroot']  : 'subSilver';
 
-	echo '<p>Use this panel to edit or remove imagesets from the database.</p>';
+		$str = '';
+		if ( isset($HTTP_POST_VARS['tpl_compile']) && !empty($HTTP_POST_VARS['decompile']) )
+		{
+			$str = "<?php\n" . $template->compile(stripslashes($HTTP_POST_VARS['decompile'])) . "\n?".">";
 
-	echo '<table cellspacing="1" cellpadding="2" border="0" align="center" bgcolor="#98AAB1">';
-	echo '<tr>';
-	echo '<td class="cat" colspan="6" height="28" align="center"><span class="gen">Available images: <select name="imageset">' . $imgname_options . '</select></span></td>';
-	echo '</tr>';
-	echo '<tr>';
-	echo '<th height="25">Image</th><th>Source</th><th>Width</th><th>Height</th><th>Border</th><th>&nbsp;</th>';
-	echo '</tr>';
-	
-	for($i = 0; $i < count($imageset); $i++)
-	{
-		$class = ( !($i%2) ) ? 'row1' : 'row2';
+			$fp = fopen($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'w+');
+			fwrite ($fp, $str);
+			fclose($fp);
 
-		echo '<tr>';
-		echo '<td class="' . $class . '" height="25"><span class="gen">' . ucfirst(str_replace('_', ' ', $imageset[$i])) . '</span></td>';
-		echo '<td class="' . $class . '"><input class="text" type="text" name="src[' . $imageset[$i] . ']" value="' . ( ( !empty($images[$imageset[$i]]) ) ? $images[$imageset[$i]] : '' ) . '" size="20" maxsize="30" /></td>';
-		echo '<td class="' . $class . '"><input class="text" type="text" name="width[' . $imageset[$i] . ']" size="3" maxsize="3" /></td>';
-		echo '<td class="' . $class . '"><input class="text" type="text" name="height[' . $imageset[$i] . ']" size="3" maxsize="3" /></td>';
-		echo '<td class="' . $class . '"><input class="text" type="text" name="border[' . $imageset[$i] . ']" size="2" maxsize="2" /></td>';
-		echo '<td class="' . $class . '"><input class="liteoption" type="submit" value="Update" onclick="this.form.' . $imageset[$i] . '.value=this.form.imageset.options[this.form.imageset.selectedIndex].value;return false" />&nbsp;<input class="liteoption" type="submit" value="Clear" onclick="this.form.' . $imageset[$i] . '.value=\'\';return false" />&nbsp;</td>';
-		echo '</tr>';
-	}
+			@chmod($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 0644);
 
-	echo '<td class="cat" colspan="6" height="28" align="center"><input class="liteoption" type="submit" name="img_update" value="Update set" /> &nbsp; <input class="liteoption" type="submit" name="img_delete" value="Delete set" /> &nbsp; <input class="liteoption" type="reset" value="Undo" /></td>';
-	echo '</tr>';
-	echo '</table>';
-	echo '</form>';
+			add_admin_log('log_template_edit', $tplname, $tplroot);
 
-}
-else if ( $mode == 'edittemplate' )
-{
-	$tplcols = ( isset($HTTP_POST_VARS['tplcols']) ) ? max(60, intval($HTTP_POST_VARS['tplcols'])) : 76;
-	$tplrows = ( isset($HTTP_POST_VARS['tplrows']) ) ? max(4, intval($HTTP_POST_VARS['tplrows'])) : 30;
-	$tplname = ( isset($HTTP_POST_VARS['tplname']) ) ? $HTTP_POST_VARS['tplname']  : '';
-	$tplroot = ( isset($HTTP_POST_VARS['tplroot']) ) ? $HTTP_POST_VARS['tplroot']  : 'subSilver';
+			exit;
+		}
+		else if ( !empty($tplname) && isset($HTTP_POST_VARS['tpl_name']) )
+		{
+			$fp = fopen($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'r');
+			while ( !feof($fp) )
+			{
+				$str .= fread($fp, 4096);
+			}
+			@fclose($fp);
+
+			$template->decompile($str);
+		}
+		else
+		{
+			$str = ( !empty($HTTP_POST_VARS['decompile']) ) ? stripslashes($HTTP_POST_VARS['decompile']) : '';
+		}
 
-	$str = '';
-	if ( isset($HTTP_POST_VARS['tpl_compile']) && !empty($HTTP_POST_VARS['decompile']) )
-	{
-		$str = "<?php\n" . $template->compile(stripslashes($HTTP_POST_VARS['decompile'])) . "\n?".">";
+		if ( isset($HTTP_POST_VARS['tpl_download']) )
+		{
+			header("Content-Type: text/html; name=\"" . $tplname . ".html\"");
+			header("Content-disposition: attachment; filename=" . $tplname . ".html");
+			echo $str;
+			exit;
 
-		$fp = fopen($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'w+');
-		fwrite ($fp, $str);
-		fclose($fp);
+		}
 
-		@chmod($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 0644);
+		$tplroot_options = get_templates($tplroot);
 
-		add_admin_log('log_template_edit', $tplname, $tplroot);
+		$tplname_options = '';
+		$dp = @opendir($phpbb_root_path . 'templates/cache/' . $tplroot . '/');
+		while ( $file = readdir($dp) )
+		{
+			if ( strstr($file, '.html.' . $phpEx) && is_file($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $file) )
+			{
+				$tpl = substr($file, 0, strpos($file, '.'));
+				$selected = ( $tplname == $tpl ) ? ' selected="selected"' : '';
+				$tplname_options .= '<option name="' . $tpl . '"' . $selected . '>' . $tpl . '</option>';
+			}
+		}
+		closedir($dp);
 
-		exit;
-	}
-	else if ( !empty($tplname) && isset($HTTP_POST_VARS['tpl_name']) )
-	{
-		$fp = fopen($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $tplname . '.html.' . $phpEx, 'r');
-		while ( !feof($fp) )
+		//
+		//
+		//
+		page_header($lang['Edit_template']);
+
+?>
+
+<h2><?php echo $lang['Edit_template']; ?></h2>
+
+<p><?php echo $lang['Edit_template_explain']; ?></p>
+
+<form method="post" action="<?php echo "admin_styles.$phpEx$SID&amp;mode=edittemplate"; ?>">
+
+<p><?php echo $lang['Select_template']; ?>: <select name="tplroot"><?php echo $tplroot_options; ?></select>&nbsp; <input class="liteoption" type="submit" name="tpl_root" value="Select" /></p>
+
+<table class="bg" cellspacing="1" cellpadding="0" border="0" align="center"><!--  bgcolor="#98AAB1" -->
+	<tr>
+		<td class="cat"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+			<tr>
+				<td>&nbsp;Template: <select name="tplname"><?php echo $tplname_options; ?></select>&nbsp; <input class="liteoption" type="submit" name="tpl_name" value="Select" /></td>
+
+				<td align="right">Columns: <input type="text" name="tplcols" size="3" maxlength="3" value="<?php echo $tplcols; ?>" /> &nbsp;Rows: <input type="text" name="tplrows" size="3" maxlength="3" value="<?php echo $tplrows; ?>" />&nbsp; <input class="liteoption" type="submit" name="tpl_layout" value="Update" />&nbsp;</td>
+			</tr>
+		</table></td>
+	</tr>
+	<tr>
+		<td colspan="2" align="center"><textarea class="edit" style="background-color:#DEE3E7" cols="<?php echo $tplcols; ?>" rows="<?php echo $tplrows; ?>" name="decompile"><?php echo htmlentities($str); ?></textarea></td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2" height="28" align="center"><input class="liteoption" type="submit" name="tpl_compile" value="Recompile" /> &nbsp; <input class="liteoption" type="submit" name="tpl_download" value="Download" /> &nbsp; <input class="liteoption" type="reset" value="Undo" /></td>
+	</tr>
+</table></form>
+
+<?php
+
+		page_footer();
+		break;
+
+	case 'edittheme':
+
+		$theme_id = ( isset($HTTP_POST_VARS['theme_id']) ) ? $HTTP_POST_VARS['theme_id']  : '';
+
+		if ( isset($HTTP_POST_VARS['update']) )
 		{
-			$str .= fread($fp, 4096);
+			$sql = "SELECT theme_id, theme_name 
+				FROM " . STYLES_CSS_TABLE . " 
+				WHERE theme_id = $theme_id";
+			$result = $db->sql_query($sql);
+
+			if ( $row = $db->sql_fetchrow($result) )
+			{
+				$theme_name = $row['theme_name'];
+
+				$css_data = ( !empty($HTTP_POST_VARS['css_data']) ) ? htmlentities($HTTP_POST_VARS['css_data']) : '';
+				$css_external = ( !empty($HTTP_POST_VARS['css_external']) ) ? $HTTP_POST_VARS['css_external'] : '';
+
+				$sql = "UPDATE " . STYLES_CSS_TABLE . " 
+					SET css_data = '$css_data', css_external = '$css_external' 
+					WHERE theme_id = $theme_id";
+				$db->sql_query($sql);
+
+				add_admin_log('log_theme_edit', $theme_name);
+
+				message_die(MESSAGE, $lang['Success_theme_update']);
+			}
 		}
-		@fclose($fp);
 
-		$template->decompile($str);
-	}
-	else
-	{
-		$str = ( !empty($HTTP_POST_VARS['decompile']) ) ? stripslashes($HTTP_POST_VARS['decompile']) : '';
-	}
+		page_header($lang['Edit_theme']);
 
-	if ( isset($HTTP_POST_VARS['tpl_download']) )
-	{
-		header("Content-Type: text/html; name=\"" . $tplname . ".html\"");
-		header("Content-disposition: attachment; filename=" . $tplname . ".html");
-		echo $str;
-		exit;
+		$sql = "SELECT theme_id, theme_name 
+			FROM " . STYLES_CSS_TABLE;
+		$result = $db->sql_query($sql);
 
-	}
+		$theme_options = '';
+		if ( $row = $db->sql_fetchrow($result) )
+		{
+			do
+			{
+				$theme_options .= ( ( $theme_options != '' ) ? ', ' : '' ) . '<option value="' . $row['theme_id'] . '">' . $row['theme_name'] . '</option>';
+			}
+			while ( $row = $db->sql_fetchrow($result) );
+		}
+		$db->sql_freeresult($result);
+	
+?>
 
-	$tplroot_options = get_templates($tplroot);
+<form method="post" action="<?php echo "admin_styles.$phpEx$SID&amp;mode=$mode"; ?>">
 
-	$tplname_options = '';
-	$dp = opendir($phpbb_root_path . 'templates/cache/' . $tplroot . '/');
-	while ( $file = readdir($dp) )
-	{
-		if ( strstr($file, '.html.' . $phpEx) && is_file($phpbb_root_path . 'templates/cache/' . $tplroot . '/' . $file) )
+<h2><?php echo $lang['Edit_theme']; ?></h2>
+
+<p><?php echo $lang['Edit_theme_explain']; ?></p>
+
+<table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+	<tr>
+		<th colspan="2"><?php echo $lang['Edit_theme']; ?></th>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2" align="center"><?php echo $lang['Select_theme']; ?>: <select name="theme_id"><?php echo $theme_options; ?></select>&nbsp; <input class="liteoption" type="submit" name="tpl_root" value="<?php echo $lang['Select']; ?>" /></td>
+	</tr>
+<?php
+
+		if ( $theme_id )
 		{
-			$tpl = substr($file, 0, strpos($file, '.'));
-			$selected = ( $tplname == $tpl ) ? ' selected="selected"' : '';
-			$tplname_options .= '<option name="' . $tpl . '"' . $selected . '>' . $tpl . '</option>';
+			$sql = "SELECT css_data, css_external  
+				FROM " . STYLES_CSS_TABLE . "
+				WHERE theme_id = $theme_id";
+			$result = $db->sql_query($sql);
+
+			if ( $row = $db->sql_fetchrow($result) )
+			{
+				$css_data = preg_replace('/\t{1,}/i', ' ', $row['css_data']);
+				$css_external = $row['css_external'];
+
+?>
+	<tr>
+		<td class="row1"><?php echo $lang['CSS_data']; ?>: <br /><span class="gensmall"><?php echo $lang['CSS_data_explain']; ?></td>
+		<td class="row2"><textarea class="edit" cols="65" rows="15" name="css_data"><?php echo htmlentities($css_data); ?></textarea></td>
+	</tr>
+	<tr>
+		<td class="row1"><?php echo $lang['CSS_sheet']; ?>: </td>
+		<td class="row2"><input type="text" name="css_external" maxlength="60" size="60" value="<?php echo $css_external; ?>" /></td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2" align="center"><input class="liteoption" type="submit" name="update" value="<?php echo $lang['Update']; ?>" />&nbsp;&nbsp;<input class="liteoption" type="reset" value="<?php echo $lang['Reset']; ?>" /></td>
+	</tr>
+</table></form>
+
+<?php
+
+			}
 		}
-	}
-	closedir($dp);
-
-	//
-	//
-	//
-	page_header($lang['Styles']);
-
-	echo '<form method="post" action="admin_styles.' . $phpEx . '?mode=edittemplate">';
-
-	echo '<h2>Edit Template</h2>';
-
-	echo '<p>Use this panel to edit an existing compiled template set. When you have made the required changes you can recompile the template and (or) download it. Please remember that the existing HTML templates are <b>not</b> altered, only the compiled versions are affected. Therefore you should download any altered files if you wish to keep them for future use and for archival purposes.</p>';
-
-	echo '<p>Template set: <select name="tplroot">' . $tplroot_options . '</select>&nbsp; <input class="liteoption" type="submit" name="tpl_root" value="Select" /></p>';
-
-	echo '<table cellspacing="1" cellpadding="0" border="0" align="center" bgcolor="#98AAB1">';
-	echo '<tr>';
-	echo '<td class="cat"><table width="100%" cellspacing="0" cellpadding="0" border="0">';
-	echo '<tr>';
-	echo '<td>&nbsp;Template: <select name="tplname">' . $tplname_options . '</select>&nbsp; <input class="liteoption" type="submit" name="tpl_name" value="Select" /></td>';
-	echo '<td align="right">Columns: <input type="text" name="tplcols" size="3" maxlength="3" value="' . $tplcols . '" /> &nbsp;Rows: <input type="text" name="tplrows" size="3" maxlength="3" value="' . $tplrows . '" />&nbsp; <input class="liteoption" type="submit" name="tpl_layout" value="Update" />&nbsp;</td>';
-	echo '</tr>';
-	echo '</table></td>';
-	echo '</tr>';
-	echo '<tr>';
-	echo '<td colspan="2" align="center"><textarea style="background-color:#DEE3E7;font-size:9pt;font-family:Courier;line-height:125%" cols="' .$tplcols . '" rows="' .$tplrows . '" name="decompile">' . htmlentities($str) . '</textarea></td>';
-	echo '</tr>';
-	echo '<tr>';
-	echo '<td class="cat" colspan="2" height="28" align="center"><input class="liteoption" type="submit" name="tpl_compile" value="Recompile" /> &nbsp; <input class="liteoption" type="submit" name="tpl_download" value="Download" /> &nbsp; <input class="liteoption" type="reset" value="Undo" /></td>';
-	echo '</tr>';
-	echo '</table>';
-	echo '</form>';
-
-	page_footer();
+
+?>
+
+</form>
+<?php
+
+		page_footer();
+
+		break;
 }
 
 
diff --git a/phpBB/admin/subSilver.css b/phpBB/admin/subSilver.css
index 1c4385d30a..393d613d70 100644
--- a/phpBB/admin/subSilver.css
+++ b/phpBB/admin/subSilver.css
@@ -160,28 +160,19 @@ hr	{
 	Forms
 */
 input, textarea, select {
-	color:			black;
-	font:			normal 11px Verdana, Arial, Helvetica, sans-serif;
-	border-color:	black;
+	color:				black;
+	font:				normal 8pt Verdana, Arial, Helvetica, sans-serif;
+	border-color:		black;
 }
 
 input.text {
 	font-family:	'Courier New',courier;
 }
 
-input.post, textarea.post, select {
-	background-color:	white;
-}
-
-input {
-	text-indent:	2px;
-}
-
-input.button {
-	background-color:	#EFEFEF;
-	color:				black;
-	font-family:		Verdana, Arial, Helvetica, sans-serif;
-	font-size:			11px;
+textarea.edit {
+	font-family:	'Courier New',courier;
+	font-size:		9pt;
+	line-height:	125%;
 }
 
 input.mainoption {
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index 4de278e5e6..b2e86c0448 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -298,6 +298,7 @@ $lang['Delete_user_posts_explain'] = 'Setting this to yes will remove all posts
 $lang['Confirm_prune_users'] = 'Are you sure you wish to prune the selected users?';
 $lang['Success_user_prune'] = 'The selected users have been pruned successfully';
 
+
 //
 // Banning
 //
@@ -710,24 +711,30 @@ $lang['Click_return_disallowadmin'] = 'Click %sHere%s to return to Disallow User
 //
 // Styles Admin
 //
+$lang['Edit_style'] = 'Edit Styles';
+$lang['Style'] = 'Style';
 $lang['Styles_admin'] = 'Styles Administration';
-$lang['Styles_explain'] = 'Using this facility you can add, remove and manage styles (templates and themes) available to your users';
-$lang['Styles_addnew_explain'] = 'The following list contains all the themes that are available for the templates you currently have. The items on this list have not yet been installed into the phpBB database. To install a theme simply click the install link beside an entry';
-
-$lang['Select_template'] = 'Select a Template';
+$lang['Styles_explain'] = 'Using this facility you can add, remove and manage styles. Styles are a combination of a template, theme (CSS) and imageset.';
 
-$lang['Edit_styles'] = 'Edit Styles';
-$lang['Edit_templates'] = 'Edit Templates';
-$lang['Edit_imagesets'] = 'Edit Imagesets';
-$lang['Edit_themes'] = 'Edit Themes';
-
-$lang['Style'] = 'Style';
-$lang['Template'] = 'Template';
-$lang['Install'] = 'Install';
+$lang['Edit_template'] = 'Edit Template';
+$lang['Edit_template_explain'] = 'Use this panel to edit an existing compiled template set. When you have made the required changes you can recompile the template and (or) download it. Please remember that the existing HTML templates are <b>not</b> altered, only the compiled versions are affected. Therefore you should download any altered files if you wish to keep them for future use and for archival purposes.';
+$lang['Select_template'] = 'Select template';
+$lang['Template'] = 'Select template';
 $lang['Download'] = 'Download';
 
 $lang['Edit_theme'] = 'Edit Theme';
-$lang['Edit_theme_explain'] = 'In the form below you can edit the settings for the selected theme';
+$lang['Edit_theme_explain'] = 'Use this panel to edit an existing theme. You can modify (or add) both CSS to be included within each page output by the forum (subject to the template including it) and an externally linked stylesheet. Remember, the location of the stylesheet is relative to the phpBB root directory.';
+$lang['Select_theme'] = 'Select theme';
+$lang['CSS_data'] = 'CSS Data';
+$lang['CSS_data_explain'] = 'This CSS is output to the template and may be included within the header of each page.';
+$lang['CSS_sheet'] = 'CSS Stylesheet';
+$lang['Success_theme_update'] = 'The theme has been successfully updated.';
+
+$lang['Edit_imageset'] = 'Edit Imageset';
+$lang['Edit_imageset_explain'] = '';
+
+
+
 
 $lang['Create_theme'] = 'Create Theme';
 $lang['Create_theme_explain'] = 'Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, i.e.. CCCCCC is valid, #CCCCCC is not';