Moved remaining hard coded text in posting template to lang_main, smilies now from DB + external smilies window if > 20

git-svn-id: file:///svn/phpbb/trunk@1609 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/lang_english/lang_main.php

@@ -337,8 +337,8 @@ $lang['Disable_Smilies_post'] = "Disable Smilies in this post";
 
 $lang['HTML_is_ON'] = "HTML is <u>ON</u>";
 $lang['HTML_is_OFF'] = "HTML is <u>OFF</u>";
-$lang['BBCode_is_ON'] = "BBCode is <u>ON</u>";
+$lang['BBCode_is_ON'] = "%sBBCode%s is <u>ON</u>"; // %s are replaced with URI pointing to FAQ
-$lang['BBCode_is_OFF'] = "BBCode is <u>OFF</u>";
+$lang['BBCode_is_OFF'] = "%sBBCode%s is <u>OFF</u>";
 $lang['Smilies_are_ON'] = "Smilies are <u>ON</u>";
 $lang['Smilies_are_OFF'] = "Smilies are <u>OFF</u>";
 
@@ -353,6 +353,49 @@ $lang['Vote_cast'] = "Your vote has been cast";
 
 $lang['Topic_reply_notification'] = "Topic Reply Notification";
 
+$lang['bbcode_b_help'] = "Bold text: [b]text[/b]  (alt+b)";
+$lang['bbcode_i_help'] = "Italic text: [i]text[/i]  (alt+i)";
+$lang['bbcode_u_help'] = "Underline text: [u]text[/u]  (alt+u)";
+$lang['bbcode_q_help'] = "Quote text: [quote]text[/quote]  (alt+q)";
+$lang['bbcode_c_help'] = "Code display: [code]code[/code]  (alt+c)";
+$lang['bbcode_l_help'] = "List: [list]text[/list] (alt+l)";
+$lang['bbcode_o_help'] = "Ordered list: [list=]text[/list]  (alt+o)";
+$lang['bbcode_p_help'] = "Insert image: [img]http://image_url[/img]  (alt+p)";
+$lang['bbcode_w_help'] = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)";
+$lang['bbcode_a_help'] = "Close all open bbCode tags";
+$lang['bbcode_s_help'] = "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000";
+$lang['bbcode_f_help'] = "Font size: [size=x-small]small text[/size]";
+
+$lang['Emoticons'] = "Emoticons";
+$lang['More_emoticons'] = "View more Emoticons";
+
+$lang['Font_color'] = "Font colour";
+$lang['color_default'] = "Default";
+$lang['color_dark_red'] = "Dark Red";
+$lang['color_red'] = "Red";
+$lang['color_orange'] = "Orange";
+$lang['color_brown'] = "Brown";
+$lang['color_yellow'] = "Yellow";
+$lang['color_green'] = "Green";
+$lang['color_olive'] = "Olive";
+$lang['color_cyan'] = "Cyan";
+$lang['color_blue'] = "Blue";
+$lang['color_dark_blue'] = "Dark Blue";
+$lang['color_indigo'] = "Indigo";
+$lang['color_violet'] = "Violet";
+$lang['color_white'] = "White";
+$lang['color_black'] = "Black";
+
+$lang['Font_size'] = "Font size";
+$lang['font_tiny'] = "Tiny";
+$lang['font_small'] = "Small";
+$lang['font_normal'] = "Normal";
+$lang['font_large'] = "Large";
+$lang['font_huge'] = "Huge";
+
+$lang['Close_Tags'] = "Close Tags";
+$lang['Styles_tip'] = "Tip: Styles can be applied quickly to selected text";
+
 
 //
 // Private Messaging

phpBB/posting.php

@@ -571,6 +571,85 @@ function topic_review($topic_id, $is_inline_review)
 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 	}
 }
+
+function generate_smilies($mode)
+{
+	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
+	global $user_ip, $forum_id, $session_length;
+	global $userdata;
+
+	if( $mode == 'window' )
+	{
+		$userdata = session_pagestart($user_ip, $forum_id, $session_length);
+		init_userprefs($userdata);
+
+		$gen_simple_header = TRUE;
+
+		$page_title = $lang['Review_topic'] ." - $topic_title";
+		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
+		$template->set_filenames(array(
+			"smiliesbody" => "posting_smilies.tpl")
+		);
+	}
+
+	$sql = "SELECT * 
+		FROM " . SMILIES_TABLE . " 
+		GROUP BY emoticon 
+		ORDER BY smilies_id";
+	if( $result = $db->sql_query($sql) )
+	{
+		if( $num_smilies = $db->sql_numrows($result) )
+		{
+			$rowset = $db->sql_fetchrowset($result);
+
+			$j = 0;
+			$s_colspan = 0;
+			$smilies_count = ( $mode == 'inline' ) ? min(20, $num_smilies) : $num_smilies;
+			$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
+			for($i = 0; $i < $smilies_count; $i++)
+			{
+				if( !$j )
+				{
+					$template->assign_block_vars("smilies_row", array());
+				}
+
+				$template->assign_block_vars("smilies_row.smilies_col", array(
+					"SMILEY_CODE" => $rowset[$i]['code'],
+					"SMILEY_IMG" => "images/smiles/" . $rowset[$i]['smile_url'],
+					"SMILEY_DESC" => $rowset[$i]['emoticon'])
+				);
+
+				$s_colspan = max($s_colspan, $j + 1);
+
+				$j = ( $j == $smilies_split_row ) ? 0 : $j + 1;
+			}
+
+			if( $mode == 'inline' && $num_smilies > 20)
+			{
+				$template->assign_block_vars("switch_smilies_extra", array());
+
+				$template->assign_vars(array(
+					"L_MORE_SMILIES" => $lang['More_emoticons'], 
+					"U_MORE_SMILIES" => append_sid("posting.$phpEx?mode=smilies"))
+				);
+			}
+
+			$template->assign_vars(array(
+				"L_EMOTICONS" => $lang['Emoticons'], 
+				"L_CLOSE_WINDOW" => $lang['Close_window'], 
+				"S_SMILIES_COLSPAN" => $s_colspan)
+			);
+		}
+	}
+
+	if( $mode == 'window' )
+	{
+		$template->pparse("smiliesbody");
+
+		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+	}
+}
 //
 // End page specific functions
 // ---------------------------
@@ -685,6 +764,11 @@ if( $mode == "topicreview" )
 	topic_review($topic_id, false);
 	exit;
 }
+else if( $mode == "smilies" )
+{
+	generate_smilies('window');
+	exit;
+}
 
 //
 // Set toggles for various options
@@ -2491,12 +2575,10 @@ $template->assign_vars(array(
 //
 if( $preview && !$error )
 {
-
 	$orig_word = array();
 	$replacement_word = array();
 	$result = obtain_word_list($orig_word, $replacement_word);
 
-
 	if( $bbcode_on )
 	{
 		$bbcode_uid = make_bbcode_uid();
@@ -2581,6 +2663,11 @@ if( $error )
 // End error handling
 //
 
+//
+// Send smilies to template
+//
+generate_smilies('inline');
+
 //
 // User not logged in so offer up a username
 // field box
@@ -2725,6 +2812,12 @@ if( !empty($post_message) && ( $preview || $error || $refresh ) )
 	$post_message = stripslashes(preg_replace($html_entities_match, $html_entities_replace, $post_message));
 }
 
+//
+// This enables the forum/topic title to be output for posting
+// but not for privmsg (where it makes no sense)
+//
+$template->assign_block_vars("switch_not_privmsg", array());
+
 //
 // Output the data to the template
 //
@@ -2733,7 +2826,7 @@ $template->assign_vars(array(
 	"SUBJECT" => preg_replace($html_entities_match, $html_entities_replace, $post_subject),
 	"MESSAGE" => $post_message,
 	"HTML_STATUS" => $html_status,
-	"BBCODE_STATUS" => $bbcode_status,
+	"BBCODE_STATUS" => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
 	"SMILIES_STATUS" => $smilies_status, 
 	"POLL_TITLE" => preg_replace($html_entities_match, $html_entities_replace, $poll_title),
 	"POLL_LENGTH" => $poll_length, 
@@ -2753,6 +2846,47 @@ $template->assign_vars(array(
 	"L_NOTIFY_ON_REPLY" => $lang['Notify'], 
 	"L_DELETE_POST" => $lang['Delete_post'],
 
+	"L_BBCODE_B_HELP" => $lang['bbcode_b_help'], 
+	"L_BBCODE_I_HELP" => $lang['bbcode_i_help'], 
+	"L_BBCODE_U_HELP" => $lang['bbcode_u_help'], 
+	"L_BBCODE_Q_HELP" => $lang['bbcode_q_help'], 
+	"L_BBCODE_C_HELP" => $lang['bbcode_c_help'], 
+	"L_BBCODE_L_HELP" => $lang['bbcode_l_help'], 
+	"L_BBCODE_O_HELP" => $lang['bbcode_o_help'], 
+	"L_BBCODE_P_HELP" => $lang['bbcode_p_help'], 
+	"L_BBCODE_W_HELP" => $lang['bbcode_w_help'], 
+	"L_BBCODE_A_HELP" => $lang['bbcode_a_help'], 
+	"L_BBCODE_S_HELP" => $lang['bbcode_s_help'], 
+	"L_BBCODE_F_HELP" => $lang['bbcode_f_help'], 
+	"L_EMPTY_MESSAGE" => $lang['Empty_message'],
+
+	"L_FONT_COLOR" => $lang['Font_color'], 
+	"L_COLOR_DEFAULT" => $lang['color_default'], 
+	"L_COLOR_DARK_RED" => $lang['color_dark_red'], 
+	"L_COLOR_RED" => $lang['color_red'], 
+	"L_COLOR_ORANGE" => $lang['color_orange'], 
+	"L_COLOR_BROWN" => $lang['color_brown'], 
+	"L_COLOR_YELLOW" => $lang['color_yellow'], 
+	"L_COLOR_GREEN" => $lang['color_green'], 
+	"L_COLOR_OLIVE" => $lang['color_olive'], 
+	"L_COLOR_CYAN" => $lang['color_cyan'], 
+	"L_COLOR_BLUE" => $lang['color_blue'], 
+	"L_COLOR_DARK_BLUE" => $lang['color_dark_blue'], 
+	"L_COLOR_INDIGO" => $lang['color_indigo'], 
+	"L_COLOR_VIOLET" => $lang['color_violet'], 
+	"L_COLOR_WHITE" => $lang['color_white'], 
+	"L_COLOR_BLACK" => $lang['color_black'], 
+
+	"L_FONT_SIZE" => $lang['Font_size'], 
+	"L_FONT_TINY" => $lang['font_tiny'], 
+	"L_FONT_SMALL" => $lang['font_small'], 
+	"L_FONT_NORMAL" => $lang['font_normal'], 
+	"L_FONT_LARGE" => $lang['font_large'], 
+	"L_FONT_HUGE" => $lang['font_huge'], 
+
+	"L_BBCODE_CLOSE_TAGS" => $lang['Close_Tags'], 
+	"L_STYLES_TIP" => $lang['Styles_tip'], 
+
 	"U_VIEWTOPIC" => ( $mode == "reply" ) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc") : "", 
 	"U_REVIEW_TOPIC" => ( $mode == "reply" ) ? append_sid("posting.$phpEx?mode=topicreview&amp;" . POST_TOPIC_URL . "=$topic_id") : "", 
 
@@ -2830,4 +2964,4 @@ $template->pparse("body");
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
-?>
+?>

phpBB/templates/subSilver/posting_body.tpl

@@ -1,7 +1,7 @@
-<!-- Spell checker option part 1: You must sign up for free at www.spellchecker.net to use this option -->
+<!-- Spell checker option part 1: You must sign up for an account at www.spellchecker.net to use this option -->
 <!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
 <!-- Remember to uncomment the spellchecker button near the end of this template -->
-<!-- script type="text/javascript" language="javascript" src=spellcheck/spch.js></script -->
+<!-- script type="text/javascript" language="javascript" src="spellcheck/spch.js"></script -->
 <!-- End spellchecker option -->
 
 <script language="JavaScript" type="text/javascript">
@@ -10,12 +10,10 @@
 // subBlue design
 // www.subBlue.com
 
-
 // Startup variables
 var imageTag = false;
 var theSelection = false;
 
-
 // Check for Browser & Platform for PC & IE specific bits
 // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
@@ -26,23 +24,23 @@ var is_nav  = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')
                 && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1)
                 && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
 
-var is_win   = ((clientPC.indexOf("win")!=-1) || (agt.indexOf("16bit")!=-1));
+var is_win   = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1));
 var is_mac    = (clientPC.indexOf("mac")!=-1);
 
 
 // Helpline messages
-b_help = "Bold text: [b]text[/b]  (alt+b)";
+b_help = "{L_BBCODE_B_HELP}";
-i_help = "Italic text: [i]text[/i]  (alt+i)";
+i_help = "{L_BBCODE_I_HELP}";
-u_help = "Underline text: [u]text[/u]  (alt+u)";
+u_help = "{L_BBCODE_U_HELP}";
-q_help = "Quote text: [quote]text[/quote]  (alt+q)";
+q_help = "{L_BBCODE_Q_HELP}";
-c_help = "Code display: [code]code[/code]  (alt+c)";
+c_help = "{L_BBCODE_C_HELP}";
-l_help = "List: [list]text[/list] (alt+l)";
+l_help = "{L_BBCODE_L_HELP}";
-o_help = "Ordered list: [list=]text[/list]  (alt+o)";
+o_help = "{L_BBCODE_O_HELP}";
-p_help = "Insert image: [img]http://image_url[/img]  (alt+p)";
+p_help = "{L_BBCODE_P_HELP}";
-w_help = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)";
+w_help = "{L_BBCODE_W_HELP}";
-a_help = "Close all open bbCode tags";
+a_help = "{L_BBCODE_A_HELP}";
-s_help = "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000";
+s_help = "{L_BBCODE_S_HELP}";
-f_help = "Font size: [size=x-small]small text[/size]";
+f_help = "{L_BBCODE_F_HELP}";
 
 // Define the bbCode tags
 bbcode = new Array();
@@ -85,7 +83,7 @@ function checkForm() {
 	formErrors = false;    
 
 	if (document.post.message.value.length < 2) {
-		formErrors = "You must enter a message!";
+		formErrors = "{L_EMPTY_MESSAGE}";
 	}
 
 	if (formErrors) {
@@ -111,7 +109,6 @@ function emoticon(text) {
 	}
 }
 
-
 function bbfontstyle(bbopen, bbclose) {
 	if ((clientVer >= 4) && is_ie && is_win) {
 		theSelection = document.selection.createRange().text;
@@ -210,12 +207,14 @@ function storeCaret(textEl) {
 {POST_PREVIEW_BOX}
 {ERROR_BOX}
 
-  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr> 
-	  <td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> 
+		<td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>
+		<!-- BEGIN switch_not_privmsg --> 
 		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
+		<!-- END switch_not_privmsg -->
 	</tr>
-  </table>
+</table>
 
   <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
 	<tr> 
@@ -254,38 +253,20 @@ function storeCaret(textEl) {
 			<td valign="middle" align="center"> <br />
 			  <table width="100" border="0" cellspacing="0" cellpadding="5">
 				<tr align="center"> 
-				  <td colspan="4" class="gensmall"><b>Emoticons</b></td>
+				  <td colspan="{S_SMILIES_COLSPAN}" class="gensmall"><b>{L_EMOTICONS}</b></td>
 				</tr>
+				<!-- BEGIN smilies_row -->
 				<tr align="center" valign="middle"> 
-				  <td><a href="javascript:emoticon(':)')"><img src="images/smiles/icon_smile.gif" width="15" height="15" border="0" alt="Smile" /></a></td>
+				  <!-- BEGIN smilies_col -->
-				  <td><a href="javascript:emoticon(':D')"><img src="images/smiles/icon_biggrin.gif" width="15" height="15" border="0" alt="Big grin" /></a></td>
+				  <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" width="15" height="15" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
-				  <td><a href="javascript:emoticon(':lol:')"> <img src="images/smiles/icon_lol.gif" width="15" height="15" border="0" alt="Laugh" /></a></td>
+				  <!-- END smilies_col -->
-				  <td><a href="javascript:emoticon(';)')"><img src="images/smiles/icon_wink.gif" width="15" height="15" border="0" alt="Wink" /></a></td>
 				</tr>
-				<tr align="center" valign="middle"> 
+				<!-- END smilies_row -->
-				  <td><a href="javascript:emoticon(':|')"><img src="images/smiles/icon_neutral.gif" width="15" height="15" border="0" alt="Neutral" /></a></td>
+				<!-- BEGIN switch_smilies_extra -->
-				  <td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td>
+				<tr align="center"> 
-				  <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td>
+				  <td colspan="{S_SMILIES_COLSPAN}"><span  class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></td>
-				  <td><a href="javascript:emoticon(':shock:')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Shocked" /></a></td>
-				</tr>
-				<tr align="center" valign="middle"> 
-				  <td><a href="javascript:emoticon(':roll:')"><img src="images/smiles/icon_rolleyes.gif" width="15" height="15" border="0" alt="Roll eyes" /></a></td>
-				  <td><a href="javascript:emoticon('8)')"><img src="images/smiles/icon_cool.gif" width="15" height="15" border="0" alt="Cool!" /></a></td>
-				  <td><a href="javascript:emoticon(':p')"><img src="images/smiles/icon_razz.gif" width="15" height="15" border="0" alt="Razz" /></a></td>
-				  <td><a href="javascript:emoticon(':oops:')"><img src="images/smiles/icon_redface.gif" width="15" height="15" border="0" alt="Embarassed" /></a></td>
-				</tr>
-				<tr align="center" valign="middle"> 
-				  <td><a href="javascript:emoticon(':evil:')"><img src="images/smiles/icon_evil.gif" width="15" height="15" border="0" alt="Evil" /></a></td>
-				  <td><a href="javascript:emoticon(':x')"><img src="images/smiles/icon_mad.gif" width="15" height="15" border="0" alt="Mad" /></a></td>
-				  <td><a href="javascript:emoticon(':cry:')"><img src="images/smiles/icon_cry.gif" width="15" height="15" border="0" alt="Cry" /></a></td>
-				  <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_surprised.gif" width="15" height="15" border="0" alt="Surprised" /></a></td>
-				</tr>
-				<tr align="center" valign="middle"> 
-				  <td><a href="javascript:emoticon(':idea:')"><img src="images/smiles/icon_idea.gif" width="15" height="15" border="0" alt="Idea" /></a></td>
-				  <td><a href="javascript:emoticon(':?:')"><img src="images/smiles/icon_question.gif" width="15" height="15" border="0" alt="Question" /></a></td>
-				  <td><a href="javascript:emoticon(':!:')"><img src="images/smiles/icon_exclaim.gif" width="15" height="15" border="0" alt="Exclaim" /></a></td>
-				  <td><a href="javascript:emoticon(':arrow:')"><img src="images/smiles/icon_arrow.gif" width="15" height="15" border="0" alt="Arrow" /></a></td>
 				</tr>
+				<!-- END switch_smilies_extra -->
 			  </table>
 			</td>
 		  </tr>
@@ -326,44 +307,39 @@ function storeCaret(textEl) {
 			<td colspan="9"> 
 			  <table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr> 
-				  <td><span class="genmed"> &nbsp;Font color: 
+				  <td><span class="genmed"> &nbsp;{L_FONT_COLOR}: 
 					<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
-					  <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">Default</option>
+					  <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option>
-					  <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">Dark 
+					  <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">{L_COLOR_DARK_RED}</option>
-					  Red</option>
+					  <option style="color:red; background-color: #DEE3E7" value="red" class="genmed">{L_COLOR_RED}</option>
-					  <option style="color:red; background-color: #DEE3E7" value="red" class="genmed">Red</option>
+					  <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">{L_COLOR_ORANGE}</option>
-					  <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">Orange</option>
+					  <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">{L_COLOR_BROWN}</option>
-					  <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">Brown</option>
+					  <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">{L_COLOR_YELLOW}</option>
-					  <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">Yellow</option>
+					  <option style="color:green; background-color: #DEE3E7" value="green" class="genmed">{L_COLOR_GREEN}</option>
-					  <option style="color:green; background-color: #DEE3E7" value="green" class="genmed">Green</option>
+					  <option style="color:olive; background-color: #DEE3E7" value="olive" class="genmed">{L_COLOR_OLIVE}</option>
-					  <option style="color:olive; background-color: #DEE3E7" value="olive" class="genmed">Olive</option>
+					  <option style="color:cyan; background-color: #DEE3E7" value="cyan" class="genmed">{L_COLOR_CYAN}</option>
-					  <option style="color:cyan; background-color: #DEE3E7" value="cyan" class="genmed">Cyan</option>
+					  <option style="color:blue; background-color: #DEE3E7" value="blue" class="genmed">{L_COLOR_BLUE}</option>
-					  <option style="color:blue; background-color: #DEE3E7" value="blue" class="genmed">Blue</option>
+					  <option style="color:darkblue; background-color: #DEE3E7" value="darkblue" class="genmed">{L_COLOR_DARK_BLUE}</option>
-					  <option style="color:darkblue; background-color: #DEE3E7" value="darkblue" class="genmed">Dark 
+					  <option style="color:indigo; background-color: #DEE3E7" value="indigo" class="genmed">{L_COLOR_INDIGO}</option>
-					  Blue</option>
+					  <option style="color:violet; background-color: #DEE3E7" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
-					  <option style="color:indigo; background-color: #DEE3E7" value="indigo" class="genmed">Indigo</option>
+					  <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option>
-					  <option style="color:violet; background-color: #DEE3E7" value="violet" class="genmed">Violet</option>
+					  <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option>
-					  <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">White</option>
+					</select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
-					  <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">Black</option>
+					  <option value="9" class="genmed">{L_FONT_TINY}</option>
-					</select>
+					  <option value="10" class="genmed">{L_FONT_SMALL}</option>
-					&nbsp;Font size: 
+					  <option value="12" selected class="genmed">{L_FONT_NORMAL}</option>
-					<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
+					  <option value="18" class="genmed">{L_FONT_LARGE}</option>
-					  <option value="9" class="genmed">Tiny</option>
+					  <option  value="24" class="genmed">{L_FONT_HUGE}</option>
-					  <option value="10" class="genmed">Small</option>
-					  <option value="12" selected class="genmed">Normal</option>
-					  <option value="18" class="genmed">Large</option>
-					  <option  value="24" class="genmed">Huge</option>
 					</select>
 					</span></td>
-				  <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">Close 
+				  <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">{L_BBCODE_CLOSE_TAGS}</a></span></td>
-					Tags</a></span></td>
 				</tr>
 			  </table>
 			</td>
 		  </tr>
 		  <tr> 
 			<td colspan="9"> <span class="gensmall"> 
-			  <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="Tip: Styles can be applied quickly to selected text" />
+			  <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" />
 			  </span></td>
 		  </tr>
 		  <tr> 
@@ -438,7 +414,7 @@ function storeCaret(textEl) {
 	{POLLBOX} 
 	<tr> 
 	  <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
-		<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
+		<!-- Spell checker option part 2: You must sign up for an account at www.spellchecker.net to use this option -->
 		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
 		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
 		<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->

phpBB/templates/subSilver/simple_header.tpl

@@ -12,203 +12,23 @@
 </style>
 {META}
 <title>{SITENAME} :: {PAGE_TITLE}</title>
+<link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" />
 <style type="text/css">
 <!--
-/* subSilver Theme for phpBB2
+/* Specifiy background images for selected styles
- * Created by subBlue design
+   This can't be done within the external style sheet as NS4 sees image paths relative to
- * http://www.subBlue.com
+   the page which called the style sheet (i.e. this page in the root phpBB directory)
- */
+   whereas all other browsers see image paths relative to the style sheet. Stupid NS again!
-
+*/
-body { 	background-color:{T_BODY_BGCOLOR};
+TH			{ background-image: url(templates/subSilver/images/cellpic3.gif) }
-		scrollbar-face-color: #C8D1D7; scrollbar-highlight-color: #EAF0F7;
+TD.cat		{ background-image: url(templates/subSilver/images/cellpic1.gif) }
-		scrollbar-shadow-color: #95AFC4; scrollbar-3dlight-color: #D6DDE2;
+TD.rowpic	{ background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }
-		scrollbar-arrow-color:  #006699; scrollbar-track-color: #EFEFEF;
-		scrollbar-darkshadow-color: #7294AF;
-		margin-bottom:0px; 
-		margin-left:0px; 
-		margin-right:0px; 
-		margin-top:0px; 
-} 
-
-}
-
-font	{ font-family: Verdana, Arial, Helvetica, sans-serif }
-td		{ font-family: Verdana, Arial, Helvetica, sans-serif }
-th		{ font-family: Verdana, Arial, Helvetica, sans-serif }
-P		{ font-family: Verdana, Arial, Helvetica, sans-serif }
-hr		{ height: 1px; color:{T_TR_COLOR3} }
-
-
-/* Forum colours */
-.bodyline	{ background-color:#FFFFFF; border: {T_TD_COLOR1}; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px }
-.forumline	{ background-color:#FFFFFF; border: 2px #006699 solid }
-
-
-/* Main table cell colours and backgrounds */
-TH			{ background-color: {T_TH_COLOR3}; height: 25px; font-size: 11px; line-height : 100%; font-weight: bold; color: #FFB163; background-image: url(templates/subSilver/images/cellpic3.gif) }
-TD.tablebg	{ background-color: #000000 }
-TD.cat		{ background-color: {T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif) }
-TD.row1		{ background-color: {T_TR_COLOR1} }
-TD.row2		{ background-color: {T_TR_COLOR2} }
-TD.row3		{ background-color: {T_TR_COLOR3} }
-TD.spaceRow { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
-TD.rowpic	{ background-color: #FFFFFF; background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }
 td.icqback	{ background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }
+TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-image: url(templates/subSilver/images/cellpic1.gif) }
 
 
-/* Setting additional nice borders for the main table cells */
-TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-color:{T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif); border: #FFFFFF; border-style: solid; }	
-
-TD.catHead	 { height: 29px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
-TD.catSides  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
-TD.catLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }	
-TD.catRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
-TD.catBottom { height: 29px; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }	
-
-TH.thHead,TH.thSides,TH.thTop,TH.thLeft,TH.thRight,TH.thBottom,TH.thCornerL,TH.thCornerR { border: #FFFFFF; border-style: solid; }
-
-TH.thHead	 { font-weight : bold; font-size: 12px; height: 25px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
-TH.thSides	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
-TH.thTop	 { border-left-width: 0px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }	
-TH.thLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }	
-TH.thRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
-TH.thBottom  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }	
-TH.thCornerL { border-left-width: 1px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }	
-TH.thCornerR { border-left-width: 0px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
-
-TD.row3Right	 { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid;  border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
-
-/* The largest text used in the index page title and toptic title etc. */
-.maintitle	{ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;}
-
-
-/* General normal text */
-.gen		{ font-size : 12px; color : #000000; }
-a.gen		{ color: #006699; text-decoration: none; }
-a.gen:hover	{ color: #C23030; text-decoration: underline; }
-
-/* General medium text */
-.genmed		{ font-size : 11px; color : #000000; }
-a.genmed		{ text-decoration: none; color : #006699; }
-a.genmed:hover	{ text-decoration: underline; color : #C23030; }
-
-
-/* General small */
-.gensmall		{ font-size : 10px; color : #000000; }
-a.gensmall		{ color: #006699; text-decoration: none; }
-a.gensmall:hover	{ color: #C23030; text-decoration: underline; }
-
-
-/* The register, login, search etc links at the top of the page */
-.mainmenu			{ font-size : 11px; text-decoration : none; color : #000000 }
-a.mainmenu			{ text-decoration: none; color : #006699;  }
-a.mainmenu:hover	{ text-decoration: underline; color : #C23030; }
-
-
-/* Forum categories */
-.cattitle			{ font-size : 12px; line-height : 100%; letter-spacing: 1px; font-weight : bold; text-decoration : none; color : #004c75 }
-a.cattitle			{ text-decoration: none; color : #004c75; }
-a.cattitle:hover	{ text-decoration: underline; }
-
-
-/* Forum title: Text and link to the forums used in: index.php */
-.forumlink			{ font-size : 12px; font-weight : bold; text-decoration : none; color : #136C99; }
-a.forumlink			{ text-decoration: none; color : #136C99; }
-a.forumlink:hover	{ text-decoration: underline; color : #D68000; }
-
-
-/* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */
-.nav			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000;}
-a.nav			{ text-decoration: none; color : #006699; }
-a.nav:hover		{ text-decoration: underline; }
-
-
-/* titles for the topics: can specify viewed link colour too */
-.topictitle			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000; }
-a.topictitle		{ text-decoration: none; color : #006699; }
-a.topictitle:hover	{ text-decoration: underline; color : #D68000; }
-a.topictitle:visited	{ text-decoration: none; color : #5584AA; }
-
-
-/* Name of poster in viewmsg.php and viewtopic.php and other places */
-.name			{ font-size : 11px; text-decoration : none; color : #000000;}
-a.name			{ color: #006699; text-decoration: none;}
-a.name:hover	{ color: #C23030; text-decoration: underline;}
-
-
-/* Location, number of posts, post date etc */
-.postdetails		{ font-size : 10px; color : #000000; }
-a.postdetails		{ color: #006699; text-decoration: none; }
-a.postdetails:hover	{ color: #C23030; text-decoration: underline; }
-
-
-/* The content of the posts (body of text) */
-.postbody { font-size : 12px; line-height: 150%}
-
-a.postlink	{ text-decoration: none; color : {T_BODY_LINK} }
-a.postlink:hover { text-decoration: underline; color : #C23030 }
-
-
-/* Quote Code (currently not used) */
-.code	{ font-family: Courier, Courier New; font-size: 11px; color: #006600;
-		  background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid;
-		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
-		}
-.quote	{ font-family: Verdana, Arial; font-size: 11px; color: #444444; line-height: 125%;
-		  background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid;
-		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
-		}
-.signature	{ font-size : 11px; text-decoration : none; line-height : 150%; color : #333366; }
-.editedby	{ font-size : 10px; line-height : 100%; color : #333333; }
-
-
-/* Form elements */
-input,textarea, select {
-color : #000000; 
-font-family : Verdana, Arial, Helvetica, sans-serif; 
-font-size : 11px; 
-font-weight : normal;
-border-color : #000000; 
-}
-
-/* The text input fields background colour */
-input.post, textarea.post, select {
-background-color : #FFFFFF; 
-}
-
-input { text-indent : 2px; }
-
-/* The buttons used for bbCode styling in message post */
-input.button {
-background-color : {T_TR_COLOR1}; 
-color : #000000; 
-font-family : Verdana, Arial, Helvetica, sans-serif; 
-font-size : 11px; 
-}
-
-
-/* The main submit button option */
-input.mainoption {
-background-color : #FAFAFA;
-font-weight : bold;
-}
-
-/* None bold submit button */
-input.liteoption {
-background-color : #FAFAFA;
-font-weight : normal;
-}
-
 /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */
 @import url("templates/subSilver/formIE.css"); 
-
-.helpline { background-color: {T_TR_COLOR2}; border-style: none; }
-
-
-/* Copyright and bottom info */
-.copyright		{ font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; font-size: 10px; letter-spacing: -1px;}
-a.copyright		{ color: #333333; text-decoration: none;}
-a.copyright:hover { color: #000000; text-decoration: underline;}
 -->
 </style>
 </head>