r208

git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@208 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

install/sql/mysql.sql

@@ -1372,7 +1372,7 @@ CREATE TABLE IF NOT EXISTS `bb_users` (
   `user_new_privmsg` smallint(5) unsigned NOT NULL default '0',
   `user_unread_privmsg` smallint(5) unsigned NOT NULL default '0',
   `user_last_privmsg` int(11) NOT NULL default '0',
-  `user_opt` int(11) NOT NULL default '0',
+  `user_opt` int(11) NOT NULL default '1',
   `user_rank` int(11) NOT NULL default '0',
   `user_avatar` varchar(100) NOT NULL default '',
   `user_avatar_type` tinyint(4) NOT NULL default '0',

upload/admin/admin_log.php

@@ -380,7 +380,7 @@ else
 $log_type_select = array($lang['ACTS_LOG_ALL_ACTIONS'] => $all_types) + $log_action->log_type_select;
 
 // Order select
-$order_options = '<option value="">&nbsp;Time&nbsp;</option>';
+$order_options = '<option value="">&nbsp;'.$lang['ACTS_LOG_TIME'].'&nbsp;</option>';
 
 $template->assign_vars(array(
 	'LOG_COLSPAN'       => 4,
@@ -389,7 +389,7 @@ $template->assign_vars(array(
 	'DATETIME_VAL'      => date('Y-m-d', $datetime_val),
 	'DAYSBACK_NAME'     => $daysback_key,
 	'DAYSBACK_VAL'      => $daysback_val,
-	'FIRST_LOG_TIME'    => ($first_log_time) ? date('Y-m-d', $first_log_time) : 'none',
+	'FIRST_LOG_TIME'    => ($first_log_time) ? date('Y-m-d', $first_log_time) : $lang['ACC_NONE'],
 
 	'TITLE_MATCH_MAX'   => $title_match_max_len,
 	'TITLE_MATCH_NAME'  => $title_match_key,

upload/config.php

@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Beta';
-$bb_cfg['tp_release_state'] = 'R207';
+$bb_cfg['tp_release_state'] = 'R208';
 $bb_cfg['tp_release_date'] = '12-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

upload/language/lang_english/lang_log_action.php

@@ -26,3 +26,5 @@ $lang['ACTS_LOG_LOGS_ACTION'] = 'Action';
 $lang['ACTS_LOG_USERNAME'] = 'Username';
 $lang['ACTS_LOG_TIME'] = 'Time';
 $lang['ACTS_LOG_INFO'] = 'Info';
+$lang['ACTS_LOG_FILTER'] = 'Filter';
+$lang['ACTS_LOG_TOPICS'] = 'Topics:';

upload/language/lang_russian/lang_admin.php

@@ -20,7 +20,6 @@ $lang['CREATE_NEW'] = 'Создать';
 $lang['ADD_NEW'] = 'Добавить';
 $lang['FLAGS'] = 'Флаги';
 $lang['REBUILD_SEARCH_INDEX'] = 'Перечесть индексы поиска';
-$lang['ACTIONS_LOG'] = 'Лог действий';
 $lang['FORUM_CONFIG'] = 'Настройки форумов';
 $lang['TRACKER_CONFIG'] = 'Настройки трекера';
 $lang['RELEASE_TEMPLATES'] = 'Шаблоны для релизов';

upload/language/lang_russian/lang_log_action.php

@@ -16,9 +16,9 @@ $lang['ACTS_LOG_ALL_ACTIONS']  = 'Все действия';
 $lang['ACTS_LOG_SEARCH_OPTIONS'] = 'Настройки отчета по действиям';
 $lang['ACTS_LOG_FORUM'] = 'Форум';
 $lang['ACTS_LOG_ACTION'] = 'Действие';
-$lang['ACTS_LOG_USER'] = 'Юзер';
+$lang['ACTS_LOG_USER'] = 'Пользователь';
 $lang['ACTS_LOG_LOGS_FROM'] = 'Логи с ';
-$lang['ACTS_LOG_FIRST'] = 'сначала ';
+$lang['ACTS_LOG_FIRST'] = 'сначала: ';
 $lang['ACTS_LOG_DAYS_BACK'] = 'дней назад';
 $lang['ACTS_LOG_TOPIC_MATCH'] = 'Совпадение с названием темы';
 $lang['ACTS_LOG_SORT_BY'] = 'Сотировать по';
@@ -26,3 +26,5 @@ $lang['ACTS_LOG_LOGS_ACTION'] = 'Действие';
 $lang['ACTS_LOG_USERNAME'] = 'Имя пользователя';
 $lang['ACTS_LOG_TIME'] = 'Время';
 $lang['ACTS_LOG_INFO'] = 'Инфо';
+$lang['ACTS_LOG_FILTER'] = 'Фильтр';
+$lang['ACTS_LOG_TOPICS'] = 'Топик:';

upload/templates/admin/admin_log.tpl

@@ -14,7 +14,7 @@ table.log_filters td {
 
 <table class="bordered w100" cellspacing="0">
 	<tr>
-		<th class="thHead">Log actions: search options</th>
+		<th class="thHead">{L_ACTS_LOG_SEARCH_OPTIONS}</th>
 	</tr>
 	<tr>
 		<td class="row1">
@@ -22,7 +22,7 @@ table.log_filters td {
 				<tr>
 					<td rowspan="2" valign="top" nowrap="nowrap" class="row1">
 						<fieldset>
-						<legend>Forum</legend>
+						<legend>{L_ACTS_LOG_FORUM}</legend>
 						<div>
 							<p class="select">{SEL_FORUM}</p>
 						</div>
@@ -30,7 +30,7 @@ table.log_filters td {
 					</td>
 					<td valign="top" class="row1">
 						<fieldset>
-						<legend>Action</legend>
+						<legend>{L_ACTS_LOG_ACTION}</legend>
 						<div>
 							<p class="select">{SEL_LOG_TYPE}</p>
 						</div>
@@ -38,7 +38,7 @@ table.log_filters td {
 					</td>
 					<td valign="top" class="row1">
 						<fieldset>
-						<legend>User</legend>
+						<legend>{L_ACTS_LOG_USER}</legend>
 						<div>
 							<p class="select">{SEL_USERS}</p>
 						</div>
@@ -54,20 +54,20 @@ table.log_filters td {
 				<tr>
 					<td valign="top" class="row1">
 						<fieldset>
-						<legend>Logs from <span style="font-size: 9px;">(<i>first: {FIRST_LOG_TIME}</i>)</span></legend>
+						<legend>{L_ACTS_LOG_LOGS_FROM} <span style="font-size: 9px;">(<i>{L_ACTS_LOG_FIRST}{FIRST_LOG_TIME}</i>)</span></legend>
 						<div>
 							<p class="input nowrap">
 								<input class="post" type="text" size="10" maxlength="20" name="{DATETIME_NAME}" value="{DATETIME_VAL}" />
 								&amp;
 								<input class="post" type="text" size="2" maxlength="5" name="{DAYSBACK_NAME}" value="{DAYSBACK_VAL}" />
-								days back
+								{L_ACTS_LOG_DAYS_BACK}
 							</p>
 						</div>
 						</fieldset>
 					</td>
 					<td valign="top" class="row1">
 						<fieldset>
-						<legend>Topic title match</legend>
+						<legend>{L_ACTS_LOG_TOPIC_MATCH}</legend>
 							<div>
 								<p class="input"><input class="post" type="text" size="28" maxlength="{TITLE_MATCH_MAX}" name="{TITLE_MATCH_NAME}" value="{TITLE_MATCH_VAL}" /></p>
 							</div>
@@ -75,7 +75,7 @@ table.log_filters td {
 					</td>
 					<td valign="top" class="row1" style="padding: 0px;">
 						<fieldset>
-						<legend>Sort by</legend>
+						<legend>{L_ACTS_LOG_SORT_BY}</legend>
 							<div>
 								<p class="select nowrap">
 									<select class="post" name="{ORDER_NAME}">{ORDER_OPTIONS}</select>
@@ -102,10 +102,10 @@ table.log_filters td {
 
 <table class="forumline">
 	<tr>
-		<th>Action</th>
-		<th>Username</th>
-		<th>Time</th>
-		<th width="60%">Info</th>
+		<th>{L_ACTS_LOG_LOGS_ACTION}</th>
+		<th>{L_ACTS_LOG_USERNAME}</th>
+		<th>{L_ACTS_LOG_TIME}</th>
+		<th width="60%">{L_ACTS_LOG_INFO}</th>
 	</tr>
 	<!-- BEGIN log -->
 	<tr class="{log.ROW_CLASS}">
@@ -174,7 +174,7 @@ table.log_filters td {
 <div class="spacer_8"></div>
 
 <fieldset class="row3">
-<legend>Filter</legend>
+<legend>{L_ACTS_LOG_FILTER}</legend>
 <table class="log_filters" cellspacing="4"><tr>
 
 	<!-- IF FILTER_FORUMS -->
@@ -190,7 +190,7 @@ table.log_filters td {
 
 	<!-- IF FILTER_TOPICS -->
 	<td>
-	<p class="med bold">Topics:</p>
+	<p class="med bold">{L_ACTS_LOG_TOPICS}</p>
 	<div>
 		<!-- BEGIN topics -->
 		<p class="med mrg_4">{topics.TOPIC_TITLE}</p>
@@ -201,7 +201,7 @@ table.log_filters td {
 
 	<!-- IF FILTER_USERS -->
 	<td>
-	<p class="med bold">Users:</p>
+	<p class="med bold">{L_ACTS_LOG_USER}:</p>
 	<div>
 		<!-- BEGIN users -->
 		<p class="med mrg_4">{users.USERNAME}</p>
@@ -213,4 +213,3 @@ table.log_filters td {
 </tr></table>
 </fieldset>
 <!-- ENDIF -->
-

upload/templates/default/usercp_viewprofile.tpl

@@ -453,7 +453,7 @@ $(document).ready(function(){
 	<!-- END leech -->
 
 	<tr class="row2 tCenter">
-		<td colspan="4" class="pad_6">
+		<td class="catBottom" colspan="4" class="pad_6">
 			<!-- IF SHOW_SEARCH_DL -->
 				<a href="{U_SEARCH_DL_WILL}" class="med">{L_SEARCH_DL_WILL_DOWNLOADS}</a>
 				::

upload/templates/xs_mod/tpl/cache.tpl

@@ -1,19 +1,3 @@
-<!-- BEGIN xs_file_version -->
-/***************************************************************************
- *                                cache.tpl
- *                                ---------
- *   copyright            : (C) 2003 - 2005 CyberAlien
- *   support              : http://www.phpbbstyles.com
- *
- *   version              : 2.3.1
- *
- *   file revision        : 55
- *   project revision     : 78
- *   last modified        : 05 Dec 2005  13:54:55
- *
- ***************************************************************************/
-<!-- END xs_file_version -->
-
 <h1>{L_XS_MANAGE_CACHE}</h1>
 
 <p>
@@ -25,11 +9,11 @@
 <tr>
 	<th class="thHead" colspan="4">{L_XS_MANAGE_CACHE}</th>
 </tr>
-<tr>
-	<td class="catLeft" align="center"><span class="gen">{L_XS_TEMPLATE}</span></td>
-	<td class="cat" align="center"><span class="gen">{L_XS_STYLES}</span></td>
-	<td class="cat" align="center"><span class="gen"><span class="gen"><a href="{U_CLEAR_ALL}">{L_XS_CLEAR_ALL_LC}</a></span></td>
-	<td class="catRight" align="center"><span class="gen"><span class="gen"><a href="{U_COMPILE_ALL}" onclick="return confirm('{L_XS_CACHE_CONFIRM}'); ">{L_XS_COMPILE_ALL_LC}</a></span></td>
+<tr class="cat tCenter">
+	<td>{L_XS_TEMPLATE}</td>
+	<td>{L_XS_STYLES}</td>
+	<td><a href="{U_CLEAR_ALL}">{L_XS_CLEAR_ALL_LC}</a></td>
+	<td><a href="{U_COMPILE_ALL}" onclick="return confirm('{L_XS_CACHE_CONFIRM}'); ">{L_XS_COMPILE_ALL_LC}</a></td>
 </tr>
 <!-- BEGIN styles -->
 <tr>