From b544500534117c0f9df3803431135b951c821623 Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Thu, 29 Mar 2012 17:35:25 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0=20dev?=
 =?UTF-8?q?eloper-jquery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 engine/lib/internal/template/js/favourite.js  |  6 +-
 templates/language/russian.php                |  6 +-
 .../actions/ActionPeople/sidebar.tpl          | 31 +++---
 .../actions/ActionProfile/profile_top.tpl     |  2 +-
 .../actions/ActionProfile/whois.tpl           |  2 +-
 .../actions/ActionSettings/profile.tpl        | 94 ++++++++++---------
 .../skin/developer-jquery/css/common.css      | 21 +++--
 templates/skin/developer-jquery/css/icons.css | 10 +-
 templates/skin/developer-jquery/css/navs.css  |  2 +-
 templates/skin/developer-jquery/css/reset.css |  2 +-
 .../skin/developer-jquery/css/tables.css      |  2 +-
 templates/skin/developer-jquery/css/topic.css |  1 +
 .../developer-jquery/favourite_form_tags.tpl  | 12 ---
 templates/skin/developer-jquery/header.tpl    |  2 +-
 .../skin/developer-jquery/header_top.tpl      | 15 ++-
 .../developer-jquery/js/developer-jquery.js   |  1 +
 templates/skin/developer-jquery/toolbar.tpl   |  4 +-
 .../skin/developer-jquery/toolbar_comment.tpl |  6 +-
 .../skin/developer-jquery/toolbar_topic.tpl   |  5 +-
 .../developer-jquery/topic_part_footer.tpl    |  7 +-
 .../window_favourite_form_tags.tpl            | 18 ++++
 21 files changed, 140 insertions(+), 109 deletions(-)
 delete mode 100644 templates/skin/developer-jquery/favourite_form_tags.tpl
 create mode 100644 templates/skin/developer-jquery/window_favourite_form_tags.tpl

diff --git a/engine/lib/internal/template/js/favourite.js b/engine/lib/internal/template/js/favourite.js
index 88f679ad..f29eb09e 100644
--- a/engine/lib/internal/template/js/favourite.js
+++ b/engine/lib/internal/template/js/favourite.js
@@ -71,14 +71,14 @@ ls.favourite = (function ($) {
 			}
 		});
 		$('#favourite-form-tags-tags').val(text);
-		$(obj).parents('.js-favourite-insert-after-form').after(form);
-		form.show();
+		//$(obj).parents('.js-favourite-insert-after-form').after(form);
+		form.jqmShow();
 
 		return false;
 	};
 
 	this.hideEditTags = function() {
-		$('#favourite-form-tags').hide();
+		$('#favourite-form-tags').jqmHide();
 		return false;
 	};
 
diff --git a/templates/language/russian.php b/templates/language/russian.php
index ebbb6a4b..97fb1ae1 100644
--- a/templates/language/russian.php
+++ b/templates/language/russian.php
@@ -214,7 +214,7 @@ return array(
 	 */
 	'topic_topic_create' => 'Создание топика',
 	'topic_topic_edit' => 'Редактирование топика',
-	'topic_create' => 'написать',
+	'topic_create' => 'Написать',
 	'topic_create_blog' => 'В какой блог публикуем?',
 	'topic_create_blog_personal' => 'мой персональный блог',
 	'topic_create_blog_error_unknown' => 'Пытаетесь запостить топик в неизвестный блог?',
@@ -378,7 +378,7 @@ return array(
 	'user_list_online_last' => 'Недавно были на сайте',
 	'user_good' => 'Позитивные',
 	'user_bad' => 'Негативные',
-	'user_privat_messages' => 'Личные сообщения',
+	'user_privat_messages' => 'Сообщения',
 	'user_privat_messages_new' => 'У вас есть новые сообщения',
 	'user_settings' => 'Настройки',
 	'user_settings_profile' => 'профиля',
@@ -959,7 +959,7 @@ return array(
 	'error' => 'Ошибка',
 	'attention' => 'Внимание',
 	'system_error' => 'Системная ошибка, повторите позже',
-	'exit' => 'выход',
+	'exit' => 'Выход',
 	'need_authorization' => 'Необходимо авторизоваться!',
 	'or' => 'или',
 	'window_close' => 'закрыть',
diff --git a/templates/skin/developer-jquery/actions/ActionPeople/sidebar.tpl b/templates/skin/developer-jquery/actions/ActionPeople/sidebar.tpl
index b217be8f..678422a0 100644
--- a/templates/skin/developer-jquery/actions/ActionPeople/sidebar.tpl
+++ b/templates/skin/developer-jquery/actions/ActionPeople/sidebar.tpl
@@ -1,19 +1,24 @@
 <section class="block">
-	<h3>{$aLang.user_stats}</h3>
+	<header class="block-header">
+		<h3>{$aLang.user_stats}</h3>
+	</header>
 	
-	<ul>
-		<li>{$aLang.user_stats_all}: <strong>{$aStat.count_all}</strong></li>
-		<li>{$aLang.user_stats_active}: <strong>{$aStat.count_active}</strong></li>
-		<li>{$aLang.user_stats_noactive}: <strong>{$aStat.count_inactive}</strong></li>
-	</ul>
 	
-	<br />
-	
-	<ul>
-		<li>{$aLang.user_stats_sex_man}: <strong>{$aStat.count_sex_man}</strong></li>
-		<li>{$aLang.user_stats_sex_woman}: <strong>{$aStat.count_sex_woman}</strong></li>
-		<li>{$aLang.user_stats_sex_other}: <strong>{$aStat.count_sex_other}</strong></li>
-	</ul>
+	<div class="block-content">
+		<ul>
+			<li>{$aLang.user_stats_all}: <strong>{$aStat.count_all}</strong></li>
+			<li>{$aLang.user_stats_active}: <strong>{$aStat.count_active}</strong></li>
+			<li>{$aLang.user_stats_noactive}: <strong>{$aStat.count_inactive}</strong></li>
+		</ul>
+		
+		<br />
+		
+		<ul>
+			<li>{$aLang.user_stats_sex_man}: <strong>{$aStat.count_sex_man}</strong></li>
+			<li>{$aLang.user_stats_sex_woman}: <strong>{$aStat.count_sex_woman}</strong></li>
+			<li>{$aLang.user_stats_sex_other}: <strong>{$aStat.count_sex_other}</strong></li>
+		</ul>
+	</div>
 </section>
 
 
diff --git a/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl b/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl
index e46db827..f12bf69b 100644
--- a/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl
+++ b/templates/skin/developer-jquery/actions/ActionProfile/profile_top.tpl
@@ -1,5 +1,5 @@
 <div class="profile">
-	<img src="{$oUserProfile->getProfileAvatarPath(48)}" alt="avatar" class="avatar" />
+	<a href="{$oUserProfile->getUserWebPath()}"><img src="{$oUserProfile->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
 	
 	<div id="vote_area_user_{$oUserProfile->getId()}" class="vote {if $oUserProfile->getRating()>=0}vote-count-positive{else}vote-count-negative{/if} {if $oVote} voted {if $oVote->getDirection()>0}voted-up{elseif $oVote->getDirection()<0}voted-down{/if}{/if}">
 		<a href="#" class="vote-up" onclick="return ls.vote.vote({$oUserProfile->getId()},this,1,'user');"></a>
diff --git a/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl b/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl
index b5722909..a7817a33 100644
--- a/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl
+++ b/templates/skin/developer-jquery/actions/ActionProfile/whois.tpl
@@ -218,7 +218,7 @@
 </table>
 
 
-<h2 class="header-table"><a href="{$oUserProfile->getUserWebPath()}friends/">{$aLang.profile_friends}</a> {$iCountFriendsUser}</h2>
+<h2 class="header-table"><a href="{$oUserProfile->getUserWebPath()}friends/">{$aLang.profile_friends}</a> ({$iCountFriendsUser})</h2>
 
 {if $aUsersFriend}
 	<table class="table table-profile-info">
diff --git a/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl b/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl
index 9bd78ef0..06be8212 100644
--- a/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl
+++ b/templates/skin/developer-jquery/actions/ActionSettings/profile.tpl
@@ -1,4 +1,5 @@
-{include file='header.tpl' menu='settings' noSidebar=true}
+{assign var="noSidebar" value=true}
+{include file='header.tpl' menu='settings'}
 
 <script type="text/javascript">
 	jQuery(document).ready(function($){
@@ -175,7 +176,55 @@
 		<p><label for="password_confirm">{$aLang.settings_profile_password_confirm}:</label>
 		<input type="password" id="password_confirm" name="password_confirm" value="" class="input-text input-width-200" /></p>
 	</fieldset>
+	
+	
+	
+	
+	<script type="text/javascript">
+		jQuery(function($){
+			$('#avatar-upload').file({ name:'avatar' }).choose(function(e, input) {
+				ls.user.uploadAvatar(null,input);
+			});
+			$('#foto-upload').file({ name:'foto' }).choose(function(e, input) {
+				ls.user.uploadFoto(null,input);
+			});
+		});
+	</script>
 
+
+	<fieldset>
+		<legend>Аватар</legend>
+		
+		<img src="{$oUserCurrent->getProfileAvatarPath(64)}" id="avatar-img" />
+
+		<p><a href="#" id="avatar-upload" class="link-dotted">{if $oUserCurrent->getProfileAvatar()}{$aLang.settings_profile_avatar_change}{else}{$aLang.settings_profile_avatar_upload}{/if}</a>&nbsp;&nbsp;&nbsp;
+		<a href="#" id="avatar-remove" class="link-dotted" onclick="return ls.user.removeAvatar();" style="{if !$oUserCurrent->getProfileAvatar()}display:none;{/if}">{$aLang.settings_profile_avatar_delete}</a></p>
+
+		<div id="avatar-resize" style="display:none;">
+			<p><img src="" alt="" id="avatar-resize-original-img"></p>
+			<button class="button button-primary" onclick="return ls.user.resizeAvatar();">{$aLang.settings_profile_avatar_resize_apply}</button>
+			<button class="button" onclick="return ls.user.cancelAvatar();">{$aLang.settings_profile_avatar_resize_cancel}</button>
+		</div>
+	</fieldset>
+
+	
+	
+	<fieldset>
+		<legend>Фотография</legend>
+		
+		<img src="{$oUserCurrent->getProfileFoto()}" id="foto-img" />
+
+		<p><a href="#" id="foto-upload" class="link-dotted">{if $oUserCurrent->getProfileFoto()}{$aLang.settings_profile_avatar_change}{else}{$aLang.settings_profile_avatar_upload}{/if}</a>&nbsp;&nbsp;&nbsp;
+		<a href="#" id="foto-remove" class="link-dotted" onclick="return ls.user.removeFoto();" style="{if !$oUserCurrent->getProfileFoto()}display:none;{/if}">{$aLang.settings_profile_avatar_delete}</a></p>
+
+		<div id="foto-resize" style="display:none;">
+			<p><img src="" alt="" id="foto-resize-original-img"></p>
+			<button class="button button-primary" onclick="return ls.user.resizeFoto();">{$aLang.settings_profile_avatar_resize_apply}</button>
+			<button class="button" onclick="return ls.user.cancelFoto();">{$aLang.settings_profile_avatar_resize_cancel}</button>
+		</div>
+	</fieldset>
+	
+	
 	{hook run='form_settings_profile_end'}
 	
 	
@@ -186,49 +235,6 @@
 
 
 
-<script type="text/javascript">
-	jQuery(function($){
-		$('#avatar-upload').file({ name:'avatar' }).choose(function(e, input) {
-			ls.user.uploadAvatar(null,input);
-		});
-		$('#foto-upload').file({ name:'foto' }).choose(function(e, input) {
-			ls.user.uploadFoto(null,input);
-		});
-	});
-</script>
-
-
-<br/><br/>
-<img src="{$oUserCurrent->getProfileAvatarPath(64)}" id="avatar-img" />
-<br/>
-
-<a href="#" id="avatar-upload">{if $oUserCurrent->getProfileAvatar()}{$aLang.settings_profile_avatar_change}{else}{$aLang.settings_profile_avatar_upload}{/if}</a><br/>
-<a href="#" id="avatar-remove" onclick="return ls.user.removeAvatar();" style="{if !$oUserCurrent->getProfileAvatar()}display:none;{/if}">{$aLang.settings_profile_avatar_delete}</a>
-
-<div id="avatar-resize" style="display:none;">
-	<div>
-		<img src="" alt="" id="avatar-resize-original-img">
-	</div>
-	<button onclick="return ls.user.resizeAvatar();">{$aLang.settings_profile_avatar_resize_apply}</button>
-	<button onclick="return ls.user.cancelAvatar();">{$aLang.settings_profile_avatar_resize_cancel}</button>
-</div>
-
-
-
-<br/><br/>
-<img src="{$oUserCurrent->getProfileFoto()}" id="foto-img" />
-<br/>
-
-<a href="#" id="foto-upload">{if $oUserCurrent->getProfileFoto()}{$aLang.settings_profile_avatar_change}{else}{$aLang.settings_profile_avatar_upload}{/if}</a><br/>
-<a href="#" id="foto-remove" onclick="return ls.user.removeFoto();" style="{if !$oUserCurrent->getProfileFoto()}display:none;{/if}">{$aLang.settings_profile_avatar_delete}</a>
-
-<div id="foto-resize" style="display:none;">
-	<div>
-		<img src="" alt="" id="foto-resize-original-img">
-	</div>
-	<button onclick="return ls.user.resizeFoto();">{$aLang.settings_profile_avatar_resize_apply}</button>
-	<button onclick="return ls.user.cancelFoto();">{$aLang.settings_profile_avatar_resize_cancel}</button>
-</div>
 
 
 
diff --git a/templates/skin/developer-jquery/css/common.css b/templates/skin/developer-jquery/css/common.css
index 12e2dc1a..51012308 100644
--- a/templates/skin/developer-jquery/css/common.css
+++ b/templates/skin/developer-jquery/css/common.css
@@ -55,17 +55,24 @@
 
 /* Toolbar 
 ---------------------------------------------------------------*/
-.toolbar 			{ float: right; position: fixed; top: 220px; right: 10px; z-index: 100; }
-.toolbar section 	{ width: 16px; padding: 10px; background: #fff; border-radius: 3px; box-shadow: 0 0 5px rgba(0,0,0,.1); margin-bottom: 10px; }
+.toolbar 					{ float: right; position: fixed; top: 220px; right: 10px; z-index: 100; }
+.toolbar section 			{ width: 34px; line-height: 14px; background: #fff; box-shadow: 0 0 5px rgba(0,0,0,.1); margin-bottom: 10px; }
+.toolbar section a			{ display: block; padding: 10px; }
+.toolbar section a:hover	{ background: #fafafa; }
+.toolbar section i			{ display: block; }
 
 /* Admin button */
-.toolbar .toolbar-admin a { display: block; width: 16px; height: 16px; background: url(../images/icons.png) -431px 1px no-repeat; }
+.toolbar .toolbar-admin a { display: block; }
 
 /* Update comments button */
-.toolbar .toolbar-update { }
-.toolbar .toolbar-update .update-comments 			{ width: 16px; height: 16px; cursor: pointer; background: url(../images/update.gif) no-repeat; }
-.toolbar .toolbar-update .update-comments.active 	{ background-position: -16px 0; }
-.toolbar .toolbar-update .new-comments 				{ border-top: 1px solid #ececed; color: #333; padding-top: 7px; margin-top: 3px; cursor: pointer; text-align: center; }
+.toolbar .toolbar-update {  }
+.toolbar .toolbar-update .update-comments 			{ padding: 9px; }
+.toolbar .toolbar-update .update-comments i 		{ display: block; width: 16px; height: 16px; background: url(../images/update.gif) no-repeat; }
+.toolbar .toolbar-update .update-comments.active i 	{ background-position: -16px 0; }
+.toolbar .toolbar-update .new-comments 				{ border-top: 1px solid #eee; padding: 10px 0; color: #333; text-align: center; font-size: 11px; }
+
+/* Topic navigation */
+.toolbar .toolbar-topic a.toolbar-topic-prev { border-bottom: 1px solid #eee; }
 
 
 
diff --git a/templates/skin/developer-jquery/css/icons.css b/templates/skin/developer-jquery/css/icons.css
index 7029b8d7..7b951136 100644
--- a/templates/skin/developer-jquery/css/icons.css
+++ b/templates/skin/developer-jquery/css/icons.css
@@ -55,7 +55,7 @@
 .icon-repeat             { background-position: -216px -24px; }
 .icon-refresh            { background-position: -240px -24px; }
 .icon-list-alt           { background-position: -264px -24px; }
-.icon-lock               { background-position: -287px -24px; } // 1px off
+.icon-lock               { background-position: -287px -24px; }
 .icon-flag               { background-position: -312px -24px; }
 .icon-headphones         { background-position: -336px -24px; }
 .icon-volume-off         { background-position: -360px -24px; }
@@ -65,13 +65,13 @@
 .icon-barcode            { background-position: -456px -24px; }
 
 .icon-tag                { background-position: 0      -48px; }
-.icon-tags               { background-position: -25px  -48px; } // 1px off
+.icon-tags               { background-position: -25px  -48px; }
 .icon-book               { background-position: -48px  -48px; }
 .icon-bookmark           { background-position: -72px  -48px; }
 .icon-print              { background-position: -96px  -48px; }
 .icon-camera             { background-position: -120px -48px; }
 .icon-font               { background-position: -144px -48px; }
-.icon-bold               { background-position: -167px -48px; } // 1px off
+.icon-bold               { background-position: -167px -48px; }
 .icon-italic             { background-position: -192px -48px; }
 .icon-text-height        { background-position: -216px -48px; }
 .icon-text-width         { background-position: -240px -48px; }
@@ -118,7 +118,7 @@
 .icon-ban-circle         { background-position: -216px -96px; }
 .icon-arrow-left         { background-position: -240px -96px; }
 .icon-arrow-right        { background-position: -264px -96px; }
-.icon-arrow-up           { background-position: -289px -96px; } // 1px off
+.icon-arrow-up           { background-position: -289px -96px; }
 .icon-arrow-down         { background-position: -312px -96px; }
 .icon-share-alt          { background-position: -336px -96px; }
 .icon-resize-full        { background-position: -360px -96px; }
@@ -140,7 +140,7 @@
 .icon-comment            { background-position: -240px -120px; }
 .icon-magnet             { background-position: -264px -120px; }
 .icon-chevron-up         { background-position: -288px -120px; }
-.icon-chevron-down       { background-position: -313px -119px; } // 1px off
+.icon-chevron-down       { background-position: -313px -119px; }
 .icon-retweet            { background-position: -336px -120px; }
 .icon-shopping-cart      { background-position: -360px -120px; }
 .icon-folder-close       { background-position: -384px -120px; }
diff --git a/templates/skin/developer-jquery/css/navs.css b/templates/skin/developer-jquery/css/navs.css
index 1c4f0af6..5a91361f 100644
--- a/templates/skin/developer-jquery/css/navs.css
+++ b/templates/skin/developer-jquery/css/navs.css
@@ -1 +1 @@
-/* ���������
------------------------------------------------- */

.nav 					{ zoom: 1; }
.nav:before,
.nav:after 				{ content: ""; display: table; }
.nav:after 				{ clear: both; }
.nav li 				{ float: left; }

.nav li:last-child 		{ border-right: none; }
.nav li a 				{ display: block; padding: 10px 15px; }
.nav li a:hover 		{ background: #f3f3f3; }
.nav li.active a 		{ background: #f3f3f3; }


/* ���� ������� */
#userbar { 
	border: 1px solid #ddd; 
	border-top: none; 
	
	background: #ffffff;
	background: -moz-linear-gradient(top,  #ffffff 0%, #f3f3f3 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3));
	background: -webkit-linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	background: -o-linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	background: -ms-linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	background: linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); 
	
	border-radius: 0 0 4px 4px;
	box-shadow: 0 0 5px #ddd;	
}
#userbar .search { float: left; margin: 5px 0 0 7px; margin-bottom: 0; }

.nav.nav-userbar 					{ float: right; }
.nav.nav-userbar li 				{ border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; }
.nav.nav-userbar li:first-child a 	{ border-radius: 0 0 0 4px; }
.nav.nav-userbar li:last-child a 	{ border-radius: 0 0 4px 0; }
.nav.nav-userbar li:first-child 	{  }


/* ������� ���� */
.nav.nav-main 					{ border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); }
.nav.nav-main li a 				{ color: #ddd; }
.nav.nav-main li a:hover 		{ background: #333; }
.nav.nav-main li:first-child a 	{ border-radius: 4px 0 0 4px; }
.nav.nav-main li:last-child  a 	{ border-radius: 0 4px 4px 0; }
.nav.nav-main li.active a 		{ background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; }


/* ��������� ���� */
.nav.nav-nested 				{ height: 51px; margin: 0 0 50px 0; }
.nav.nav-nested li 				{ margin-right: 1px; position: relative; }
.nav.nav-nested li a 			{ background: #ddd; color: #333; padding: 7px 13px; }
.nav.nav-nested li a:hover 		{ background: #ccc; }
.nav.nav-nested li.active > a 	{ background: #333; color: #fff; }
.nav.nav-nested ul	 			{ position: absolute; top: 100%; left: 0; width: 400px; margin-top: 1px; }


/* ������������� */
.nav.nav-pills 				{ margin-bottom: 15px; }
.nav.nav-pills li 			{ margin-right: 3px; }
.nav.nav-pills li a 		{ border-radius: 4px; padding: 5px 12px; background: #eee; }
.nav.nav-pills li a:hover 	{ background: #eaeaea; }
.nav.nav-pills li.active a 	{ background: #2375C6; color: #fff; }

.nav.nav-pills.nav-pills-profile 		{ margin-bottom: 30px; }


/* ��������� �� ������� ������������ */
.nav.nav-profile 				{ margin-bottom: 15px; }
.nav.nav-profile li 			{ float: none; margin-bottom: 2px; background: #eee; }
.nav.nav-profile li a 			{ padding: 5px 12px; border-radius: 0; }
.nav.nav-profile li a:hover 	{ background: #eaeaea; }
.nav.nav-profile li.active a 	{ background: #333; color: #fff; }

\ No newline at end of file
+/* ���������
------------------------------------------------- */

.nav 					{ zoom: 1; }
.nav:before,
.nav:after 				{ content: ""; display: table; }
.nav:after 				{ clear: both; }
.nav li 				{ float: left; }

.nav li:last-child 		{ border-right: none; }
.nav li a 				{ display: block; padding: 10px 15px; }
.nav li a:hover 		{ background: #f3f3f3; }
.nav li.active a 		{ background: #f3f3f3; }


/* ���� ������� */
#userbar { 
	border: 1px solid #ddd; 
	border-top: none; 
	
	background: #ffffff;
	background: -moz-linear-gradient(top,  #ffffff 0%, #f3f3f3 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3));
	background: -webkit-linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	background: -o-linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	background: -ms-linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	background: linear-gradient(top,  #ffffff 0%,#f3f3f3 100%);
	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); 
	
	border-radius: 0 0 4px 4px;
	box-shadow: 0 0 5px #ddd;	
}
#userbar .search { float: left; margin: 5px 0 0 7px; margin-bottom: 0; }

.nav.nav-userbar 					{ float: right; }
.nav.nav-userbar li 				{ border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; }
.nav.nav-userbar li:first-child a 	{ border-radius: 0 0 0 4px; }
.nav.nav-userbar li:last-child a 	{ border-radius: 0 0 4px 0; }
.nav.nav-userbar li:first-child 	{  }
.nav.nav-userbar li.nav-userbar-username a { position: relative; padding-left: 47px; font-weight: bold; }
.nav.nav-userbar li.nav-userbar-username .avatar { position: absolute; top: 7px; left: 15px; }
.nav.nav-userbar li .new-messages { font-weight: bold; }


/* ������� ���� */
.nav.nav-main 					{ border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); }
.nav.nav-main li a 				{ color: #ddd; }
.nav.nav-main li a:hover 		{ background: #333; }
.nav.nav-main li:first-child a 	{ border-radius: 4px 0 0 4px; }
.nav.nav-main li:last-child  a 	{ border-radius: 0 4px 4px 0; }
.nav.nav-main li.active a 		{ background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; }


/* ��������� ���� */
.nav.nav-nested 				{ height: 51px; margin: 0 0 50px 0; }
.nav.nav-nested li 				{ margin-right: 1px; position: relative; }
.nav.nav-nested li a 			{ background: #ddd; color: #333; padding: 7px 13px; }
.nav.nav-nested li a:hover 		{ background: #ccc; }
.nav.nav-nested li.active > a 	{ background: #333; color: #fff; }
.nav.nav-nested ul	 			{ position: absolute; top: 100%; left: 0; width: 400px; margin-top: 1px; }


/* ������������� */
.nav.nav-pills 				{ margin-bottom: 15px; }
.nav.nav-pills li 			{ margin-right: 3px; }
.nav.nav-pills li a 		{ border-radius: 4px; padding: 5px 12px; background: #eee; }
.nav.nav-pills li a:hover 	{ background: #eaeaea; }
.nav.nav-pills li.active a 	{ background: #2375C6; color: #fff; }

.nav.nav-pills.nav-pills-profile 		{ margin-bottom: 30px; }


/* ��������� �� ������� ������������ */
.nav.nav-profile 				{ margin-bottom: 15px; }
.nav.nav-profile li 			{ float: none; margin-bottom: 2px; background: #eee; }
.nav.nav-profile li a 			{ padding: 5px 12px; border-radius: 0; }
.nav.nav-profile li a:hover 	{ background: #eaeaea; }
.nav.nav-profile li.active a 	{ background: #333; color: #fff; }

\ No newline at end of file
diff --git a/templates/skin/developer-jquery/css/reset.css b/templates/skin/developer-jquery/css/reset.css
index ca47cb76..6e2ade93 100644
--- a/templates/skin/developer-jquery/css/reset.css
+++ b/templates/skin/developer-jquery/css/reset.css
@@ -101,7 +101,7 @@ body {
  */
 
 a:focus {
-    outline: thin dotted;
+    outline: 0;
 }
 
 /*
diff --git a/templates/skin/developer-jquery/css/tables.css b/templates/skin/developer-jquery/css/tables.css
index 1b84a5a2..b1fa3274 100644
--- a/templates/skin/developer-jquery/css/tables.css
+++ b/templates/skin/developer-jquery/css/tables.css
@@ -3,7 +3,7 @@
 ------------------------------------------------------------------- */
 
 .table 					{ width: 100%; margin-bottom: 15px; }
-.table th 				{ text-align: left; }
+.table th 				{ text-align: left; background: #fafafa; }
 .table td, .table th 	{ border-bottom: 1px solid #eee; padding: 10px; }
 .table tr.active td 	{ background: #CBF4BC; }
 
diff --git a/templates/skin/developer-jquery/css/topic.css b/templates/skin/developer-jquery/css/topic.css
index 6dbffed7..59ebc9c6 100644
--- a/templates/skin/developer-jquery/css/topic.css
+++ b/templates/skin/developer-jquery/css/topic.css
@@ -17,6 +17,7 @@
 /* Tags */
 .topic .topic-footer .topic-tags 			{ margin: 0 0 15px; }
 .topic .topic-footer .topic-tags li 		{ display: inline; color: #888; }
+.topic .topic-footer .topic-tags li.topic-tags-edit { margin-left: 20px; }
 
 /* Info */
 .topic .topic-footer .topic-info 		{ overflow: hidden; background: #eee; border-radius: 3px; }
diff --git a/templates/skin/developer-jquery/favourite_form_tags.tpl b/templates/skin/developer-jquery/favourite_form_tags.tpl
deleted file mode 100644
index c5a3c243..00000000
--- a/templates/skin/developer-jquery/favourite_form_tags.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{if $oUserCurrent}
-	<div id="favourite-form-tags" style="display:none;">
-		<form onsubmit="return ls.favourite.saveTags(this);">
-			<input type="hidden" name="target_type" value="" id="favourite-form-tags-target-type">
-			<input type="hidden" name="target_id" value="" id="favourite-form-tags-target-id">
-
-			<input type="text" name="tags" value="" id="favourite-form-tags-tags" class="autocomplete-tags-sep"><br/>
-			<button name="" class="button button-primary" />{$aLang.favourite_form_tags_button_save}</button>
-			<button name="" class="button" onclick="return ls.favourite.hideEditTags();" />{$aLang.favourite_form_tags_button_cancel}</button>
-		</form>
-	</div>
-{/if}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/header.tpl b/templates/skin/developer-jquery/header.tpl
index f07b6ee5..98d8d967 100644
--- a/templates/skin/developer-jquery/header.tpl
+++ b/templates/skin/developer-jquery/header.tpl
@@ -95,7 +95,7 @@
 			{/if}
 		
 			<div id="content" role="main" {if $noSidebar}class="content-full-width"{/if} {if $sidebarPosition == 'left'}class="content-right"{/if}>
-				{include file='favourite_form_tags.tpl'}
+				{include file='window_favourite_form_tags.tpl'}
 				{include file='window_login.tpl'}
 				{include file='nav_content.tpl'}
 				{include file='system_message.tpl'}
diff --git a/templates/skin/developer-jquery/header_top.tpl b/templates/skin/developer-jquery/header_top.tpl
index ce834bc7..2a0a4844 100644
--- a/templates/skin/developer-jquery/header_top.tpl
+++ b/templates/skin/developer-jquery/header_top.tpl
@@ -7,15 +7,14 @@
 	
 	<ul class="nav nav-userbar">
 		{if $oUserCurrent}
-			<li><a href="{$oUserCurrent->getUserWebPath()}" class="username">{$oUserCurrent->getLogin()}</a></li>
+			<li class="nav-userbar-username">
+				<a href="{$oUserCurrent->getUserWebPath()}" class="username">
+					<img src="{$oUserCurrent->getProfileAvatarPath(24)}" alt="avatar" class="avatar" />
+					{$oUserCurrent->getLogin()}
+				</a>
+			</li>
 			<li><a href="{router page='topic'}add/" class="create">{$aLang.topic_create}</a></li>
-			
-			{if $iUserCurrentCountTalkNew}
-				<li><a href="{router page='talk'}" class="message-new" id="new_messages" title="{$aLang.user_privat_messages_new}">{$aLang.user_privat_messages} ({$iUserCurrentCountTalkNew})</a></li>
-			{else}
-				<li><a href="{router page='talk'}" id="new_messages">{$aLang.user_privat_messages} ({$iUserCurrentCountTalkNew})</a></li>
-			{/if}
-			
+			<li><a href="{router page='talk'}" {if $iUserCurrentCountTalkNew}class="new-messages"{/if} id="new_messages" title="{$aLang.user_privat_messages_new}">{$aLang.user_privat_messages} ({$iUserCurrentCountTalkNew})</a></li>
 			<li><a href="{router page='settings'}profile/">{$aLang.user_settings}</a></li>
 			<li><a href="{router page='login'}exit/?security_ls_key={$LIVESTREET_SECURITY_KEY}">{$aLang.exit}</a></li>
 			
diff --git a/templates/skin/developer-jquery/js/developer-jquery.js b/templates/skin/developer-jquery/js/developer-jquery.js
index e4469553..c9156fb0 100644
--- a/templates/skin/developer-jquery/js/developer-jquery.js
+++ b/templates/skin/developer-jquery/js/developer-jquery.js
@@ -12,6 +12,7 @@ jQuery(document).ready(function($){
 	$('#add_friend_form').jqm({trigger: '#add_friend_show'});
 	$('#form_upload_img').jqm();
 	$('#userfield_form').jqm();
+	$('#favourite-form-tags').jqm();
 	
 	// Datepicker
 	 /**
diff --git a/templates/skin/developer-jquery/toolbar.tpl b/templates/skin/developer-jquery/toolbar.tpl
index b39c29e5..4228ab26 100644
--- a/templates/skin/developer-jquery/toolbar.tpl
+++ b/templates/skin/developer-jquery/toolbar.tpl
@@ -3,7 +3,9 @@
 
 	{if $oUserCurrent and $oUserCurrent->isAdministrator()}
 		<section class="toolbar-admin">
-			<a href="{router page='admin'}" title="{$aLang.admin_title}"></a>
+			<a href="{router page='admin'}" title="{$aLang.admin_title}">
+				<i class="icon-cog"></i>
+			</a>
 		</section>
 	{/if}
 </aside>
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/toolbar_comment.tpl b/templates/skin/developer-jquery/toolbar_comment.tpl
index 236a3946..e5c97992 100644
--- a/templates/skin/developer-jquery/toolbar_comment.tpl
+++ b/templates/skin/developer-jquery/toolbar_comment.tpl
@@ -1,8 +1,8 @@
 {if $oUserCurrent}
 	{assign var=aPagingCmt value=$params.aPagingCmt}
-	<section class="toolbar-update" id="update" style="{if $aPagingCmt and $aPagingCmt.iCountPage>1}display:none;{/if}">
-		<div class="update-comments" id="update-comments" onclick="ls.comments.load({$params.iTargetId},'{$params.sTargetType}'); return false;"></div>
-		<div class="new-comments" id="new_comments_counter" style="display: none;" onclick="ls.comments.goToNextComment();"></div>
+	<section class="toolbar-update" id="update" style="{if $aPagingCmt and $aPagingCmt.iCountPage > 1}display: none;{/if}">
+		<a href="#" class="update-comments" id="update-comments" onclick="ls.comments.load({$params.iTargetId},'{$params.sTargetType}'); return false;"><i></i></a>
+		<a href="#" class="new-comments" id="new_comments_counter" style="display: none;" title="Число новых комментариев" onclick="ls.comments.goToNextComment();"></a>
 
 		<input type="hidden" id="comment_last_id" value="{$params.iMaxIdComment}" />
 		<input type="hidden" id="comment_use_paging" value="{if $aPagingCmt and $aPagingCmt.iCountPage>1}1{/if}" />
diff --git a/templates/skin/developer-jquery/toolbar_topic.tpl b/templates/skin/developer-jquery/toolbar_topic.tpl
index 29427179..c1fc7ccd 100644
--- a/templates/skin/developer-jquery/toolbar_topic.tpl
+++ b/templates/skin/developer-jquery/toolbar_topic.tpl
@@ -1,8 +1,7 @@
 {if $params.iCountTopic}
 	<section class="toolbar-topic" id="" style="">
-		<a href="#" onclick="return ls.toolbar.topic.goPrev();">&uarr;</a>
-		<br/>
-		<a href="#" onclick="return ls.toolbar.topic.goNext();">&darr;</a>
+		<a href="#" onclick="return ls.toolbar.topic.goPrev();" title="Предыдущий топик" class="toolbar-topic-prev"><i class="icon-arrow-up"></i></a>
+		<a href="#" onclick="return ls.toolbar.topic.goNext();" title="Следующий топик" class="toolbar-topic-next"><i class="icon-arrow-down"></i></a>
 	</section>
 {/if}
 
diff --git a/templates/skin/developer-jquery/topic_part_footer.tpl b/templates/skin/developer-jquery/topic_part_footer.tpl
index 330e8916..649da748 100644
--- a/templates/skin/developer-jquery/topic_part_footer.tpl
+++ b/templates/skin/developer-jquery/topic_part_footer.tpl
@@ -18,17 +18,22 @@
 
 		<ul class="topic-tags js-favourite-insert-after-form js-favourite-tags-topic-{$oTopic->getId()}">
 			<li>{$aLang.block_tags}:</li>
+			
 			{strip}
 				{foreach from=$oTopic->getTagsArray() item=sTag name=tags_list}
 					<li>{if !$smarty.foreach.tags_list.first}, {/if}<a rel="tag" href="{router page='tag'}{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a></li>
 				{/foreach}
+				
 				{if $oUserCurrent}
 					{if $oFavourite}
 						{foreach from=$oFavourite->getTagsArray() item=sTag name=tags_list_user}
 							<li class="topic-tags-user js-favourite-tag-user">, <a rel="tag" href="{$oUserCurrent->getUserWebPath()}favourites/topics/tag/{$sTag|escape:'url'}/">{$sTag|escape:'html'}</a></li>
 						{/foreach}
 					{/if}
-					<li class="topic-tags-edit js-favourite-tag-edit" {if !$oFavourite}style="display:none;"{/if}><a href="#" onclick="return ls.favourite.showEditTags({$oTopic->getId()},'topic',this);">{$aLang.favourite_form_tags_button_show}</a></li>
+					
+					<li class="topic-tags-edit js-favourite-tag-edit" {if !$oFavourite}style="display:none;"{/if}>
+						<a href="#" onclick="return ls.favourite.showEditTags({$oTopic->getId()},'topic',this);" class="link-dotted">{$aLang.favourite_form_tags_button_show}</a>
+					</li>
 				{/if}
 			{/strip}
 		</ul>
diff --git a/templates/skin/developer-jquery/window_favourite_form_tags.tpl b/templates/skin/developer-jquery/window_favourite_form_tags.tpl
new file mode 100644
index 00000000..ab0e8974
--- /dev/null
+++ b/templates/skin/developer-jquery/window_favourite_form_tags.tpl
@@ -0,0 +1,18 @@
+{if $oUserCurrent}
+	<div id="favourite-form-tags" class="modal">
+		<header>
+			<h3>{$aLang.user_authorization}</h3>
+			<a href="#" class="close jqmClose"></a>
+		</header>
+		
+		
+		<form onsubmit="return ls.favourite.saveTags(this);">
+			<input type="hidden" name="target_type" value="" id="favourite-form-tags-target-type">
+			<input type="hidden" name="target_id" value="" id="favourite-form-tags-target-id">
+
+			<p><input type="text" name="tags" value="" id="favourite-form-tags-tags" class="autocomplete-tags-sep input-text input-width-full"></p>
+			<button name="" class="button button-primary" />{$aLang.favourite_form_tags_button_save}</button>
+			<button name="" class="button jqmClose" />{$aLang.favourite_form_tags_button_cancel}</button>
+		</form>
+	</div>
+{/if}
\ No newline at end of file