diff --git a/templates/skin/developer/actions/ActionProfile/changemail_confirm.tpl b/templates/skin/developer/actions/ActionProfile/changemail_confirm.tpl index a392daa0..aea69856 100644 --- a/templates/skin/developer/actions/ActionProfile/changemail_confirm.tpl +++ b/templates/skin/developer/actions/ActionProfile/changemail_confirm.tpl @@ -1,11 +1,8 @@ -{assign var="noSidebar" value=true} +{$noSidebar = true} {include file='header.tpl' noShowSystemMessage=true} -

{$sText}

-
- {include file='footer.tpl'} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/created_comments.tpl b/templates/skin/developer/actions/ActionProfile/created_comments.tpl index fb6f4922..1e2c5e79 100644 --- a/templates/skin/developer/actions/ActionProfile/created_comments.tpl +++ b/templates/skin/developer/actions/ActionProfile/created_comments.tpl @@ -1,11 +1,5 @@ {include file='header.tpl'} - - - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_created.tpl'} - - - {include file='comments/comment_list.tpl'} {include file='footer.tpl'} \ 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 5ff0040a..f63fb2e3 100644 --- a/templates/skin/developer/actions/ActionProfile/created_notes.tpl +++ b/templates/skin/developer/actions/ActionProfile/created_notes.tpl @@ -1,11 +1,7 @@ {include file='header.tpl'} - - - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_created.tpl'} - {if $aNotes} {foreach from=$aNotes item=oNote} @@ -20,9 +16,5 @@
{$aLang.user_note_list_empty}
{/if} - {include file='paging.tpl' aPaging=$aPaging} - - - {include file='footer.tpl'} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/created_topics.tpl b/templates/skin/developer/actions/ActionProfile/created_topics.tpl index ac3fc6b6..4e7f899b 100644 --- a/templates/skin/developer/actions/ActionProfile/created_topics.tpl +++ b/templates/skin/developer/actions/ActionProfile/created_topics.tpl @@ -1,11 +1,5 @@ {include file='header.tpl'} - - - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_created.tpl'} - - - {include file='topics/topic_list.tpl'} {include file='footer.tpl'} \ 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 4dc457dd..e4ce77d7 100644 --- a/templates/skin/developer/actions/ActionProfile/favourite_comments.tpl +++ b/templates/skin/developer/actions/ActionProfile/favourite_comments.tpl @@ -1,7 +1,5 @@ {include file='header.tpl'} - {include file='actions/ActionProfile/profile_top.tpl'} {include file='navs/nav.profile_favourite.tpl'} {include file='comments/comment_list.tpl'} - {include file='footer.tpl'} \ 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 55baebce..16a3839e 100644 --- a/templates/skin/developer/actions/ActionProfile/favourite_topics.tpl +++ b/templates/skin/developer/actions/ActionProfile/favourite_topics.tpl @@ -1,17 +1,10 @@ {include file='header.tpl'} - - - {include file='actions/ActionProfile/profile_top.tpl'} - {include file='navs/nav.profile_favourite.tpl'} -{if $oUserCurrent and $oUserCurrent->getId()==$oUserProfile->getId()} +{if $oUserCurrent and $oUserCurrent->getId() == $oUserProfile->getId()} {insert name="block" block=tagsFavouriteTopic params={$aBlockParams.user=$oUserProfile}} {/if} {include file='topics/topic_list.tpl'} - - - {include file='footer.tpl'} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionProfile/friends.tpl b/templates/skin/developer/actions/ActionProfile/friends.tpl index ec5e625a..51baa9a0 100644 --- a/templates/skin/developer/actions/ActionProfile/friends.tpl +++ b/templates/skin/developer/actions/ActionProfile/friends.tpl @@ -1,11 +1,7 @@ {include file='header.tpl'} - {include file='actions/ActionProfile/profile_top.tpl'} +

{$aLang.user_menu_profile_friends}

- {include file='user_list.tpl' aUsersList=$aFriends} - - - {include file='footer.tpl'} \ 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 index f7ce1fde..05c77c43 100644 --- a/templates/skin/developer/actions/ActionProfile/profile_top.tpl +++ b/templates/skin/developer/actions/ActionProfile/profile_top.tpl @@ -1,3 +1,5 @@ +{$oVote = $oUserProfile->getVote()} +
{hook run='profile_top_begin' oUserProfile=$oUserProfile} diff --git a/templates/skin/developer/actions/ActionProfile/sidebar.tpl b/templates/skin/developer/actions/ActionProfile/sidebar.tpl index 03876525..e5a591a9 100644 --- a/templates/skin/developer/actions/ActionProfile/sidebar.tpl +++ b/templates/skin/developer/actions/ActionProfile/sidebar.tpl @@ -1,7 +1,6 @@ {hook run='profile_sidebar_begin' oUserProfile=$oUserProfile} {include file='modals/modal.profile_photo_upload.tpl'} - {include file='blocks/block.profilePhoto.tpl'} {if $oUserCurrent && $oUserCurrent->getId() != $oUserProfile->getId()} diff --git a/templates/skin/developer/actions/ActionProfile/stream.tpl b/templates/skin/developer/actions/ActionProfile/stream.tpl index 70c8d6dc..b7707119 100644 --- a/templates/skin/developer/actions/ActionProfile/stream.tpl +++ b/templates/skin/developer/actions/ActionProfile/stream.tpl @@ -1,8 +1,7 @@ {include file='header.tpl'} - {include file='actions/ActionProfile/profile_top.tpl'} -

{$aLang.user_menu_profile_stream}

+

{$aLang.user_menu_profile_stream}

{if count($aStreamEvents)}