From af8bc9148cf894895650b1f762c41cdb630b44b4 Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Fri, 12 Apr 2013 10:55:43 +0700
Subject: [PATCH] Fix add friend modal

---
 templates/framework/js/livestreet/user.js                     | 2 +-
 .../skin/developer/actions/ActionProfile/friend_item.tpl      | 2 +-
 templates/skin/developer/modals/modal.add_friend.tpl          | 4 ++--
 templates/skin/synio/actions/ActionProfile/friend_item.tpl    | 2 +-
 templates/skin/synio/modals/modal.add_friend.tpl              | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/framework/js/livestreet/user.js b/templates/framework/js/livestreet/user.js
index 42dbda5c..6fa55a4b 100644
--- a/templates/framework/js/livestreet/user.js
+++ b/templates/framework/js/livestreet/user.js
@@ -39,7 +39,7 @@ ls.user = (function ($) {
 				ls.msg.notice(null,result.sMsg);
 				$('#add_friend_form').jqmHide();
 				$('#add_friend_item').remove();
-				$('#profile_actions').prepend($(result.sToggleText));
+				$('#profile_actions').prepend($($.trim(result.sToggleText)));
 				ls.hook.run('ls_user_add_friend_after', [idUser,sAction,result], obj);
 			}
 		});
diff --git a/templates/skin/developer/actions/ActionProfile/friend_item.tpl b/templates/skin/developer/actions/ActionProfile/friend_item.tpl
index 6bde06f0..2394baee 100644
--- a/templates/skin/developer/actions/ActionProfile/friend_item.tpl
+++ b/templates/skin/developer/actions/ActionProfile/friend_item.tpl
@@ -11,7 +11,7 @@
 {elseif !$oUserFriend}
 	{include file='modals/modal.add_friend.tpl'}
 	
-	<li id="add_friend_item"><a href="#"  title="{$aLang.user_friend_add}" data-type="modal-toggle" data-option-target="add_friend_form">{$aLang.user_friend_add}</a></li>
+	<li id="add_friend_item"><a href="#"  title="{$aLang.user_friend_add}" data-type="modal-toggle" data-option-target="modal-add-friend">{$aLang.user_friend_add}</a></li>
 {else}
 	<li id="add_friend_item"><a href="#" title="{$aLang.user_friend_add}" onclick="return ls.user.addFriend(this,{$oUserProfile->getId()},'link');">{$aLang.user_friend_add}</a></li>
 {/if}
\ No newline at end of file
diff --git a/templates/skin/developer/modals/modal.add_friend.tpl b/templates/skin/developer/modals/modal.add_friend.tpl
index 2cf4f003..4e1156d9 100644
--- a/templates/skin/developer/modals/modal.add_friend.tpl
+++ b/templates/skin/developer/modals/modal.add_friend.tpl
@@ -1,11 +1,11 @@
 {extends file='modals/modal_base.tpl'}
 
-{block name='id'}add_friend_form{/block}
+{block name='id'}modal-add-friend{/block}
 {block name='class'}js-modal-default{/block}
 {block name='title'}{$aLang.profile_add_friend}{/block}
 
 {block name='content'}
-	<form onsubmit="return ls.user.addFriend(this,{$oUserProfile->getId()},'add');">
+	<form id="add_friend_form" onsubmit="return ls.user.addFriend(this,{$oUserProfile->getId()},'add');">
 		<label for="add_friend_text">{$aLang.user_friend_add_text_label}</label>
 		<textarea id="add_friend_text" rows="3" class="input-text input-width-full"></textarea>
 	</form>
diff --git a/templates/skin/synio/actions/ActionProfile/friend_item.tpl b/templates/skin/synio/actions/ActionProfile/friend_item.tpl
index 212056b0..15fb9e72 100644
--- a/templates/skin/synio/actions/ActionProfile/friend_item.tpl
+++ b/templates/skin/synio/actions/ActionProfile/friend_item.tpl
@@ -11,7 +11,7 @@
 {elseif !$oUserFriend}
 	{include file='modals/modal.add_friend.tpl'}
 	
-	<li id="add_friend_item"><a href="#"  title="{$aLang.user_friend_add}" data-type="modal-toggle" data-option-target="add_friend_form">{$aLang.user_friend_add}</a></li>
+	<li id="add_friend_item"><a href="#"  title="{$aLang.user_friend_add}" data-type="modal-toggle" data-option-target="modal-add-friend">{$aLang.user_friend_add}</a></li>
 {else}
 	<li id="add_friend_item"><a href="#" title="{$aLang.user_friend_add}" onclick="return ls.user.addFriend(this,{$oUserProfile->getId()},'link');">{$aLang.user_friend_add}</a></li>
 {/if}
\ No newline at end of file
diff --git a/templates/skin/synio/modals/modal.add_friend.tpl b/templates/skin/synio/modals/modal.add_friend.tpl
index 68f1475a..bc0f7cc9 100644
--- a/templates/skin/synio/modals/modal.add_friend.tpl
+++ b/templates/skin/synio/modals/modal.add_friend.tpl
@@ -1,11 +1,11 @@
 {extends file='modals/modal_base.tpl'}
 
-{block name='id'}add_friend_form{/block}
+{block name='id'}modal-add-friend{/block}
 {block name='class'}add_friend_form js-modal-default{/block}
 {block name='title'}{$aLang.profile_add_friend}{/block}
 
 {block name='content'}
-	<form onsubmit="return ls.user.addFriend(this,{$oUserProfile->getId()},'add');">
+	<form id="add_friend_form" onsubmit="return ls.user.addFriend(this,{$oUserProfile->getId()},'add');">
 		<label for="add_friend_text">{$aLang.user_friend_add_text_label}</label>
 		<textarea id="add_friend_text" rows="3" class="input-text input-width-full"></textarea>
 	</form>