Template cleaning + bonus logo

Чистим шаблон немного.

contributors.txt

@@ -34,12 +34,13 @@ Philstone (http://worldofminecraft.su/)
 Nightwolf
 nord51
 Вася
+Alexander.S (http://torrent.dchub.ws/)
 
 *****************************
 **    Прочая информация    **
 *****************************
 
-Большое вам всем спасибо за помощь.
+Отдельная благодарность выражается компании JetBrains за предоставление лицензии на PhpStorm (http://www.jetbrains.com/phpstorm/).
 
 Если в данных списках кто-то не указан, либо если вы хотите указать дополнительно адрес своего трекера, отправьте письмо по адресу admin@torrentpier.me,
 с указанием вашего ника на форуме и адреса вашего трекера, дабы мы могли вас добавить в этот список.

upload/includes/page_header.php

@@ -191,6 +191,7 @@ $template->assign_vars(array(
 
 	'CURRENT_TIME'       => sprintf($lang['CURRENT_TIME'], bb_date(TIMENOW, $bb_cfg['last_visit_date_format'], false)),
 	'S_TIMEZONE'         => preg_replace('/\(.*?\)/', '', sprintf($lang['ALL_TIMES'], $lang['TZ'][str_replace(',', '.', floatval($bb_cfg['board_timezone']))])),
+	'BOARD_TIMEZONE'     => $bb_cfg['board_timezone'],
 
 	'PM_INFO'            => $pm_info,
 	'PRIVMSG_IMG'        => $icon_pm,

upload/templates/default/common.tpl

@@ -19,7 +19,7 @@
 <!-- IF TPL_CONFIRM -->
 <!--========================================================================-->
 
-	<form action="{FORM_ACTION}" method="{FORM_METHOD}">
+<form action="{FORM_ACTION}" method="{FORM_METHOD}">
 	{HIDDEN_FIELDS}
 
 	<div class="spacer_10"></div>
@@ -46,8 +46,8 @@
 		</tr>
 	</table>
 
-	</form>
+</form>
-	<div class="spacer_10"></div>
+<div class="spacer_10"></div>
 
 <!--========================================================================-->
 <!-- ENDIF / TPL_CONFIRM -->

upload/templates/default/group.tpl

@@ -105,7 +105,6 @@
 	</td>
 </tr>
 <!-- END switch_mod_option -->
-
 </table>
 
 </form>

upload/templates/default/page_header.tpl

@@ -236,7 +236,7 @@ function go_to_page ()
 	<b>Вы используете устаревший браузер. Сайт может отображаться некорректно.</b>
 </div>
 <script>
-if ( (typeof(window.opera) != "undefined" && window.opera.version() < 13) || (window.attachEvent && !window.addEventListener) /* IE < 9 */ ) {
+if ( (typeof(window.opera) != "undefined" && window.opera.version() < 12) || (window.attachEvent && !window.addEventListener) /* IE < 9 */ ) {
 	document.getElementById('old-browser-warn').style.display = '';
 }
 </script>
@@ -295,7 +295,7 @@ ajax.callback.index_data = function(data) {};
 $(document).ready(function() {
 	x = new Date();
 	tz = -x.getTimezoneOffset()/60;
-	if (tz != <?php echo $bb_cfg['board_timezone']?>)
+	if (tz != {BOARD_TIMEZONE})
 	{
 		ajax.index_data(tz);
 	}

upload/templates/default/usercp_attachcp.tpl

@@ -1,112 +0,0 @@
-<h1>{L_UACP} :: {USERNAME}</h1>
-
-<form method="post" name="attach_list" action="{S_MODE_ACTION}">
-{S_USER_HIDDEN}
-
-<table width="100%">
-<tr>
-	<td width="100%" class="nav vBottom"><a href="{U_INDEX}">{T_INDEX}</a></td>
-	<td class="tRight nowrap med">
-		{L_SORT_BY}: {S_MODE_SELECT}
-		{L_ORDER} {S_ORDER_SELECT}
-		<input type="submit" name="submit" value="{L_SUBMIT}" class="lite" />
-	</td>
-</tr>
-</table>
-
-<script type="text/javascript">
-$(document).ready(function(){
-	$('input.a-chbox').click(function(){ $('#a-'+this.value).toggleClass('hl-selected-topic'); });
-});
-</script>
-
-<table class="forumline tablesorter">
-<col class="row2">
-<col class="row1">
-<col class="row1">
-<col class="row1">
-<col class="row2">
-<col class="row2">
-<col class="row2">
-<col class="row2">
-<col class="row2">
-<thead>
-<tr>
-	<th class="{sorter: 'digit'}">#</th>
-	<th class="{sorter: false}">{L_POSTED_IN_TOPIC}</th>
-	<th class="{sorter: 'text'}">{L_FILENAME}</th>
-	<th class="{sorter: false}">{L_FILECOMMENT}</th>
-	<th class="{sorter: 'text'}">{L_EXTENSION}</th>
-	<th class="{sorter: 'digit'}">{L_SIZE}</th>
-	<th class="{sorter: 'digit'}">{L_DOWNLOADS}</th>
-	<th class="{sorter: 'digit'}">{L_POST_TIME}</th>
-	<th class="{sorter: false}">{L_DELETE}</th>
-</tr>
-</thead>
-
-<tbody>
-<!-- BEGIN attachrow -->
-<tr id="a-{attachrow.ATTACH_ID}" class="tCenter">
-	<td>{attachrow.ROW_NUMBER}</td>
-	<td><span class="gen">{attachrow.POST_TITLE}</span></td>
-	<td><a href="{attachrow.U_VIEW_ATTACHMENT}" class="gen">{attachrow.FILENAME}</a></td>
-	<td>{attachrow.COMMENT}</td>
-	<td>{attachrow.EXTENSION}</td>
-	<td>
-		<u>{attachrow.SIZE_RAW}</u>
-		<p>{attachrow.SIZE}</p>
-	</td>
-	<td>{attachrow.DOWNLOAD_COUNT}</td>
-	<td>
-		<u>{attachrow.POST_TIME_RAW}</u>
-		<span class="small">{attachrow.POST_TIME}</span>
-	</td>
-	<td>{attachrow.S_DELETE_BOX}{attachrow.S_HIDDEN}</td>
-</tr>
-<!-- END attachrow -->
-</tbody>
-<tr>
-	<td class="catBottom tRight" colspan="9">
-		<input type="submit" name="delete" value="{L_DELETE_MARKED}" class="lite" />
- </td>
-</tr>
-</table>
-
-</form>
-
-<p class="small bold tRight">
-	<a href="javascript:select_switch(true);" class="small">{L_MARK_ALL}</a>
-	::
-	<a href="javascript:select_switch(false);" class="small">{L_UNMARK_ALL}</a>
-</p>
-
-<!--bottom_info-->
-<div class="bottom_info">
-
-	<div class="spacer_6"></div>
-
-	<div class="nav">
-		<p style="float: left">{PAGE_NUMBER}</p>
-		<p style="float: right">{PAGINATION}</p>
-		<div class="clear"></div>
-	</div>
-
-	<div class="spacer_4"></div>
-
-	<div id="timezone">
-		<p>{CURRENT_TIME}</p>
-		<p>{S_TIMEZONE}</p>
-	</div>
-	<div class="clear"></div>
-
-</div><!--/bottom_info-->
-
-<script type="text/javascript">
-function select_switch(status)
-{
-	for (i = 0; i < document.attach_list.length; i++)
-	{
-		document.attach_list.elements[i].checked = status;
-	}
-}
-</script>

upload/templates/default/usercp_bonus.tpl

@@ -14,12 +14,12 @@
 
 <table class="forumline tCenter">
 <tr>
-    <th colspan="3">{MY_BONUS}</th>
+	<th colspan="3">{MY_BONUS}</th>
 </tr>
 <tr class="row3 med">
-    <td class="bold tCenter">{L_DESCRIPTION}</td>
+	<td class="bold tCenter">{L_DESCRIPTION}</td>
-    <td class="bold tCenter">{L_PRICE}</td>
+	<td class="bold tCenter">{L_PRICE}</td>
-    <td class="bold tCenter">{L_BONUS_SELECT}</td>
+	<td class="bold tCenter">{L_BONUS_SELECT}</td>
 </tr>
 
 <!-- BEGIN bonus_upload -->

upload/templates/default/usercp_topic_watch.tpl

@@ -76,7 +76,7 @@ td.topic_id { cursor: pointer; }
 <tr>
 	<td width="100%">
 		<h1 class="maintitle">{PAGE_TITLE}</h1>
-        <div id="forums_top_links" class="nav">
+		<div id="forums_top_links" class="nav">
 			<a href="{U_INDEX}">{T_INDEX}</a>&nbsp;<em>&middot;</em>
 			<span id="show-edit-btn"><a href="#">{L_EDIT_MY_MESSAGE_LIST}</a></span>
 			<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span><em>&middot;</em>
@@ -90,29 +90,29 @@ td.topic_id { cursor: pointer; }
 <table width="100%" class="forumline tablesorter">
 <thead>
 <tr>
-    <th class="{sorter: 'text'}"></th>
+	<th class="{sorter: 'text'}"></th>
-    <th class="{sorter: 'text'}" width="25%"><b class="tbs-text">{L_FORUM}</b></th>
+	<th class="{sorter: 'text'}" width="25%"><b class="tbs-text">{L_FORUM}</b></th>
-    <th class="{sorter: 'text'}" width="75%"><b class="tbs-text">{L_TOPIC}</b></th>
+	<th class="{sorter: 'text'}" width="75%"><b class="tbs-text">{L_TOPIC}</b></th>
-    <th class="{sorter: 'text'}"><b class="tbs-text">{L_AUTHOR}</b></th>
+	<th class="{sorter: 'text'}"><b class="tbs-text">{L_AUTHOR}</b></th>
-    <th width="80" class="{sorter: 'text'}"><b class="tbs-text">{L_REPLIES}</b></th>
+	<th width="80" class="{sorter: 'text'}"><b class="tbs-text">{L_REPLIES}</b></th>
-    <th width="120" class="{sorter: 'text'} nowrap"><b class="tbs-text">{L_LASTPOST}</b></th>
+	<th width="120" class="{sorter: 'text'} nowrap"><b class="tbs-text">{L_LASTPOST}</b></th>
 </tr>
 </thead>
 <!-- BEGIN watch -->
 <tr class="tCenter {watch.ROW_CLASS}" id="tr-{watch.TOPIC_ID}">
-    <td id="{watch.TOPIC_ID}" class="topic_id">
+	<td id="{watch.TOPIC_ID}" class="topic_id">
-	    <span style="display: none;">{watch.TOPIC_ICON}</span>
+		<span style="display: none;">{watch.TOPIC_ICON}</span>
-	    <img class="topic_icon" src="{watch.TOPIC_ICON}">
+		<img class="topic_icon" src="{watch.TOPIC_ICON}">
 	</td>
 	<td><a href="{watch.U_FORUM}" class="genmed">{watch.FORUM_TITLE}</a></td>
-    <td class="tLeft nowrap">
+	<td class="tLeft nowrap">
-	    <a class="topictitle" title="{watch.FULL_TOPIC_TITLE}" href="{watch.U_TOPIC}">{watch.TOPIC_TITLE}</a>
+		<a class="topictitle" title="{watch.FULL_TOPIC_TITLE}" href="{watch.U_TOPIC}">{watch.TOPIC_TITLE}</a>
-	    <!-- IF watch.PAGINATION --><br /><span class="topicPG">&nbsp;[{ICON_GOTOPOST}{L_GOTO_SHORT} {watch.PAGINATION} ]</span><!-- ENDIF -->
+		<!-- IF watch.PAGINATION --><br /><span class="topicPG">&nbsp;[{ICON_GOTOPOST}{L_GOTO_SHORT} {watch.PAGINATION} ]</span><!-- ENDIF -->
 	</td>
-    <td>{watch.AUTHOR}</td>
+	<td>{watch.AUTHOR}</td>
-    <td class="gensmall">{watch.REPLIES}</td>
+	<td class="gensmall">{watch.REPLIES}</td>
-    <td class="gensmall nowrap">
+	<td class="gensmall nowrap">
-	    {watch.LAST_POST}<!-- IF watch.IS_UNREAD --><a href="{TOPIC_URL}{watch.TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ELSE -->
+		{watch.LAST_POST}<!-- IF watch.IS_UNREAD --><a href="{TOPIC_URL}{watch.TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ELSE -->
 		<a href="{POST_URL}{watch.LAST_POST_ID}#{watch.LAST_POST_ID}">{ICON_LATEST_REPLY}</a><!-- ENDIF -->
 	</td>
 </tr>

upload/templates/default/usercp_viewprofile.tpl

@@ -428,7 +428,7 @@ ajax.callback.gen_passkey = function(data){
 			<!-- IF GENDER -->
 			<tr>
 				<th>{L_GENDER}:</th>
-				<td id="user_gender"><span class="med editable">{GENDER}</span></td>
+				<td id="user_gender"><span class="editable">{GENDER}</span></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- IF BIRTHDAY -->

upload/templates/default/viewforum.tpl

@@ -270,25 +270,25 @@ td.topic_id { cursor: pointer; }
 			<h1 class="maintitle"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h1>
 
 			<p class="small" id="moderators"><a style="text-decoration: none;" href="#">{L_MODERATORS}</a></p>
-            <script type="text/javascript">
+			<script type="text/javascript">
-                $(document).ready(function(){
+				$(document).ready(function(){
-                    $("#moderators a").one('click', function(){
+					$("#moderators a").one('click', function(){
-                    $('#moderators').html($('#moderators').text());
+						$('#moderators').html($('#moderators').text());
-                        ajax.index_data();
+						ajax.index_data();
-                            return false;
+						return false;
-                    });
+					});
-                });
+				});
-                ajax.index_data = function() {
+				ajax.index_data = function() {
-                    ajax.exec({
+					ajax.exec({
-                        action   : 'index_data',
+						action   : 'index_data',
-                        mode     : 'get_forum_mods',
+						mode     : 'get_forum_mods',
-                        forum_id : {FORUM_ID}
+						forum_id : {FORUM_ID}
-                    });
+					});
-                };
+				};
-                ajax.callback.index_data = function(data) {
+				ajax.callback.index_data = function(data) {
-                    $('#moderators').append(data.html);
+					$('#moderators').append(data.html);
-                };
+				};
-            </script>
+			</script>
 
 			<!-- IF SHOW_ONLINE_LIST -->
 			<p class="small">{LOGGED_IN_USER_LIST}</p>

upload/templates/default/viewtopic_attach.tpl

@@ -347,7 +347,6 @@ $('#tor-filelist-btn').click(function(){
 <div id="fl-tbl-wrap">
 	<table class="w100 borderless" cellspacing="0" cellpadding="0">
 	<tr>
-		<!--<td></td>-->
 		<td>
 			<div id="tor-fl-treecontrol">
 				<a href="#">{L_COLLAPSE}</a>&middot;
@@ -357,7 +356,6 @@ $('#tor-filelist-btn').click(function(){
 		</td>
 	</tr>
 	<tr>
-		<!--<td class="vTop"><div id="tor-fl-bgn" class="border bw_TRBL med row1">YOUR ADS BLOCK</div></td>-->
 		<td class="vTop" style="width: 100%;"><div id="tor-filelist" class="border bw_TRBL med row1"><span class="loading-1">{L_LOADING}</span></div></td>
 	</tr>
 	</table>

upload/templates/default/viewtopic_torrent.tpl

@@ -132,11 +132,11 @@ $(document).ready(function(){
 			<thead>
 			<tr>
 				<th class="{sorter: 'text'}"><b class="tbs-text">{L_DL_USER}</b><img width="130" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}" title="{L_DL_FORMULA}"><b class="tbs-text">{L_DL_ULR}</b><img width="40" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}" title="{L_DL_FORMULA}"><b class="tbs-text">{L_DL_ULR}</b><img width="40" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
 				<!-- BEGIN iphead -->
 				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_IP_ADDRESS}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
 				<!-- END iphead -->
@@ -181,11 +181,11 @@ $(document).ready(function(){
 			<thead>
 			<tr>
 				<th class="{sorter: 'text'}"><b class="tbs-text">{L_DL_USER}</b><img width="130" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}" title="{L_DL_PERCENT}"><b class="tbs-text">%</b><img width="40" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}" title="{L_DL_PERCENT}"><b class="tbs-text">%</b><img width="40" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL}</b><img width="70" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_UL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
-		        <th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
+				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_DL_DL_SPEED}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
 				<!-- BEGIN iphead -->
 				<th class="{sorter: 'digit'}"><b class="tbs-text">{L_IP_ADDRESS}</b><img width="75" class="spacer" src="{SPACER}" alt="" /></th>
 				<!-- END iphead -->