Доработка и исправление багов в шаблоне

livestreet · Apr 12, 2012 · d8ca536 · d8ca536
1 parent 94359f1
commit d8ca536
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/templates/language/english.php b/templates/language/english.php
@@ -201,6 +201,7 @@
 	'block_stream_comments_all' => 'All comment block',
 	'block_stream_topics_all' => 'All topics block',
 	'comments_all' => 'All comments',
+	'add_favourite_tags' => 'Add tags',
 	/**
 	 * Topic menus
 	 */
@@ -524,6 +525,7 @@
 	'profile_date_registration' => 'Registered at',
 	'profile_date_last' => 'Last visit',
 	'profile_social_contacts' => 'Contacts and social services',
+	'profile_add_friend' => 'Add friend',
 	/**
 	 * UserFields
 	 */

diff --git a/templates/language/russian.php b/templates/language/russian.php
@@ -201,6 +201,7 @@
 	'block_stream_comments_all' => 'Весь эфир',
 	'block_stream_topics_all' => 'Весь эфир',
 	'comments_all' => 'Прямой эфир',
+	'add_favourite_tags' => 'Добавить свои теги',
 	/**
 	 * Меню топиков
 	 */
@@ -524,6 +525,7 @@
 	'profile_date_registration' => 'Зарегистрирован',
 	'profile_date_last' => 'Последний визит',
 	'profile_social_contacts' => 'Контакты и социальные сервисы',
+	'profile_add_friend' => 'Добавить друга',
 	/**
 	 * UserFields
 	 */

diff --git a/templates/skin/developer-jquery/actions/ActionProfile/friend_item.tpl b/templates/skin/developer-jquery/actions/ActionProfile/friend_item.tpl
@@ -11,14 +11,13 @@
 {elseif !$oUserFriend}
 	<div id="add_friend_form" class="modal">
 		<header class="modal-header">
-			<h3>{$aLang.user_authorization}</h3>
+			<h3>{$aLang.profile_add_friend}</h3>
 			<a href="#" class="close jqmClose"></a>
 		</header>
 
 		<form onsubmit="return ls.user.addFriend(this,{$oUserProfile->getId()},'add');" class="modal-content">
-
 			<p><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></p>
+			<textarea id="add_friend_text" rows="3" class="input-text input-width-full"></textarea></p>
 
 			<button class="button button-primary">{$aLang.user_friend_add_submit}</button>
 		</form>

diff --git a/templates/skin/developer-jquery/css/navs.css b/templates/skin/developer-jquery/css/navs.css
diff --git a/templates/skin/developer-jquery/images/user_foto_250.png b/templates/skin/developer-jquery/images/user_foto_250.png
diff --git a/templates/skin/developer-jquery/menu.blog.tpl b/templates/skin/developer-jquery/menu.blog.tpl
@@ -17,7 +17,7 @@
 		{if $sMenuItemSelect=='blog'}
 			<ul class="sub-menu">
 				<li {if $sMenuSubItemSelect=='good'}class="active"{/if}><a href="{$sMenuSubBlogUrl}">{$aLang.blog_menu_collective_good}</a></li>
-				{if $iCountTopicsBlogNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{$sMenuSubBlogUrl}new/">{$aLang.blog_menu_collective_new}</a> +{$iCountTopicsBlogNew}</li>{/if}
+				{if $iCountTopicsBlogNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{$sMenuSubBlogUrl}new/">{$aLang.blog_menu_collective_new} +{$iCountTopicsBlogNew}</a></li>{/if}
 				<li {if $sMenuSubItemSelect=='discussed'}class="active"{/if}><a href="{$sMenuSubBlogUrl}discussed/">{$aLang.blog_menu_collective_discussed}</a></li>
 				<li {if $sMenuSubItemSelect=='top'}class="active"{/if}><a href="{$sMenuSubBlogUrl}top/">{$aLang.blog_menu_collective_top}</a></li>
 				{hook run='menu_blog_blog_item'}
@@ -30,7 +30,7 @@
 		{if $sMenuItemSelect=='log'}
 			<ul class="sub-menu">
 				<li {if $sMenuSubItemSelect=='good'}class="active"{/if}><a href="{router page='personal_blog'}">{$aLang.blog_menu_personal_good}</a></li>
-				{if $iCountTopicsPersonalNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{router page='personal_blog'}new/">{$aLang.blog_menu_personal_new}</a> +{$iCountTopicsPersonalNew}</li>{/if}
+				{if $iCountTopicsPersonalNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{router page='personal_blog'}new/">{$aLang.blog_menu_personal_new} +{$iCountTopicsPersonalNew}</a></li>{/if}
 				<li {if $sMenuSubItemSelect=='discussed'}class="active"{/if}><a href="{router page='personal_blog'}discussed/">{$aLang.blog_menu_personal_discussed}</a></li>
 				<li {if $sMenuSubItemSelect=='top'}class="active"{/if}><a href="{router page='personal_blog'}top/">{$aLang.blog_menu_personal_top}</a></li>
 				{hook run='menu_blog_log_item'}

diff --git a/templates/skin/developer-jquery/window_favourite_form_tags.tpl b/templates/skin/developer-jquery/window_favourite_form_tags.tpl
@@ -1,7 +1,7 @@
 {if $oUserCurrent}
 	<div id="favourite-form-tags" class="modal">
 		<header class="modal-header">
-			<h3>{$aLang.user_authorization}</h3>
+			<h3>{$aLang.add_favourite_tags}</h3>
 			<a href="#" class="close jqmClose"></a>
 		</header>