diff --git a/contributors.txt b/contributors.txt index 9776221fe..f2274757c 100644 --- a/contributors.txt +++ b/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, с указанием вашего ника на форуме и адреса вашего трекера, дабы мы могли вас добавить в этот список. \ No newline at end of file diff --git a/upload/images/logo/logo_summer.png b/upload/images/logo/logo_summer.png new file mode 100644 index 000000000..d7c2fddb9 Binary files /dev/null and b/upload/images/logo/logo_summer.png differ diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index f8274fb28..ff86aa4a5 100644 --- a/upload/includes/page_header.php +++ b/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, diff --git a/upload/templates/default/common.tpl b/upload/templates/default/common.tpl index 9aa36744c..634fb58cd 100644 --- a/upload/templates/default/common.tpl +++ b/upload/templates/default/common.tpl @@ -19,7 +19,7 @@ -
+ {HIDDEN_FIELDS}
@@ -46,8 +46,8 @@ -
-
+ +
\ No newline at end of file diff --git a/upload/templates/default/group.tpl b/upload/templates/default/group.tpl index f25b6356f..a52b2a105 100644 --- a/upload/templates/default/group.tpl +++ b/upload/templates/default/group.tpl @@ -105,7 +105,6 @@ - diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index 2d607a8ec..52d8ef08d 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -236,7 +236,7 @@ function go_to_page () Вы используете устаревший браузер. Сайт может отображаться некорректно. @@ -295,7 +295,7 @@ ajax.callback.index_data = function(data) {}; $(document).ready(function() { x = new Date(); tz = -x.getTimezoneOffset()/60; - if (tz != ) + if (tz != {BOARD_TIMEZONE}) { ajax.index_data(tz); } diff --git a/upload/templates/default/usercp_attachcp.tpl b/upload/templates/default/usercp_attachcp.tpl deleted file mode 100644 index 5a52e665f..000000000 --- a/upload/templates/default/usercp_attachcp.tpl +++ /dev/null @@ -1,112 +0,0 @@ -

{L_UACP} :: {USERNAME}

- -
-{S_USER_HIDDEN} - - - - - - -
- {L_SORT_BY}: {S_MODE_SELECT} - {L_ORDER} {S_ORDER_SELECT} - -
- - - - ---------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#{L_POSTED_IN_TOPIC}{L_FILENAME}{L_FILECOMMENT}{L_EXTENSION}{L_SIZE}{L_DOWNLOADS}{L_POST_TIME}{L_DELETE}
{attachrow.ROW_NUMBER}{attachrow.POST_TITLE}{attachrow.FILENAME}{attachrow.COMMENT}{attachrow.EXTENSION} - {attachrow.SIZE_RAW} -

{attachrow.SIZE}

-
{attachrow.DOWNLOAD_COUNT} - {attachrow.POST_TIME_RAW} - {attachrow.POST_TIME} - {attachrow.S_DELETE_BOX}{attachrow.S_HIDDEN}
- -
- -
- -

- {L_MARK_ALL} - :: - {L_UNMARK_ALL} -

- - -
- -
- - - -
- -
-

{CURRENT_TIME}

-

{S_TIMEZONE}

-
-
- -
- - \ No newline at end of file diff --git a/upload/templates/default/usercp_bonus.tpl b/upload/templates/default/usercp_bonus.tpl index 8cc1a7596..c3c1a466e 100644 --- a/upload/templates/default/usercp_bonus.tpl +++ b/upload/templates/default/usercp_bonus.tpl @@ -14,12 +14,12 @@ - + - - - + + + diff --git a/upload/templates/default/usercp_topic_watch.tpl b/upload/templates/default/usercp_topic_watch.tpl index be0c3c52c..86fce8c28 100644 --- a/upload/templates/default/usercp_topic_watch.tpl +++ b/upload/templates/default/usercp_topic_watch.tpl @@ -76,7 +76,7 @@ td.topic_id { cursor: pointer; } - - - - - + + + + + @@ -181,11 +181,11 @@ $(document).ready(function(){ - - - - - + + + + +
{MY_BONUS}{MY_BONUS}
{L_DESCRIPTION}{L_PRICE}{L_BONUS_SELECT}{L_DESCRIPTION}{L_PRICE}{L_BONUS_SELECT}

{PAGE_TITLE}

-
{L_DL_USER}{L_DL_ULR}{L_DL_UL}{L_DL_DL}{L_DL_UL_SPEED}{L_DL_DL_SPEED}{L_DL_ULR}{L_DL_UL}{L_DL_DL}{L_DL_UL_SPEED}{L_DL_DL_SPEED} {L_IP_ADDRESS}
{L_DL_USER}%{L_DL_UL}{L_DL_DL}{L_DL_UL_SPEED}{L_DL_DL_SPEED}%{L_DL_UL}{L_DL_DL}{L_DL_UL_SPEED}{L_DL_DL_SPEED} {L_IP_ADDRESS}