From 8e3c39c9345010e3f023d81b2f0ba50adaece5ac Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Sat, 7 Apr 2012 00:06:57 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0=20dev?= =?UTF-8?q?eloper-jquery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/language/russian.php | 6 +- .../actions/ActionProfile/profile_top.tpl | 9 +-- .../actions/ActionProfile/sidebar.tpl | 63 +++++++++++-------- .../actions/ActionProfile/wall_items.tpl | 2 +- .../actions/ActionTalk/add.tpl | 5 ++ .../actions/ActionTalk/favourites.tpl | 2 + .../actions/ActionTalk/filter.tpl | 6 +- .../actions/ActionTalk/friends.tpl | 6 +- .../actions/ActionTalk/inbox.tpl | 8 ++- .../actions/ActionTalk/read.tpl | 34 +++++++--- .../actions/ActionTalk/speakers.tpl | 56 ++++++++--------- .../block.tagsFavouriteTopic.tpl | 2 +- .../skin/developer-jquery/css/blocks.css | 16 +++-- .../skin/developer-jquery/css/buttons.css | 2 +- .../skin/developer-jquery/css/comments.css | 2 +- templates/skin/developer-jquery/css/forms.css | 4 +- templates/skin/developer-jquery/css/grid.css | 4 +- templates/skin/developer-jquery/css/navs.css | 2 +- .../skin/developer-jquery/css/profile.css | 9 +-- templates/skin/developer-jquery/css/topic.css | 22 ++++++- templates/skin/developer-jquery/menu.talk.tpl | 4 +- .../settings/config/config.php | 15 +---- 22 files changed, 162 insertions(+), 117 deletions(-) diff --git a/templates/language/russian.php b/templates/language/russian.php index f95825f5..99902e43 100644 --- a/templates/language/russian.php +++ b/templates/language/russian.php @@ -688,7 +688,7 @@ return array( 'block_stream_comments' => 'Комментарии', 'block_stream_comments_no' => 'Нет комментариев.', 'block_stream_comments_all' => 'Весь эфир', - 'block_friends' => 'Друзья', + 'block_friends' => 'Выбрать получателей из списка друзей', 'block_friends_check' => 'Отметить всех', 'block_friends_uncheck' => 'Снять отметку', 'block_friends_empty' => 'Список ваших друзей пуст', @@ -737,13 +737,13 @@ return array( 'talk_favourite_del' => 'удалить из избранного', 'talk_favourite_del_ok' => 'Письмо удалено из избранного', 'talk_favourite_empty' => 'Нет писем в избранном', - 'talk_filter_title' => 'Фильтровать', + 'talk_filter_title' => 'Поиск сообщений', 'talk_filter_erase' => 'Сбросить фильтр', 'talk_filter_erase_form' => 'Очистить форму', 'talk_filter_label_sender' => 'Отправитель', 'talk_filter_label_keyword' => 'Искать в заголовке', 'talk_filter_label_keyword_text' => 'Искать в тексте', - 'talk_filter_label_favourite' => 'Искать в избранном', + 'talk_filter_label_favourite' => 'Искать только в избранном', 'talk_filter_label_date' => 'Ограничения по дате', 'talk_filter_notice_sender' => 'Укажите логин отправителя', 'talk_filter_notice_keyword' => 'Введите одно или несколько слов', diff --git a/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl b/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl index 5c9df9ce..066f4c51 100644 --- a/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl +++ b/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl @@ -13,16 +13,9 @@
{math equation="round(x, 1)" x=$oUserProfile->getSkill()}
-

{$oUserProfile->getLogin()}

+

{$oUserProfile->getLogin()}

{if $oUserProfile->getProfileName()}

{$oUserProfile->getProfileName()|escape:'html'}

{/if} - - {if $oUserCurrent && $oUserCurrent->getId()!=$oUserProfile->getId()} - - {/if} \ No newline at end of file diff --git a/templates/skin/developer-jquery/actions/ActionProfile/sidebar.tpl b/templates/skin/developer-jquery/actions/ActionProfile/sidebar.tpl index b2423e12..bb1669cb 100644 --- a/templates/skin/developer-jquery/actions/ActionProfile/sidebar.tpl +++ b/templates/skin/developer-jquery/actions/ActionProfile/sidebar.tpl @@ -12,34 +12,47 @@ +{if $oUserCurrent && $oUserCurrent->getId()!=$oUserProfile->getId()} +
+
+
    + {include file='actions/ActionProfile/friend_item.tpl' oUserFriend=$oUserProfile->getUserFriend()} +
  • {$aLang.user_write_prvmsg}
    • +
+
+
+{/if} + + + {if $oUserCurrent && $oUserCurrent->getId() != $oUserProfile->getId()}
- {if $oUserNote} - - {/if} + {if $oUserNote} + + {/if} -
-

- {if $oUserNote} - {$oUserNote->getText()} - {/if} -

- - -
+
+

+ {if $oUserNote} + {$oUserNote->getText()} + {/if} +

- - - {$aLang.user_note_add} + +
+ + + + {$aLang.user_note_add}
{/if} @@ -50,7 +63,7 @@
  • {$aLang.user_menu_profile_whois}
    • {if $oUserCurrent and $oUserCurrent->getId() == $oUserProfile->getId()} -
  • {$aLang.talk_menu_inbox} (0)
    • +
  • {$aLang.talk_menu_inbox} ({$iUserCurrentCountTalkNew})
    • {/if}
  • {$aLang.user_menu_profile_wall}{if ($iCountWallUser)>0} ({$iCountWallUser}){/if}
    • diff --git a/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl b/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl index c0e4650a..ce6640c0 100644 --- a/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl +++ b/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl @@ -6,7 +6,7 @@
    avatar -