From 81c3b994fdfc6574d287a7a5449ca69d7156d377 Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Mon, 27 May 2013 16:05:36 +0700
Subject: [PATCH] Fix profile, fixes #281

---
 .../ActionProfile/changemail_confirm.tpl      |  5 +-
 .../ActionProfile/created_comments.tpl        |  6 ---
 .../actions/ActionProfile/created_notes.tpl   |  8 ---
 .../actions/ActionProfile/created_topics.tpl  |  6 ---
 .../ActionProfile/favourite_comments.tpl      |  2 -
 .../ActionProfile/favourite_topics.tpl        |  9 +---
 .../actions/ActionProfile/friends.tpl         |  6 +--
 .../actions/ActionProfile/profile_top.tpl     |  2 +
 .../actions/ActionProfile/sidebar.tpl         |  1 -
 .../actions/ActionProfile/stream.tpl          |  5 +-
 .../developer/actions/ActionProfile/wall.tpl  | 23 +++------
 .../actions/ActionProfile/wall_items.tpl      | 31 ++++++++----
 .../ActionProfile/wall_items_reply.tpl        | 10 +++-
 .../developer/actions/ActionProfile/whois.tpl | 29 +++++------
 .../ActionProfile/changemail_confirm.tpl      |  5 +-
 .../ActionProfile/created_comments.tpl        |  7 ---
 .../actions/ActionProfile/created_notes.tpl   |  9 ----
 .../actions/ActionProfile/created_topics.tpl  |  7 ---
 .../ActionProfile/favourite_comments.tpl      |  8 ---
 .../ActionProfile/favourite_topics.tpl        |  7 ---
 .../synio/actions/ActionProfile/friends.tpl   |  7 ---
 .../actions/ActionProfile/profile_top.tpl     |  2 +
 .../synio/actions/ActionProfile/stream.tpl    |  9 +---
 .../skin/synio/actions/ActionProfile/wall.tpl | 18 ++-----
 .../actions/ActionProfile/wall_items.tpl      |  6 +--
 .../ActionProfile/wall_items_reply.tpl        | 14 ++++--
 .../synio/actions/ActionProfile/whois.tpl     | 49 +++++++++----------
 templates/skin/synio/header.tpl               |  2 +-
 28 files changed, 103 insertions(+), 190 deletions(-)

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}
 
-
 <div class="content-error">
 	<p>{$sText}</p>
-	<br />
 </div>
 
-
 {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}
 	<table class="table table-profile-notes" cellspacing="0">
 		{foreach from=$aNotes item=oNote}
@@ -20,9 +16,5 @@
 	<div class="notice-empty">{$aLang.user_note_list_empty}</div>
 {/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'}
+
 <h3 class="profile-page-header">{$aLang.user_menu_profile_friends}</h3>
 
-
 {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()}
+
 <div class="profile">
 	{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'}
-<h3 class="profile-page-header">{$aLang.user_menu_profile_stream}</h3>
 
+<h3 class="profile-page-header">{$aLang.user_menu_profile_stream}</h3>
 
 {if count($aStreamEvents)}
 	<ul class="stream-list" id="stream-list">
@@ -17,6 +16,4 @@
 	{$aLang.stream_no_events}
 {/if}
 
-
-
 {include file='footer.tpl'}
\ 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 3373af77..9239779d 100644
--- a/templates/skin/developer/actions/ActionProfile/wall.tpl
+++ b/templates/skin/developer/actions/ActionProfile/wall.tpl
@@ -1,15 +1,9 @@
 {include file='header.tpl'}
-
-{assign var="oSession" value=$oUserProfile->getSession()}
-{assign var="oVote" value=$oUserProfile->getVote()}
-			
-
-			
 {include file='actions/ActionProfile/profile_top.tpl'}
+
 <h3 class="profile-page-header">{$aLang.user_menu_profile_wall}</h3>
 
-
-<script type="text/javascript">
+<script>
 	ls.wall.init({
 		login:'{$oUserProfile->getLogin()}'
 	});
@@ -18,7 +12,7 @@
 {if $oUserCurrent}
 	<form class="wall-submit">
 		<label for="wall-text">{$aLang.wall_add_title}:</label>
-		<p><textarea rows="4" id="wall-text" class="input-text input-width-full js-wall-reply-parent-text"></textarea></p>
+		<p><textarea rows="4" id="wall-text" class="width-full js-wall-reply-parent-text"></textarea></p>
 
 		<button type="button" onclick="ls.wall.add(jQuery('#wall-text').val(),0);" class="button button-primary js-button-wall-submit">{$aLang.wall_add_submit}</button>
 	</form>
@@ -28,7 +22,7 @@
 	</div>
 {/if}
 
-{if !count($aWall)}
+{if ! count($aWall)}
 	<div id="wall-note-list-empty" class="wall-note">
 		<h3>{$aLang.wall_list_empty}</h3>
 	</div>
@@ -38,11 +32,10 @@
 	{include file='actions/ActionProfile/wall_items.tpl'}
 </div>
 
-
-{if $iCountWall-count($aWall)}
-	<a href="#" onclick="return ls.wall.loadNext();" id="wall-button-next" class="wall-more"><span class="wall-more-inner">{$aLang.wall_load_more} (<span id="wall-count-next">{$iCountWall-count($aWall)}</span>)</span></a>
+{if $iCountWall - count($aWall)}
+	<a href="#" onclick="return ls.wall.loadNext();" id="wall-button-next" class="wall-more">
+		<span class="wall-more-inner">{$aLang.wall_load_more} (<span id="wall-count-next">{$iCountWall-count($aWall)}</span>)</span>
+	</a>
 {/if}
 
-
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/developer/actions/ActionProfile/wall_items.tpl b/templates/skin/developer/actions/ActionProfile/wall_items.tpl
index 2cc8599f..b4478133 100644
--- a/templates/skin/developer/actions/ActionProfile/wall_items.tpl
+++ b/templates/skin/developer/actions/ActionProfile/wall_items.tpl
@@ -1,14 +1,21 @@
 {foreach from=$aWall item=oWall}
-	{assign var="oWallUser" value=$oWall->getUser()}
-	{assign var="aReplyWall" value=$oWall->getLastReplyWall()}
+	{$oWallUser = $oWall->getUser()}
+	{$aReplyWall = $oWall->getLastReplyWall()}
 
 	<div id="wall-item-{$oWall->getId()}" class="js-wall-item comment-wrapper">
 		<div class="comment">
-			<a href="{$oWallUser->getUserWebPath()}"><img src="{$oWallUser->getProfileAvatarPath(48)}" alt="avatar" class="comment-avatar" /></a>
+			<a href="{$oWallUser->getUserWebPath()}">
+				<img src="{$oWallUser->getProfileAvatarPath(48)}" alt="avatar" class="comment-avatar" />
+			</a>
 			
 			<ul class="comment-info">
 				<li class="comment-author"><a href="{$oWallUser->getUserWebPath()}">{$oWallUser->getLogin()}</a></li>
-				<li class="comment-date"><time datetime="{date_format date=$oWall->getDateAdd() format='c'}">{date_format date=$oWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time></li>
+				<li class="comment-date">
+					<time datetime="{date_format date=$oWall->getDateAdd() format='c'}">
+						{date_format date=$oWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
+					</time>
+				</li>
+
 				{if $oWall->isAllowDelete()}
 					<li><a href="#" onclick="return ls.wall.remove({$oWall->getId()});" class="link-dotted">{$aLang.wall_action_delete}</a></li>
 				{/if}
@@ -18,21 +25,23 @@
 				{$oWall->getText()}
 			</div>
 			
-			{if $oUserCurrent and !$aReplyWall}
+			{if $oUserCurrent and ! $aReplyWall}
 				<ul class="comment-actions">
 					<li><a href="#" class="link-dotted" onclick="return ls.wall.toggleReply({$oWall->getId()});">{$aLang.wall_action_reply}</a></li>
 				</ul>
 			{/if}
 		</div>
 		
-		
 		{if count($aReplyWall) < $oWall->getCountReply()}
 			<a href="#" onclick="return ls.wall.loadReplyNext({$oWall->getId()});" id="wall-reply-button-next-{$oWall->getId()}" class="wall-more wall-more-reply">
-				<span class="wall-more-inner">{$aLang.wall_load_reply_more} <span id="wall-reply-count-next-{$oWall->getId()}">{$oWall->getCountReply()}</span> {$oWall->getCountReply()|declension:$aLang.comment_declension:'russian'}</span>
+				<span class="wall-more-inner">
+					{$aLang.wall_load_reply_more} 
+					<span id="wall-reply-count-next-{$oWall->getId()}">{$oWall->getCountReply()}</span> 
+					{$oWall->getCountReply()|declension:$aLang.comment_declension:'russian'}
+				</span>
 			</a>
 		{/if}
 
-		
 		<div id="wall-reply-container-{$oWall->getId()}" class="comment-wrapper">
 			{if $aReplyWall}
 				{include file='actions/ActionProfile/wall_items_reply.tpl'}
@@ -41,7 +50,11 @@
 
 		{if $oUserCurrent}
 			<form class="wall-submit wall-submit-reply" {if !$aReplyWall}style="display: none"{/if}>
-				<textarea rows="4" id="wall-reply-text-{$oWall->getId()}" class="input-text input-width-full js-wall-reply-text" placeholder="{$aLang.wall_reply_placeholder}" onclick="return ls.wall.expandReply({$oWall->getId()});"></textarea>
+				<textarea rows="4" 
+						  id="wall-reply-text-{$oWall->getId()}" 
+						  class="input-text input-width-full js-wall-reply-text" 
+						  placeholder="{$aLang.wall_reply_placeholder}" 
+						  onclick="return ls.wall.expandReply({$oWall->getId()});"></textarea>
 				<button type="button" onclick="ls.wall.addReply(jQuery('#wall-reply-text-{$oWall->getId()}').val(), {$oWall->getId()});" class="button button-primary js-button-wall-submit">{$aLang.wall_reply_submit}</button>
 			</form>
 		{/if}
diff --git a/templates/skin/developer/actions/ActionProfile/wall_items_reply.tpl b/templates/skin/developer/actions/ActionProfile/wall_items_reply.tpl
index a944ffa3..254655ba 100644
--- a/templates/skin/developer/actions/ActionProfile/wall_items_reply.tpl
+++ b/templates/skin/developer/actions/ActionProfile/wall_items_reply.tpl
@@ -1,11 +1,17 @@
 {foreach from=$aReplyWall item=oReplyWall}
-	{assign var="oReplyUser" value=$oReplyWall->getUser()}
+	{$oReplyUser = $oReplyWall->getUser()}
+
 	<div id="wall-reply-item-{$oReplyWall->getId()}" class="js-wall-reply-item comment wall-comment-reply">
 		<a href="{$oReplyUser->getUserWebPath()}"><img src="{$oReplyUser->getProfileAvatarPath(48)}" alt="avatar" class="comment-avatar" /></a>
 		
 		<ul class="comment-info">
 			<li class="comment-author"><a href="{$oReplyUser->getUserWebPath()}">{$oReplyUser->getLogin()}</a></li>
-			<li class="comment-date"><time datetime="{date_format date=$oReplyWall->getDateAdd() format='c'}">{date_format date=$oReplyWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time></li>
+			<li class="comment-date">
+				<time datetime="{date_format date=$oReplyWall->getDateAdd() format='c'}">
+					{date_format date=$oReplyWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
+				</time>
+			</li>
+			
 			{if $oReplyWall->isAllowDelete()}
 				<li><a href="#" onclick="return ls.wall.remove({$oReplyWall->getId()});" class="link-dotted">{$aLang.wall_action_delete}</a></li>
 			{/if}
diff --git a/templates/skin/developer/actions/ActionProfile/whois.tpl b/templates/skin/developer/actions/ActionProfile/whois.tpl
index 878524c4..29eb0449 100644
--- a/templates/skin/developer/actions/ActionProfile/whois.tpl
+++ b/templates/skin/developer/actions/ActionProfile/whois.tpl
@@ -1,16 +1,11 @@
-{assign var="sidebarPosition" value='left'}
-{assign var="sMenuItemSelect" value='profile'}
+{$sMenuItemSelect = 'profile'}
+{$oSession = $oUserProfile->getSession()}
+{$oVote = $oUserProfile->getVote()}
+{$oGeoTarget = $oUserProfile->getGeoTarget()}
 {include file='header.tpl'}
-
-{assign var="oSession" value=$oUserProfile->getSession()}
-{assign var="oVote" value=$oUserProfile->getVote()}
-{assign var="oGeoTarget" value=$oUserProfile->getGeoTarget()}
-
-
-			
 {include file='actions/ActionProfile/profile_top.tpl'}
-<h3 class="profile-page-header">{$aLang.user_menu_profile_whois}</h3>
 
+<h3 class="profile-page-header">{$aLang.user_menu_profile_whois}</h3>
 
 {if $oUserProfile->getProfileAbout()}					
 	<div class="profile-info-about">
@@ -22,7 +17,8 @@
 	</div>
 {/if}
 
-{assign var="aUserFieldValues" value=$oUserProfile->getUserFieldValues(true,array(''))}
+
+{$aUserFieldValues = $oUserProfile->getUserFieldValues(true,array(''))}
 
 {if $oUserProfile->getProfileSex()!='other' || $oUserProfile->getProfileBirthday() || $oGeoTarget || $oUserProfile->getProfileAbout() || count($aUserFieldValues)}
 	<h2 class="header-table">{$aLang.profile_privat}</h2>
@@ -81,7 +77,7 @@
 
 {hook run='profile_whois_item_after_privat' oUserProfile=$oUserProfile}
 
-{assign var="aUserFieldContactValues" value=$oUserProfile->getUserFieldValues(true,array('contact'))}
+{$aUserFieldContactValues = $oUserProfile->getUserFieldValues(true,array('contact'))}
 {if $aUserFieldContactValues}
 	<h2 class="header-table">{$aLang.profile_contacts}</h2>
 	
@@ -96,7 +92,7 @@
 {/if}
 
 
-{assign var="aUserFieldContactValues" value=$oUserProfile->getUserFieldValues(true,array('social'))}
+{$aUserFieldContactValues = $oUserProfile->getUserFieldValues(true,array('social'))}
 {if $aUserFieldContactValues}
 	<h2 class="header-table">{$aLang.profile_social}</h2>
 	
@@ -157,7 +153,7 @@
 			<td class="cell-label">{$aLang.profile_blogs_administration}:</td>
 			<td>
 				{foreach from=$aBlogAdministrators item=oBlogUser name=blog_user}
-					{assign var="oBlog" value=$oBlogUser->getBlog()}
+					{$oBlog = $oBlogUser->getBlog()}
 					<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>{if !$smarty.foreach.blog_user.last}, {/if}
 				{/foreach}
 			</td>
@@ -170,7 +166,7 @@
 			<td class="cell-label">{$aLang.profile_blogs_moderation}:</td>
 			<td>
 				{foreach from=$aBlogModerators item=oBlogUser name=blog_user}
-					{assign var="oBlog" value=$oBlogUser->getBlog()}
+					{$oBlog = $oBlogUser->getBlog()}
 					<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>{if !$smarty.foreach.blog_user.last}, {/if}
 				{/foreach}
 			</td>
@@ -183,7 +179,7 @@
 			<td class="cell-label">{$aLang.profile_blogs_join}:</td>
 			<td>
 				{foreach from=$aBlogUsers item=oBlogUser name=blog_user}
-					{assign var="oBlog" value=$oBlogUser->getBlog()}
+					{$oBlog = $oBlogUser->getBlog()}
 					<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>{if !$smarty.foreach.blog_user.last}, {/if}
 				{/foreach}
 			</td>
@@ -209,7 +205,6 @@
 </table>
 
 
-
 {if $aUsersFriend}
 	<h2 class="header-table mb-15"><a href="{$oUserProfile->getUserWebPath()}friends/">{$aLang.profile_friends}</a> ({$iCountFriendsUser})</h2>
 	
diff --git a/templates/skin/synio/actions/ActionProfile/changemail_confirm.tpl b/templates/skin/synio/actions/ActionProfile/changemail_confirm.tpl
index a392daa0..aea69856 100644
--- a/templates/skin/synio/actions/ActionProfile/changemail_confirm.tpl
+++ b/templates/skin/synio/actions/ActionProfile/changemail_confirm.tpl
@@ -1,11 +1,8 @@
-{assign var="noSidebar" value=true}
+{$noSidebar = true}
 {include file='header.tpl' noShowSystemMessage=true}
 
-
 <div class="content-error">
 	<p>{$sText}</p>
-	<br />
 </div>
 
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/synio/actions/ActionProfile/created_comments.tpl b/templates/skin/synio/actions/ActionProfile/created_comments.tpl
index a7e789ff..fe8512bc 100644
--- a/templates/skin/synio/actions/ActionProfile/created_comments.tpl
+++ b/templates/skin/synio/actions/ActionProfile/created_comments.tpl
@@ -1,12 +1,5 @@
-{assign var="sidebarPosition" value='left'}
 {include file='header.tpl' nav='people'}
-
-
-
 {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/synio/actions/ActionProfile/created_notes.tpl b/templates/skin/synio/actions/ActionProfile/created_notes.tpl
index 15e383ea..da139995 100644
--- a/templates/skin/synio/actions/ActionProfile/created_notes.tpl
+++ b/templates/skin/synio/actions/ActionProfile/created_notes.tpl
@@ -1,12 +1,7 @@
-{assign var="sidebarPosition" value='left'}
 {include file='header.tpl' nav='people'}
-
-
-
 {include file='actions/ActionProfile/profile_top.tpl'}
 {include file='navs/nav.profile_created.tpl'}
 
-
 {if $aNotes}
 	<table class="table table-profile-notes" cellspacing="0">
 		{foreach from=$aNotes item=oNote}
@@ -21,9 +16,5 @@
 	<div class="notice-empty">{$aLang.user_note_list_empty}</div>
 {/if}
 
-
 {include file='paging.tpl' aPaging=$aPaging}
-
-
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/synio/actions/ActionProfile/created_topics.tpl b/templates/skin/synio/actions/ActionProfile/created_topics.tpl
index a359f781..f287d0a5 100644
--- a/templates/skin/synio/actions/ActionProfile/created_topics.tpl
+++ b/templates/skin/synio/actions/ActionProfile/created_topics.tpl
@@ -1,12 +1,5 @@
-{assign var="sidebarPosition" value='left'}
 {include file='header.tpl' nav='people'}
-
-
-
 {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/synio/actions/ActionProfile/favourite_comments.tpl b/templates/skin/synio/actions/ActionProfile/favourite_comments.tpl
index 1e947748..c4b4d5d9 100644
--- a/templates/skin/synio/actions/ActionProfile/favourite_comments.tpl
+++ b/templates/skin/synio/actions/ActionProfile/favourite_comments.tpl
@@ -1,13 +1,5 @@
-{assign var="sidebarPosition" value='left'}
 {include file='header.tpl' nav='people'}
-
-
-
 {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/synio/actions/ActionProfile/favourite_topics.tpl b/templates/skin/synio/actions/ActionProfile/favourite_topics.tpl
index 847f45d8..3a40e9da 100644
--- a/templates/skin/synio/actions/ActionProfile/favourite_topics.tpl
+++ b/templates/skin/synio/actions/ActionProfile/favourite_topics.tpl
@@ -1,8 +1,4 @@
-{assign var="sidebarPosition" value='left'}
 {include file='header.tpl' nav='people'}
-
-
-
 {include file='actions/ActionProfile/profile_top.tpl'}
 {include file='navs/nav.profile_favourite.tpl'}
 
@@ -12,7 +8,4 @@
 {/if}
 
 {include file='topics/topic_list.tpl'}
-
-
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/synio/actions/ActionProfile/friends.tpl b/templates/skin/synio/actions/ActionProfile/friends.tpl
index 52f8eb6a..95a74f8d 100644
--- a/templates/skin/synio/actions/ActionProfile/friends.tpl
+++ b/templates/skin/synio/actions/ActionProfile/friends.tpl
@@ -1,11 +1,4 @@
-{assign var="sidebarPosition" value='left'}
 {include file='header.tpl' nav='people'}
-
 {include file='actions/ActionProfile/profile_top.tpl'}
-
-
 {include file='user_list.tpl' aUsersList=$aFriends}
-
-
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/synio/actions/ActionProfile/profile_top.tpl b/templates/skin/synio/actions/ActionProfile/profile_top.tpl
index 041e717c..1ae2600e 100644
--- a/templates/skin/synio/actions/ActionProfile/profile_top.tpl
+++ b/templates/skin/synio/actions/ActionProfile/profile_top.tpl
@@ -1,3 +1,5 @@
+{$oVote = $oUserProfile->getVote()}
+
 <div class="profile">
 	{hook run='profile_top_begin' oUserProfile=$oUserProfile}
 	
diff --git a/templates/skin/synio/actions/ActionProfile/stream.tpl b/templates/skin/synio/actions/ActionProfile/stream.tpl
index 0da17365..5cd3d3ce 100644
--- a/templates/skin/synio/actions/ActionProfile/stream.tpl
+++ b/templates/skin/synio/actions/ActionProfile/stream.tpl
@@ -1,15 +1,12 @@
-{assign var="sidebarPosition" value='left'}
 {include file='header.tpl' nav='people'}
-
 {include file='actions/ActionProfile/profile_top.tpl'}
 
-
 {if count($aStreamEvents)}
 	<ul class="stream-list" id="stream-list">
-	{include file='actions/ActionStream/events.tpl'}
+		{include file='actions/ActionStream/events.tpl'}
 	</ul>
 
-	{if !$bDisableGetMoreButton}
+	{if ! $bDisableGetMoreButton}
 		<input type="hidden" id="stream_last_id" value="{$iStreamLastId}" />
 		<a class="stream-get-more" id="stream_get_more" href="javascript:ls.stream.getMoreByUser({$oUserProfile->getId()})">{$aLang.stream_get_more} &darr;</a>
 	{/if}
@@ -17,6 +14,4 @@
 	{$aLang.stream_no_events}
 {/if}
 
-
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/synio/actions/ActionProfile/wall.tpl b/templates/skin/synio/actions/ActionProfile/wall.tpl
index aa264fa3..21c4b946 100644
--- a/templates/skin/synio/actions/ActionProfile/wall.tpl
+++ b/templates/skin/synio/actions/ActionProfile/wall.tpl
@@ -1,15 +1,9 @@
-{assign var="sidebarPosition" value='left'}
+{$oSession = $oUserProfile->getSession()}
+{$oVote = $oUserProfile->getVote()}
 {include file='header.tpl' nav='people'}
-
-{assign var="oSession" value=$oUserProfile->getSession()}
-{assign var="oVote" value=$oUserProfile->getVote()}
-			
-
-			
 {include file='actions/ActionProfile/profile_top.tpl'}
 
-
-<script type="text/javascript">
+<script>
 	ls.wall.init({
 		login:'{$oUserProfile->getLogin()}'
 	});
@@ -24,7 +18,7 @@
 
 {if $oUserCurrent}
 	<form class="wall-submit">
-		<textarea rows="4" id="wall-text" class="input-text input-width-full js-wall-reply-parent-text"></textarea>
+		<textarea rows="4" id="wall-text" class="width-full js-wall-reply-parent-text"></textarea>
 
 		<button type="button" onclick="ls.wall.add(jQuery('#wall-text').val(),0);" class="button button-primary js-button-wall-submit">{$aLang.wall_add_submit}</button>
 	</form>
@@ -34,7 +28,7 @@
 	</div>
 {/if}
 
-{if !count($aWall)}
+{if ! count($aWall)}
 	<div class="wall-note" id="wall-note-list-empty">
 		<h3>{$aLang.wall_list_empty}</h3>
 	</div>
@@ -44,11 +38,9 @@
 	{include file='actions/ActionProfile/wall_items.tpl'}
 </div>
 
-
 {if $iCountWall-count($aWall)}
 	<a href="#" onclick="return ls.wall.loadNext();" id="wall-button-next" class="stream-get-more"><span class="wall-more-inner">{$aLang.wall_load_more} (<span id="wall-count-next">{$iCountWall-count($aWall)}</span>)</span></a>
 {/if}
 
 
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/synio/actions/ActionProfile/wall_items.tpl b/templates/skin/synio/actions/ActionProfile/wall_items.tpl
index fa0e9495..aa818fee 100644
--- a/templates/skin/synio/actions/ActionProfile/wall_items.tpl
+++ b/templates/skin/synio/actions/ActionProfile/wall_items.tpl
@@ -1,6 +1,6 @@
 {foreach from=$aWall item=oWall}
-	{assign var="oWallUser" value=$oWall->getUser()}
-	{assign var="aReplyWall" value=$oWall->getLastReplyWall()}
+	{$oWallUser = $oWall->getUser()}
+	{$aReplyWall = $oWall->getLastReplyWall()}
 
 	<div id="wall-item-{$oWall->getId()}" class="js-wall-item wall-item-wrapper">
 		<div class="wall-item">
@@ -45,7 +45,7 @@
 		
 		{if $oUserCurrent}
 			<form class="wall-submit wall-submit-reply" {if !$aReplyWall}style="display: none"{/if}>
-				<textarea rows="4" id="wall-reply-text-{$oWall->getId()}" class="input-text input-width-full js-wall-reply-text" placeholder="{$aLang.wall_reply_placeholder}" onclick="return ls.wall.expandReply({$oWall->getId()});"></textarea>
+				<textarea rows="4" id="wall-reply-text-{$oWall->getId()}" class="width-full js-wall-reply-text" placeholder="{$aLang.wall_reply_placeholder}" onclick="return ls.wall.expandReply({$oWall->getId()});"></textarea>
 				<button type="button" onclick="ls.wall.addReply(jQuery('#wall-reply-text-{$oWall->getId()}').val(), {$oWall->getId()});" class="button button-primary js-button-wall-submit">{$aLang.wall_reply_submit}</button>
 			</form>
 		{/if}
diff --git a/templates/skin/synio/actions/ActionProfile/wall_items_reply.tpl b/templates/skin/synio/actions/ActionProfile/wall_items_reply.tpl
index c73a3e43..12da2ea4 100644
--- a/templates/skin/synio/actions/ActionProfile/wall_items_reply.tpl
+++ b/templates/skin/synio/actions/ActionProfile/wall_items_reply.tpl
@@ -1,13 +1,21 @@
 {foreach from=$aReplyWall item=oReplyWall}
-	{assign var="oReplyUser" value=$oReplyWall->getUser()}
+	{$oReplyUser = $oReplyWall->getUser()}
+
 	<div id="wall-reply-item-{$oReplyWall->getId()}" class="js-wall-reply-item wall-item-reply">
-		<a href="{$oReplyUser->getUserWebPath()}"><img src="{$oReplyUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
+		<a href="{$oReplyUser->getUserWebPath()}">
+			<img src="{$oReplyUser->getProfileAvatarPath(48)}" alt="avatar" class="avatar" />
+		</a>
 		
 		<a href="{$oReplyUser->getUserWebPath()}" class="author">{$oReplyUser->getLogin()}</a> ·
 		<span class="comment-content text">{$oReplyWall->getText()}</span>
 		
 		<ul class="actions">
-			<li class="date"><time datetime="{date_format date=$oReplyWall->getDateAdd() format='c'}">{date_format date=$oReplyWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time></li>
+			<li class="date">
+				<time datetime="{date_format date=$oReplyWall->getDateAdd() format='c'}">
+					{date_format date=$oReplyWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
+				</time>
+			</li>
+
 			{if $oReplyWall->isAllowDelete()}
 				<li><a href="#" onclick="return ls.wall.remove({$oReplyWall->getId()});" class="link-dotted">{$aLang.wall_action_delete}</a></li>
 			{/if}
diff --git a/templates/skin/synio/actions/ActionProfile/whois.tpl b/templates/skin/synio/actions/ActionProfile/whois.tpl
index 99ca015f..fe47a0f3 100644
--- a/templates/skin/synio/actions/ActionProfile/whois.tpl
+++ b/templates/skin/synio/actions/ActionProfile/whois.tpl
@@ -1,49 +1,47 @@
-{assign var="sidebarPosition" value='left'}
-{assign var="sMenuItemSelect" value='profile'}
+{$sMenuItemSelect = 'profile'}
+{$oSession = $oUserProfile->getSession()}
+{$oVote = $oUserProfile->getVote()}
+{$oGeoTarget = $oUserProfile->getGeoTarget()}
 {include file='header.tpl' nav='people'}
-
-{assign var="oSession" value=$oUserProfile->getSession()}
-{assign var="oVote" value=$oUserProfile->getVote()}
-{assign var="oGeoTarget" value=$oUserProfile->getGeoTarget()}
-
-
-			
 {include file='actions/ActionProfile/profile_top.tpl'}
 {include file='navs/nav.profile_whois.tpl'}
 
 
-
 <div class="profile-info-about">
-	<a href="{$oUserProfile->getUserWebPath()}" class="avatar"><img src="{$oUserProfile->getProfileAvatarPath(100)}" alt="avatar" itemprop="photo" /></a>
+	<a href="{$oUserProfile->getUserWebPath()}" class="avatar">
+		<img src="{$oUserProfile->getProfileAvatarPath(100)}" alt="avatar" itemprop="photo" />
+	</a>
 
 	<h3>{$aLang.profile_about}</h3>
+
 	{if $oUserProfile->getProfileAbout()}	
 		<p class="text">{$oUserProfile->getProfileAbout()}</p>
 	{else}
 		<p>{$aLang.profile_about_empty}</p>
 	{/if}
+
 	<br />
+
 	{if $oUserCurrent and $oUserCurrent->getId() == $oUserProfile->getId()}
 		<a href="{router page='settings'}" class="edit">{$aLang.profile_about_edit}</a>
 	{/if}
 </div>
 
 
-
-<div class="wrapper">
+<div class="clearfix">
 	<div class="profile-left">
-		{assign var="aUserFieldValues" value=$oUserProfile->getUserFieldValues(true,array(''))}
+		{$aUserFieldValues = $oUserProfile->getUserFieldValues(true,array(''))}
 
-		{if $oUserProfile->getProfileSex()!='other' || $oUserProfile->getProfileBirthday() || $oGeoTarget || $oUserProfile->getProfileAbout() || count($aUserFieldValues)}
+		{if $oUserProfile->getProfileSex() != 'other' || $oUserProfile->getProfileBirthday() || $oGeoTarget || $oUserProfile->getProfileAbout() || count($aUserFieldValues)}
 			<h2 class="header-table">{$aLang.profile_privat}</h2>
 			
 			
 			<ul class="profile-dotted-list">		
-				{if $oUserProfile->getProfileSex()!='other'}
+				{if $oUserProfile->getProfileSex() != 'other'}
 					<li>
 						<span>{$aLang.profile_sex}:</span>
 						<strong>
-							{if $oUserProfile->getProfileSex()=='man'}
+							{if $oUserProfile->getProfileSex() == 'man'}
 								{$aLang.profile_sex_man}
 							{else}
 								{$aLang.profile_sex_woman}
@@ -96,7 +94,6 @@
 		<h2 class="header-table">{$aLang.profile_activity}</h2>
 
 		<ul class="profile-dotted-list">
-
 			{if $oConfig->GetValue('general.reg.invite') and $oUserInviteFrom}
 				<li>
 					<span>{$aLang.profile_invite_from}:</span>
@@ -136,7 +133,7 @@
 					<span>{$aLang.profile_blogs_administration}:</span>
 					<strong>
 						{foreach from=$aBlogAdministrators item=oBlogUser name=blog_user}
-							{assign var="oBlog" value=$oBlogUser->getBlog()}
+							{$oBlog = $oBlogUser->getBlog()}
 							<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>{if !$smarty.foreach.blog_user.last}, {/if}
 						{/foreach}
 					</strong>
@@ -149,7 +146,7 @@
 					<span>{$aLang.profile_blogs_moderation}:</span>
 					<strong>
 						{foreach from=$aBlogModerators item=oBlogUser name=blog_user}
-							{assign var="oBlog" value=$oBlogUser->getBlog()}
+							{$oBlog = $oBlogUser->getBlog()}
 							<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>{if !$smarty.foreach.blog_user.last}, {/if}
 						{/foreach}
 					</strong>
@@ -162,7 +159,7 @@
 					<span>{$aLang.profile_blogs_join}:</span>
 					<strong>
 						{foreach from=$aBlogUsers item=oBlogUser name=blog_user}
-							{assign var="oBlog" value=$oBlogUser->getBlog()}
+							{$oBlog = $oBlogUser->getBlog()}
 							<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>{if !$smarty.foreach.blog_user.last}, {/if}
 						{/foreach}
 					</strong>
@@ -201,10 +198,9 @@
 	
 	
 	
-	
-	
 	<div class="profile-right">
-		{assign var="aUserFieldContactValues" value=$oUserProfile->getUserFieldValues(true,array('contact'))}
+		{$aUserFieldContactValues = $oUserProfile->getUserFieldValues(true,array('contact'))}
+
 		{if $aUserFieldContactValues}
 			<h2 class="header-table">{$aLang.profile_contacts}</h2>
 			
@@ -216,7 +212,8 @@
 		{/if}
 
 
-		{assign var="aUserFieldContactValues" value=$oUserProfile->getUserFieldValues(true,array('social'))}
+		{$aUserFieldContactValues = $oUserProfile->getUserFieldValues(true,array('social'))}
+
 		{if $aUserFieldContactValues}
 			<h2 class="header-table">{$aLang.profile_social}</h2>
 			
@@ -232,6 +229,4 @@
 </div>
 
 
-
-
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/synio/header.tpl b/templates/skin/synio/header.tpl
index 8b880f98..9aae8129 100644
--- a/templates/skin/synio/header.tpl
+++ b/templates/skin/synio/header.tpl
@@ -133,7 +133,7 @@
 		{include file='navs/nav.tpl'}
 
 		<div id="wrapper" class="{if $noSidebar}no-sidebar{/if}{hook run='wrapper_class'}">
-			<div id="content-wrapper" {if $sidebarPosition == 'left'}class="content-profile"{/if}>
+			<div id="content-wrapper">
 				<div id="content" role="main" {if $sMenuItemSelect=='profile'}itemscope itemtype="http://data-vocabulary.org/Person"{/if}>
 					{include file='navs/nav_content.tpl'}
 					{include file='system_message.tpl'}