Merge pull request #33 from stfalcon-studio/crlf

поправил ошибки валидации, переводы строк, пробелы в конце строк и отступы

templates/language/english.php

@@ -1,4 +1,5 @@
 <?php
+
 /* -------------------------------------------------------
  *
  *   LiveStreet Engine Social Networking
@@ -31,7 +32,6 @@ return array(
 	'blogs_personal_title' => "Blogger's name",
 	'blogs_personal_description' => 'This is your personal blog.',
 	'blog_closed' => 'Private blog',
-	
 	'blog_no_topic' => 'No one posted here yet',
 	'blog_rss' => 'RSS feed',
 	'blog_rating' => 'Rating',
@@ -148,7 +148,6 @@ return array(
 	'blog_admin_users_submit_notice' => "After pushing \"Save\" button, user's permissions will be saved",
 	'blog_admin_users_submit_ok' => 'Permissions saved',
 	'blog_admin_users_submit_error' => "Hmm... Something's wrong",
-	
 	'blog_admin_delete_confirm' => 'Are you sure you want to create blog?',
 	'blog_admin_delete_move' => 'Move topics to the blog',
 	'blog_delete_clear' => 'Delete topics',
@@ -156,7 +155,6 @@ return array(
 	'blog_admin_delete_not_empty' => "You can't delete blog containing records. Please delete all records first.",
 	'blog_admin_delete_move_error' => 'Unable to move topics from the blog which is being deleted',
 	'blog_admin_delete_move_personal' => "Can't move topics to personal blog",
-	
 	'blog_admin_user_add_label' => 'Invite users:',
 	'blog_admin_user_invited' => 'List of invitees:',
 	'blog_close_show' => "It's a 'close blog', you don't have enought rights to see it's content",
@@ -171,7 +169,6 @@ return array(
 	'blog_user_invite_accept' => 'Invitation accepted',
 	'blog_user_invite_reject' => 'Invitation rejected',
 	'blog_user_invite_readd' => 'Re-add',
-	
 	/**
 	 * Topics
 	 */
@@ -196,7 +193,6 @@ return array(
 	'topic_favourite_del' => 'Remove from favourites',
 	'topic_favourite_del_ok' => 'Topic removed from favourites',
 	'error_favorite_topic_is_draft' => 'Topic of the draft can not be added to favorites',
-	
 	'block_stream_comments_all' => 'All comment block',
 	'block_stream_topics_all' => 'All topics block',
 	'comments_all' => 'All comments',
@@ -243,7 +239,6 @@ return array(
 	'topic_create_submit_notice' => 'Pushing «save to drafts» will save topic to the drafts and will be viewable by you only, showing lock alongside. Push «publish» to make it viewable by everyone.',
 	'topic_create_notice' => "Note: <cut> tag shortens long articles, hiding them totally or partially under the link («Read more»). Hidden part is not visible in the blog but will be available on the full Topic's page.",
 	'topic_create_error' => "During topic creation we've experienced some technical difficulties. Please try again later.",
-	
 	'topic_edit' => 'Edit',
 	'topic_delete' => 'Delete',
 	'topic_delete_confirm' => 'Do you really want to delete this topic?',
@@ -303,7 +298,6 @@ return array(
 	'topic_vote_ok' => 'Your vote counted',
 	'topic_vote_ok_abstain' => 'You\'ve abstained in order to view topic raiting',
 	'topic_vote_count' => 'All votes',
-
 	/**
 	 * Photoset
 	 */
@@ -332,7 +326,6 @@ return array(
 	'topic_photoset_title_create' => 'Create a photoset',
 	'topic_photoset_error_bad_filesize' => 'Photo size must be less than %%MAX%% Kb',
 	'topic_photoset_photos' => 'photos',
-
 	/**
 	 * Comments
 	 */
@@ -362,21 +355,16 @@ return array(
 	'comment_vote_error_self' => "You can't vote for your own comment!",
 	'comment_vote_error_noexists' => "You're voting for comment wich doesn't exist!",
 	'comment_vote_ok' => 'Your vote counted',
-
 	'comment_favourite_add' => 'Add to favoutites',
 	'comment_favourite_add_ok' => 'Comment added to favourites',
 	'comment_favourite_add_no' => 'This comment is not in your favourites',
 	'comment_favourite_add_already' => 'This comment is already in your favourites',
 	'comment_favourite_del' => 'Delete from favourites',
 	'comment_favourite_del_ok' => 'Comment deleted from favourites',
-
-	
 	/**
 	 * People
 	 */
 	'people' => 'People',
-	
-	
 	/**
 	 * User
 	 */
@@ -401,7 +389,6 @@ return array(
 	'user_authorization' => 'Authorisation',
 	'user_registration' => 'Registration',
 	'user_write_prvmsg' => 'Write private message',
-
 	'user_friend_add' => 'Add to friends',
 	'user_friend_add_ok' => 'You\'ve got a new friend',
 	'user_friend_add_self' => 'Your friend is - yourself!',
@@ -425,7 +412,6 @@ return array(
 	'user_friend_reject_notice_text' => 'User %%login%% rejected your friendship offer',
 	'user_friend_del_notice_title' => 'You\'ve been removed from friendship list',
 	'user_friend_del_notice_text' => 'User %%login%% is not your friend anymore',
-	
 	'user_rating' => 'Rating',
 	'user_skill' => 'Power',
 	'user_date_last' => 'Last visit',
@@ -438,10 +424,8 @@ return array(
 	'user_stats_sex_man' => 'Males',
 	'user_stats_sex_woman' => 'Females',
 	'user_stats_sex_other' => 'Gender not specified',
-	
 	'user_not_found' => 'User <b>%%login%%</b> wasn\'t not found',
 	'user_not_found_by_id' => 'User <b>#%%id%%</b> wasn\'t not found',
-	
 	/**
 	 * User's profile menu
 	 */
@@ -449,7 +433,6 @@ return array(
 	'people_menu_users_all' => 'All',
 	'people_menu_users_online' => 'Online',
 	'people_menu_users_new' => 'New',
-	
 	/**
 	 * Registration
 	 */
@@ -481,7 +464,6 @@ return array(
 	'registration_captcha_error' => 'Wrong code',
 	'registration_submit' => 'Submit registration',
 	'registration_ok' => 'Congratulation with successful registration!',
-			
 	/**
 	 * Vote for users
 	 */
@@ -493,22 +475,18 @@ return array(
 	'user_vote_error_acl' => 'You don\'t have enough rating and power to vote!',
 	'user_vote_ok' => 'Your vote counted',
 	'user_vote_count' => 'Votes',
-	
 	/**
 	 * User profile menu
 	 */
 	'user_menu_profile' => 'Profile',
 	'user_menu_profile_whois' => 'Whois',
-	
 	'user_menu_profile_favourites' => 'Favourite topics',
 	'user_menu_profile_favourites_comments' => 'Favourite comments',
-	
 	'user_menu_profile_tags' => 'Tags',
 	'user_menu_publication' => 'Publications',
 	'user_menu_publication_blog' => 'Blog',
 	'user_menu_publication_comment' => 'Comments',
 	'user_menu_publication_comment_rss' => 'RSS feed',
-	
 	/**
 	 * Profile
 	 */
@@ -532,7 +510,6 @@ return array(
 	'profile_date_registration' => 'Registered at',
 	'profile_date_last' => 'Last visit',
 	'profile_social_contacts' => 'Contacts and social services',
-	
 	/**
 	 * UserFields
 	 */
@@ -551,8 +528,6 @@ return array(
 	'user_field_error_add_no_name' => 'You must specify the name of the field',
 	'user_field_error_add_no_title' => 'You must specify a title field',
 	'user_field_error_name_exists' => 'Field with that name already exists',
-
-	
 	/**
 	 * Configs.
 	 */
@@ -608,8 +583,6 @@ return array(
 	'settings_tuning_notice_new_friend' => 'On joining to a friends list',
 	'settings_tuning_submit' => 'Save configs',
 	'settings_tuning_submit_ok' => 'Configs saved',
-	
-	
 	/**
 	 * Configs menu
 	 */
@@ -617,7 +590,6 @@ return array(
 	'settings_menu_profile' => 'Profile',
 	'settings_menu_tuning' => 'Configs',
 	'settings_menu_invite' => 'Invites',
-	
 	/**
 	 * Password restore
 	 */
@@ -628,7 +600,6 @@ return array(
 	'password_reminder_send_link' => 'Link for password reset sent to your e-mail address.',
 	'password_reminder_bad_code' => 'Wrong code for password reset.',
 	'password_reminder_bad_email' => 'Can\'t find user with this e-mail address',
-	
 	/**
 	 * Panel
 	 */
@@ -656,7 +627,6 @@ return array(
 	'panel_clear_tags' => 'clean up the tags',
 	'panel_user' => 'user inserted',
 	'panel_user_promt' => 'Enter the user login',
-	
 	/**
 	 * Blocks
 	 */
@@ -678,15 +648,12 @@ return array(
 	'block_stream_comments' => 'Comments',
 	'block_stream_comments_no' => 'No comments.',
 	'block_stream_comments_all' => 'All comments',
-	
 	'block_friends' => 'Friends',
 	'block_friends_check' => 'Check all',
 	'block_friends_uncheck' => 'Uncheck',
 	'block_friends_empty' => 'Empty friends list',
-	
 	'site_history_back' => 'Go back',
 	'site_go_main' => 'Go to the main page',
-	
 	/**
 	 * Search
 	 */
@@ -696,7 +663,6 @@ return array(
 	'search_results_empty' => 'Thats strange. No results found.',
 	'search_results_count_topics' => 'topics',
 	'search_results_count_comments' => 'comments',
-	
 	/**
 	 * Malbox
 	 */
@@ -722,7 +688,6 @@ return array(
 	'talk_create_text_error' => 'Message text should consist of 2 upto 3000 chars',
 	'talk_create_submit' => 'Send',
 	'talk_time_limit' => 'You can\'t send messages in such a frequent rate',
-	
 	'talk_favourite_inbox' => 'Favourite messages',
 	'talk_favourite_add' => 'Add to favourites',
 	'talk_favourite_add_ok' => 'Message added to favourites',
@@ -731,7 +696,6 @@ return array(
 	'talk_favourite_del' => 'remove from favourites',
 	'talk_favourite_del_ok' => 'Message removed from Favourites\' list',
 	'talk_favourite_empty' => 'No letters to favorites',
-	
 	'talk_filter_title' => 'Filter',
 	'talk_filter_erase' => 'Remove filter',
 	'talk_filter_erase_form' => 'Empty form',
@@ -746,7 +710,6 @@ return array(
 	'talk_filter_error_date_format' => 'Wrong date format',
 	'talk_filter_result_count' => 'Found %%count%% messages',
 	'talk_filter_result_empty' => 'No messages found according to specified criteria',
-	
 	'talk_user_in_blacklist' => 'User <b>%%login%%</b> blacklisted your messages',
 	'talk_blacklist_title' => 'Blacklist messages from:',
 	'talk_blacklist_empty' => 'Accept from all',
@@ -758,7 +721,6 @@ return array(
 	'talk_blacklist_delete_ok' => 'User <b>%%login%%</b> removed from blacklist',
 	'talk_blacklist_user_not_found' => 'User <b>%%login%%</b> is not in your black list',
 	'talk_blacklist_add_self' => 'You can\'t add yourself to the blacklist',
-	
 	'talk_speaker_title' => 'Message members',
 	'talk_speaker_add_label' => 'Add member',
 	'talk_speaker_delete_ok' => 'Member <b>%%login%%</b> deleted successfully',
@@ -767,10 +729,7 @@ return array(
 	'talk_speaker_add_ok' => 'User <b>%%login%%</b> added successfully',
 	'talk_speaker_delete_by_self' => 'Member <b>%%login%%</b> deleted this message',
 	'talk_speaker_add_self' => 'You can\'t add yourself as a member',
-	
 	'talk_not_found' => 'Message not found',
-	
-	
 	/**
 	 * Userfeed
 	 */
@@ -781,17 +740,13 @@ return array(
 	'userfeed_subscribes_already_subscribed' => 'You are already subscribed to the topics of this user',
 	'userfeed_subscribes_updated' => 'Settings saved',
 	'userfeed_get_more' => 'Get more topics',
-	
 	'userfeed_title' => 'Feed',
-	
 	'userfeed_settings_note_follow_blogs' => 'Choose the blogs that you\'d like to read',
 	'userfeed_settings_note_follow_user' => 'Add users, topics you\'d like to read',
 	'userfeed_settings_note_follow_friend' => 'Select friends topics you\'d like to read',
-    
 	'userfeed_no_subscribed_users' => 'You have not yet subscribed to the user',
 	'userfeed_no_blogs' => 'You have not entered into any blog',
 	'userfeed_error_subscribe_to_yourself' => 'You can not sign up for yourself',
-
 	/**
 	 * Stream
 	 */
@@ -814,7 +769,6 @@ return array(
 	'stream_no_subscribed_users' => 'You have not yet subscribed to the user',
 	'stream_no_events' => 'Stream is empty',
 	'stream_error_subscribe_to_yourself' => 'You can not sign up for yourself',
-
 	'stream_list_user' => 'User',
 	'stream_list_event_add_topic' => 'added a new topic',
 	'stream_list_event_add_blog' => 'added a new blog',
@@ -825,19 +779,14 @@ return array(
 	'stream_list_event_vote_comment' => 'voted comment',
 	'stream_list_event_join_blog' => 'join to blog',
 	'stream_list_event_add_friend' => 'add to friends',
-	
 	'stream_personal_title' => 'Stream',
-	
 	'stream_settings_note_filter' => 'Select the actions that will be tracked',
 	'stream_settings_note_follow_user' => 'Add people to the activity that you would like to watch',
 	'stream_settings_note_follow_friend' => 'Choose your friends for the activity that you would like to watch',
-    
 	'admin_list_plugins' => 'Manage plugins',
 	'admin_list_userfields' => 'Configuring custom fields',
 	'admin_list_restorecomment' => 'Rebuilding a tree comments',
 	'admin_list_recalcfavourite' => 'Recalculate counters of favorites',
-	
-	
 	/**
 	 * Rating TOP
 	 */
@@ -845,12 +794,10 @@ return array(
 	'top_blogs' => 'TOP Blogs',
 	'top_topics' => 'TOP Topics',
 	'top_comments' => 'TOP Comments',
-	
 	/**
 	 * Tag search
 	 */
 	'tag_title' => 'Tag search',
-	
 	/**
 	 * Paging
 	 */
@@ -859,7 +806,6 @@ return array(
 	'paging_last' => 'Last',
 	'paging_first' => 'First',
 	'paging' => 'Pages',
-	
 	/**
 	 * Image upload
 	 */
@@ -879,7 +825,6 @@ return array(
 	'uploadimg_submit' => 'Submit',
 	'uploadimg_cancel' => 'Cancel',
 	'uploadimg_title' => 'Title',
-	
 	/**
 	 * Notifications
 	 */
@@ -895,14 +840,12 @@ return array(
 	'notify_subject_blog_invite_new' => 'You\'ve got a blog membership offer',
 	'notify_subject_reminder_code' => 'Password reminder',
 	'notify_subject_reminder_password' => 'New password',
-	
 	/**
 	 * Админка
 	 */
 	'admin_title' => 'Admin',
 	'admin_comment_restore_tree' => 'Tree comments restore successful',
 	'admin_favourites_recalculated' => 'Favourites counters has been recalculated',
-	
 	/**
 	 * Plugin administration page
 	 */
@@ -924,8 +867,6 @@ return array(
 	'plugins_activation_requires_error' => 'Plugin requires activated <b>%%plugin%%</b> plugin',
 	'plugins_submit_delete' => 'Delete plugins',
 	'plugins_delete_confirm' => 'Do you really want to delete those plugins?',
-	
-	
 	'system_error_event_args' => 'Wrong number of arguments during event addition',
 	'system_error_event_method' => 'Added event method not found',
 	'system_error_404' => 'Unfortunately there is no such page. Probably deleted or wasn\'t there in the first place.',
@@ -934,7 +875,6 @@ return array(
 	'system_error_cache_type' => 'Wrong cache type',
 	'system_error_template' => 'Can\'t find template',
 	'system_error_template_block' => 'Can\'t find template of added blog',
-	
 	'error' => 'Error',
 	'attention' => 'Attention',
 	'system_error' => 'System error. Please try later.',
@@ -948,7 +888,6 @@ return array(
 	'delete' => 'Delete',
 	'date_day' => 'day',
 	'date_month' => 'month',
-	
 	'month_array' => array(
 		1 => array('January', 'January', 'January'),
 		2 => array('February', 'February', 'February'),
@@ -963,9 +902,7 @@ return array(
 		11 => array('November', 'November', 'November'),
 		12 => array('December', 'December', 'December'),
 	),
- 	
 	'date_year' => 'year',
-	
 	'date_now' => 'Today\'s date',
 	'date_today' => 'Today at',
 	'date_yesterday' => 'Yesterday at',
@@ -975,5 +912,4 @@ return array(
 	'date_hours_back' => '%%hours%% hours ago; %%hours%% hours ago; %%hours%% hours ago',
 	'date_hours_back_less' => 'Less than an hour ago',
 );
-
 ?>

templates/language/russian.php

@@ -1,4 +1,5 @@
 <?php
+
 /* -------------------------------------------------------
  *
  *   LiveStreet Engine Social Networking
@@ -31,7 +32,6 @@ return array(
 	'blogs_personal_title' => 'Блог им.',
 	'blogs_personal_description' => 'Это ваш персональный блог.',
 	'blog_closed' => 'Закрытый блог',
-
 	'blog_no_topic' => 'Сюда еще никто не успел написать',
 	'blog_rss' => 'RSS лента',
 	'blog_rating' => 'Рейтинг',
@@ -148,7 +148,6 @@ return array(
 	'blog_admin_users_submit_notice' => 'После нажатия на кнопку «Сохранить» права пользователей будут сохранены',
 	'blog_admin_users_submit_ok' => 'Права сохранены',
 	'blog_admin_users_submit_error' => 'Что-то не так',
-
 	'blog_admin_delete_confirm' => 'Вы уверены, что хотите удалить блог?',
 	'blog_admin_delete_move' => 'Переместить топики в блог',
 	'blog_delete_clear' => 'Удалить топики',
@@ -156,7 +155,6 @@ return array(
 	'blog_admin_delete_not_empty' => 'Вы не можете удалить блок с записями. Предварительно удалите из блога все записи.',
 	'blog_admin_delete_move_error' => 'Не удалось переместить топики из удаляемого блога',
 	'blog_admin_delete_move_personal' => 'Нельзя перемещать топики в персональный блог',
-
 	'blog_admin_user_add_label' => 'Пригласить пользователей:',
 	'blog_admin_user_invited' => 'Список приглашенных:',
 	'blog_close_show' => 'Это закрытый блог, у вас нет прав на просмотр контента',
@@ -171,7 +169,6 @@ return array(
 	'blog_user_invite_accept' => 'Приглашение принято',
 	'blog_user_invite_reject' => 'Приглашение отклонено',
 	'blog_user_invite_readd' => 'повторить',
-
 	/**
 	 * Топики
 	 */
@@ -242,7 +239,6 @@ return array(
 	'topic_create_submit_notice' => 'Если нажать кнопку «Сохранить в черновиках», текст топика будет виден только Вам, а рядом с его заголовком будет отображаться замочек. Чтобы топик был виден всем, нажмите «Опубликовать».',
 	'topic_create_notice' => 'Не забывайте: тег <cut> сокращает длинные записи, скрывая их целиком или частично под ссылкой («читать дальше»). Скрытая часть не видна в блоге, но доступна в полной записи на странице топика.',
 	'topic_create_error' => 'Возникли технические неполадки при добавлении топика. Пожалуйста, повторите позже.',
-
 	'topic_edit' => 'Редактировать',
 	'topic_delete' => 'Удалить',
 	'topic_delete_confirm' => 'Вы действительно хотите удалить топик?',
@@ -302,7 +298,6 @@ return array(
 	'topic_vote_ok' => 'Ваш голос учтен',
 	'topic_vote_ok_abstain' => 'Вы воздержались для просмотра рейтинга топика',
 	'topic_vote_count' => 'всего проголосовало',
-    
 	/**
 	 * Фотосет
 	 */
@@ -331,8 +326,6 @@ return array(
 	'topic_photoset_title_create' => 'Создание фотосета',
 	'topic_photoset_error_bad_filesize' => 'Размер фото должен быть не более %%MAX%% Кб',
 	'topic_photoset_photos' => 'фото',
-                 
-            
 	/**
 	 * Комментарии
 	 */
@@ -362,21 +355,16 @@ return array(
 	'comment_vote_error_self' => 'Вы не можете голосовать за свой комментарий!',
 	'comment_vote_error_noexists' => 'Вы голосуете за несуществующий комментарий!',
 	'comment_vote_ok' => 'Ваш голос учтен',
-
 	'comment_favourite_add' => 'добавить в избранное',
 	'comment_favourite_add_ok' => 'Комментарий добавлен в избранное',
 	'comment_favourite_add_no' => 'Этого комментария нет в вашем избранном',
 	'comment_favourite_add_already' => 'Этот комментарий уже есть в вашем избранном',
 	'comment_favourite_del' => 'удалить из избранного',
 	'comment_favourite_del_ok' => 'Комментарий удален из избранного',
-
-
 	/**
 	 * Люди
 	 */
 	'people' => 'Люди',
-
-
 	/**
 	 * Пользователь
 	 */
@@ -401,7 +389,6 @@ return array(
 	'user_authorization' => 'Авторизация',
 	'user_registration' => 'Регистрация',
 	'user_write_prvmsg' => 'Написать письмо',
-
 	'user_friend_add' => 'Добавить в друзья',
 	'user_friend_add_ok' => 'У вас появился новый друг',
 	'user_friend_add_self' => 'Ваш друг - это вы!',
@@ -425,7 +412,6 @@ return array(
 	'user_friend_reject_notice_text' => 'Пользователь %%login%% отказался с вами дружить',
 	'user_friend_del_notice_title' => 'Вас удалили из друзей',
 	'user_friend_del_notice_text' => 'У вас больше нет друга %%login%%',
-
 	'user_rating' => 'Рейтинг',
 	'user_skill' => 'Сила',
 	'user_date_last' => 'Последний визит',
@@ -438,10 +424,8 @@ return array(
 	'user_stats_sex_man' => 'Мужчины',
 	'user_stats_sex_woman' => 'Женщины',
 	'user_stats_sex_other' => 'Пол не указан',
-
 	'user_not_found' => 'Пользователь <b>%%login%%</b> не найден',
 	'user_not_found_by_id' => 'Пользователь <b>#%%id%%</b> не найден',
-
 	/**
 	 * Меню профиля пользователя
 	 */
@@ -449,7 +433,6 @@ return array(
 	'people_menu_users_all' => 'Все',
 	'people_menu_users_online' => 'Онлайн',
 	'people_menu_users_new' => 'Новые',
-
 	/**
 	 * Регистрация
 	 */
@@ -481,7 +464,6 @@ return array(
 	'registration_captcha_error' => 'Неверный код',
 	'registration_submit' => 'Зарегистрироваться',
 	'registration_ok' => 'Поздравляем! Регистрация прошла успешно',
-
 	/**
 	 * Голосование за пользователя
 	 */
@@ -493,22 +475,18 @@ return array(
 	'user_vote_error_acl' => 'У вас не хватает рейтинга и силы для голосования!',
 	'user_vote_ok' => 'Ваш голос учтен',
 	'user_vote_count' => 'голосов',
-
 	/**
 	 * Меню профиля пользователя
 	 */
 	'user_menu_profile' => 'Профиль',
 	'user_menu_profile_whois' => 'Whois',
-
 	'user_menu_profile_favourites' => 'Избранные топики',
 	'user_menu_profile_favourites_comments' => 'Избранные комментарии',
-
 	'user_menu_profile_tags' => 'Метки',
 	'user_menu_publication' => 'Публикации',
 	'user_menu_publication_blog' => 'Блог',
 	'user_menu_publication_comment' => 'Комментарии',
 	'user_menu_publication_comment_rss' => 'RSS лента',
-
 	/**
 	 * Профиль
 	 */
@@ -532,7 +510,6 @@ return array(
 	'profile_date_registration' => 'Зарегистрирован',
 	'profile_date_last' => 'Последний визит',
 	'profile_social_contacts' => 'Контакты и социальные сервисы',
-
 	/**
 	 * UserFields
 	 */
@@ -551,8 +528,6 @@ return array(
 	'user_field_error_add_no_name' => 'Необходимо указать название поля',
 	'user_field_error_add_no_title' => 'Необходимо указать заголовок поля',
 	'user_field_error_name_exists' => 'Поле с таким именем уже существует',
-
-
 	/**
 	 * Настройки
 	 */
@@ -608,8 +583,6 @@ return array(
 	'settings_tuning_notice_new_friend' => 'при добавлении вас в друзья',
 	'settings_tuning_submit' => 'сохранить настройки',
 	'settings_tuning_submit_ok' => 'Настройки успешно сохранены',
-
-
 	/**
 	 * Меню настроек
 	 */
@@ -617,7 +590,6 @@ return array(
 	'settings_menu_profile' => 'Профиль',
 	'settings_menu_tuning' => 'Тюнинг',
 	'settings_menu_invite' => 'Инвайты',
-
 	/**
 	 * Восстановление пароля
 	 */
@@ -628,7 +600,6 @@ return array(
 	'password_reminder_send_link' => 'Ссылка для восстановления пароля отправлена на ваш адрес электронной почты.',
 	'password_reminder_bad_code' => 'Неверный код на восстановление пароля.',
 	'password_reminder_bad_email' => 'Пользователь с таким e-mail не найден',
-
 	/**
 	 * Панель
 	 */
@@ -656,7 +627,6 @@ return array(
 	'panel_clear_tags' => 'очистить от тегов',
 	'panel_user' => 'вставить пользователя',
 	'panel_user_promt' => 'Введите логин пользователя',
-
 	/**
 	 * Блоки
 	 */
@@ -678,15 +648,12 @@ return array(
 	'block_stream_comments' => 'Комментарии',
 	'block_stream_comments_no' => 'Нет комментариев.',
 	'block_stream_comments_all' => 'Весь эфир',
-
 	'block_friends' => 'Друзья',
 	'block_friends_check' => 'Отметить всех',
 	'block_friends_uncheck' => 'Снять отметку',
 	'block_friends_empty' => 'Список ваших друзей пуст',
-
 	'site_history_back' => 'Вернуться назад',
 	'site_go_main' => 'перейти на главную',
-
 	/**
 	 * Поиск
 	 */
@@ -696,7 +663,6 @@ return array(
 	'search_results_empty' => 'Удивительно, но поиск не дал результатов',
 	'search_results_count_topics' => 'топиков',
 	'search_results_count_comments' => 'комментариев',
-
 	/**
 	 * Почта
 	 */
@@ -722,7 +688,6 @@ return array(
 	'talk_create_text_error' => 'Текст сообщения должен быть от 2 до 3000 символов',
 	'talk_create_submit' => 'Отправить',
 	'talk_time_limit' => 'Вам нельзя отправлять инбоксы слишком часто',
-
 	'talk_favourite_inbox' => 'Избранные письма',
 	'talk_favourite_add' => 'добавить в избранное',
 	'talk_favourite_add_ok' => 'Письмо добавлено в избранное',
@@ -731,7 +696,6 @@ return array(
 	'talk_favourite_del' => 'удалить из избранного',
 	'talk_favourite_del_ok' => 'Письмо удалено из избранного',
 	'talk_favourite_empty' => 'Нет писем в избранном',
-
 	'talk_filter_title' => 'Фильтровать',
 	'talk_filter_erase' => 'Сбросить фильтр',
 	'talk_filter_erase_form' => 'Очистить форму',
@@ -746,7 +710,6 @@ return array(
 	'talk_filter_error_date_format' => 'Указан неверный формат даты',
 	'talk_filter_result_count' => 'Найдено писем: %%count%%',
 	'talk_filter_result_empty' => 'По вашим критериям писем не найдено',
-
 	'talk_user_in_blacklist' => 'Пользователь <b>%%login%%</b> не принимает от вас писем',
 	'talk_blacklist_title' => 'Не принимать писем от:',
 	'talk_blacklist_empty' => 'Принимать от всех',
@@ -758,7 +721,6 @@ return array(
 	'talk_blacklist_delete_ok' => 'Пользователь <b>%%login%%</b> успешно удален',
 	'talk_blacklist_user_not_found' => 'Пользователя <b>%%login%%</b> нет в вашем black list`е',
 	'talk_blacklist_add_self' => 'Нельзя добавлять в black list себя',
-
 	'talk_speaker_title' => 'Участники разговора',
 	'talk_speaker_add_label' => 'Добавить пользователя',
 	'talk_speaker_delete_ok' => 'Участник <b>%%login%%</b> успешно удален',
@@ -767,9 +729,7 @@ return array(
 	'talk_speaker_add_ok' => 'Участник <b>%%login%%</b> успешно добавлен',
 	'talk_speaker_delete_by_self' => 'Участник <b>%%login%%</b> удалил этот разговор',
 	'talk_speaker_add_self' => 'Нельзя добавлять в участники себя',
-
 	'talk_not_found' => 'Разговор не найден',
-
 	/**
 	 * Userfeed
 	 */
@@ -780,17 +740,13 @@ return array(
 	'userfeed_subscribes_already_subscribed' => 'Вы уже подписаны на топики этого пользователя',
 	'userfeed_subscribes_updated' => 'Настройки ленты сохранены',
 	'userfeed_get_more' => 'Получить ещё топики',
-	
 	'userfeed_title' => 'Лента',
-	
 	'userfeed_settings_note_follow_blogs' => 'Выберите блоги которые вы хотели бы читать',
 	'userfeed_settings_note_follow_user' => 'Добавьте людей, топики которых вы хотели бы читать',
 	'userfeed_settings_note_follow_friend' => 'Выберите друзей, топики которых вы хотели бы читать',
-    
 	'userfeed_no_subscribed_users' => 'Вы ещё не подписались на пользователей, чьи топики хотите видеть',
 	'userfeed_no_blogs' => 'Вы не вступили ни в один блог',
 	'userfeed_error_subscribe_to_yourself' => 'Вы не можете подписаться на себя',
-
 	/**
 	 * Stream
 	 */
@@ -813,7 +769,6 @@ return array(
 	'stream_no_subscribed_users' => 'Вы ещё не подписались на пользователей, чью активность хотите видеть',
 	'stream_no_events' => 'Лента активности пуста',
 	'stream_error_subscribe_to_yourself' => 'Вы не можете подписаться на себя',
-
 	'stream_list_user' => 'Пользователь',
 	'stream_list_event_add_topic' => 'добавил новый топик',
 	'stream_list_event_add_blog' => 'добавил новый блог',
@@ -824,18 +779,14 @@ return array(
 	'stream_list_event_vote_comment' => 'оценил комментарий к топику',
 	'stream_list_event_join_blog' => 'вступил в блог',
 	'stream_list_event_add_friend' => 'добавил в друзья пользователя',
-	
 	'stream_personal_title' => 'Активность',
-	
 	'stream_settings_note_filter' => 'Выберите действия которые будут отслеживаться',
 	'stream_settings_note_follow_user' => 'Добавьте людей за активностью которых вы хотели бы следить',
 	'stream_settings_note_follow_friend' => 'Выберите друзей за активностью которых вы хотели бы следить',
-    
 	'admin_list_plugins' => 'Управление плагинами',
 	'admin_list_userfields' => 'Настройка пользовательских полей',
 	'admin_list_restorecomment' => 'Перестроение дерева комментариев',
 	'admin_list_recalcfavourite' => 'Пересчитать счетчики избранных',
-
 	/**
 	 * Рейтинг TOP
 	 */
@@ -843,12 +794,10 @@ return array(
 	'top_blogs' => 'TOP Блогов',
 	'top_topics' => 'TOP топиков',
 	'top_comments' => 'TOP комментариев',
-
 	/**
 	 * Поиск по тегам
 	 */
 	'tag_title' => 'Поиск по тегам',
-
 	/**
 	 * Постраничность
 	 */
@@ -857,7 +806,6 @@ return array(
 	'paging_last' => 'последняя',
 	'paging_first' => 'первая',
 	'paging' => 'Страницы',
-
 	/**
 	 * Загрузка изображений
 	 */
@@ -877,7 +825,6 @@ return array(
 	'uploadimg_submit' => 'Загрузить',
 	'uploadimg_cancel' => 'Отмена',
 	'uploadimg_title' => 'Описание',
-
 	/**
 	 * Уведомления
 	 */
@@ -893,14 +840,12 @@ return array(
 	'notify_subject_blog_invite_new' => 'Вас пригласили вступить в блог',
 	'notify_subject_reminder_code' => 'Восстановление пароля',
 	'notify_subject_reminder_password' => 'Новый пароль',
-
 	/**
 	 * Админка
 	 */
 	'admin_title' => 'Админка',
 	'admin_comment_restore_tree' => 'Дерево комментариев перестроенно',
 	'admin_favourites_recalculated' => 'Счетчики избранных пересчитаны',
-	
 	/**
 	 * Страница администрирования плагинов
 	 */
@@ -922,8 +867,6 @@ return array(
 	'plugins_activation_requires_error' => 'Для работы плагина необходим активированный плагин <b>%%plugin%%</b>',
 	'plugins_submit_delete' => 'Удалить плагины',
 	'plugins_delete_confirm' => 'Вы уверены, что желаете удалить указанные плагины?',
-
-
 	'system_error_event_args' => 'Некорректное число аргументов при добавлении евента',
 	'system_error_event_method' => 'Добавляемый метод евента не найден',
 	'system_error_404' => 'К сожалению, такой страницы не существует. Вероятно, она была удалена с сервера, либо ее здесь никогда не было.',
@@ -932,7 +875,6 @@ return array(
 	'system_error_cache_type' => 'Неверный тип кеширования',
 	'system_error_template' => 'Не найден шаблон',
 	'system_error_template_block' => 'Не найден шаблон подключаемого блока',
-
 	'error' => 'Ошибка',
 	'attention' => 'Внимание',
 	'system_error' => 'Системная ошибка, повторите позже',
@@ -946,7 +888,6 @@ return array(
 	'delete' => 'Удалить',
 	'date_day' => 'день',
 	'date_month' => 'месяц',
-
 	'month_array' => array(
 		1 => array('январь', 'января', 'январе'),
 		2 => array('февраль', 'февраля', 'феврале'),
@@ -961,9 +902,7 @@ return array(
 		11 => array('ноябрь', 'ноября', 'ноябре'),
 		12 => array('декабрь', 'декабря', 'декабре'),
 	),
-
 	'date_year' => 'год',
-
 	'date_now' => 'Только что',
 	'date_today' => 'Сегодня в',
 	'date_yesterday' => 'Вчера в',
@@ -973,5 +912,4 @@ return array(
 	'date_hours_back' => '%%hours%% час назад; %%hours%% часа назад; %%hours%% часов назад',
 	'date_hours_back_less' => 'Менее часа назад',
 );
-
 ?>

templates/skin/new-jquery/actions/ActionAdmin/plugins.tpl

@@ -3,7 +3,7 @@
 
 
 <form action="{router page='admin'}plugins/" method="post" id="form_plugins_list">
-	<table class="table">
+	<table class="table plugins-list">
 		<thead>
 			<tr>
 				<td width="20"><input type="checkbox" name="" onclick="ls.tools.checkAll('form_plugins_checkbox', this, true);" /></td>
@@ -29,9 +29,9 @@
 					<td>{if $aPlugin.is_active}<a href="{$aPlugin.property->settings}">{$aPlugin.property->settings}</a>{else}{$aPlugin.property->settings}{/if}</td>
 					<td>
 						{if $aPlugin.is_active}
-							<a href="{router page='admin'}plugins/?plugin={$aPlugin.code}&action=deactivate&security_ls_key={$LIVESTREET_SECURITY_KEY}">{$aLang.plugins_plugin_deactivate}</a>
+							<a href="{router page='admin'}plugins/?plugin={$aPlugin.code}&amp;action=deactivate&amp;security_ls_key={$LIVESTREET_SECURITY_KEY}">{$aLang.plugins_plugin_deactivate}</a>
 						{else}
-							<a href="{router page='admin'}plugins/?plugin={$aPlugin.code}&action=activate&security_ls_key={$LIVESTREET_SECURITY_KEY}">{$aLang.plugins_plugin_activate}</a>
+							<a href="{router page='admin'}plugins/?plugin={$aPlugin.code}&amp;action=activate&amp;security_ls_key={$LIVESTREET_SECURITY_KEY}">{$aLang.plugins_plugin_activate}</a>
 						{/if}
 					</td>
 				</tr>

templates/skin/new-jquery/actions/ActionAdmin/user_fields.tpl

@@ -5,13 +5,13 @@
 
 
 <div class="userfield-form jqmWindow" id="userfield_form">
-	<p><label for="user_fields_add_name">{$aLang.userfield_form_name}</label><br />
+	<p><label for="user_fields_form_name">{$aLang.userfield_form_name}</label><br />
 	<input type="text" id="user_fields_form_name" class="input-text" /></p>
 
-	<p><label for="user_fields_add_title">{$aLang.userfield_form_title}</label><br />
+	<p><label for="user_fields_form_title">{$aLang.userfield_form_title}</label><br />
 	<input type="text" id="user_fields_form_title" class="input-text" /></p>
 
-    <p><label for="user_fields_add_pattern">{$aLang.userfield_form_pattern}</label><br />
+	<p><label for="user_fields_form_pattern">{$aLang.userfield_form_pattern}</label><br />
 	<input type="text" id="user_fields_form_pattern" class="input-text" /></p>
 
 	<input type="hidden" id="user_fields_form_action" />

templates/skin/new-jquery/actions/ActionBlog/add.tpl

@@ -59,7 +59,7 @@
 	</script>
 {/if}
 
-<form action="" method="POST" enctype="multipart/form-data">
+<form action="#" method="POST" enctype="multipart/form-data">
 	{hook run='form_add_blog_begin'}
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
 

templates/skin/new-jquery/actions/ActionBlog/admin.tpl

@@ -2,7 +2,7 @@
 {include file='menu.blog_edit.tpl'}
 
 {if $aBlogUsers}
-	<form action="" method="POST" enctype="multipart/form-data">
+	<form action="#" method="POST" enctype="multipart/form-data">
 		<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
 		<table class="table">
 			<thead>

templates/skin/new-jquery/actions/ActionBlog/index.tpl

@@ -1,4 +1,3 @@
 {include file='header.tpl' menu='blog'}
 {include file='topic_list.tpl'}
 {include file='footer.tpl'}
-

templates/skin/new-jquery/actions/ActionComments/index.tpl

@@ -4,4 +4,3 @@
 
 {include file='comment_list.tpl'}
 {include file='footer.tpl'}
-

templates/skin/new-jquery/actions/ActionIndex/index.tpl

@@ -1,4 +1,3 @@
 {include file='header.tpl' menu='blog'}
 {include file='topic_list.tpl'}
 {include file='footer.tpl'}
-

templates/skin/new-jquery/actions/ActionLink/add.tpl

@@ -12,7 +12,7 @@
 {/if}
 
 {hook run='add_topic_link_begin'}
-<form action="" method="POST" enctype="multipart/form-data">
+<form action="#" method="POST" enctype="multipart/form-data">
 	{hook run='form_add_topic_link_begin'}
 
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
@@ -25,7 +25,7 @@
 		{/foreach}
 	</select></p>
 
-	<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript">
 		jQuery(document).ready(function($){
 			ls.blog.loadInfo($('#blog_id').val());
 		});

templates/skin/new-jquery/actions/ActionLogin/reminder.tpl

@@ -7,7 +7,7 @@
 		<h2>{$aLang.password_reminder}</h2>
 
 		<p><label for="mail">{$aLang.password_reminder_email}<br />
-		<input type="text" name="mail" id="name" class="input-200" /></label></p>	
+		<input type="text" name="mail" id="mail" class="input-200" /></label></p>
 
 		<input type="submit" name="submit_reminder" class="button" value="{$aLang.password_reminder_submit}" />
 	</form>

templates/skin/new-jquery/actions/ActionMy/blog.tpl

@@ -1,4 +1,3 @@
 {include file='header.tpl' menu="profile"}
 {include file='topic_list.tpl'}
 {include file='footer.tpl'}
-

templates/skin/new-jquery/actions/ActionNew/index.tpl

@@ -1,4 +1,3 @@
 {include file='header.tpl' menu='blog'}
 {include file='topic_list.tpl'}
 {include file='footer.tpl'}
-

templates/skin/new-jquery/actions/ActionPeople/index.tpl

@@ -12,18 +12,18 @@
 	<table class="table table-people">
 		<thead>
 			<tr>
-				<td>{$aLang.user}</td>													
+				<td class="user-login">{$aLang.user}</td>
-				<td align="center" width="60">{$aLang.user_skill}</td>
+				<td class="user-skill">{$aLang.user_skill}</td>
-				<td align="center" width="80">{$aLang.user_rating}</td>
+				<td class="user-rating">{$aLang.user_rating}</td>
 			</tr>
 		</thead>
 
 		<tbody>
 		{foreach from=$aUsersRating item=oUser}
 			<tr>
-				<td><a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="" class="avatar" /></a><a href="{$oUser->getUserWebPath()}" class="username">{$oUser->getLogin()}</a></td>														
+				<td class="user-login"><a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="" class="avatar" /></a><a href="{$oUser->getUserWebPath()}" class="username">{$oUser->getLogin()}</a></td>
-				<td align="center" class="strength">{$oUser->getSkill()}</td>
+				<td class="user-skill strength">{$oUser->getSkill()}</td>
-				<td align="center" class="rating"><strong>{$oUser->getRating()}</strong></td>
+				<td class="user-rating rating"><strong>{$oUser->getRating()}</strong></td>
 			</tr>
 		{/foreach}
 		</tbody>

templates/skin/new-jquery/actions/ActionPeople/new.tpl

@@ -7,20 +7,20 @@
 	<table class="table table-people">
 		<thead>
 			<tr>
-				<td>{$aLang.user}</td>													
+				<td class="user-login">{$aLang.user}</td>
-				<td align="center" width="170">{$aLang.user_date_registration}</td>
+				<td class="user-date-registration">{$aLang.user_date_registration}</td>
-				<td align="center" width="60">{$aLang.user_skill}</td>
+				<td class="user-skill">{$aLang.user_skill}</td>
-				<td align="center" width="80">{$aLang.user_rating}</td>
+				<td class="user-rating">{$aLang.user_rating}</td>
 			</tr>
 		</thead>
 
 		<tbody>
 		{foreach from=$aUsersRegister item=oUser}
 			<tr>
-				<td><a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="" class="avatar" /></a><a href="{$oUser->getUserWebPath()}" class="username">{$oUser->getLogin()}</a></td>														
+				<td class="user-login"><a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="" class="avatar" /></a><a href="{$oUser->getUserWebPath()}" class="username">{$oUser->getLogin()}</a></td>
-				<td align="center" class="date">{date_format date=$oUser->getDateRegister()}</td>
+				<td class="user-date-registration date">{date_format date=$oUser->getDateRegister()}</td>
-				<td align="center" class="strength">{$oUser->getSkill()}</td>							
+				<td class="user-skill strength">{$oUser->getSkill()}</td>
-				<td align="center" class="rating"><strong>{$oUser->getRating()}</strong></td>
+				<td class="user-rating rating"><strong>{$oUser->getRating()}</strong></td>
 			</tr>
 		{/foreach}
 		</tbody>

templates/skin/new-jquery/actions/ActionPeople/online.tpl

@@ -7,10 +7,10 @@
 	<table class="table table-people">
 		<thead>
 			<tr>
-				<td>{$aLang.user}</td>													
+				<td class="user-login">{$aLang.user}</td>
-				<td align="center" width="170">{$aLang.user_date_last}</td>
+				<td class="user-date-last">{$aLang.user_date_last}</td>
-				<td align="center" width="80">{$aLang.user_skill}</td>
+				<td class="user-skill">{$aLang.user_skill}</td>
-				<td align="center" width="80">{$aLang.user_rating}</td>
+				<td class="user-rating">{$aLang.user_rating}</td>
 			</tr>
 		</thead>
 
@@ -18,10 +18,10 @@
 		{foreach from=$aUsersLast item=oUser}
 			{assign var="oSession" value=$oUser->getSession()}
 			<tr>
-				<td><a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="" class="avatar" /></a><a href="{$oUser->getUserWebPath()}" class="username">{$oUser->getLogin()}</a></td>														
+				<td class="user-login"><a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="" class="avatar" /></a><a href="{$oUser->getUserWebPath()}" class="username">{$oUser->getLogin()}</a></td>
-				<td align="center" class="date">{date_format date=$oSession->getDateLast()}</td>
+				<td class="user-date-last date">{date_format date=$oSession->getDateLast()}</td>
-				<td align="center" class="strength">{$oUser->getSkill()}</td>							
+				<td class="user-skill strength">{$oUser->getSkill()}</td>
-				<td align="center" class="rating"><strong>{$oUser->getRating()}</strong></td>
+				<td class="user-rating rating"><strong>{$oUser->getRating()}</strong></td>
 			</tr>
 		{/foreach}
 		</tbody>

templates/skin/new-jquery/actions/ActionPersonalBlog/index.tpl

@@ -1,4 +1,3 @@
 {include file='header.tpl' menu='blog'}
 {include file='topic_list.tpl'}
 {include file='footer.tpl'}
-

templates/skin/new-jquery/actions/ActionPhotoset/add.tpl

@@ -67,9 +67,10 @@ if (jQuery.browser.flash) {
 	{else}
 		<h2>{$aLang.topic_photoset_edit}</h2>
 	{/if}
+
 	<form id="photoset-upload-form" method="POST" enctype="multipart/form-data" onsubmit="return false;">
 		<p id="topic-photo-upload-input" class="topic-photo-upload-input">
-                <label for="">{$aLang.topic_photoset_choose_image}:</label><br />
+			<label for="photoset-upload-file">{$aLang.topic_photoset_choose_image}:</label><br />
 			<input type="file" id="photoset-upload-file" name="Filedata" /><br><br>
 
 			<button onclick="ls.photoset.upload();">{$aLang.topic_photoset_upload_choose}</button>
@@ -80,7 +81,7 @@ if (jQuery.browser.flash) {
 	</form>
 
 	{hook run='add_topic_photoset_begin'}
-	<form action="" method="POST" enctype="multipart/form-data">
+	<form action="#" method="POST" enctype="multipart/form-data">
 		{hook run='form_add_topic_photoset_begin'}
 
 		<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
@@ -93,7 +94,7 @@ if (jQuery.browser.flash) {
 			{/foreach}
 		</select></p>
 
-		<script language="JavaScript" type="text/javascript">
+		<script type="text/javascript">
 			jQuery(document).ready(function($){
 				ls.blog.loadInfo($('#blog_id').val());
 			});

templates/skin/new-jquery/actions/ActionProfile/favourites.tpl

@@ -1,4 +1,3 @@
 {include file='header.tpl' menu="profile"}
 {include file='topic_list.tpl'}
 {include file='footer.tpl'}
-

templates/skin/new-jquery/actions/ActionQuestion/add.tpl

@@ -13,7 +13,7 @@
 {/if}
 
 {hook run='add_topic_question_begin'}
-<form action="" method="POST" enctype="multipart/form-data">
+<form action="#" method="POST" enctype="multipart/form-data">
 	{hook run='form_add_topic_question_begin'}
 
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
@@ -26,7 +26,7 @@
 		{/foreach}
 	</select></p>
 
-	<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript">
 		jQuery(document).ready(function($){
 			ls.blog.loadInfo($('#blog_id').val());
 		});

templates/skin/new-jquery/actions/ActionRegistration/index.tpl

@@ -24,7 +24,7 @@
 		<input type="password" value="" id="repass" name="password_confirm" class="input-text input-wide" /></label></p>
 
 		{$aLang.registration_captcha}<br />
-		<img src="{cfg name='path.root.engine_lib'}/external/kcaptcha/index.php?{$_sPhpSessionName}={$_sPhpSessionId}" onclick="this.src='{cfg name='path.root.engine_lib'}/external/kcaptcha/index.php?{$_sPhpSessionName}={$_sPhpSessionId}&n='+Math.random();" />
+		<img src="{cfg name='path.root.engine_lib'}/external/kcaptcha/index.php?{$_sPhpSessionName}={$_sPhpSessionId}" onclick="this.src='{cfg name='path.root.engine_lib'}/external/kcaptcha/index.php?{$_sPhpSessionName}={$_sPhpSessionId}&amp;n='+Math.random();" alt="it's img captcha" />
 
 		<p><input type="text" name="captcha" value="" maxlength="3" class="input-text input-100" /></p>
 

templates/skin/new-jquery/actions/ActionSettings/invite.tpl

@@ -3,7 +3,7 @@
 
 <h2>{$aLang.settings_invite}</h2>
 
-<form action="" method="POST" enctype="multipart/form-data">
+<form action="#" method="POST" enctype="multipart/form-data">
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
 
 	<p>

templates/skin/new-jquery/actions/ActionSettings/profile.tpl

@@ -3,7 +3,7 @@
 
 <h2>{$aLang.settings_profile_edit}</h2>
 
-<form action="" method="POST" enctype="multipart/form-data">
+<form action="#" method="POST" enctype="multipart/form-data">
 
 	{hook run='form_settings_profile_begin'}
 
@@ -26,7 +26,7 @@
 		<label><input type="radio" name="profile_sex" id="profile_sex_o" value="other" {if $oUserCurrent->getProfileSex()=='other'}checked{/if} class="checkbox" />{$aLang.settings_profile_sex_other}</label>
 	</p>
 	<p>
-		<label for="">{$aLang.settings_profile_birthday}:</label><br />
+		<label>{$aLang.settings_profile_birthday}:</label><br />
 		<select name="profile_birthday_day">
 			<option value="">{$aLang.date_day}</option>
 			{section name=date_day start=1 loop=32 step=1}

templates/skin/new-jquery/actions/ActionTag/index.tpl

@@ -1,8 +1,8 @@
 {include file='header.tpl'}
 
 
-<form action="" method="GET" class="tags-search" id="tag_search_form">
+<form action="#" method="GET" class="tags-search" id="tag_search_form">
-	<img src="{cfg name='path.static.skin'}/images/tagcloud.gif" border="0" style="margin-left: 13px;">&nbsp;
+	<img src="{cfg name='path.static.skin'}/images/tagcloud.gif" class="tagcloud" alt="" />&nbsp;
 	<input type="text" name="tag" value="{$sTag|escape:'html'}" class="tags-input" id="tag_search" >
 </form>
 

templates/skin/new-jquery/actions/ActionTalk/add.tpl

@@ -53,7 +53,7 @@
 
 <h2>{$aLang.talk_create}</h2>
 
-<form action="" method="POST" enctype="multipart/form-data">
+<form action="#" method="POST" enctype="multipart/form-data">
 	{hook run='form_add_talk_begin'}
 
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />

templates/skin/new-jquery/actions/ActionTopic/add.tpl

@@ -62,7 +62,7 @@
 {/if}
 
 {hook run='add_topic_topic_begin'}
-<form action="" method="POST" enctype="multipart/form-data">
+<form action="#" method="POST" enctype="multipart/form-data">
 	{hook run='form_add_topic_topic_begin'}
 
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
@@ -75,7 +75,7 @@
 		{/foreach}
 	</select></p>
 
-	<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript">
 		jQuery(document).ready(function($){
 			ls.blog.loadInfo($('#blog_id').val());
 		});

templates/skin/new-jquery/actions/ActionUserfeed/list.tpl

@@ -13,4 +13,5 @@
 	<p style="margin-left:30px">{$aLang.userfeed_no_events}</p>
 {/if}
 
+
 {include file='footer.tpl'}

templates/skin/new-jquery/block.streamConfig.tpl

@@ -1,6 +1,6 @@
 {if $oUserCurrent}
 {literal}
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 	jQuery(document).ready( function() {
 		ls.autocomplete.add(jQuery('#stream_users_complete'), aRouter['ajax']+'autocompleter/user/?security_ls_key='+LIVESTREET_SECURITY_KEY);
 		jQuery('#stream_users_complete').keydown(function (event) {

templates/skin/new-jquery/block.stream_topic.tpl

@@ -17,4 +17,3 @@
 <div class="bottom">
 	<a href="{router page='new'}">{$aLang.block_stream_topics_all}</a> | <a href="{router page='rss'}new/">RSS</a>
 </div>
-					

templates/skin/new-jquery/block.userfeedUsers.tpl

@@ -1,6 +1,6 @@
 {if $oUserCurrent}
 {literal}
-<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript">
 		jQuery(document).ready( function() {
 			ls.autocomplete.add(jQuery('#userfeed_users_complete'), aRouter['ajax']+'autocompleter/user/?security_ls_key='+LIVESTREET_SECURITY_KEY);
 			jQuery('#userfeed_users_complete').keydown(function (event) {

templates/skin/new-jquery/blog_list.tpl

@@ -1,10 +1,10 @@
 <table class="table blog-list-table table-people">
 	<thead>
 		<tr>
-			<td>{$aLang.blogs_title}</td>
+			<td class="blog-title">{$aLang.blogs_title}</td>
-			{if $oUserCurrent}<td align="center" width="100px">{$aLang.blog_join_leave}</td>{/if}
+			{if $oUserCurrent}<td class="blog-join-leave">{$aLang.blog_join_leave}</td>{/if}
-			<td align="center" width="60px">{$aLang.blogs_readers}</td>														
+			<td class="blog-readers-count">{$aLang.blogs_readers}</td>
-			<td align="center" width="60px">{$aLang.blogs_rating}</td>
+			<td class="blog-rating">{$aLang.blogs_rating}</td>
 		</tr>
 	</thead>
 
@@ -12,14 +12,14 @@
 		{foreach from=$aBlogs item=oBlog}
 			{assign var="oUserOwner" value=$oBlog->getOwner()}
 			<tr>
-				<td>
+				<td class="blog-title">
 					<a href="{router page='blog'}{$oBlog->getUrl()}/"><img src="{$oBlog->getAvatarPath(24)}" alt="" class="avatar" /></a>
 					<a href="{router page='blog'}{$oBlog->getUrl()}/" class="title">{$oBlog->getTitle()|escape:'html'}</a>
 					{if $oBlog->getType()=='close'}<img src="{cfg name='path.static.skin'}/images/lock.png" alt="[x]" title="{$aLang.blog_closed}" class="private" />{/if}
 					<p>{$aLang.blogs_owner}: <a href="{router page='profile'}{$oUserOwner->getLogin()}/" class="user">{$oUserOwner->getLogin()}</a></p>
 				</td>
 				{if $oUserCurrent}
-					<td align="center">
+					<td class="blog-join-leave">
 						{if $oUserCurrent->getId()!=$oBlog->getOwnerId() and $oBlog->getType()=='open'}
 							<div onclick="ls.blog.toggleJoin(this, {$oBlog->getId()}); return false;" class="join {if $oBlog->getUserIsJoin()}active{/if}"></div>
 						{else}
@@ -27,8 +27,8 @@
 						{/if}
 					</td>
 				{/if}
-				<td align="center" id="blog_user_count_{$oBlog->getId()}" class="date">{$oBlog->getCountUser()}</td>													
+				<td class="blog-readers-count date" id="blog_user_count_{$oBlog->getId()}">{$oBlog->getCountUser()}</td>
-				<td align="center" class="rating"><strong>{$oBlog->getRating()}</strong></td>
+				<td class="blog-rating rating"><strong>{$oBlog->getRating()}</strong></td>
 			</tr>
 		{/foreach}
 	</tbody>

templates/skin/new-jquery/comment.tpl

@@ -3,7 +3,7 @@
 
 <div id="comment_id_{$oComment->getId()}" class="comment {if !$oUserCurrent or ($oUserCurrent and !$oUserCurrent->isAdministrator())}not-admin{/if} {if $oComment->getDelete()} deleted{elseif $oUserCurrent and $oComment->getUserId()==$oUserCurrent->getId()} self{elseif $sDateReadLast<=$oComment->getDate()} new{/if}" >
 {if !$oComment->getDelete() or $bOneComment or ($oUserCurrent and $oUserCurrent->isAdministrator())}
-	<a name="comment{$oComment->getId()}" ></a>
+	<a id="comment{$oComment->getId()}"></a>
 
 
 	<div class="folding"></div>

templates/skin/new-jquery/comment_tree.tpl

@@ -16,9 +16,6 @@
 	<a href="#" onclick="ls.comments.expandCommentAll(); return false;" onfocus="blur();">{$aLang.comment_expand}</a>
 </div>
 
-<a name="comments"></a>
-	
-	
 <div class="comments" id="comments">
 	{assign var="nesting" value="-1"}
 	{foreach from=$aComments item=oComment name=rublist}
@@ -117,7 +114,7 @@
 					<div class="comment-preview" id="comment_preview_0" style="display: none;"><div class="comment-inner"><div class="content"></div></div></div>
 				{/if}
 
-				<form action="" method="POST" id="form_comment" onsubmit="return false;" enctype="multipart/form-data">
+				<form action="#" method="POST" id="form_comment" onsubmit="return false;" enctype="multipart/form-data">
 					<textarea name="comment_text" id="form_comment_text" class="input-wide"></textarea>
 					<input type="button" value="{$aLang.comment_preview}" onclick="ls.comments.preview();" />
 					<input type="submit" name="submit_comment" value="{$aLang.comment_add}" id="comment-button-submit" onclick="ls.comments.add('form_comment',{$iTargetId},'{$sTargetType}'); return false;" />
@@ -130,5 +127,3 @@
 		{$aLang.comment_unregistered}
 	{/if}
 {/if}
-
-

templates/skin/new-jquery/css/common.css

@@ -85,27 +85,33 @@
 .join { width: 10px; height: 10px; background: url(../images/icons.gif) no-repeat 0 -250px; cursor: pointer; }
 .join.active { background-position: -10px -250px; }
 
-.table { width: 100%; margin-bottom: 15px; }
+table { width: 100%; margin-bottom: 15px; }
-.table td { padding: 5px; }
+table td { padding: 5px; }
-.table tr.active td { background: #F1FCEF; }
+table tr.active td { background: #F1FCEF; }
-.table thead td { background: #F0F1F1; font-weight: bold; }
+table thead td { background: #F0F1F1; font-weight: bold; }
-.table tbody td { padding: 5px; border-bottom: 1px solid #ddd; font-size: 11px; }
+table tbody td { padding: 5px; border-bottom: 1px solid #ddd; font-size: 11px; }
 
-.table.table-people {  }
+table.table-people { }
-.table.table-people .avatar { vertical-align: middle; margin-right: 7px; }
+table.table-people td { padding: 5px 10px; vertical-align: middle; }
-.table.table-people td { padding: 5px 10px; vertical-align: middle; }
+table.table-people td.user-skill, table.table-people td.user-rating, table.table-people td.user-date-last { text-align: center; }
-.table.table-people .username { font-weight: bold; color: #999; }
+table.table-people td.user-skill { width: 60px; }
-.table.table-people .strength { font-weight: bold; color: #70AAE0; }
+table.table-people td.user-rating { width: 80px; }
-.table.table-people .date { color: #999; }
+table.table-people td.user-date-last, table.table-people td.user-date-registration { width: 170px; }
-.table.table-people .rating strong { font-weight: bold; color: #fff; background: #FF68CF; padding: 5px 10px; }
+table.table-people .avatar { vertical-align: middle; margin-right: 7px; }
+table.table-people .username { font-weight: bold; color: #999; }
+table.table-people .strength { font-weight: bold; color: #70AAE0; }
+table.table-people .date { color: #999; }
+table.table-people .rating strong { font-weight: bold; color: #fff; background: #FF68CF; padding: 5px 10px; }
 
-.table.table-talk tbody td { color: #999; }
+table.table-talk tbody td { color: #999; }
-.table.table-talk td { padding: 5px; }
+table.table-talk td { padding: 5px; }
-.table.table-talk td .username { padding-left: 13px; background: url(../images/icons.gif) 0 -108px no-repeat; margin-right: 5px; text-decoration: none;}
+table.table-talk td .username { padding-left: 13px; background: url(../images/icons.gif) 0 -108px no-repeat; margin-right: 5px; text-decoration: none;}
-.table.table-talk td .username.inactive { color: #bbb; }
+table.table-talk td .username.inactive { color: #bbb; }
-.table.table-talk a.favourite { float: left; width: 10px; height: 8px; background: url(../images/icons.gif) -40px -40px no-repeat; }
+table.table-talk a.favourite { float: left; width: 10px; height: 8px; background: url(../images/icons.gif) -40px -40px no-repeat; }
-.table.table-talk a.favourite.active { background-position: -50px -40px; }
+table.table-talk a.favourite.active { background-position: -50px -40px; }
-.table.table-talk a.favourite:hover { background-position: -50px -40px; }
+table.table-talk a.favourite:hover { background-position: -50px -40px; }
 
 .right { float: right; }
 span.green { color: #008000; }
+
+img.tagcloud { border: 0; margin-left: 13px; }

templates/skin/new-jquery/css/grid.css

@@ -116,13 +116,19 @@
 .blog .blog-wrapper .user-list li img { display: block; margin: 0 auto 2px; }
 
 .blog-list-table { }
+.blog-list-table thead td.blog-join-leave, .blog-list-table thead td.blog-readers-count, .blog-list-table thead td.blog-rating { text-align: center; width: 60px; }
+.blog-list-table thead td.blog-join-leave { width: 100px; }
+.blog-list-table tbody td.blog-join-leave, .blog-list-table tbody td.blog-readers-count, .blog-list-table tbody td.blog-rating { text-align: center; }
 .blog-list-table tbody { color: #999; }
+.blog-list-table td.blog-join-leave, .blog-list-table td.blog-readers-count, .blog-list-table td.blog-rating { text-align: center; width: 60px; }
+.blog-list-table td.blog-join-leave { width: 100px; }
 .blog-list-table td .avatar { float: left; position: relative; top: 2px; }
 .blog-list-table td .title { font-size: 18px; line-height: 22px; }
 .blog-list-table td .user { font-weight: bold; color: #999; background: url(../images/icons.gif) 0 -108px no-repeat; }
 .blog-list-table td .private { position: relative; top: 2px; }
 .blog-list-table td p { margin-bottom: 0; color: #999; }
 
+
 /* User profile */
 .user-profile { margin-bottom: 20px; overflow: hidden; zoom: 1; position: relative; }
 .user-profile .avatar { float: left; margin-right: 15px; }

templates/skin/new-jquery/css/main.css

@@ -1,8 +1,4 @@
-body { 
+body { font: 12px/18px Tahoma, Arial, Sans-Serif; color: #333; background: #F7F8F9; }
-	font: 12px/18px Tahoma, Arial, Sans-Serif; 
-	color: #333; 
-	background: #F7F8F9;
-}
 
 h1, h2, h3, h4, h5, h6 { font: normal 18px Verdana, Arial, Sans-Serif; line-height: 1.3em; margin-bottom: 0.3em; color: #333; }
 h2 { font-size: 22px; margin-bottom: 10px; }
@@ -15,9 +11,3 @@ a:hover 	{ text-decoration: none; }
 a.dashed { text-decoration: none; border-bottom: 1px dashed #70AAE0; }
 
 p { margin-bottom: 18px; }
-
-
-
-
-
-

templates/skin/new-jquery/footer.tpl

@@ -11,7 +11,7 @@
 		<div id="footer-inner">
 			<div class="right">{hook run='copyright'}</div>
 			Design by — <a href="http://www.xeoart.com">Студия XeoArt</a>
-			<img border="0" src="{cfg name='path.static.skin'}/images/xeoart.gif">
+			<img src="{cfg name='path.static.skin'}/images/xeoart.gif" alt="xeoart logo" />
 			{if $oUserCurrent and $oUserCurrent->isAdministrator()}| <a href="{cfg name='path.root.web'}/admin">{$aLang.admin_title}</a>{/if}
 			{hook run='footer_end'}
 		</div>

templates/skin/new-jquery/header.light.tpl

@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML>
 
-<html lang="ru">
+<html>
 
 <head>
 	{hook run='html_head_begin'}
 	<title>{$sHtmlTitle}</title>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	
+	<meta charset="UTF-8" />
 
 	{$aHtmlHeadFiles.css}
 

templates/skin/new-jquery/header.tpl

@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML>
 
-<html lang="ru">
+<html>
 <head>
 	{hook run='html_head_begin'}
 
 	<title>{$sHtmlTitle}</title>
 
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<meta charset="UTF-8" />
 	<meta name="description" content="{$sHtmlDescription}" />
 	<meta name="keywords" content="{$sHtmlKeywords}" />
 
@@ -23,7 +23,7 @@
 		<meta HTTP-EQUIV="Refresh" CONTENT="3; URL={cfg name='path.root.web'}/">
 	{/if}
 
-	<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript">
 		var DIR_WEB_ROOT		= '{cfg name="path.root.web"}';
 		var DIR_STATIC_SKIN		= '{cfg name="path.static.skin"}';
 		var DIR_ROOT_ENGINE_LIB		= '{cfg name="path.root.engine_lib"}';
@@ -44,7 +44,7 @@
 
 	{$aHtmlHeadFiles.js}
 
-	<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript">
 		var tinyMCE=false;
 		ls.lang.load({json var=$aLangJs});
 	</script>

templates/skin/new-jquery/js/favourite.js

@@ -29,7 +29,9 @@ ls.favourite = (function ($) {
 	* Переключение избранного
 	*/
 	this.toggle = function(idTarget, objFavourite, type) {
-		if (!this.options.type[type]) { return false; }
+		if (!this.options.type[type]) {
+			return false;
+		}
 
 		this.objFavourite = $(objFavourite);
 

templates/skin/new-jquery/js/stream.js

@@ -3,7 +3,9 @@ var ls = ls || {};
 ls.stream =( function ($) {
 	this.isBusy = false;
 	this.subscribe = function (iTargetUserId) {
-        ls.ajax(aRouter['stream']+'subscribe/', {'id':iTargetUserId}, function(data) { 
+		ls.ajax(aRouter['stream']+'subscribe/', {
+			'id':iTargetUserId
+		}, function(data) {
 			if (data.bStateError) {
 				ls.msg.error(data.sMsgTitle,data.sMsg);
 			} else {
@@ -13,14 +15,18 @@ ls.stream =( function ($) {
 		});
 	}
 	this.unsubscribe = function (iId) {
-         ls.ajax(aRouter['stream']+'unsubscribe/', {'id':iId}, function(data) { 
+		ls.ajax(aRouter['stream']+'unsubscribe/', {
+			'id':iId
+		}, function(data) {
 			if (!data.bStateError) {
 				ls.msg.notice(data.sMsgTitle,data.sMsg);
 			}
 		});
 	}
 	this.switchEventType = function (iType) {
-         ls.ajax(aRouter['stream']+'switchEventType/', { 'type':iType}, function(data) { 
+		ls.ajax(aRouter['stream']+'switchEventType/', {
+			'type':iType
+		}, function(data) {
 			if (!data.bStateError) {
 				ls.msg.notice(data.sMsgTitle,data.sMsg);
 			}
@@ -29,7 +35,9 @@ ls.stream =( function ($) {
 	this.appendUser = function() {
 		var sLogin = $('#stream_users_complete').val();
 		if (!sLogin) return;
-        ls.ajax(aRouter['stream']+'subscribeByLogin/', {'login':sLogin}, function(data) {
+		ls.ajax(aRouter['stream']+'subscribeByLogin/', {
+			'login':sLogin
+		}, function(data) {
 			if (!data.bStateError) {
 				$('#stream_no_subscribed_users').remove();
 				var checkbox = $('#strm_u_'+data.uid);
@@ -58,13 +66,17 @@ ls.stream =( function ($) {
 		if (!lastId) return;
 		$('#stream_get_more').addClass('stream_loading');
 		this.isBusy = true;
-        ls.ajax(aRouter['stream']+'get_more/', {'last_id':lastId}, function(data) {
+		ls.ajax(aRouter['stream']+'get_more/', {
+			'last_id':lastId
+		}, function(data) {
 			if (!data.bStateError && data.events_count) {
 				$('#stream-list').append(data.result);
 				$('#stream_last_id').attr('value', data.iStreamLastId);
 			}
 			if (!data.events_count) {
-                $('#stream_get_more').css({'display':'none'});
+				$('#stream_get_more').css({
+					'display':'none'
+				});
 			}
 			$('#stream_get_more').removeClass('stream_loading');
 			this.isBusy = false;

templates/skin/new-jquery/js/userfeed.js

@@ -3,14 +3,20 @@ var ls = ls || {};
 ls.userfeed =( function ($) {
 	this.isBusy = false;
 	this.subscribe = function (sType, iId) {
-       ls.ajax(aRouter['feed']+'subscribe/', {'type':sType, 'id':iId}, function(data) { 
+		ls.ajax(aRouter['feed']+'subscribe/', {
+			'type':sType,
+			'id':iId
+		}, function(data) {
 			if (!data.bStateError) {
 				ls.msg.notice(data.sMsgTitle,data.sMsg);
 			}
 		});
 	}
 	this.unsubscribe = function (sType, iId) {
-         ls.ajax(aRouter['feed']+'unsubscribe/', {'type':sType, 'id':iId}, function(data) { 
+		ls.ajax(aRouter['feed']+'unsubscribe/', {
+			'type':sType,
+			'id':iId
+		}, function(data) {
 			if (!data.bStateError) {
 				ls.msg.notice(data.sMsgTitle,data.sMsg);
 			}
@@ -19,7 +25,9 @@ ls.userfeed =( function ($) {
 	this.appendUser = function() {
 		var sLogin = $('#userfeed_users_complete').val();
 		if (!sLogin) return;
-         ls.ajax(aRouter['feed']+'subscribeByLogin/', {'login':sLogin}, function(data) {
+		ls.ajax(aRouter['feed']+'subscribeByLogin/', {
+			'login':sLogin
+		}, function(data) {
 			if (data.bStateError) {
 				ls.msg.error(data.sMsgTitle,data.sMsg);
 			} else {
@@ -48,13 +56,17 @@ ls.userfeed =( function ($) {
 		if (!lastId) return;
 		$('#userfeed_get_more').addClass('userfeed_loading');
 		this.isBusy = true;
-        ls.ajax(aRouter['feed']+'get_more/', {'last_id':lastId}, function(data) {
+		ls.ajax(aRouter['feed']+'get_more/', {
+			'last_id':lastId
+		}, function(data) {
 			if (!data.bStateError && data.topics_count) {
 				$('#userfeed_loaded_topics').append(data.result);
 				$('#userfeed_last_id').attr('value', data.iUserfeedLastId);
 			}
 			if (!data.topics_count) {
-                $('#userfeed_get_more').css({'display':'none'});
+				$('#userfeed_get_more').css({
+					'display':'none'
+				});
 			}
 			$('#userfeed_get_more').removeClass('userfeed_loading');
 			this.isBusy = false;

templates/skin/new-jquery/js/userfield.js

@@ -34,7 +34,12 @@ ls.userfield =( function ($) {
 		var name = $('#user_fields_form_name').val();
 		var title = $('#user_fields_form_title').val();
 		var pattern = $('#user_fields_form_pattern').val();
-        ls.ajax(aRouter['admin']+'userfields', {'action':'add', 'name':name,  'title':title,  'pattern':pattern}, function(data) { 
+		ls.ajax(aRouter['admin']+'userfields', {
+			'action':'add',
+			'name':name,
+			'title':title,
+			'pattern':pattern
+		}, function(data) {
 			if (!data.bStateError) {
 				liElement = '<li id="field_'+data.id+'"><span class="userfield_admin_name"></span > / <span class="userfield_admin_title"></span> / <span class="userfield_admin_pattern"></span>'+
 				'<div class="uf-actions"><a href="javascript:ls.userfield.showEditForm('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/edit.png"></a> '+
@@ -55,7 +60,13 @@ ls.userfield =( function ($) {
 		var name = $('#user_fields_form_name').val();
 		var title = $('#user_fields_form_title').val();
 		var pattern = $('#user_fields_form_pattern').val();
-        ls.ajax(aRouter['admin']+'userfields', {'action':'update', 'id':id, 'name':name,  'title':title,  'pattern':pattern}, function(data) { 
+		ls.ajax(aRouter['admin']+'userfields', {
+			'action':'update',
+			'id':id,
+			'name':name,
+			'title':title,
+			'pattern':pattern
+		}, function(data) {
 			if (!data.bStateError) {
 				$('#field_'+id+' .userfield_admin_name').text(name);
 				$('#field_'+id+' .userfield_admin_title').text(title);
@@ -68,8 +79,13 @@ ls.userfield =( function ($) {
 	}
 
 	this.deleteUserfield = function(id) {
-	if (!confirm(ls.lang.get('user_field_delete_confirm'))) {return;}
+		if (!confirm(ls.lang.get('user_field_delete_confirm'))) {
-	ls.ajax(aRouter['admin']+'userfields', {'action':'delete', 'id':id}, function(data) { 
+			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);

templates/skin/new-jquery/menu.settings.tpl

@@ -23,7 +23,3 @@
 
 	{hook run='menu_settings'}
 </ul>
-		
-		
-		
-

templates/skin/new-jquery/menu.topic_action.tpl

@@ -24,7 +24,3 @@
 
 	{hook run='menu_topic_action'}
 </ul>
-		
-		
-		
-

templates/skin/new-jquery/notify/english/notify.invite.tpl

@@ -3,4 +3,3 @@ The invitation code:  <b>{$oInvite->getCode()}</b><br>
 To register you need to enter the invitation code on <a href="{router page='login'}"> the main page</a>
 <br><br>
 Best regards, site administration <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>
-							

templates/skin/new-jquery/notify/russian/notify.invite.tpl

@@ -3,4 +3,3 @@
 Для регистрации вам будет необходимо ввести код приглашения на <a href="{router page='login'}">странице входа</a>
 <br><br>
 С уважением, администрация сайта <a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a>
-							

templates/skin/new-jquery/topic_link.tpl

@@ -11,7 +11,9 @@
 		<img src="{cfg name='path.static.skin'}/images/topic_link_big.gif" title="{$aLang.topic_link}" alt="{$aLang.topic_link}" />
 	</h1>
 
-	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}"><span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span></a>
+	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}"><span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">
+		{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span>
+	</a>
 
 
 	<div class="info-top">

templates/skin/new-jquery/topic_photoset.tpl

@@ -20,7 +20,9 @@ jQuery(window).load(function($) {
 		{/if}
 	</h1>
 
-	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}"><span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span></a>
+	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}">
+		<span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span>
+	</a>
 
 
 

templates/skin/new-jquery/topic_question.tpl

@@ -15,7 +15,9 @@
 		{/if}
 	</h1>
 
-	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}"><span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span></a>
+	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}">
+		<span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span>
+	</a>
 
 
 

templates/skin/new-jquery/topic_topic.tpl

@@ -14,7 +14,9 @@
 		{/if}
 	</h1>
 
-	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}"><span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span></a>
+	<a href="#" onclick="return ls.favourite.toggle({$oTopic->getId()},this,'topic');" class="favourite {if $oUserCurrent && $oTopic->getIsFavourite()}active{/if}">
+		<span class="favourite-count" id="fav_count_topic_{$oTopic->getId()}">{if $oTopic->getCountFavourite()>0}{$oTopic->getCountFavourite()}{else}&nbsp;{/if}</span>
+	</a>
 
 
 

templates/skin/new-jquery/window_load_img.tpl

@@ -1,8 +1,8 @@
-<form method="POST" action="" class="upload-form popup jqmWindow" enctype="multipart/form-data" id="form_upload_img">
+<form method="POST" action="#" class="upload-form popup jqmWindow" enctype="multipart/form-data" id="form_upload_img">
 	<h3>{$aLang.uploadimg}</h3>
 	<p>
 		<label>{$aLang.uploadimg_file}:<br />
-		<input type="file" name="img_file" id="img_file" value="" class="input-wide" /></label>
+		<input type="file" name="img_file" id="img_file" class="input-wide" /></label>
 	</p>
 	<p>
 		<label>{$aLang.uploadimg_url}:<br />
@@ -10,8 +10,8 @@
 	</p>
 	{hook run="uploadimg_source"}
 	<p>
-		<label for="align">{$aLang.uploadimg_align}:</label>
+		<label for="window_load_img_align">{$aLang.uploadimg_align}:</label>
-		<select name="align" class="input-wide">
+		<select name="align" id="window_load_img_align" class="input-wide">
 			<option value="">{$aLang.uploadimg_align_no}</option>
 			<option value="left">{$aLang.uploadimg_align_left}</option>
 			<option value="right">{$aLang.uploadimg_align_right}</option>
@@ -24,4 +24,3 @@
 	<input type="button" value="{$aLang.uploadimg_submit}" class="button" onclick="ls.ajaxUploadImg('form_upload_img','{$sToLoad}');" />
 	<input type="button" value="{$aLang.uploadimg_cancel}" class="button jqmClose" />
 </form>
-