ok, this one is rather large... the most important change:

re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different apart from this, code cleanage, bug fixing, etc. git-svn-id: file:///svn/phpbb/trunk@6015 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2006-06-06 20:53:46 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2006-06-06 20:53:46 +0000
commit: dd9ad539fdab80badedf801a816b8a0beafbbf5c (patch)
tree: db8ae8a184b060d5576604cc0dfa723773daedb8 /phpBB/styles
parent: 2c8afb820e3842bed2ab6cec4053e71b5c566985 (diff)
download: forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar
forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.gz
forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.bz2
forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.xz
forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.zip
5 files changed, 357 insertions, 253 deletions
diff --git a/phpBB/styles/subSilver/template/editor.js b/phpBB/styles/subSilver/template/editor.js
index 5ccc210a3c..ef52b65998 100644
--- a/phpBB/styles/subSilver/template/editor.js
+++ b/phpBB/styles/subSilver/template/editor.js
@@ -1,5 +1,7 @@
-// bbCode control by subBlue design [ www.subBlue.com ]
-// Includes unixsafe colour palette selector by SHS`
+/**
+* bbCode control by subBlue design [ www.subBlue.com ]
+* Includes unixsafe colour palette selector by SHS`
+*/
 
 // Startup variables
 var imageTag = false;
@@ -10,51 +12,74 @@ var theSelection = false;
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
 var clientVer = parseInt(navigator.appVersion); // Get browser version
 
-var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1));
-var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1)
-                && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1)
-                && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
+var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
+var is_nav = ((clientPC.indexOf('mozilla') != -1) && (clientPC.indexOf('spoofer') == -1) && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera') == -1) && (clientPC.indexOf('webtv') == -1) && (clientPC.indexOf('hotjava') == -1));
 
-var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1));
-var is_mac = (clientPC.indexOf("mac")!=-1);
+var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+var is_mac = (clientPC.indexOf('mac') != -1);
 
-// Shows the help messages in the helpline window
-function helpline(help) {
-	document.forms[form_name].helpbox.value = eval(help + "_help");
+/**
+* Shows the help messages in the helpline window
+*/
+function helpline(help)
+{
+	document.forms[form_name].helpbox.value = eval(help + '_help');
 }
 
-// Replacement for arrayname.length property
-function getarraysize(thearray) {
-	for (i = 0; i < thearray.length; i++) {
-		if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null))
+/**
+* Replacement for arrayname.length property
+*/
+function getarraysize(thearray)
+{
+	for (i = 0; i < thearray.length; i++)
+	{
+		if (thearray[i] == 'undefined' || thearray[i] == '' || thearray[i] == null)
+		{
 			return i;
 		}
+	}
+
 	return thearray.length;
 }
 
-// Replacement for arrayname.push(value) not implemented in IE until version 5.5
-// Appends element to the array
-function arraypush(thearray,value) {
-	thearray[ getarraysize(thearray) ] = value;
+/**
+* Replacement for arrayname.push(value) not implemented in IE until version 5.5
+* Appends element to the array
+*/
+function arraypush(thearray,value)
+{
+	thearray[getarraysize(thearray)] = value;
 }
 
-// Replacement for arrayname.pop() not implemented in IE until version 5.5
-// Removes and returns the last element of an array
-function arraypop(thearray) {
+/**
+* Replacement for arrayname.pop() not implemented in IE until version 5.5
+* Removes and returns the last element of an array
+*/
+function arraypop(thearray)
+{
 	thearraysize = getarraysize(thearray);
 	retval = thearray[thearraysize - 1];
 	delete thearray[thearraysize - 1];
+
 	return retval;
 }
 
-function smiley(text) {
+/**
+* Insert emoticon
+*/
+function smiley(text) 
+{
 	text = ' ' + text + ' ';
-	if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) {
+
+	if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos)
+	{
 		var caretPos = document.forms[form_name].elements[text_name].caretPos;
 
 		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
 		document.forms[form_name].elements[text_name].focus();
-	} else {
+	}
+	else
+	{
 		var selStart = document.forms[form_name].elements[text_name].selectionStart;
 		var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
 
@@ -65,15 +90,21 @@ function smiley(text) {
 	}
 }
 
-function bbfontstyle(bbopen, bbclose) {
-
+/**
+* Apply bbcodes
+*/
+function bbfontstyle(bbopen, bbclose)
+{
 	theSelection = false;
 	document.forms[form_name].elements[text_name].focus();
 
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
-		theSelection = document.selection.createRange().text; // Get text selection
-		if (theSelection) {
+		// Get text selection
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
+		{
 			// Add tags around selection
 			document.selection.createRange().text = bbopen + theSelection + bbclose;
 			document.forms[form_name].elements[text_name].focus();
@@ -89,11 +120,16 @@ function bbfontstyle(bbopen, bbclose) {
 		return;
 	}
 
-	if (imageTag) {		// Close image tag before adding
+	// Close image tag before adding
+	if (imageTag)
+	{
 		insert_text(bbtags[15]);
 
-		lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
-		document.forms[form_name].addbbcode14.value = "Img";	// Return button back to normal state
+		// Remove the close image tag from the list
+		lastValue = arraypop(bbcode) - 1;
+
+		// Return button back to normal state
+		document.forms[form_name].addbbcode14.value = 'Img';
 		imageTag = false;
 	}
 
@@ -106,6 +142,9 @@ function bbfontstyle(bbopen, bbclose) {
 	return;
 }
 
+/**
+* Insert text at position
+*/
 function insert_text(text)
 {
 	if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos)
@@ -128,20 +167,27 @@ function insert_text(text)
 	}
 }
 
-function attach_inline() {
+/**
+* Add inline attachment at position
+*/
+function attach_inline()
+{
 	insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]');
 	document.forms[form_name].elements[text_name].focus();
 }
 
-function addquote(post_id, username) {
-
+/**
+* Add quote text to message
+*/
+function addquote(post_id, username)
+{
 	var message_name = 'message_' + post_id;
 	var theSelection = '';
 	var divarea = false;
 
 	if (document.all)
 	{
-		eval("divarea = document.all." + message_name + ";");
+		eval('divarea = document.all.' + message_name + ';');
 	}
 	else
 	{
@@ -177,7 +223,7 @@ function addquote(post_id, username) {
 			theSelection = divarea.firstChild.nodeValue;
 		}
 	}
-	
+
 	if (theSelection)
 	{
 		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
@@ -186,39 +232,54 @@ function addquote(post_id, username) {
 	return;
 }
 
-function bbstyle(bbnumber) {
-
+/**
+* bbstyle
+*/
+function bbstyle(bbnumber)
+{
 	donotinsert = false;
 	theSelection = false;
 	bblast = 0;
 	document.forms[form_name].elements[text_name].focus();
 
-	if (bbnumber == -1) { // Close all open tags & default button names
-		while (bbcode[0]) {
+	// Close all open tags & default button names
+	if (bbnumber == -1)
+	{
+		while (bbcode[0])
+		{
 			butnumber = arraypop(bbcode) - 1;
 			document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1];
 			buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
-			if (buttext != "[*]")
+		
+			if (buttext != '[*]')
 			{
 				eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
 			}
 		}
-		document.forms[form_name].addbbcode10.value = "List";
-		bbtags[10] = "[list]";
-		document.forms[form_name].addbbcode12.value = "List=";
-		bbtags[12] = "[list=]";
-		imageTag = false; // All tags are closed including image tags :D
+
+		document.forms[form_name].addbbcode10.value = 'List';
+		bbtags[10] = '[list]';
+
+		document.forms[form_name].addbbcode12.value = 'List=';
+		bbtags[12] = '[list=]';
+		
+		// All tags are closed including image tags :D
+		imageTag = false;
 		document.forms[form_name].elements[text_name].focus();
+
 		return;
 	}
 
 	// [*] doesn't have an end tag
-	noEndTag = (bbtags[bbnumber] == "[*]")
+	noEndTag = (bbtags[bbnumber] == '[*]')
 
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
-		theSelection = document.selection.createRange().text; // Get text selection
-		if (theSelection) {
+		// Get text selection
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection) 
+		{
 			// Add tags around selection
 			document.selection.createRange().text = bbtags[bbnumber] + theSelection + ((!noEndTag) ? bbtags[bbnumber+1] : '');
 			document.forms[form_name].elements[text_name].focus();
@@ -235,92 +296,114 @@ function bbstyle(bbnumber) {
 	}
 
 	// Find last occurance of an open tag the same as the one just clicked
-	for (i = 0; i < bbcode.length; i++) {
-		if (bbcode[i] == bbnumber+1) {
+	for (i = 0; i < bbcode.length; i++)
+	{
+		if (bbcode[i] == bbnumber+1)
+		{
 			bblast = i;
 			donotinsert = true;
 		}
 	}
 
-	if ((bbnumber == 10) && (bbtags[10] != "[*]"))
+	if (bbnumber == 10 && bbtags[10] != '[*]')
 	{
 		if (donotinsert)
 		{
-			document.forms[form_name].addbbcode12.value = "List=";
+			document.forms[form_name].addbbcode12.value = 'List=';
 			tmp_help = o_help;
 			o_help = e_help;
 			e_help = tmp_help;
-			bbtags[12] = "[list=]";
+			bbtags[12] = '[list=]';
 		}
 		else
 		{
-			document.forms[form_name].addbbcode12.value = "[*]";
+			document.forms[form_name].addbbcode12.value = '[*]';
 			tmp_help = o_help;
 			o_help = e_help;
 			e_help = tmp_help;
-			bbtags[12] = "[*]";
+			bbtags[12] = '[*]';
 		}
 	}
 
-	if ((bbnumber == 12) && (bbtags[12] != "[*]"))
+	if (bbnumber == 12 && bbtags[12] != '[*]')
 	{
 		if (donotinsert)
 		{
-			document.forms[form_name].addbbcode10.value = "List";
+			document.forms[form_name].addbbcode10.value = 'List';
 			tmp_help = l_help;
 			l_help = e_help;
 			e_help = tmp_help;
-			bbtags[10] = "[list]";
+			bbtags[10] = '[list]';
 		}
 		else
 		{
-			document.forms[form_name].addbbcode10.value = "[*]";
+			document.forms[form_name].addbbcode10.value = '[*]';
 			tmp_help = l_help;
 			l_help = e_help;
 			e_help = tmp_help;
-			bbtags[10] = "[*]";
+			bbtags[10] = '[*]';
 		}
 	}
 
-	if (donotinsert) {		// Close all open tags up to the one just clicked & default button names
-		while (bbcode[bblast]) {
-				butnumber = arraypop(bbcode) - 1;
-				if (bbtags[butnumber] != "[*]")
-				{
-					insert_text(bbtags[butnumber + 1]);
-				}
-				else
-				{
-					insert_text(bbtags[butnumber]);
-				}
-				buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
-				if (bbtags[butnumber] != "[*]")
-				{
-					eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
-				}
-				imageTag = false;
+	// Close all open tags up to the one just clicked & default button names
+	if (donotinsert)
+	{
+		while (bbcode[bblast])
+		{
+			butnumber = arraypop(bbcode) - 1;
+
+			if (bbtags[butnumber] != '[*]')
+			{
+				insert_text(bbtags[butnumber + 1]);
 			}
-			document.forms[form_name].elements[text_name].focus();
-			return;
-	} else { // Open tags
+			else
+			{
+				insert_text(bbtags[butnumber]);
+			}
+
+			buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
 
-		if (imageTag && (bbnumber != 14)) {		// Close image tag before adding another
+			if (bbtags[butnumber] != '[*]')
+			{
+				eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+			}
+			imageTag = false;
+		}
+		document.forms[form_name].elements[text_name].focus();
+		return;
+	}
+	else
+	{
+		// Open tags
+
+		// Close image tag before adding another
+		if (imageTag && (bbnumber != 14))
+		{
 			insert_text(bbtags[15]);
 
-			lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
-			document.forms[form_name].addbbcode14.value = "Img";	// Return button back to normal state
+			// Remove the close image tag from the list
+			lastValue = arraypop(bbcode) - 1;
+
+			// Return button back to normal state
+			document.forms[form_name].addbbcode14.value = 'Img';
 			imageTag = false;
 		}
 
 		// Open tag
 		insert_text(bbtags[bbnumber]);
 
-		if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
-		if (bbtags[bbnumber] != "[*]")
+		// Check to stop additional tags after an unclosed image tag
+		if (bbnumber == 14 && imageTag == false)
 		{
-			arraypush(bbcode,bbnumber+1);
+			imageTag = 1; 
+		}
+
+		if (bbtags[bbnumber] != '[*]')
+		{
+			arraypush(bbcode, bbnumber + 1);
 			eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"');
 		}
+
 		document.forms[form_name].elements[text_name].focus();
 		return;
 	}
@@ -328,67 +411,90 @@ function bbstyle(bbnumber) {
 	storeCaret(document.forms[form_name].elements[text_name]);
 }
 
-// From http://www.massless.org/mozedit/
+/**
+* From http://www.massless.org/mozedit/
+*/
 function mozWrap(txtarea, open, close)
 {
 	var selLength = txtarea.textLength;
 	var selStart = txtarea.selectionStart;
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
+
 	if (selEnd == 1 || selEnd == 2) 
+	{
 		selEnd = selLength;
+	}
 
 	var s1 = (txtarea.value).substring(0,selStart);
 	var s2 = (txtarea.value).substring(selStart, selEnd)
 	var s3 = (txtarea.value).substring(selEnd, selLength);
+
 	txtarea.value = s1 + open + s2 + close + s3;
 	txtarea.selectionStart = selEnd + open.length + close.length;
 	txtarea.selectionEnd = txtarea.selectionStart;
 	txtarea.focus();
 	txtarea.scrollTop = scrollTop;
+
 	return;
 }
 
-// Insert at Claret position. Code from
-// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-function storeCaret(textEl) {
-	if (textEl.createTextRange) { textEl.caretPos = document.selection.createRange().duplicate(); }
+/**
+* Insert at Claret position. Code from
+* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
+*/
+function storeCaret(textEl)
+{
+	if (textEl.createTextRange)
+	{
+		textEl.caretPos = document.selection.createRange().duplicate();
+	}
 }
 
+/**
+* Color pallette
+*/
 function colorPalette(dir, width, height)
 {
 	var r = 0, g = 0, b = 0;
 	var numberList = new Array(6);
-	numberList[0] = "00";
-	numberList[1] = "40";
-	numberList[2] = "80";
-	numberList[3] = "BF";
-	numberList[4] = "FF";
+
+	numberList[0] = '00';
+	numberList[1] = '40';
+	numberList[2] = '80';
+	numberList[3] = 'BF';
+	numberList[4] = 'FF';
+
 	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
-	for(r = 0; r < 5; r++)
+
+	for (r = 0; r < 5; r++)
 	{
 		if (dir == 'h')
 		{
 			document.writeln('<tr>');
 		}
-		for(g = 0; g < 5; g++)
+
+		for (g = 0; g < 5; g++)
 		{
 			if (dir == 'v')
 			{
 				document.writeln('<tr>');
 			}
-			for(b = 0; b < 5; b++)
+			
+			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
 				document.write('<td bgcolor="#' + color + '">');
 				document.write('<a href="javascript:bbfontstyle(\'[color=#' + color + ']\', \'[/color]\');" onmouseover="helpline(\'s\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" border="0" alt="#' + color + '" title="#' + color + '" /></a>');
 				document.writeln('</td>');
 			}
+
 			if (dir == 'v')
 			{
 				document.writeln('</tr>');
 			}
 		}
+
 		if (dir == 'h')
 		{
 			document.writeln('</tr>');
@@ -396,4 +502,3 @@ function colorPalette(dir, width, height)
 	}
 	document.writeln('</table>');
 }
-
diff --git a/phpBB/styles/subSilver/template/faq_body.html b/phpBB/styles/subSilver/template/faq_body.html
index 251123990f..b00ff8a3a4 100644
--- a/phpBB/styles/subSilver/template/faq_body.html
+++ b/phpBB/styles/subSilver/template/faq_body.html
@@ -1,60 +1,57 @@
 <!-- INCLUDE overall_header.html -->
 
-	<a name="top"></a>
-	<div id="pagecontent">
+<a name="faqtop"></a>
+<div id="pagecontent">
 
-		<table class="tablebg" width="100%" cellspacing="1">
-			<tr>
-				<th>{L_FAQ_TITLE}</th>
-			</tr>
-			<tr>
-				<td class="row1">
-					<!-- BEGIN faq_block_link -->
-					<span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b></span><br />
-					<!-- BEGIN faq_row_link -->
-					<span class="gen"><a class="postlink" href="{faq_block_link.faq_row_link.U_FAQ_LINK}">{faq_block_link.faq_row_link.FAQ_LINK}</a></span><br />
-					<!-- END faq_row_link -->
-					<br />
-					<!-- END faq_block_link -->
-				</td>
-			</tr>
-			<tr>
-				<td class="cat">&nbsp;</td>
-			</tr>
-		</table>
+	<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th>{L_FAQ_TITLE}</th>
+	</tr>
+	<tr>
+		<td class="row1">
+		<!-- BEGIN faq_block -->
+			<span class="gen"><b>{faq_block.BLOCK_TITLE}</b></span><br />
+			<!-- BEGIN faq_row -->
+				<span class="gen"><a class="postlink" href="#f{faq_block.S_ROW_COUNT}{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></span><br />
+			<!-- END faq_row -->
+			<br />
+		<!-- END faq_block -->
+		</td>
+	</tr>
+	<tr>
+		<td class="cat">&nbsp;</td>
+	</tr>
+	</table>
 
-		<br clear="all" />
+	<br clear="all" />
 
-		<!-- BEGIN faq_block -->
+	<!-- BEGIN faq_block -->
 		<table class="tablebg" width="100%" cellspacing="1">
-			<tr> 
-				<td class="cat" align="center"><h4>{faq_block.BLOCK_TITLE}</h4></td>
-			</tr>
-			<!-- BEGIN faq_row --> 
-			<tr>
-			
+		<tr> 
+			<td class="cat" align="center"><h4>{faq_block.BLOCK_TITLE}</h4></td>
+		</tr>
+		<!-- BEGIN faq_row --> 
+		<tr>
 			<!-- IF faq_block.faq_row.S_ROW_COUNT is even -->
 				<td class="row1" valign="top">
 			<!-- ELSE -->
 				<td class="row2" valign="top">
 			<!-- ENDIF -->
-					<p class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>&#187; {faq_block.faq_row.FAQ_QUESTION}</b></p>
-
-					<p class="postbody">{faq_block.faq_row.FAQ_ANSWER}</p>
-					
-					<p class="gensmall"><a href="#top">{L_BACK_TO_TOP}</a></p>
-				</td>
-			</tr>
-			<tr>
-				<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
-			</tr>
-			<!-- END faq_row -->
+				<p class="postbody"><a name="f{faq_block.S_ROW_COUNT}{faq_block.faq_row.S_ROW_COUNT}"></a><b>&#187; {faq_block.faq_row.FAQ_QUESTION}</b></p>
+				<p class="postbody">{faq_block.faq_row.FAQ_ANSWER}</p>
+				<p class="gensmall"><a href="#faqtop">{L_BACK_TO_TOP}</a></p>
+			</td>
+		</tr>
+		<tr>
+			<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
+		</tr>
+		<!-- END faq_row -->
 		</table>
 
 		<br clear="all" />
-		<!-- END faq_block -->
+	<!-- END faq_block -->
 
-	</div>
+</div>
 
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
 		<tr>
diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html
index 3cb928bb40..028e5141ac 100644
--- a/phpBB/styles/subSilver/template/index_body.html
+++ b/phpBB/styles/subSilver/template/index_body.html
@@ -1,44 +1,41 @@
 <!-- INCLUDE overall_header.html -->
 
-	<!-- IF U_MCP -->
+<!-- IF U_MCP -->
 	<div id="pageheader">
 		<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>
 	</div>
 
 	<br clear="all" /><br />
-	<!-- ENDIF -->
-
-	<table class="tablebg" cellspacing="1" width="100%">
-		<tr>
-			<td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a>&nbsp;</td>
-		</tr>
-		<tr>
-			<th colspan="2">&nbsp;{L_FORUM}&nbsp;</th>
-			<th width="50">&nbsp;{L_TOPICS}&nbsp;</th>
-			<th width="50">&nbsp;{L_POSTS}&nbsp;</th>
-			<th>&nbsp;{L_LAST_POST}&nbsp;</th>
-		</tr>
-		<!-- BEGIN forumrow -->
-		<!-- IF forumrow.S_IS_CAT -->
+<!-- ENDIF -->
+
+<table class="tablebg" cellspacing="1" width="100%">
+<tr>
+	<td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a>&nbsp;</td>
+</tr>
+<tr>
+	<th colspan="2">&nbsp;{L_FORUM}&nbsp;</th>
+	<th width="50">&nbsp;{L_TOPICS}&nbsp;</th>
+	<th width="50">&nbsp;{L_POSTS}&nbsp;</th>
+	<th>&nbsp;{L_LAST_POST}&nbsp;</th>
+</tr>
+<!-- BEGIN forumrow -->
+	<!-- IF forumrow.S_IS_CAT -->
 		<tr>
 			<td class="cat" colspan="2"><h4><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></h4></td>
 			<td class="catdiv" colspan="3">&nbsp;</td>
 		</tr>
-		<!-- ELSEIF forumrow.S_IS_LINK -->
+	<!-- ELSEIF forumrow.S_IS_LINK -->
 		<tr>
 			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
-			<!-- IF forumrow.CLICKS -->
-			<td class="row1">
-			<!-- ELSE -->
-			<td class="row1" colspan="4">
-			<!-- ENDIF -->
+			<!-- IF forumrow.CLICKS --><td class="row1"><!-- ELSE --><td class="row1" colspan="4"><!-- ENDIF -->
 				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>
-				<p class="forumdesc">{forumrow.FORUM_DESC}</p></td>
+				<p class="forumdesc">{forumrow.FORUM_DESC}</p>
+			</td>
 			<!-- IF forumrow.CLICKS -->
-			<td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td>
+				<td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td>
 			<!-- ENDIF -->
 		</tr>
-		<!-- ELSE -->
+	<!-- ELSE -->
 		<tr>
 			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
 			<td class="row1" width="100%">
@@ -69,101 +66,106 @@
 				<!-- ENDIF -->
 			</td>
 		</tr>
-		<!-- ENDIF -->
-		<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" align="center"><p class="gensmall">{L_NO_FORUMS}</p></td>
-		</tr>
-		<!-- END forumrow -->
-	</table>
-	<span class="gensmall"><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> | <a href="{U_TEAM}">{L_THE_TEAM}</a></span><br />
-
-	<br clear="all" />
-
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-		<tr>
-			<td class="row1">
-				<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a></p>
-				<p class="datetime">{S_TIMEZONE}</p>
-			</td>
-		</tr>
-	</table>
-
-	<!-- IF S_DISPLAY_ONLINE_LIST -->
+	<!-- ENDIF -->
+<!-- BEGINELSE -->
+	<tr>
+		<td class="row1" colspan="5" align="center"><p class="gensmall">{L_NO_FORUMS}</p></td>
+	</tr>
+<!-- END forumrow -->
+</table>
+
+<span class="gensmall"><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> | <a href="{U_TEAM}">{L_THE_TEAM}</a></span><br />
+
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
+<tr>
+	<td class="row1">
+		<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a></p>
+		<p class="datetime">{S_TIMEZONE}</p>
+	</td>
+</tr>
+</table>
+
+<!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
 
 	<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="cat" colspan="2"><h4><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h4></td>
-		</tr>
-		<tr>
-			<!-- IF LEGEND -->
-			<td class="row1" rowspan="2" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
-			<!-- ELSE -->
-			<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
-			<!-- ENDIF -->
-			<td class="row1" width="100%"><span class="genmed">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}<br /><br />{L_ONLINE_EXPLAIN}</span></td>
-		</tr>
-		<!-- IF LEGEND -->
+	<tr>
+		<td class="cat" colspan="2"><h4><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h4></td>
+	</tr>
+	<tr>
+	<!-- IF LEGEND -->
+		<td class="row1" rowspan="2" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
+	<!-- ELSE -->
+		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
+	<!-- ENDIF -->
+		<td class="row1" width="100%"><span class="genmed">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}<br /><br />{L_ONLINE_EXPLAIN}</span></td>
+	</tr>
+	<!-- IF LEGEND -->
 		<tr>
 			<td class="row1"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td>
 		</tr>
-		<!-- ENDIF -->
-	</table>
 	<!-- ENDIF -->
-
-	<!-- IF S_DISPLAY_BIRTHDAY_LIST -->
-	<br clear="all" />
-
-	<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="cat" colspan="2"><h4>{L_BIRTHDAYS}</h4></td>
-		</tr>
-		<tr>
-			<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_BIRTHDAYS}" /></td>
-			<td class="row1" width="100%"><p class="genmed"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td>
-		</tr>
 	</table>
-	<!-- ENDIF -->
+<!-- ENDIF -->
 
+<!-- IF S_DISPLAY_BIRTHDAY_LIST -->
 	<br clear="all" />
 
 	<table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="cat" colspan="2"><h4>{L_STATISTICS}</h4></td>
-		</tr>
-		<tr>
-			<td class="row1"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_STATISTICS}" /></td>
-			<td class="row1" width="100%" valign="middle"><p class="genmed">{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}</p></td>
-		</tr>
+	<tr>
+		<td class="cat" colspan="2"><h4>{L_BIRTHDAYS}</h4></td>
+	</tr>
+	<tr>
+		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_BIRTHDAYS}" /></td>
+		<td class="row1" width="100%"><p class="genmed"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td>
+	</tr>
 	</table>
+<!-- ENDIF -->
 
-	<!-- IF not S_USER_LOGGED_IN -->
-	<br clear="all" />
+<br clear="all" />
 
-	<form method="post" action="{S_LOGIN_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
-		<tr>
-			<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>
-		</tr>
-		<tr>
-			<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" />&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
-		</tr>
-	</table></form>
-	<!-- ENDIF -->
+<table class="tablebg" width="100%" cellspacing="1">
+<tr>
+	<td class="cat" colspan="2"><h4>{L_STATISTICS}</h4></td>
+</tr>
+<tr>
+	<td class="row1"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_STATISTICS}" /></td>
+	<td class="row1" width="100%" valign="middle"><p class="genmed">{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}</p></td>
+</tr>
+</table>
 
+<!-- IF not S_USER_LOGGED_IN -->
 	<br clear="all" />
 
-	<table class="legend">
-		<tr>
-			<td width="20" align="center">{FORUM_NEW_IMG}</td>
-			<td><span class="gensmall">{L_NEW_POSTS}</span></td>
-			<td>&nbsp;&nbsp;</td>
-			<td width="20" align="center">{FORUM_IMG}</td>
-			<td><span class="gensmall">{L_NO_NEW_POSTS}</span></td>
-			<td>&nbsp;&nbsp;</td>
-			<td width="20" align="center">{FORUM_LOCKED_IMG}</td>
-			<td><span class="gensmall">{L_FORUM_LOCKED}</span></td>
-		</tr>
+	<form method="post" action="{S_LOGIN_ACTION}">
+	
+	<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>
+	</tr>
+	<tr>
+		<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" />&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
+	</tr>
 	</table>
+	
+	</form>
+<!-- ENDIF -->
+
+<br clear="all" />
+
+<table class="legend">
+<tr>
+	<td width="20" align="center">{FORUM_NEW_IMG}</td>
+	<td><span class="gensmall">{L_NEW_POSTS}</span></td>
+	<td>&nbsp;&nbsp;</td>
+	<td width="20" align="center">{FORUM_IMG}</td>
+	<td><span class="gensmall">{L_NO_NEW_POSTS}</span></td>
+	<td>&nbsp;&nbsp;</td>
+	<td width="20" align="center">{FORUM_LOCKED_IMG}</td>
+	<td><span class="gensmall">{L_FORUM_LOCKED}</span></td>
+</tr>
+</table>
 
 <!-- INCLUDE overall_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/memberlist_body.html b/phpBB/styles/subSilver/template/memberlist_body.html
index ea4e4019d3..b513586035 100644
--- a/phpBB/styles/subSilver/template/memberlist_body.html
+++ b/phpBB/styles/subSilver/template/memberlist_body.html
@@ -19,7 +19,7 @@
 	</form>
 <!-- ENDIF -->
 
-	<!-- IF S_SEARCH_USER -->
+	<!-- IF S_SEARCH_USER and S_FORM_NAME -->
 		<form method="post" name="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user);return false">
 	<!-- ELSE -->
 		<form method="post" action="{S_MODE_ACTION}">
@@ -35,7 +35,7 @@
 		<th nowrap="nowrap" width="11%">{L_SEND_MESSAGE}</th>
 		<th nowrap="nowrap" width="11%"><a href="{U_SORT_EMAIL}">{L_EMAIL}</a></th>
 		<th nowrap="nowrap" width="11%"><a href="{U_SORT_WEBSITE}">{L_WEBSITE}</a></th>
-		<!-- IF S_SEARCH_USER --><th width="2%" nowrap="nowrap">{L_MARK}</th><!-- ENDIF -->
+		<!-- IF S_SEARCH_USER and S_FORM_NAME --><th width="2%" nowrap="nowrap">{L_MARK}</th><!-- ENDIF -->
 	</tr>
 	<!-- BEGIN memberrow -->
 		<!-- IF S_SHOW_GROUP -->
@@ -64,19 +64,19 @@
 			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
 			<td class="gen" align="center">&nbsp;{memberrow.PROFILE_FIELD1_VALUE}</td>
 		<!-- ENDIF -->
-		<!-- IF S_SEARCH_USER --><td align="center"><input type="checkbox" name="user" value="{memberrow.USERNAME}" /></td><!-- ENDIF -->
+		<!-- IF S_SEARCH_USER and S_FORM_NAME --><td align="center"><input type="checkbox" name="user" value="{memberrow.USERNAME}" /></td><!-- ENDIF -->
 	</tr>
 
 	<!-- BEGINELSE -->
 
 	<tr>
-		<td class="row1" colspan="<!-- IF S_SEARCH_USER -->9<!-- ELSE -->8<!-- ENDIF -->" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
+		<td class="row1" colspan="<!-- IF S_SEARCH_USER and S_FORM_NAME -->9<!-- ELSE -->8<!-- ENDIF -->" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
 	</tr>
 
 	<!-- END memberrow -->
 
 	<tr>
-		<td class="cat" colspan="<!-- IF S_SEARCH_USER -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_SEARCH_USER --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}:</span>&nbsp;<select name="sk">{S_MODE_SELECT}</select>&nbsp; <span class="gensmall">{L_ORDER}</span>&nbsp;<select name="sd">{S_ORDER_SELECT}</select>&nbsp; <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td>
+		<td class="cat" colspan="<!-- IF S_SEARCH_USER and S_FORM_NAME -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_SEARCH_USER and S_FORM_NAME --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}:</span>&nbsp;<select name="sk">{S_MODE_SELECT}</select>&nbsp; <span class="gensmall">{L_ORDER}</span>&nbsp;<select name="sd">{S_ORDER_SELECT}</select>&nbsp; <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td>
 	</tr>
 	</table>
 	
@@ -85,7 +85,7 @@
 	<table width="100%" cellspacing="0" cellpadding="0">
 	<tr>
 		<td class="pagination">{PAGE_NUMBER} [ {TOTAL_USERS} ]</td>
-		<td align="right"><!-- IF S_SEARCH_USER --><b class="nav"><a href="javascript:marklist('results', 'user', true);">{L_MARK_ALL}</a> :: <a  href="javascript:marklist('results', 'user', false);">{L_UNMARK_ALL}</a></b><br /><!-- ENDIF --><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td>
+		<td align="right"><!-- IF S_SEARCH_USER and S_FORM_NAME --><b class="nav"><a href="javascript:marklist('results', 'user', true);">{L_MARK_ALL}</a> :: <a  href="javascript:marklist('results', 'user', false);">{L_UNMARK_ALL}</a></b><br /><!-- ENDIF --><span class="pagination"><!-- IF PAGINATION --><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --><!-- ENDIF --></span></td>
 	</tr>
 	</table>
 
diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html
index f866bd04e9..e27f37c2b7 100644
--- a/phpBB/styles/subSilver/template/viewtopic_body.html
+++ b/phpBB/styles/subSilver/template/viewtopic_body.html
@@ -64,7 +64,7 @@
 							<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
 						</tr>
 						<tr>
-							<td align="center"><table cellspacing="0" cellpadding="2" border="0">
+							<td align="left"><table cellspacing="0" cellpadding="2" border="0">
 								<!-- BEGIN poll_option -->
 								<tr>
 									<!-- IF S_CAN_VOTE -->
@@ -79,7 +79,7 @@
 									<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
 									<!-- IF S_DISPLAY_RESULTS -->
 									<td>{POLL_LEFT_CAP_IMG}{poll_option.POLL_OPTION_IMG}{POLL_RIGHT_CAP_IMG}</td>
-									<td class="gen" align="center"><b>&nbsp;{poll_option.POLL_OPTION_PERCENT}&nbsp;</b></td>
+									<td class="gen" align="right"><b>&nbsp;{poll_option.POLL_OPTION_PERCENT}&nbsp;</b></td>
 									<td class="gen" align="center">[ {poll_option.POLL_OPTION_RESULT} ]</td>
 									<!-- IF poll_option.POLL_OPTION_VOTED -->
 									<td class="gensmall" valign="top"><b title="{L_POLL_VOTED_OPTION}">x</b></td>
author	Meik Sievertsen <acydburn@phpbb.com>	2006-06-06 20:53:46 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2006-06-06 20:53:46 +0000
commit	dd9ad539fdab80badedf801a816b8a0beafbbf5c (patch)
tree	db8ae8a184b060d5576604cc0dfa723773daedb8 /phpBB/styles
parent	2c8afb820e3842bed2ab6cec4053e71b5c566985 (diff)
download	forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.gz forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.bz2 forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.tar.xz forums-dd9ad539fdab80badedf801a816b8a0beafbbf5c.zip