10 files changed, 103 insertions, 82 deletions
diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html
index eb0cad2597..bf575c20fa 100644
--- a/phpBB/styles/prosilver/template/confirm_body.html
+++ b/phpBB/styles/prosilver/template/confirm_body.html
@@ -4,7 +4,7 @@
 	<p>{MESSAGE_TEXT}</p>
 
 	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
+		<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
 		<input type="button" name="cancel" value="{L_NO}" class="button2" />
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 93506b8d4a..0a749347ad 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -298,9 +298,12 @@ function storeCaret(textEl) {
 * Color pallette
 */
 function colorPalette(dir, width, height) {
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	var color = '';
+	var r = 0, 
+		g = 0, 
+		b = 0,
+		numberList = new Array(6);
+		color = '',
+		html = '';
 
 	numberList[0] = '00';
 	numberList[1] = '40';
@@ -308,37 +311,46 @@ function colorPalette(dir, width, height) {
 	numberList[3] = 'BF';
 	numberList[4] = 'FF';
 
-	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
+	html += '<table cellspacing="1" cellpadding="0" border="0">';
 
 	for (r = 0; r < 5; r++) {
-		if (dir === 'h') {
-			document.writeln('<tr>');
+		if (dir == 'h') {
+			html += '<tr>';
 		}
 
 		for (g = 0; g < 5; g++) {
-			if (dir === 'v') {
-				document.writeln('<tr>');
+			if (dir == 'v') {
+				html += '<tr>';
 			}
 
 			for (b = 0; b < 5; b++) {
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
+				html += '<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">';
+				html += '<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="display: block; width: ' + width + 'px; height: ' + height + 'px; " alt="#' + color + '" title="#' + color + '"></a>';
+				html += '</td>';
 			}
 
-			if (dir === 'v') {
-				document.writeln('</tr>');
+			if (dir == 'v') {
+				html += '</tr>';
 			}
 		}
 
-		if (dir === 'h') {
-			document.writeln('</tr>');
+		if (dir == 'h') {
+			html += '</tr>';
 		}
 	}
-	document.writeln('</table>');
+	html += '</table>';
+	return html;
 }
 
+(function($) {
+	$(document).ready(function() {
+		$('#color_palette_placeholder').each(function() {
+			$(this).html(colorPalette('h', 15, 12));
+		});
+	});
+})(jQuery);
+
 /**
 * Caret Position object
 */
diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html
index 63f0b2e0f7..c83a625b3f 100644
--- a/phpBB/styles/prosilver/template/login_forum.html
+++ b/phpBB/styles/prosilver/template/login_forum.html
@@ -1,31 +1,36 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2 class="solo">{L_LOGIN} {FORUM_NAME}</h2>
+<!-- IF FORUM_NAME --><h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2><!-- ENDIF -->
 
 <form id="login_forum" method="post" action="{S_LOGIN_ACTION}">
 {S_FORM_TOKEN}
 <div class="panel">
 	<div class="inner">
 
-	<p>{L_LOGIN_FORUM}</p>
-
-	<fieldset class="fields2">
-	<!-- IF LOGIN_ERROR -->
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd class="error">{LOGIN_ERROR}</dd>
-		</dl>
-	<!-- ENDIF -->
-	<dl>
-		<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
-		<dd><input class="inputbox narrow" type="password" name="password" id="password" size="25" tabindex="1" /></dd>
-	</dl>
-	<dl class="fields2">
-		<dt>&nbsp;</dt>
-		<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
-	</dl>
-	{S_LOGIN_REDIRECT}
-	</fieldset>
+	<div class="content">
+		<h2>{L_LOGIN}</h2>
+
+		<p>{L_LOGIN_FORUM}</p>
+
+		<fieldset class="fields1">
+			<!-- IF LOGIN_ERROR -->
+				<dl>
+					<dt>&nbsp;</dt>
+					<dd class="error">{LOGIN_ERROR}</dd>
+				</dl>
+			<!-- ENDIF -->
+
+			<dl>
+				<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
+				<dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" /></dd>
+			</dl>
+			{S_LOGIN_REDIRECT}
+			<dl>
+				<dt>&nbsp;</dt>
+				<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
+			</dl>
+		</fieldset>
+	</div>
 
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 8e87407757..fadbc9b3ca 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -35,37 +35,30 @@
 	var panels = new Array('options-panel', 'attach-panel', 'poll-panel');
 	var show_panel = 'options-panel';
 
+	function change_palette()
+	{
+		dE('colour_palette');
+		e = document.getElementById('colour_palette');
+		
+		if (e.style.display == 'block')
+		{
+			document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
+		}
+		else
+		{
+			document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
+		}
+	}
 
 // ]]>
 </script>
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
+<!-- INCLUDEJS template/editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
 	<dl style="clear: left;">
 		<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt>
-		<dd>
-		<script type="text/javascript">
-		// <![CDATA[
-			function change_palette()
-			{
-				dE('colour_palette');
-				e = document.getElementById('colour_palette');
-				
-				if (e.style.display == 'block')
-				{
-					document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
-				}
-				else
-				{
-					document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
-				}
-			}
-
-			colorPalette('h', 15, 10);
-		// ]]>
-		</script>
-		</dd>
+		<dd id="color_palette_placeholder"></dd>
 	</dl>
 </div>
 
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 11957aa90d..d5097a2191 100644..100755
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -34,8 +34,16 @@
 	<!-- END forumrow -->
 	</ul>
 <!-- ELSEIF S_FORUM_NOTIFY -->
+    <ul class="topiclist">
+        <li class="header">
+            <dl class="icon">
+                <dt>{L_WATCHED_FORUMS}</dt>
+            </dl>
+        </li>
+    </ul>
 	<p><strong>{L_NO_WATCHED_FORUMS}</strong></p>
 <!-- ENDIF -->
+    <br />
 
 <!-- IF .topicrow -->
 	<ul class="topiclist">
@@ -83,14 +91,21 @@
 	<ul class="linklist">
 		<li class="rightside pagination">
 			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF -->
-			<!-- IF .pagination --> 
+			<!-- IF .pagination -->
 				<!-- INCLUDE pagination.html -->
-			<!-- ELSE --> 
+			<!-- ELSE -->
 				{PAGE_NUMBER}
 			<!-- ENDIF -->
 		</li>
 	</ul>
 <!-- ELSEIF S_TOPIC_NOTIFY -->
+    <ul class="topiclist">
+        <li class="header">
+            <dl class="icon">
+                <dt>{L_WATCHED_TOPICS}</dt>
+            </dl>
+        </li>
+    </ul>
 	<p><strong>{L_NO_WATCHED_TOPICS}</strong></p>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index ed462c770d..26ec23b2e6 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -476,6 +476,8 @@ dl.details dd {
 	margin-bottom: 5px;
 	float: left;
 	width: 65%;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index b6012f8a63..bf9e587ce1 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -669,6 +669,11 @@ fieldset.polls dd div {
 	margin-left: 8px;
 }
 
+.postprofile dd {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 .postprofile strong {
 	font-weight: normal;
 }
diff --git a/phpBB/styles/subsilver2/template/confirm_body.html b/phpBB/styles/subsilver2/template/confirm_body.html
index 7516196b3c..1712017c38 100644
--- a/phpBB/styles/subsilver2/template/confirm_body.html
+++ b/phpBB/styles/subsilver2/template/confirm_body.html
@@ -9,7 +9,7 @@
 		<th>{MESSAGE_TITLE}</th>
 	</tr>
 	<tr>
-		<td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td>
+		<td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnlite" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td>
 	</tr>
 	</table>
 	
diff --git a/phpBB/styles/subsilver2/template/login_forum.html b/phpBB/styles/subsilver2/template/login_forum.html
index c9b2c7277e..9a141fc295 100644
--- a/phpBB/styles/subsilver2/template/login_forum.html
+++ b/phpBB/styles/subsilver2/template/login_forum.html
@@ -1,5 +1,13 @@
 <!-- INCLUDE overall_header.html -->
 
+<!-- IF FORUM_NAME -->
+	<div id="pageheader">
+		<h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
+	</div>
+
+	<br clear="all" /><br />
+<!-- ENDIF -->
+
 <div id="pagecontent">
 
 	<form name="login_forum" method="post" action="{S_LOGIN_ACTION}">
diff --git a/phpBB/styles/subsilver2/template/mcp_jumpbox.html b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
deleted file mode 100644
index e6ef4ecdad..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_jumpbox.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Note: no longer in use... -->
-
-<form name="jumpbox" method="get" action="{S_JUMPBOX_ACTION}">
-
-	{HIDDEN_FIELDS_FOR_JUMPBOX}
-	<span class="gensmall">{L_JUMP_TO}{L_COLON}</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ document.forms['jumpbox'].submit() }">
-
-<!-- IF S_ENABLE_SELECT_ALL -->
-	<option value="0">{L_ALL_FORUMS}</option>
-<!-- ELSE -->
-	<option value="-1">{L_SELECT_FORUM}</option>
-<!-- ENDIF -->
-
-<!-- BEGIN options -->
-	<option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="disabled-option"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option>
-<!-- BEGINELSE -->
-<!-- END options -->
-</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onclick="if(document.jumpbox.f.value == -1){return false;}" />
-</form>