From 05582e929dcd8036e6aaf50f92bad4f9df12809e Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Fri, 2 Sep 2011 19:27:22 +0000
Subject: [PATCH] r278

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@278 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                           | 2 +-
 upload/language/lang_english/lang_main.php  | 1 +
 upload/language/lang_russian/lang_main.php  | 1 +
 upload/templates/default/posting.tpl        | 2 +-
 upload/templates/default/posting_editor.tpl | 9 +++++----
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 6e217b815..f951f375d 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R277';
+$bb_cfg['tp_release_state'] = 'R278';
 $bb_cfg['tp_release_date'] = '02-09-2011';
 
 // Database
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 5e4a3aa93..6c37da373 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -1648,6 +1648,7 @@ $lang['LIST'] = 'List';
 $lang['LIST_TITLE'] = 'List (Ctrl+L)';
 $lang['LIST_ITEM'] = 'List item (Ctrl+0)';
 $lang['QUOTE_SEL'] = 'Quote selected';
+$lang['JAVASCRIPT_ON'] = 'Heads necessary to send messages to enable JavaScript';
 
 $lang['NEW'] = 'New';
 $lang['NEWEST'] = 'Newest';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 7cec2e105..9c8866bee 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1658,6 +1658,7 @@ $lang['LIST_ITEM'] = 'Элемент списка (Ctrl+0)';
 $lang['QUOTE_SEL'] = 'Цит.выдел';
 $lang['TRANSLIT'] = 'Транслит';
 $lang['TRANSLIT_TITLE'] = 'Перевести выделение из транслита на русский';
+$lang['JAVASCRIPT_ON'] = 'Для отправки сообщений необходимo включить JavaScript';
 
 $lang['NEW'] = 'Новое';
 $lang['NEWEST'] = 'Непрочит.';
diff --git a/upload/templates/default/posting.tpl b/upload/templates/default/posting.tpl
index 5e82f92d4..1b3bbdead 100644
--- a/upload/templates/default/posting.tpl
+++ b/upload/templates/default/posting.tpl
@@ -105,7 +105,7 @@
 		<!-- END smilies_row -->
 		<!-- BEGIN switch_smilies_extra -->
 		<tr>
-			<td colspan="{S_SMILIES_COLSPAN}"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=400,resizable=yes,scrollbars=yes,WIDTH=400'); return false;" target="_phpbbsmilies" class="med">{L_MORE_EMOTICONS}</a></td>
+			<td colspan="{S_SMILIES_COLSPAN}"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=400,resizable=yes,scrollbars=yes,WIDTH=450'); return false;" target="_phpbbsmilies" class="med">{L_MORE_EMOTICONS}</a></td>
 		</tr>
 		<!-- END switch_smilies_extra -->
 		</table><!--/smilies-->
diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl
index 47c75702a..5921a1d46 100644
--- a/upload/templates/default/posting_editor.tpl
+++ b/upload/templates/default/posting_editor.tpl
@@ -13,18 +13,19 @@ ajax.callback.posts = function(data){
 <select name="fontFace">
 	<option style="font-family: Verdana" value="-1" selected="selected">{L_QR_FONT_SEL}:</option>
 	<option style="font-family: Courier" value="Courier">&nbsp;Courier</option>
-	<option style="font-family: 'Courier New'" value="'Courier New'">&nbsp;Courier New</option>
+	<option style="font-family: Courier New" value="Courier New">&nbsp;Courier New</option>
 	<option style="font-family: monospace" value="monospace">&nbsp;monospace</option>
 	<option style="font-family: Fixedsys" value="Fixedsys">&nbsp;Fixedsys</option>
 	<option style="font-family: Arial" value="Arial">&nbsp;Arial</option>
-	<option style="font-family: 'Comic Sans MS'" value="'Comic Sans MS'">&nbsp;Comic Sans</option>
+	<option style="font-family: Comic Sans MS" value="Comic Sans MS">&nbsp;Comic Sans</option>
 	<option style="font-family: Georgia" value="Georgia">&nbsp;Georgia</option>
 	<option style="font-family: Tahoma" value="Tahoma">&nbsp;Tahoma</option>
-	<option style="font-family: 'Times New Roman'" value="'Times New Roman'">&nbsp;Times</option>
+	<option style="font-family: Times New Roman" value="Times New Roman">&nbsp;Times</option>
 	<option style="font-family: serif" value="serif">&nbsp;serif</option>
 	<option style="font-family: sans-serif" value="sans-serif">&nbsp;sans-serif</option>
 	<option style="font-family: cursive" value="cursive">&nbsp;cursive</option>
 	<option style="font-family: fantasy" value="fantasy">&nbsp;fantasy</option>
+	<option style="font-family: Monotype Corsiva" value="Monotype Corsiva">&nbsp;Monotype</option>
 </select>
 &nbsp;
 <select name="codeColor" class="text_color">
@@ -152,7 +153,7 @@ ajax.callback.posts = function(data){
 		<input onclick="submitted = true;" title="Ctrl+Enter" type="submit" name="post" class="bold" value="{L_SUBMIT}" id="post-submit-btn">&nbsp;&nbsp;
 		<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#message').val()});">
 	</div>
-	<div id="post-js-warn">Для отправки сообщений необходимo включить JavaScript</div>
+	<div id="post-js-warn">{L_JAVASCRIPT_ON}</div>
 </div>
 
 <script type="text/javascript">