diff --git a/templates/skin/developer/actions/ActionProfile/created_comments.tpl b/templates/skin/developer/actions/ActionProfile/created_comments.tpl index 225074d2..a23d6f0d 100644 --- a/templates/skin/developer/actions/ActionProfile/created_comments.tpl +++ b/templates/skin/developer/actions/ActionProfile/created_comments.tpl @@ -2,10 +2,11 @@ * Список комментариев созданных пользователем *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_publication}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_created.tpl'} {include file='comments/comment_list.tpl'} {/block} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/created_notes.tpl b/templates/skin/developer/actions/ActionProfile/created_notes.tpl index a63de7e6..5d227783 100644 --- a/templates/skin/developer/actions/ActionProfile/created_notes.tpl +++ b/templates/skin/developer/actions/ActionProfile/created_notes.tpl @@ -2,10 +2,11 @@ * Список заметок созданных пользователем *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_publication}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_created.tpl'} {if $aNotes} diff --git a/templates/skin/developer/actions/ActionProfile/created_topics.tpl b/templates/skin/developer/actions/ActionProfile/created_topics.tpl index 6bebbaa3..710f113f 100644 --- a/templates/skin/developer/actions/ActionProfile/created_topics.tpl +++ b/templates/skin/developer/actions/ActionProfile/created_topics.tpl @@ -2,10 +2,11 @@ * Список топиков созданных пользователем *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_publication}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_created.tpl'} {include file='topics/topic_list.tpl'} {/block} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/favourite_comments.tpl b/templates/skin/developer/actions/ActionProfile/favourite_comments.tpl index 5caae356..bc423b25 100644 --- a/templates/skin/developer/actions/ActionProfile/favourite_comments.tpl +++ b/templates/skin/developer/actions/ActionProfile/favourite_comments.tpl @@ -2,10 +2,11 @@ * Избранные комментарии пользователя *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_profile_favourites}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_favourite.tpl'} {include file='comments/comment_list.tpl'} {/block} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/favourite_topics.tpl b/templates/skin/developer/actions/ActionProfile/favourite_topics.tpl index 5f9bf1ea..7f735cf6 100644 --- a/templates/skin/developer/actions/ActionProfile/favourite_topics.tpl +++ b/templates/skin/developer/actions/ActionProfile/favourite_topics.tpl @@ -2,10 +2,11 @@ * Избранные топики пользователя *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_profile_favourites}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_favourite.tpl'} {if $oUserCurrent and $oUserCurrent->getId() == $oUserProfile->getId()} diff --git a/templates/skin/developer/actions/ActionProfile/friends.tpl b/templates/skin/developer/actions/ActionProfile/friends.tpl index 93f0d322..6136b5e2 100644 --- a/templates/skin/developer/actions/ActionProfile/friends.tpl +++ b/templates/skin/developer/actions/ActionProfile/friends.tpl @@ -2,12 +2,10 @@ * Список друзей *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_profile_friends}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} - -

{$aLang.user_menu_profile_friends}

- {include file='user_list.tpl' aUsersList=$aFriends} {/block} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/profile_top.tpl b/templates/skin/developer/actions/ActionProfile/profile_top.tpl deleted file mode 100644 index 26f20b51..00000000 --- a/templates/skin/developer/actions/ActionProfile/profile_top.tpl +++ /dev/null @@ -1,31 +0,0 @@ -{** - * Шапка профиля - *} - -{$oVote = $oUserProfile->getVote()} - -
- {hook run='profile_top_begin' oUserProfile=$oUserProfile} - - avatar - -
-
{$aLang.user_rating}
- - -
{if $oUserProfile->getRating() > 0}+{/if}{$oUserProfile->getRating()}
-
- -
-
{$aLang.user_skill}
-
{$oUserProfile->getSkill()}
-
- - - - {if $oUserProfile->getProfileName()} -

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

- {/if} - - {hook run='profile_top_end' oUserProfile=$oUserProfile} -
\ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/stream.tpl b/templates/skin/developer/actions/ActionProfile/stream.tpl index 2daf7ab8..417e15cf 100644 --- a/templates/skin/developer/actions/ActionProfile/stream.tpl +++ b/templates/skin/developer/actions/ActionProfile/stream.tpl @@ -2,12 +2,10 @@ * Активность пользователя *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_profile_stream}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} - -

{$aLang.user_menu_profile_stream}

- {include file='actions/ActionStream/event_list.tpl' sActivityType='user' sActivityParams="data-param-i-user-id=\"{$oUserProfile->getId()}\""} {/block} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/wall.tpl b/templates/skin/developer/actions/ActionProfile/wall.tpl index 48c3ff77..6c0f5078 100644 --- a/templates/skin/developer/actions/ActionProfile/wall.tpl +++ b/templates/skin/developer/actions/ActionProfile/wall.tpl @@ -2,13 +2,11 @@ * Стена *} -{extends file='layout.base.tpl'} +{extends file='layout.user.tpl'} + +{block name='layout_user_page_title'}{$aLang.user_menu_profile_wall}{/block} {block name='layout_content'} - {include file='actions/ActionProfile/profile_top.tpl'} - -

{$aLang.user_menu_profile_wall}

-