From 34e4f5d0e917e3fd52777d264d5f1302779e5ab0 Mon Sep 17 00:00:00 2001
From: kirsan <rus.engine@gmail.com>
Date: Thu, 21 Jul 2011 13:20:42 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 engine/lib/external/swfupload/swfupload.handlers.js  |  8 ++++++--
 .../developer-jquery/actions/ActionPhotoset/add.tpl  |  2 +-
 .../developer-jquery/actions/ActionStream/list.tpl   |  2 +-
 templates/skin/developer-jquery/header_top.tpl       |  5 +++++
 templates/skin/developer-jquery/js/ls.lang.ru.js     |  9 ++++++---
 templates/skin/developer-jquery/js/photoset.js       | 12 +++++++-----
 templates/skin/developer-jquery/js/userfield.js      |  9 +++++----
 templates/skin/developer-jquery/menu.people.tpl      |  5 -----
 .../skin/developer/actions/ActionStream/list.tpl     |  2 +-
 templates/skin/developer/header_top.tpl              |  5 +++++
 templates/skin/developer/js/ls.lang.ru.js            |  9 ++++++---
 templates/skin/developer/js/other.js                 |  1 +
 templates/skin/developer/js/userfield.js             |  1 +
 templates/skin/developer/menu.people.tpl             |  5 -----
 templates/skin/new/actions/ActionStream/list.tpl     |  2 +-
 templates/skin/new/block.userfeedUsers.tpl           |  2 +-
 templates/skin/new/header_top.tpl                    |  5 +++++
 templates/skin/new/js/ls.lang.ru.js                  |  9 ++++++---
 templates/skin/new/js/other.js                       |  1 +
 templates/skin/new/js/userfield.js                   |  1 +
 templates/skin/new/menu.people.tpl                   |  5 -----
 21 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/engine/lib/external/swfupload/swfupload.handlers.js b/engine/lib/external/swfupload/swfupload.handlers.js
index 3557ff95..2f41208f 100644
--- a/engine/lib/external/swfupload/swfupload.handlers.js
+++ b/engine/lib/external/swfupload/swfupload.handlers.js
@@ -35,7 +35,11 @@ function fileQueueError(file, errorCode, message) {
 
 function fileDialogComplete(numFilesSelected, numFilesQueued) {
 	try {
-                photosetCloseForm();
+               if (!window.jQuery) {
+                   photosetCloseForm();
+               } else {
+                  ls.photoset.closeForm();
+               }
 		if (numFilesQueued > 0) {
 			this.startUpload();
 		}
@@ -69,7 +73,7 @@ function uploadSuccess(file, serverData) {
                            if (!window.jQuery) {
                                addTopicImage(JSON.decode(serverData, true));
                            } else {
-                               addTopicImage(jQuery.parseJSON(serverData));
+                              ls.photoset.addPhoto(jQuery.parseJSON(serverData));
                            }
 			
 			progress.setStatus("Image uploaded.");
diff --git a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
index 94d55b0b..ce2970f9 100644
--- a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
+++ b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
@@ -195,7 +195,7 @@ tinyMCE.init({
                                             <img src="{$oPhoto->getWebPath(100)}" alt="image" />
                                             <textarea onBlur="ls.photoset.setPreviewDescription({$oPhoto->getId()}, this.value)">{$oPhoto->getDescription()}</textarea><br />
                                             <a href="javascript:ls.photoset.deletePhoto({$oPhoto->getId()})" class="image-delete">Удалить</a>
-                                            <span class="photo-preview-state">
+                                            <span id="photo_preview_state_{$oPhoto->getId()}" class="photo-preview-state">
                                                  {if $bIsMainPhoto}
                                                     {$aLang.topic_photoset_is_preview}
                                                 {else}
diff --git a/templates/skin/developer-jquery/actions/ActionStream/list.tpl b/templates/skin/developer-jquery/actions/ActionStream/list.tpl
index 73a80697..1a24a0c3 100644
--- a/templates/skin/developer-jquery/actions/ActionStream/list.tpl
+++ b/templates/skin/developer-jquery/actions/ActionStream/list.tpl
@@ -1,4 +1,4 @@
-{include file='header.tpl' menu='people'}
+{include file='header.tpl'}
 
 
 <h2 class="stream-header">{$aLang.stream_personal_title}</h2>
diff --git a/templates/skin/developer-jquery/header_top.tpl b/templates/skin/developer-jquery/header_top.tpl
index 27d6ca54..b2d16192 100644
--- a/templates/skin/developer-jquery/header_top.tpl
+++ b/templates/skin/developer-jquery/header_top.tpl
@@ -32,6 +32,11 @@
 		<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a></li>
 		<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
 		<li {if $sMenuItemSelect=='top'}class="active"{/if}><a href="{router page='top'}">{$aLang.blog_menu_top}</a></li>
+		{if $oUserCurrent}
+			<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
+				<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
+			</li>
+		{/if}
 						
 		{hook run='main_menu'}
 	</ul>
diff --git a/templates/skin/developer-jquery/js/ls.lang.ru.js b/templates/skin/developer-jquery/js/ls.lang.ru.js
index fcecd018..b133c5d6 100644
--- a/templates/skin/developer-jquery/js/ls.lang.ru.js
+++ b/templates/skin/developer-jquery/js/ls.lang.ru.js
@@ -1,4 +1,7 @@
 var lsLang = new Array();
-lsLang['mark_as_preview'] = 'Отметить как превью';
-lsLang['preview'] = 'Превью';
-lsLang['delete'] = 'Удалить';
\ No newline at end of file
+lsLang['photoset_mark_as_preview'] = 'Отметить как превью';
+lsLang['photoset_preview'] = 'Превью';
+lsLang['photoset_delete'] = 'Удалить';
+lsLang['photoset_confirm_delete'] = 'Удалить фото?';
+
+lsLang['userfield_confirm_delete'] = 'Удалить поле?';
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/js/photoset.js b/templates/skin/developer-jquery/js/photoset.js
index 26e8ca8b..ab49af37 100644
--- a/templates/skin/developer-jquery/js/photoset.js
+++ b/templates/skin/developer-jquery/js/photoset.js
@@ -6,8 +6,8 @@ ls.photoset =( function ($) {
         if (!response.bStateError) {
             template = '<li id="photo_'+response.id+'"><a href="#"><img src="'+response.file+'" alt="image" /></a>'
                                 +'<textarea onBlur="ls.photoset.setPreviewDescription('+response.id+', this.value)"></textarea><br />'
-                                +'<a href="javascript:ls.photoset.deletePhoto('+response.id+')" class="image-delete">'+lsLang['delete']+'</a>'
-                                +'<span class="photo-preview-state"><a href="javascript:ls.photoset.setPreview('+response.id+')" class="mark-as-preview">'+lsLang['mark_as_preview']+'</a></span></li>';
+                                +'<a href="javascript:ls.photoset.deletePhoto('+response.id+')" class="image-delete">'+lsLang['photoset_delete']+'</a>'
+                                +'<span id="photo_preview_state_'+response.id+'" class="photo-preview-state"><a href="javascript:ls.photoset.setPreview('+response.id+')" class="mark-as-preview">'+lsLang['photoset_mark_as_preview']+'</a></span></li>';
             $('#swfu_images').append(template);
             ls.msg.notice(response.sMsgTitle,response.sMsg);
         } else {
@@ -18,7 +18,8 @@ ls.photoset =( function ($) {
 
     this.deletePhoto = function(id)
     {
-        ls.ajax(aRouter['photoset']+'deleteimage', {'id':id}, function(response){
+	if (!confirm(lsLang['photoset_confirm_delete'])) {return;}
+	ls.ajax(aRouter['photoset']+'deleteimage', {'id':id}, function(response){
                         if (!response.bStateError) {
                             $('#photo_'+id).remove();
                            ls.msg.notice(response.sMsgTitle,response.sMsg);
@@ -34,10 +35,11 @@ ls.photoset =( function ($) {
 
         $('.marked-as-preview').each(function (index, el) {
             $(el).removeClass('marked-as-preview');
-            $(el).children('span').html('<a href="javascript:ls.photoset.setDescription('+$(el).attr('id').slice($(el).attr('id').lastIndexOf('_')+1)+')" class="mark-as-preview">'+lsLang['mark_as_preview']+'</a>');
+	tmpId = $(el).attr('id').slice($(el).attr('id').lastIndexOf('_')+1);
+            $('#photo_preview_state_'+tmpId).html('<a href="javascript:ls.photoset.setDescription('+tmpId+')" class="mark-as-preview">'+lsLang['photoset_mark_as_preview']+'</a>');
         });
         $('#photo_'+id).addClass('marked-as-preview');
-        $('#photo_'+id).children('span').html(lsLang['preview']);
+	$('#photo_preview_state_'+id).html(lsLang['photoset_preview']);
     }
 
     this.setPreviewDescription = function(id, text)
diff --git a/templates/skin/developer-jquery/js/userfield.js b/templates/skin/developer-jquery/js/userfield.js
index 4ce1835d..35fbdf0a 100644
--- a/templates/skin/developer-jquery/js/userfield.js
+++ b/templates/skin/developer-jquery/js/userfield.js
@@ -40,9 +40,9 @@ ls.userfield =( function ($) {
 				'<div class="uf-actions"><a href="javascript:ls.userfield.showEditForm('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/edit.png"></a> '+
 				'<a href="javascript:ls.userfield.deleteUserfield('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/delete.png"></a></div>';
                 $('#user_field_list').append(liElement);
-                $('#field_'+id+' .userfield_admin_name').html(name);
-                $('#field_'+id+' .userfield_admin_title').html(title);
-                $('#field_'+id+' .userfield_admin_pattern').text(pattern);
+                $('#field_'+data.id+' .userfield_admin_name').html(name);
+                $('#field_'+data.id+' .userfield_admin_title').html(title);
+                $('#field_'+data.id+' .userfield_admin_pattern').text(pattern);
                 ls.msg.notice(data.sMsgTitle,data.sMsg);
             } else {
                 ls.msg.error(data.sMsgTitle,data.sMsg);
@@ -68,7 +68,8 @@ ls.userfield =( function ($) {
     }
 
     this.deleteUserfield = function(id) {
-        ls.ajax(aRouter['admin']+'userfields', {'action':'delete', 'id':id}, function(data) { 
+	if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
+	ls.ajax(aRouter['admin']+'userfields', {'action':'delete', 'id':id}, function(data) { 
             if (!data.bStateError) {
                 $('#field_'+id).remove();
                 ls.msg.notice(data.sMsgTitle,data.sMsg);
diff --git a/templates/skin/developer-jquery/menu.people.tpl b/templates/skin/developer-jquery/menu.people.tpl
index 6ff328ff..aa914190 100644
--- a/templates/skin/developer-jquery/menu.people.tpl
+++ b/templates/skin/developer-jquery/menu.people.tpl
@@ -9,10 +9,5 @@
 			</ul>
 		{/if}
 	</li>
-        {if $oUserCurrent}
-		<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
-			<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
-		</li>
-	{/if}
 	{hook run='menu_people'}
 </ul>
diff --git a/templates/skin/developer/actions/ActionStream/list.tpl b/templates/skin/developer/actions/ActionStream/list.tpl
index 4fda92be..299c036d 100644
--- a/templates/skin/developer/actions/ActionStream/list.tpl
+++ b/templates/skin/developer/actions/ActionStream/list.tpl
@@ -1,4 +1,4 @@
-{include file='header.tpl' menu='people'}
+{include file='header.tpl'}
 
 
 <h2 class="stream-header">{$aLang.stream_personal_title}</h2>
diff --git a/templates/skin/developer/header_top.tpl b/templates/skin/developer/header_top.tpl
index f4a90f74..978e54bc 100644
--- a/templates/skin/developer/header_top.tpl
+++ b/templates/skin/developer/header_top.tpl
@@ -53,6 +53,11 @@
 		<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{router page='blog'}">{$aLang.clean_posts}</a></li>
 		<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a></li>
 		<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
+		{if $oUserCurrent}
+			<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
+				<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
+			</li>
+		{/if}
 						
 		{hook run='main_menu'}
 	</ul>
diff --git a/templates/skin/developer/js/ls.lang.ru.js b/templates/skin/developer/js/ls.lang.ru.js
index fcecd018..b133c5d6 100644
--- a/templates/skin/developer/js/ls.lang.ru.js
+++ b/templates/skin/developer/js/ls.lang.ru.js
@@ -1,4 +1,7 @@
 var lsLang = new Array();
-lsLang['mark_as_preview'] = 'Отметить как превью';
-lsLang['preview'] = 'Превью';
-lsLang['delete'] = 'Удалить';
\ No newline at end of file
+lsLang['photoset_mark_as_preview'] = 'Отметить как превью';
+lsLang['photoset_preview'] = 'Превью';
+lsLang['photoset_delete'] = 'Удалить';
+lsLang['photoset_confirm_delete'] = 'Удалить фото?';
+
+lsLang['userfield_confirm_delete'] = 'Удалить поле?';
\ No newline at end of file
diff --git a/templates/skin/developer/js/other.js b/templates/skin/developer/js/other.js
index df4a31fe..a71703e7 100644
--- a/templates/skin/developer/js/other.js
+++ b/templates/skin/developer/js/other.js
@@ -137,6 +137,7 @@ function addTopicImage(response)
 
 function deleteTopicImage(id)
 {
+	if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
     new Request.JSON({
 		url: aRouter['photoset']+'deleteimage',
 		data: {'id':id, 'security_ls_key': LIVESTREET_SECURITY_KEY },
diff --git a/templates/skin/developer/js/userfield.js b/templates/skin/developer/js/userfield.js
index 4b82cf07..fcb729db 100644
--- a/templates/skin/developer/js/userfield.js
+++ b/templates/skin/developer/js/userfield.js
@@ -89,6 +89,7 @@ function updateUserfield() {
 }
 
 function deleteUserfield(id) {
+	if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
     new Request.JSON({
             url: aRouter['admin']+'userfields',
             data: {'action':'delete', 'id':id, 'security_ls_key':LIVESTREET_SECURITY_KEY},
diff --git a/templates/skin/developer/menu.people.tpl b/templates/skin/developer/menu.people.tpl
index 6ff328ff..aa914190 100644
--- a/templates/skin/developer/menu.people.tpl
+++ b/templates/skin/developer/menu.people.tpl
@@ -9,10 +9,5 @@
 			</ul>
 		{/if}
 	</li>
-        {if $oUserCurrent}
-		<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
-			<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
-		</li>
-	{/if}
 	{hook run='menu_people'}
 </ul>
diff --git a/templates/skin/new/actions/ActionStream/list.tpl b/templates/skin/new/actions/ActionStream/list.tpl
index 4fda92be..299c036d 100644
--- a/templates/skin/new/actions/ActionStream/list.tpl
+++ b/templates/skin/new/actions/ActionStream/list.tpl
@@ -1,4 +1,4 @@
-{include file='header.tpl' menu='people'}
+{include file='header.tpl'}
 
 
 <h2 class="stream-header">{$aLang.stream_personal_title}</h2>
diff --git a/templates/skin/new/block.userfeedUsers.tpl b/templates/skin/new/block.userfeedUsers.tpl
index 756d21c5..090f0e9a 100644
--- a/templates/skin/new/block.userfeedUsers.tpl
+++ b/templates/skin/new/block.userfeedUsers.tpl
@@ -28,7 +28,7 @@
 		<div class="stream-settings-userlist">
 			<p><input type="text" id="userfeed_users_complete" autocomplete="off" />
 			<a href="javascript:lsUserfeed.appendUser()">{$aLang.userfeed_block_users_append}</a></p>
-		         {if count($aStreamSubscribedUsers)}	
+		         {if count($aUserfeedSubscribedUsers)}	
 			<ul id="userfeed_block_users_list">
                                     {foreach from=$aUserfeedSubscribedUsers item=oUser}
                                         {assign var=iUserId value=$oUser->getId()}
diff --git a/templates/skin/new/header_top.tpl b/templates/skin/new/header_top.tpl
index a5269438..3667d0e6 100644
--- a/templates/skin/new/header_top.tpl
+++ b/templates/skin/new/header_top.tpl
@@ -27,6 +27,11 @@
 		<ul class="nav-main">
 			<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{router page='blog'}">{$aLang.blogs}</a></li>
 			<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
+			 {if $oUserCurrent}
+				<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
+					<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
+				</li>
+			{/if}
 			{hook run='main_menu'}
 		</ul>
 		
diff --git a/templates/skin/new/js/ls.lang.ru.js b/templates/skin/new/js/ls.lang.ru.js
index fcecd018..b133c5d6 100644
--- a/templates/skin/new/js/ls.lang.ru.js
+++ b/templates/skin/new/js/ls.lang.ru.js
@@ -1,4 +1,7 @@
 var lsLang = new Array();
-lsLang['mark_as_preview'] = 'Отметить как превью';
-lsLang['preview'] = 'Превью';
-lsLang['delete'] = 'Удалить';
\ No newline at end of file
+lsLang['photoset_mark_as_preview'] = 'Отметить как превью';
+lsLang['photoset_preview'] = 'Превью';
+lsLang['photoset_delete'] = 'Удалить';
+lsLang['photoset_confirm_delete'] = 'Удалить фото?';
+
+lsLang['userfield_confirm_delete'] = 'Удалить поле?';
\ No newline at end of file
diff --git a/templates/skin/new/js/other.js b/templates/skin/new/js/other.js
index 1b977250..4d3a9fb9 100644
--- a/templates/skin/new/js/other.js
+++ b/templates/skin/new/js/other.js
@@ -148,6 +148,7 @@ function addTopicImage(response)
 
 function deleteTopicImage(id)
 {
+	if (!confirm(lsLang['photoset_confirm_delete'])) {return;}
     new Request.JSON({
 		url: aRouter['photoset']+'deleteimage',
 		data: {'id':id, 'security_ls_key': LIVESTREET_SECURITY_KEY },
diff --git a/templates/skin/new/js/userfield.js b/templates/skin/new/js/userfield.js
index 4b82cf07..fcb729db 100644
--- a/templates/skin/new/js/userfield.js
+++ b/templates/skin/new/js/userfield.js
@@ -89,6 +89,7 @@ function updateUserfield() {
 }
 
 function deleteUserfield(id) {
+	if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
     new Request.JSON({
             url: aRouter['admin']+'userfields',
             data: {'action':'delete', 'id':id, 'security_ls_key':LIVESTREET_SECURITY_KEY},
diff --git a/templates/skin/new/menu.people.tpl b/templates/skin/new/menu.people.tpl
index 1c263879..f5782f27 100644
--- a/templates/skin/new/menu.people.tpl
+++ b/templates/skin/new/menu.people.tpl
@@ -10,10 +10,5 @@
 					</ul>
 				{/if}
 			</li>
-                            {if $oUserCurrent}
-				<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
-					<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
-				</li>
-			{/if}
 			{hook run='menu_people'}
 		</ul>
\ No newline at end of file