Merge branch 'develop' into feature/merging-style-components

* develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
2025-08-04 15:57:45 +02:00 · 2012-03-31 10:43:06 +03:00
parent 506951e8af 013a8649a5
commit 398a6c8045
81 changed files with 1716 additions and 627 deletions
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -0,0 +1,100 @@
+(function($) {  // Avoid conflicts with other libraries
+
+"use strict";
+
+// This callback finds the post from the delete link, and removes it.
+phpbb.add_ajax_callback('post_delete', function() {
+	var el = $(this),
+		post_id;
+
+	if (el.attr('data-refresh') === undefined)
+	{
+		post_id = el[0].href.split('&p=')[1];
+		var post = el.parents('#p' + post_id).css('pointer-events', 'none');
+		if (post.hasClass('bg1') || post.hasClass('bg2'))
+		{
+			var posts1 = post.nextAll('.bg1');
+			post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
+			posts1.removeClass('bg1').addClass('bg2');
+		}
+		post.fadeOut(function() {
+			$(this).remove();
+		});
+	}
+});
+
+// This callback removes the approve / disapprove div or link.
+phpbb.add_ajax_callback('post_approve', function(res) {
+	var remove = (res.approved) ? $(this) : $(this).parents('.post');
+	$(remove).css('pointer-events', 'none').fadeOut(function() {
+		$(this).remove();
+	});
+});
+
+// This removes the parent row of the link or form that fired the callback.
+phpbb.add_ajax_callback('row_delete', function() {
+	$(this).parents('tr').remove();
+});
+
+// This handles friend / foe additions removals.
+phpbb.add_ajax_callback('zebra', function(res) {
+	var zebra;
+
+	if (res.success) {
+		zebra = $('.zebra');
+		zebra.first().html(res.MESSAGE_TEXT);
+		zebra.not(':first').html('&nbsp;').prev().html('&nbsp;');
+	}
+});
+
+
+
+$('[data-ajax]').each(function() {
+	var $this = $(this),
+		ajax = $this.attr('data-ajax'),
+		fn;
+
+	if (ajax !== 'false')
+	{
+		fn = (ajax !== 'true') ? ajax : null;
+		phpbb.ajaxify({
+			selector: this,
+			refresh: $this.attr('data-refresh') !== undefined,
+			callback: fn
+		});
+	}
+});
+
+
+
+/**
+ * This AJAXifies the quick-mod tools. The reason it cannot be a standard
+ * callback / data attribute is that it requires filtering - some of the options
+ * can be ajaxified, while others cannot.
+ */
+phpbb.ajaxify({
+	selector: '#quickmodform',
+	refresh: true,
+	filter: function (data) {
+		var action = $('#quick-mod-select').val();
+
+		if (action === 'make_normal')
+		{
+			return $(this).find('select option[value="make_global"]').length > 0;
+		}
+		else if (action === 'lock' || action === 'unlock')
+		{
+			return true;
+		}
+
+		if (action === 'delete_topic' || action === 'make_sticky' || action === 'make_announce' || action === 'make_global') {
+			return true;
+		}
+
+		return false;
+	}
+});
+
+
+
+})(jQuery); // Avoid conflicts with other libraries
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -8,7 +8,7 @@
 	<!-- IF S_DISPLAY_SEARCH -->
 		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_LOAD_UNREADS --> &bull; <a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a><!-- ENDIF --><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
 	<!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
+	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="true">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
 </ul>
 <!-- ENDIF -->

--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -35,15 +35,15 @@
 		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->
 		<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
 			<!-- IF U_REMOVE_FRIEND -->
-				<dt>&nbsp;</dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
+				<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
 			<!-- ELSEIF U_REMOVE_FOE -->
-				<dt>&nbsp;</dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd>
+				<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_REMOVE_FOE}" data-ajax="zebra"><strong>{L_REMOVE_FOE}</strong></a></dd>
 			<!-- ELSE -->
 				<!-- IF U_ADD_FRIEND -->
-					<dt>&nbsp;</dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd>
+					<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_ADD_FRIEND}" data-ajax="zebra"><strong>{L_ADD_FRIEND}</strong></a></dd>
 				<!-- ENDIF -->
 				<!-- IF U_ADD_FOE -->
-					<dt>&nbsp;</dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd>
+					<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_ADD_FOE}" data-ajax="zebra"><strong>{L_ADD_FOE}</strong></a></dd>
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 		<!-- ENDIF -->
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -8,12 +8,12 @@
 		<ul class="linklist">
 			<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
 				<!-- IF not S_IS_BOT -->
-					<!-- IF S_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
-					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a></li><!-- ENDIF -->
-					<!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF -->
-					<!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
+					<!-- IF S_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="alt_text" data-alt-text="<!-- IF S_WATCHING_FORUM -->{L_START_WATCHING_FORUM}<!-- ELSE -->{L_STOP_WATCHING_FORUM}<!-- ENDIF -->">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
+					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}" data-ajax="alt_text" data-alt-text="<!-- IF S_WATCHING_TOPIC -->{L_START_WATCHING_TOPIC}<!-- ELSE -->{L_STOP_WATCHING_TOPIC}<!-- ENDIF -->">{L_WATCH_TOPIC}</a></li><!-- ENDIF -->
+					<!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="<!-- IF S_BOOKMARKED_TOPIC -->{L_BOOKMARK_TOPIC_REAL}<!-- ELSE -->{L_BOOKMARK_TOPIC_REMOVE}<!-- ENDIF -->">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF -->
+					<!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
 				<!-- ENDIF -->
-			<li class="rightside"><!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a> &bull; <!-- ENDIF --><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> &bull; <!-- ENDIF -->{S_TIMEZONE}</li>
+			<li class="rightside"><!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a> &bull; <!-- ENDIF --><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a> &bull; <!-- ENDIF -->{S_TIMEZONE}</li>
 		</ul>

 		<span class="corners-bottom"><span></span></span></div>
@@ -24,6 +24,22 @@
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 	</div>
+
+	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}">
+		<div id="darken">&nbsp;</div>
+		<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
+	</div>
+
+	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
+		<a href="#" class="alert_close"></a>
+		<h3 class="alert_title"></h3><p class="alert_text"></p>
+	</div>
+	<div id="phpbb_confirm" class="phpbb_alert">
+		<a href="#" class="alert_close"></a>
+		<p class="alert_text"></p>
+		<input type="button" class="button1" value="{L_YES}" />&nbsp;
+		<input type="button" class="button2" value="{L_NO}" />
+	</div>
 </div>

 </div>
@@ -35,6 +51,8 @@

 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script>
+<script type="text/javascript" src="{T_TEMPLATE_PATH}/ajax.js"></script>

 </body>
 </html>
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,6 +84,10 @@
 	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
 <!-- ENDIF -->

+<!--[if lte IE 8]>
+	<link href="{T_THEME_PATH}/tweaks.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<![endif]-->
+
 </head>

 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
--- a/phpBB/styles/prosilver/template/quickreply_editor.html
+++ b/phpBB/styles/prosilver/template/quickreply_editor.html
@@ -1,51 +1,5 @@
-<script type="text/javascript">
-// <![CDATA[
-	function hide_qr(show)
-	{
-		dE('qr_editor_div');
-		dE('qr_showeditor_div');
-		if (show && document.getElementById('qr_editor_div').style.display != 'none')
-		{
-			document.getElementsByName('message')[0].focus();
-		}
-		return true;
-	}
-
-
-	function init_qr()
-	{
-		dE('qr_showeditor_div');
-		return true;
-	}
-	onload_functions.push('init_qr();');
-	// ]]>
-</script>
-<noscript>
-	<form method="post" action="{U_QR_ACTION}">
-		<div class="panel" id="qr_ns_editor_div">
-			<div class="inner"><span class="corners-top"><span></span></span>
-					<h2>{L_QUICKREPLY}</h2>
-					<fieldset class="fields1">
-						<dl style="clear: left;">
-							<dt><label for="subject">{L_SUBJECT}:</label></dt>
-							<dd><input type="text" name="subject" id="subject-ns" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>
-						</dl>
-					<div id="message-box-ns">
-						<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea>
-					</div>
-					</fieldset>
-					<fieldset class="submit-buttons">
-						{S_FORM_TOKEN}
-						{QR_HIDDEN_FIELDS}
-						<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
-						<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
-					</fieldset>
-			<span class="corners-bottom"><span></span></span></div>
-		</div>
-	</form>
-</noscript>
 <form method="post" action="{U_QR_ACTION}">
-	<div class="panel" style="display: none" id="qr_editor_div">
+	<div class="panel">
 		<div class="inner"><span class="corners-top"><span></span></span>
 				<h2>{L_QUICKREPLY}</h2>
 				<fieldset class="fields1">
@@ -61,19 +15,8 @@
 					{S_FORM_TOKEN}
 					{QR_HIDDEN_FIELDS}
 					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
-					<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
+					<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" data-ajax="false" />&nbsp;
 				</fieldset>
-				<a href="" class="right-box up" onclick="hide_qr(false); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a>
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-	<div class="panel" style="display: none" id="qr_showeditor_div" >
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div class="content">
-				<fieldset class="submit-buttons">
-					<input type="submit" name="show_qr" tabindex="1" class="button2" value="{L_SHOW_QR}" onclick="hide_qr(true);return false;"/>
-				</fieldset>
-			</div>
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 </form>
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -50,6 +50,10 @@
 	<link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
 <!-- ENDIF -->

+<!--[if lte IE 8]>
+	<link href="{T_THEME_PATH}/tweaks.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<![endif]-->
+
 <!-- DEFINE $POPUP = 1 -->

 </head>
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -57,7 +57,7 @@

 	<!-- IF PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
 		<div class="pagination">
-			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
+			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="true">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF --><!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
 			<!-- IF PAGE_NUMBER -->
 				<!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF -->
 			<!-- ENDIF -->
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -122,7 +122,7 @@
 			<!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE -->
 				<ul class="profile-icons">
 					<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
+					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" data-ajax="post_delete"<!-- IF postrow.POST_NUMBER == 1 --> data-refresh="true"<!-- ENDIF -->><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF -->
@@ -135,10 +135,18 @@
 			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; {postrow.POST_DATE} </p>

 			<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
+			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}" data-ajax="post_approve">
 				<p class="rules">
-					<!-- IF postrow.S_POST_UNAPPROVED -->{UNAPPROVED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_UNAPPROVED}</strong></a><br /><!-- ENDIF -->
+					<!-- IF postrow.S_POST_UNAPPROVED -->
+						{UNAPPROVED_IMG} <strong>{L_POST_UNAPPROVED}</strong>
+						<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
+						<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
+						<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
+						{S_FORM_TOKEN}
+					<br /><!-- ENDIF -->
 					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF -->
 				</p>
+			</form>
 			<!-- ENDIF -->

 			<div class="content">{postrow.MESSAGE}</div>
@@ -254,10 +262,16 @@

 <!-- INCLUDE jumpbox.html -->

-<!-- IF S_TOPIC_MOD -->
-	<form method="post" action="{S_MOD_ACTION}">
+<!-- IF .quickmod -->
+	<form method="post" action="{S_MOD_ACTION}" id="quickmodform" data-ajax="true">
 	<fieldset class="quickmod">
-		<label for="quick-mod-select">{L_QUICK_MOD}:</label> {S_TOPIC_MOD} <input type="submit" value="{L_GO}" class="button2" />
+		<label for="quick-mod-select">{L_QUICK_MOD}:</label>
+		<select name="action" id="quick-mod-select">
+			<!-- BEGIN quickmod -->
+			<option value="{quickmod.VALUE}">{quickmod.TITLE}</option>
+			<!-- END quickmod -->
+		</select>
+		<input type="submit" value="{L_GO}" class="button2" />
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -26,10 +26,6 @@ hr {
 	border-top-color: #CCCCCC;
 }

-hr.dashed {
-	border-top-color: #CCCCCC;
-}
-
 /* Search box
 --------------------------------------------- */

@@ -452,6 +448,10 @@ dl.faq dt {
 	color: #BC2A4D;
 }

+.announce, .unreadpost {
+	/* Highlight the announcements & unread posts box */
+}
+
 /* Post signature */
 .signature {
 	border-top-color: #CCCCCC;
@@ -957,7 +957,7 @@ dl.mini dt {

 /* Avatar gallery */
 #gallery label {
-	background-color: #FFFFFF;
+	background: #FFFFFF;
 	border-color: #CCC;
 }

@@ -992,6 +992,10 @@ dd label {
 	color: #333;
 }

+fieldset.fields1 {
+	background-color: transparent;
+}
+
 /* Hover effects */
 fieldset dl:hover dt label {
 	color: #000000;
@@ -1070,3 +1074,17 @@ input.search {
 input.disabled {
 	color: #666666;
 }
+
+/* jQuery popups
+---------------------------------------- */
+.phpbb_alert {
+	background-color: #FFFFFF;
+	border-color: #999999;
+}
+.phpbb_alert .alert_close {
+	background-image: url("./images/alert_close.png");
+}
+#darken {
+	background-color: #000000;
+}
+
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -55,8 +55,6 @@ html {
 body {
 	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
 	font-family: Verdana, Helvetica, Arial, sans-serif;
-	color: #828282;
-	background-color: #FFFFFF;
 	/*font-size: 62.5%;			 This sets the default font size to be equivalent to 10px */
 	font-size: 10px;
 	line-height: normal;
@@ -68,7 +66,6 @@ h1 {
 	/* Forum name */
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 	margin-right: 200px;
-	color: #FFFFFF;
 	margin-top: 15px;
 	font-weight: bold;
 	font-size: 2em;
@@ -78,7 +75,6 @@ h2 {
 	/* Forum header titles */
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 	font-weight: normal;
-	color: #3f3f3f;
 	font-size: 2em;
 	margin: 0.8em 0 0.2em 0;
 }
@@ -92,11 +88,10 @@ h3 {
 	font-family: Arial, Helvetica, sans-serif;
 	font-weight: bold;
 	text-transform: uppercase;
-	border-bottom: 1px solid #CCCCCC;
+	border-bottom: 1px solid transparent;
 	margin-bottom: 3px;
 	padding-bottom: 2px;
 	font-size: 1.05em;
-	color: #989898;
 	margin-top: 20px;
 }

@@ -118,8 +113,8 @@ img {

 hr {
 	/* Also see tweaks.css */
-	border: 0 none #FFFFFF;
-	border-top: 1px solid #CCCCCC;
+	border: 0 solid transparent;
+	border-top-width: 1px;
 	height: 1px;
 	margin: 5px 0;
 	display: block;
@@ -127,7 +122,7 @@ hr {
 }

 hr.dashed {
-	border-top: 1px dashed #CCCCCC;
+	border-top-style: dashed;
 	margin: 10px 0;
 }

@@ -209,7 +204,6 @@ a#logo:hover {
 /* Search box
 --------------------------------------------- */
 #search-box {
-	color: #FFFFFF;
 	position: relative;
 	margin-top: 30px;
 	margin-right: 5px;
@@ -221,11 +215,10 @@ a#logo:hover {

 #search-box #keywords {
 	width: 95px;
-	background-color: #FFF;
 }

 #search-box input {
-	border: 1px solid #b0b0b0;
+	border: 1px solid transparent;
 }

 /* .button1 style defined later, just a few tweaks for the search button version */
@@ -256,26 +249,24 @@ a#logo:hover {
 /* Round cornered boxes and backgrounds
 ---------------------------------------- */
 .headerbar {
-	background: #ebebeb none repeat-x 0 0;
-	color: #FFFFFF;
+	background: transparent none repeat-x 0 0;
 	margin-bottom: 4px;
 	padding: 0 5px;
 }

 .navbar {
-	background-color: #ebebeb;
 	padding: 0 10px;
 }

 .forabg {
-	background: #b1b1b1 none repeat-x 0 0;
+	background: transparent none repeat-x 0 0;
 	margin-bottom: 4px;
 	padding: 0 5px;
 	clear: both;
 }

 .forumbg {
-	background: #ebebeb none repeat-x 0 0;
+	background: transparent none repeat-x 0 0;
 	margin-bottom: 4px;
 	padding: 0 5px;
 	clear: both;
@@ -284,8 +275,6 @@ a#logo:hover {
 .panel {
 	margin-bottom: 4px;
 	padding: 0 10px;
-	background-color: #f3f3f3;
-	color: #3f3f3f;
 }

 .post {
@@ -295,31 +284,10 @@ a#logo:hover {
 	background-position: 100% 0;
 }

-.post:target .content {
-	color: #000000;
-}
-
-.post:target h3 a {
-	color: #000000;
-}
-
-.bg1	{ background-color: #f7f7f7;}
-.bg2	{ background-color: #f2f2f2; }
-.bg3	{ background-color: #ebebeb; }
-
 .rowbg {
 	margin: 5px 5px 2px 5px;
 }

-.ucprowbg {
-	background-color: #e2e2e2;
-}
-
-.fieldsbg {
-	/*border: 1px #DBDEE2 solid;*/
-	background-color: #eaeaea;
-}
-
 span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span {
 	font-size: 1px;
 	line-height: 1px;
@@ -372,6 +340,8 @@ span.corners-bottom span {
 ul.linklist {
 	display: block;
 	margin: 0;
+	height: 4%;
+	overflow: hidden;
 }

 ul.linklist li {
@@ -394,7 +364,7 @@ ul.linklist li.rightside, p.rightside {
 ul.navlinks {
 	padding-bottom: 1px;
 	margin-bottom: 1px;
-	border-bottom: 1px solid #FFFFFF;
+	border-bottom: 1px solid transparent;
 	font-weight: bold;
 }

@@ -425,7 +395,6 @@ table.table1 {
 table.table1 thead th {
 	font-weight: normal;
 	text-transform: uppercase;
-	color: #FFFFFF;
 	line-height: 1.3em;
 	font-size: 1em;
 	padding: 0 0 4px 3px;
@@ -436,30 +405,22 @@ table.table1 thead th span {
 }

 table.table1 tbody tr {
-	border: 1px solid #cfcfcf;
-}
-
-table.table1 tbody tr:hover, table.table1 tbody tr.hover {
-	background-color: #f6f6f6;
-	color: #000;
+	border: 1px solid transparent;
 }

 table.table1 td {
-	color: #6a6a6a;
 	font-size: 1.1em;
 }

 table.table1 tbody td {
 	padding: 5px;
-	border-top: 1px solid #FAFAFA;
+	border-top: 1px solid transparent;
 }

 table.table1 tbody th {
 	padding: 5px;
-	border-bottom: 1px solid #000000;
+	border-bottom: 1px solid transparent;
 	text-align: left;
-	color: #333333;
-	background-color: #FFFFFF;
 }

 /* Specific column styles */
@@ -486,7 +447,6 @@ table.info tbody th {
 	padding: 3px;
 	text-align: right;
 	vertical-align: top;
-	color: #000000;
 	font-weight: normal;
 }

@@ -508,7 +468,7 @@ table.info tbody th {

 /* Misc layout styles
 ---------------------------------------- */
-/* column[1-2] styles are containers for two column layouts 
+/* column[1-2] styles are containers for two column layouts
   Also see tweaks.css */
 .column1 {
 	float: left;
@@ -545,7 +505,6 @@ dl.details dt {
 	clear: left;
 	width: 30%;
 	text-align: right;
-	color: #000000;
 	display: block;
 }

@@ -553,11 +512,15 @@ dl.details dd {
 	margin-left: 0;
 	padding-left: 5px;
 	margin-bottom: 5px;
-	color: #828282;
 	float: left;
 	width: 65%;
 }

+.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
+	height: 1%;
+	overflow: hidden;
+}
+
 /* Pagination
 ---------------------------------------- */
 .pagination {
@@ -584,28 +547,21 @@ li.pagination {
 	padding: 0 2px;
 	margin: 0 2px;
 	font-weight: normal;
-	color: #FFFFFF;
-	background-color: #bfbfbf;
-	border: 1px solid #bfbfbf;
+	border: 1px solid transparent;
 	font-size: 0.9em;
 }

 .pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
 	font-weight: normal;
 	text-decoration: none;
-	color: #747474;
 	margin: 0 2px;
 	padding: 0 2px;
-	background-color: #eeeeee;
-	border: 1px solid #bababa;
+	border: 1px solid transparent;
 	font-size: 0.9em;
 	line-height: 1.5em;
 }

 .pagination span a:hover {
-	border-color: #d2d2d2;
-	background-color: #d2d2d2;
-	color: #FFF;
 	text-decoration: none;
 }

@@ -632,6 +588,53 @@ li.pagination {
 	background-color: #d2d2d2;
 }

+/* jQuery popups
+---------------------------------------- */
+.phpbb_alert {
+	border: 1px solid transparent;
+	position: fixed;
+	display: none;
+	top: 100px;
+	left: 35%;
+	width: 30%;
+	z-index: 50;
+	padding: 25px;
+	padding: 0 25px 20px 25px;
+}
+
+.phpbb_alert .alert_close {
+	display: block;
+	float: right;
+	width: 16px;
+	height: 16px;
+	overflow: hidden;
+	text-decoration: none !important;
+	background: transparent none 0 0 no-repeat;
+	margin-top: -7px;
+	margin-right: -31px;
+}
+.phpbb_alert .alert_close:hover {
+	background-position: 0 -16px;
+}
+
+.phpbb_alert p {
+	margin: 8px 0;
+	padding-bottom: 8px;
+}
+
+#darkenwrapper {
+	display: none;
+}
+
+#darken {
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0.5;
+}
+
 /* Miscellaneous styles
 ---------------------------------------- */
 #forum-permissions {
@@ -646,7 +649,6 @@ li.pagination {
 .copyright {
 	padding: 5px;
 	text-align: center;
-	color: #555555;
 }

 .small {
@@ -662,22 +664,11 @@ li.pagination {
 }

 .error {
-	color: #bcbcbc;
 	font-weight: bold;
 	font-size: 1em;
 }

-.reported {
-	background-color: #f7f7f7;
-}
-
-li.reported:hover {
-	background-color: #ececec;
-}
-
 div.rules {
-	background-color: #ececec;
-	color: #bcbcbc;
 	padding: 0 10px;
 	margin: 10px 0;
 	font-size: 1.1em;
@@ -688,13 +679,16 @@ div.rules ul, div.rules ol {
 }

 p.rules {
-	background-color: #ececec;
 	background-image: none;
 	padding: 5px;
 }

 p.rules img {
 	vertical-align: middle;
+}
+
+p.rules strong {
+	vertical-align: middle;
 	padding-top: 5px;
 }

@@ -715,3 +709,7 @@ p.rules a {
 	line-height: 1px;
 	background: transparent;
 }
+
+.hidden {
+	display: none;
+}
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -8,13 +8,12 @@ ul.topiclist {
 }

 ul.forums {
-	background: #f9f9f9 none repeat-x 0 0;
+	background: transparent none repeat-x 0 0;
 }

 ul.topiclist li {
 	display: block;
 	list-style-type: none;
-	color: #777777;
 	margin: 0;
 }

@@ -38,7 +37,7 @@ ul.topiclist dt {
 ul.topiclist dd {
 	display: block;
 	float: left;
-	border-left: 1px solid #FFFFFF;
+	border-left: 1px solid transparent;
 	padding: 4px 0;
 }

@@ -65,28 +64,18 @@ ul.topiclist li.row dt a.subforum {
 }

 li.row {
-	border-top: 1px solid #FFFFFF;
-	border-bottom: 1px solid #8f8f8f;
+	border-top: 1px solid transparent;
+	border-bottom: 1px solid transparent;
 }

 li.row strong {
 	font-weight: normal;
-	color: #000000;
-}
-
-li.row:hover {
-	background-color: #f6f6f6;
-}
-
-li.row:hover dd {
-	border-left-color: #CCCCCC;
 }

 li.header dt, li.header dd {
 	line-height: 1em;
 	border-left-width: 0;
 	margin: 2px 0 4px 0;
-	color: #FFFFFF;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	font-size: 1em;
@@ -205,7 +194,6 @@ ul.topiclist dd.searchextra {
 	margin-left: 5px;
 	padding: 0.2em 0;
 	font-size: 1.1em;
-	color: #333333;
 	border-left: none;
 	clear: both;
 	width: 98%;
@@ -228,7 +216,6 @@ div[class].topic-actions {
 .postbody {
 	padding: 0;
 	line-height: 1.48em;
-	color: #333333;
 	width: 76%;
 	float: left;
 	clear: both;
@@ -320,14 +307,12 @@ div[class].topic-actions {
 	line-height: 1.4em;
 	font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
 	font-size: 1em;
-	color: #333333;
 	padding-bottom: 1px;
 }

 .content h2, .panel h2 {
 	font-weight: normal;
-	color: #989898;
-	border-bottom: 1px solid #CCCCCC;
+	border-bottom: 1px solid transparent;
 	font-size: 1.6em;
 	margin-top: 0.5em;
 	margin-bottom: 0.5em;
@@ -361,7 +346,6 @@ dl.faq {

 dl.faq dt {
 	font-weight: bold;
-	color: #333333;
 }

 .content dl.faq {
@@ -379,17 +363,9 @@ dl.faq dt {
 }

 .posthilit {
-	background-color: #f3f3f3;
-	color: #BCBCBC;
 	padding: 0 2px 1px 2px;
 }

-.announce, .unreadpost {
-	/* Highlight the announcements & unread posts box */
-	border-left-color: #BCBCBC;
-	border-right-color: #BCBCBC;
-}
-
 /* Post author */
 p.author {
 	margin: 0 15em 0.6em 0;
@@ -404,7 +380,7 @@ p.author {
 	margin-top: 1.5em;
 	padding-top: 0.2em;
 	font-size: 1.1em;
-	border-top: 1px solid #CCCCCC;
+	border-top: 1px solid transparent;
 	clear: left;
 	line-height: 140%;
 	overflow: hidden;
@@ -434,7 +410,7 @@ dd .signature {
 	margin-top: 1.5em;
 	padding-top: 0.2em;
 	font-size: 1em;
-	border-top: 1px dashed #CCCCCC;
+	border-top: 1px dashed transparent;
 	clear: left;
 	line-height: 130%;
 }
@@ -450,8 +426,8 @@ ul.searchresults {
 ----------------------------------------*/
 /* Quote block */
 blockquote {
-	background: #ebebeb none 6px 8px no-repeat;
-	border: 1px solid #dbdbdb;
+	background: transparent none 6px 8px no-repeat;
+	border: 1px solid transparent;
 	font-size: 0.95em;
 	margin: 0.5em 1px 0 25px;
 	overflow: hidden;
@@ -460,16 +436,10 @@ blockquote {

 blockquote blockquote {
 	/* Nested quotes */
-	background-color: #bababa;
 	font-size: 1em;
 	margin: 0.5em 1px 0 15px;	
 }

-blockquote blockquote blockquote {
-	/* Nested quotes */
-	background-color: #e4e4e4;
-}
-
 blockquote cite {
 	/* Username/source of quoter */
 	font-style: normal;
@@ -490,14 +460,13 @@ blockquote.uncited {
 /* Code block */
 dl.codebox {
 	padding: 3px;
-	background-color: #FFFFFF;
-	border: 1px solid #d8d8d8;
+	border: 1px solid transparent;
 	font-size: 1em;
 }

 dl.codebox dt {
 	text-transform: uppercase;
-	border-bottom: 1px solid #CCCCCC;
+	border-bottom: 1px solid transparent;
 	margin-bottom: 3px;
 	font-size: 0.8em;
 	font-weight: bold;
@@ -518,17 +487,9 @@ dl.codebox code {
 	padding-top: 5px;
 	font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
 	line-height: 1.3em;
-	color: #8b8b8b;
 	margin: 2px 0;
 }

-.syntaxbg		{ color: #FFFFFF; }
-.syntaxcomment	{ color: #000000; }
-.syntaxdefault	{ color: #bcbcbc; }
-.syntaxhtml		{ color: #000000; }
-.syntaxkeyword	{ color: #585858; }
-.syntaxstring	{ color: #a7a7a7; }
-
 /* Attachments
 ----------------------------------------*/
 .attachbox {
@@ -536,15 +497,10 @@ dl.codebox code {
 	width: auto; 
 	margin: 5px 5px 5px 0;
 	padding: 6px;
-	background-color: #FFFFFF;
-	border: 1px dashed #d8d8d8;
+	border: 1px dashed transparent;
 	clear: left;
 }

-.pm-message .attachbox {
-	background-color: #f3f3f3;
-}
-
 .attachbox dt {
 	font-family: Arial, Helvetica, sans-serif;
 	text-transform: uppercase;
@@ -554,7 +510,7 @@ dl.codebox code {
 	margin-top: 4px;
 	padding-top: 4px;
 	clear: left;
-	border-top: 1px solid #d8d8d8;
+	border-top: 1px solid transparent;
 }

 .attachbox dd dd {
@@ -563,7 +519,6 @@ dl.codebox code {

 .attachbox p {
 	line-height: 110%;
-	color: #666666;
 	font-weight: normal;
 	clear: left;
 }
@@ -571,7 +526,6 @@ dl.codebox code {
 .attachbox p.stats
 {
 	line-height: 110%;
-	color: #666666;
 	font-weight: normal;
 	clear: left;
 }
@@ -584,7 +538,7 @@ dl.codebox code {
 }

 .attach-image img {
-	border: 1px solid #999999;
+	border: 1px solid transparent;
 /*	cursor: move; */
 	cursor: default;
 }
@@ -613,19 +567,16 @@ dl.file dt {
 }

 dl.file dd {
-	color: #666666;
 	margin: 0;
 	padding: 0;	
 }

 dl.thumbnail img {
 	padding: 3px;
-	border: 1px solid #666666;
-	background-color: #FFF;
+	border: 1px solid transparent;
 }

 dl.thumbnail dd {
-	color: #666666;
 	font-style: italic;
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 }
@@ -634,12 +585,8 @@ dl.thumbnail dd {
 	font-size: 100%;
 }

-dl.thumbnail dt a:hover {
-	background-color: #EEEEEE;
-}
-
 dl.thumbnail dt a:hover img {
-	border: 1px solid #d2d2d2;
+	border: 1px solid transparent;
 }

 /* Post poll styles
@@ -650,15 +597,13 @@ fieldset.polls {

 fieldset.polls dl {
 	margin-top: 5px;
-	border-top: 1px solid #e2e2e2;
+	border-top: 1px solid transparent;
 	padding: 5px 0 0 0;
 	line-height: 120%;
-	color: #666666;
 }

 fieldset.polls dl.voted {
 	font-weight: bold;
-	color: #000000;
 }

 fieldset.polls dt {
@@ -692,41 +637,15 @@ fieldset.polls dd input {
 fieldset.polls dd div {
 	text-align: right;
 	font-family: Arial, Helvetica, sans-serif;
-	color: #FFFFFF;
 	font-weight: bold;
 	padding: 0 2px;
 	overflow: visible;
 	min-width: 2%;
 }

-.pollbar1 {
-	background-color: #aaaaaa;
-	border-bottom: 1px solid #747474;
-	border-right: 1px solid #747474;
-}
-
-.pollbar2 {
-	background-color: #bebebe;
-	border-bottom: 1px solid #8c8c8c;
-	border-right: 1px solid #8c8c8c;
-}
-
-.pollbar3 {
-	background-color: #D1D1D1;
-	border-bottom: 1px solid #aaaaaa;
-	border-right: 1px solid #aaaaaa;
-}
-
-.pollbar4 {
-	background-color: #e4e4e4;
-	border-bottom: 1px solid #bebebe;
-	border-right: 1px solid #bebebe;
-}
-
-.pollbar5 {
-	background-color: #f8f8f8;
-	border-bottom: 1px solid #D1D1D1;
-	border-right: 1px solid #D1D1D1;
+.pollbar1, .pollbar2, .pollbar3, .pollbar4, .pollbar5 {
+	border-bottom: 1px solid transparent;
+	border-right: 1px solid transparent;
 }

 /* Poster profile block
@@ -735,15 +654,11 @@ fieldset.polls dd div {
 	/* Also see tweaks.css */
 	margin: 5px 0 10px 0;
 	min-height: 80px;
-	color: #666666;
-	border-left: 1px solid #FFFFFF;
+	border-left: 1px solid transparent;
 	width: 22%;
 	float: right;
 	display: inline;
 }
-.pm .postprofile {
-	border-left: 1px solid #DDDDDD;
-}

 .postprofile dd, .postprofile dt {
 	line-height: 1.2em;
@@ -752,7 +667,6 @@ fieldset.polls dd div {

 .postprofile strong {
 	font-weight: normal;
-	color: #000000;
 }

 .avatar {
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -20,10 +20,6 @@
 	padding: 0;
 }

-#cp-main h3, #cp-main hr, #cp-menu hr {
-	border-color: #bfbfbf;
-}
-
 #cp-main .panel p {
 	font-size: 1.1em;
 }
@@ -34,17 +30,16 @@
 }

 #cp-main .panel li.row {
-	border-bottom: 1px solid #cbcbcb;
-	border-top: 1px solid #F9F9F9;
+	border-bottom: 1px solid transparent;
+	border-top: 1px solid transparent;
 }

 ul.cplist {
 	margin-bottom: 5px;
-	border-top: 1px solid #cbcbcb;
+	border-top: 1px solid transparent;
 }

 #cp-main .panel li.header dd, #cp-main .panel li.header dt {
-	color: #000000;
 	margin-bottom: 2px;
 }

@@ -53,9 +48,8 @@ ul.cplist {
 }

 #cp-main table.table1 thead th {
-	color: #333333;
 	font-weight: bold;
-	border-bottom: 1px solid #333333;
+	border-bottom: 1px solid transparent;
 	padding: 5px;
 }

@@ -76,9 +70,8 @@ ul.cplist {
 }

 #cp-main .pm-message {
-	border: 1px solid #e2e2e2;
+	border: 1px solid transparent;
 	margin: 10px 0;
-	background-color: #FFFFFF;
 	width: auto;
 	float: none;
 }
@@ -141,23 +134,17 @@ ul.cplist {
 	display: block;
 	background: none no-repeat 100% -35px;
 	padding: 6px 10px 6px 5px;
-	color: #828282;
 	white-space: nowrap;
 }

-#tabs a:hover span {
-	color: #bcbcbc;
-}
-
 #tabs .activetab a {
 	background-position: 0 0;
-	border-bottom: 1px solid #ebebeb;
+	border-bottom: 1px solid transparent;
 }

 #tabs .activetab a span {
 	background-position: 100% 0;
 	padding-bottom: 7px;
-	color: #333333;
 }

 #tabs a:hover {
@@ -173,7 +160,6 @@ ul.cplist {
 }

 #tabs .activetab a:hover span {
-	color: #000000;
 	background-position: 100% 0;
 }

@@ -196,7 +182,6 @@ ul.cplist {
 	padding: 0 10px 4px 10px;
 	font-size: 1em;
 	font-weight: bold;
-	background-color: #f2f2f2;
 	margin-left: 2px;
 }

@@ -207,14 +192,6 @@ ul.cplist {
 	text-decoration: none;
 }

-#minitabs li.activetab {
-	background-color: #F9F9F9;
-}
-
-#minitabs li.activetab a, #minitabs li.activetab a:hover {
-	color: #333333;
-}
-
 /* UCP navigation menu
 ----------------------------------------*/
 /* Container for sub-navigation list */
@@ -242,43 +219,25 @@ ul.cplist {
 	margin: 1px 0;
 	text-decoration: none;
 	font-weight: bold;
-	color: #333;
-	background: #cfcfcf none repeat-y 100% 0;
+	background: transparent none repeat-y 100% 0;
 }

 #navigation a:hover {
 	text-decoration: none;
-	background-color: #c6c6c6;
-	color: #bcbcbc;
 	background-image: none;
 }

 #navigation #active-subsection a {
 	display: block;
-	color: #d3d3d3;
-	background-color: #F9F9F9;
 	background-image: none;
 }

-#navigation #active-subsection a:hover {
-	color: #d3d3d3;
-}
-
 /* Preferences pane layout
 ----------------------------------------*/
 #cp-main h2 {
 	border-bottom: none;
 	padding: 0;
 	margin-left: 10px;
-	color: #333333;
-}
-
-#cp-main .panel {
-	background-color: #F9F9F9;
-}
-
-#cp-main .pm {
-	background-color: #FFFFFF;
 }

 #cp-main span.corners-top, #cp-menu span.corners-top {
@@ -316,7 +275,6 @@ ul.cplist {

 /* Friends list */
 .cp-mini {
-	background-color: #f9f9f9;
 	padding: 0 5px;
 	margin: 10px 15px 10px 5px;
 }
@@ -327,7 +285,6 @@ ul.cplist {

 dl.mini dt {
 	font-weight: bold;
-	color: #676767;
 }

 dl.mini dd {
@@ -362,11 +319,6 @@ dl.mini dd {
 	padding-top: 5px;
 }

-/* PM Message history */
-.current {
-	color: #999999;
-}
-
 /* Defined rules list for PM options */
 ol.def-rules {
 	padding-left: 0;
@@ -387,31 +339,16 @@ ol.def-rules li {
 }

 .pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
-	border-left-color: #bcbcbc;
-	border-right-color: #bcbcbc;
-}
-
-.pmlist li.pm_marked_colour, .pm_marked_colour {
-	padding: 0;
-	border: solid 3px #ffffff;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_replied_colour, .pm_replied_colour {
-	padding: 0;
-	border: solid 3px #c2c2c2;
-	border-width: 0 3px;
-}
-
-.pmlist li.pm_friend_colour, .pm_friend_colour {
-	padding: 0;
-	border: solid 3px #bdbdbd;
-	border-width: 0 3px;
+	border-left-color: transparent;
+	border-right-color: transparent;
 }

+.pmlist li.pm_marked_colour, .pm_marked_colour, 
+.pmlist li.pm_replied_colour, .pm_replied_colour,
+.pmlist li.pm_friend_colour, .pm_friend_colour,
 .pmlist li.pm_foe_colour, .pm_foe_colour {
 	padding: 0;
-	border: solid 3px #000000;
+	border: solid 3px transparent;
 	border-width: 0 3px;
 }

@@ -430,11 +367,6 @@ ol.def-rules li {
 	margin: 10px;
 	padding: 5px;
 	width: auto;
-	background: #FFFFFF;
-	border: 1px solid #CCC;
+	border: 1px solid transparent;
 	text-align: center;
 }
-
-#gallery label:hover {
-	background-color: #EEE;
-}
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -23,9 +23,8 @@ select {
 	font-weight: normal;
 	cursor: pointer;
 	vertical-align: middle;
-	border: 1px solid #666666;
+	border: 1px solid transparent;
 	padding: 1px;
-	background-color: #FAFAFA;
 	font-size: 1em;
 }

@@ -33,10 +32,6 @@ option {
 	padding-right: 1em;
 }

-option.disabled-option {
-	color: graytext;
-}
-
 textarea {
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
 	width: 60%;
@@ -48,7 +43,6 @@ textarea {
 label {
 	cursor: default;
 	padding-right: 5px;
-	color: #676767;
 }

 label input {
@@ -89,10 +83,6 @@ fieldset.fields1 dd {
 	border-left-width: 0;
 }

-fieldset.fields1 {
-	background-color: transparent;
-}
-
 fieldset.fields1 div {
 	margin-bottom: 3px;
 }
@@ -121,7 +111,6 @@ dt label {

 dd label {
 	white-space: nowrap;
-	color: #333;
 }

 dd input, dd textarea {
@@ -137,22 +126,10 @@ dd textarea {
 }

 /* Hover effects */
-fieldset dl:hover dt label {
-	color: #000000;
-}
-
-fieldset.fields2 dl:hover dt label {
-	color: inherit;
-}
-
 #timezone {
 	width: 95%;
 }

-* html #timezone {
-	width: 50%;
-}
-
 /* Quick-login on index page */
 fieldset.quick-login {
 	margin-top: 5px;
@@ -166,7 +143,6 @@ fieldset.quick-login input.inputbox {
 	width: 15%;
 	vertical-align: middle;
 	margin-right: 5px;
-	background-color: #f3f3f3;
 }

 fieldset.quick-login label {
@@ -268,7 +244,6 @@ fieldset.submit-buttons input {
 	min-width: 100%;
 	max-width: 100%;
 	font-size: 1.2em;
-	color: #333333;
 }

 /* Emoticons panel */
@@ -284,20 +259,13 @@ fieldset.submit-buttons input {
 /* Input field styles
 ---------------------------------------- */
 .inputbox {
-	background-color: #FFFFFF;
-	border: 1px solid #c0c0c0;
-	color: #333333;
+	border: 1px solid transparent;
 	padding: 2px;
 	cursor: text;
 }

-.inputbox:hover {
-	border: 1px solid #eaeaea;
-}
-
-.inputbox:focus {
-	border: 1px solid #eaeaea;
-	color: #4b4b4b;
+.inputbox:hover, .inputbox:focus {
+	border: 1px solid transparent;
 }

 input.inputbox	{ width: 85%; }
@@ -324,13 +292,12 @@ a.button1, input.button1, input.button3, a.button2, input.button2 {
 	padding-top: 1px;
 	padding-bottom: 1px;
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
-	color: #000;
-	background: #FAFAFA none repeat-x top left;
+	background: transparent none repeat-x top left;
 }

 a.button1, input.button1 {
 	font-weight: bold;
-	border: 1px solid #666666;
+	border: 1px solid transparent;
 }

 input.button3 {
@@ -344,13 +311,12 @@ input.button3 {

 /* Alternative button */
 a.button2, input.button2, input.button3 {
-	border: 1px solid #666666;
+	border: 1px solid transparent;
 }

 /* <a> button in the style of the form buttons */
 a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active {
 	text-decoration: none;
-	color: #000000;
 	padding: 2px 8px;
 	line-height: 250%;
 	vertical-align: text-bottom;
@@ -359,14 +325,12 @@ a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.but

 /* Hover states */
 a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
-	border: 1px solid #BCBCBC;
+	border: 1px solid transparent;
 	background-position: 0 100%;
-	color: #BCBCBC;
 }

 input.disabled {
 	font-weight: normal;
-	color: #666666;
 }

 /* Topic and forum Search */
--- a/phpBB/styles/prosilver/theme/images/alert_close.png
+++ b/phpBB/styles/prosilver/theme/images/alert_close.png
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -7,10 +7,17 @@ a {
 	unicode-bidi: embed;
 }

-a:link	{ color: #898989; text-decoration: none; }
-a:visited	{ color: #898989; text-decoration: none; }
-a:hover	{ color: #d3d3d3; text-decoration: underline; }
-a:active	{ color: #d2d2d2; text-decoration: none; }
+a:link, a:visited { 
+	text-decoration: none;
+}
+
+a:hover	{ 
+	text-decoration: underline;
+}
+
+a:active {
+	text-decoration: none;
+}

 /* Coloured usernames */
 .username-coloured {
@@ -21,22 +28,18 @@ a:active	{ color: #d2d2d2; text-decoration: none; }

 /* Links on gradient backgrounds */
 #search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link {
-	color: #FFFFFF;
 	text-decoration: none;
 }

 #search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited {
-	color: #FFFFFF;
 	text-decoration: none;
 }

 #search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover {
-	color: #ffffff;
 	text-decoration: underline;
 }

 #search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active {
-	color: #ffffff;
 	text-decoration: none;
 }

@@ -45,96 +48,65 @@ a.forumtitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;
 	font-size: 1.2em;
 	font-weight: bold;
-	color: #898989;
 	text-decoration: none;
 }

-/* a.forumtitle:visited { color: #898989; } */
-
 a.forumtitle:hover {
-	color: #bcbcbc;
 	text-decoration: underline;
 }

-a.forumtitle:active {
-	color: #898989;
-}
-
 a.topictitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;
 	font-size: 1.2em;
 	font-weight: bold;
-	color: #898989;
 	text-decoration: none;
 }

-/* a.topictitle:visited { color: #d2d2d2; } */
-
 a.topictitle:hover {
-	color: #bcbcbc;
 	text-decoration: underline;
 }

-a.topictitle:active {
-	color: #898989;
-}
-
 /* Post body links */
 .postlink {
 	text-decoration: none;
-	color: #d2d2d2;
-	border-bottom: 1px solid #d2d2d2;
+	border-bottom: 1px solid transparent;
 	padding-bottom: 0;
 }

-/* .postlink:visited { color: #bdbdbd; } */
-
-.postlink:active {
-	color: #d2d2d2;
-}
-
 .postlink:hover {
-	background-color: #f6f6f6;
 	text-decoration: none;
-	color: #404040;
 }

 .signature a, .signature a:visited, .signature a:hover, .signature a:active {
 	border: none;
 	text-decoration: underline;
-	background-color: transparent;
 }

 /* Profile links */
 .postprofile a:link, .postprofile a:visited, .postprofile dt.author a {
 	font-weight: bold;
-	color: #898989;
 	text-decoration: none;
 }

 .postprofile a:hover, .postprofile dt.author a:hover {
 	text-decoration: underline;
-	color: #d3d3d3;
 }

 /* CSS spec requires a:link, a:visited, a:hover and a:active rules to be specified in this order. */
 /* See http://www.phpbb.com/bugs/phpbb3/59685 */
 .postprofile a:active {
 	font-weight: bold;
-	color: #898989;
 	text-decoration: none;
 }


 /* Profile searchresults */	
 .search .postprofile a {
-	color: #898989;
 	text-decoration: none; 
 	font-weight: normal;
 }

 .search .postprofile a:hover {
-	color: #d3d3d3;
 	text-decoration: underline; 
 }

@@ -177,7 +149,6 @@ a.up, a.up:link, a.up:active, a.up:visited {

 a.up:hover {
 	background-position: left top;
-	background-color: transparent;
 }

 a.down, a.down:link, a.down:active, a.down:visited {
@@ -194,7 +165,6 @@ a.left, a.left:active, a.left:visited {
 }

 a.left:hover {
-	color: #d2d2d2;
 	text-decoration: none;
 	background-position: 0 60%;
 }
@@ -204,7 +174,6 @@ a.right, a.right:active, a.right:visited {
 }

 a.right:hover {
-	color: #d2d2d2;
 	text-decoration: none;
 	background-position: 100% 60%;
 }
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -13,6 +13,5 @@
@import url("buttons.css");
@import url("cp.css");
@import url("forms.css");
-@import url("tweaks.css");
@import url("colours.css");
@import url("imageset.css");
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -1,97 +1,31 @@
 /* Style Sheet Tweaks

-These style definitions are mainly IE specific 
+These style definitions are IE 7 and 8 specific 
 tweaks required due to its poor CSS support.
 -------------------------------------------------*/

-* html table, * html select, * html input { font-size: 100%; }
-* html hr { margin: 0; }
-* html span.corners-top, * html span.corners-bottom { background-image: url("./images/corners_left.gif"); }
-* html span.corners-top span, * html span.corners-bottom span { background-image: url("./images/corners_right.gif"); }
-
 table.table1 {
-	width: 99%;		/* IE < 6 browsers */
-	/* Tantek hack */
-	voice-family: "\"}\"";
-	voice-family: inherit;
 	width: 100%;
 }
-html>body table.table1 { width: 100%; }	/* Reset 100% for opera */

-* html ul.topiclist li { position: relative; }
-* html .postbody h3 img { vertical-align: middle; }
-
-/* Form styles */
-html>body dd label input { vertical-align: text-bottom; }	/* Align checkboxes/radio buttons nicely */
-
-* html input.button1, * html input.button2 {
-	padding-bottom: 0;
-	margin-bottom: 1px;
+/* Align checkboxes/radio buttons nicely */
+dd label input { 
+	vertical-align: text-bottom; 
+	*vertical-align: middle; 
 }

-/* Misc layout styles */
-* html .column1, * html .column2 { width: 45%; }
-
-/* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above)
-   From http://www.positioniseverything.net/easyclearing.html 
-#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after {
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}*/
-
-.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
-	height: 1%;
-	overflow: hidden;
-}
-
-/* viewtopic fix */
-* html .post {
-	height: 25%;
-	overflow: hidden;
-}
-
-/* navbar fix */
-* html .clearfix, * html .navbar, ul.linklist {
-	height: 4%;
-	overflow: hidden;
-}
-
-/* Simple fix so forum and topic lists always have a min-height set, even in IE6
-	From http://www.dustindiaz.com/min-height-fast-hack */
+/* Simple fix so forum and topic lists always have a height set */
 dl.icon {
-	min-height: 35px;
-	height: auto !important;
-	height: 35px;
-}
-
-* html li.row dl.icon dt {
-	height: 35px;
-	overflow: visible;
-}
-
-* html #search-box {
-	width: 25%;
+	*height: 35px;
 }

 /* Correctly clear floating for details on profile view */
-*:first-child+html dl.details dd {
-	margin-left: 30%;
-	float: none;
+dl.details dd {
+	*margin-left: 30%;
+	*float: none;
 }

-* html dl.details dd {
-	margin-left: 30%;
-	float: none;
-}
-
-/* Headerbar height fix for IE7 and below */
-* html #site-description p {
-	margin-bottom: 1.0em;
-}
-
-*:first-child+html #site-description p {
-	margin-bottom: 1.0em;
+/* Headerbar height fix for IE7 */
+#site-description p {
+	*margin-bottom: 1.0em;
 }
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -347,7 +347,19 @@

 <table width="100%" cellspacing="1">
 <tr>
-	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}"><!-- IF S_TOPIC_MOD --><form method="post" action="{S_MOD_ACTION}"><span class="gensmall">{L_QUICK_MOD}:</span> {S_TOPIC_MOD} <input class="btnlite" type="submit" value="{L_GO}" /></form><!-- ENDIF --></td>
+	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}">
+	<!-- IF .quickmod -->
+		<form method="post" action="{S_MOD_ACTION}">
+			<span class="gensmall">{L_QUICK_MOD}:</span>
+			<select name="action" id="quick-mod-select">
+				<!-- BEGIN quickmod -->
+				<option value="{quickmod.VALUE}">{quickmod.TITLE}</option>
+				<!-- END quickmod -->
+			</select>
+			<input class="btnlite" type="submit" value="{L_GO}" />
+		</form>
+	<!-- ENDIF -->
+	</td>
 	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td>
 </tr>
 </table>