Доработка шаблонов

config/config.php

@@ -505,10 +505,10 @@ $config['block']['rule_profile'] = array(
 	'action' => array( 'profile', 'talk', 'settings' ),
 	'blocks' => array( 
 		'right' => array(
-			'blocks/block.profilePhoto.tpl'   =>array('priority' => 100),
-			'blocks/block.profileActions.tpl' =>array('priority' => 50),
-			'blocks/block.profileNote.tpl'    =>array('priority' => 25),
-			'blocks/block.profileNav.tpl'     =>array('priority' => 1),
+			'blocks/block.userPhoto.tpl'   =>array('priority' => 100),
+			'blocks/block.userActions.tpl' =>array('priority' => 50),
+			'blocks/block.userNote.tpl'    =>array('priority' => 25),
+			'blocks/block.userNav.tpl'     =>array('priority' => 1),
 		) 
 	)
 );
@@ -534,7 +534,6 @@ $config['head']['default']['js'] = array(
 	"___path.static.framework___/js/vendor/jquery.charcount.js",
 	"___path.static.framework___/js/vendor/jquery.imagesloaded.js",
 	"___path.static.framework___/js/vendor/notifier/jquery.notifier.js",
-	"___path.static.framework___/js/vendor/markitup/jquery.markitup.js",
 	"___path.static.framework___/js/vendor/prettify/prettify.js",
 	"___path.static.framework___/js/vendor/prettyphoto/js/jquery.prettyphoto.js",
 
@@ -554,6 +553,7 @@ $config['head']['default']['js'] = array(
 	/* LiveStreet */
 	"___path.static.framework___/js/livestreet/favourite.js",
 	"___path.static.framework___/js/livestreet/blocks.js",
+	"___path.static.framework___/js/livestreet/editor.js",
 	"___path.static.framework___/js/livestreet/talk.js",
 	"___path.static.framework___/js/livestreet/vote.js",
 	"___path.static.framework___/js/livestreet/poll.js",

templates/framework/js/core/main.js

@@ -487,23 +487,6 @@ ls = (function ($) {
 		form.ajaxSubmit(options);
 	};
 
-	/**
-	* Загрузка изображения
-	*/
-	this.ajaxUploadImg = function(form) {
-		ls.hook.marker('ajaxUploadImgBefore');
-		ls.ajaxSubmit('upload/image/',form,function(data){
-			if (data.bStateError) {
-				ls.msg.error(data.sMsgTitle,data.sMsg);
-			} else {
-				$.markItUp({replaceWith: data.sText} );
-				$('#window_upload_img').find('input[type="text"], input[type="file"]').val('');
-				$('#window_upload_img').jqmHide();
-				ls.hook.marker('ajaxUploadImgAfter');
-			}
-		});
-	};
-
 	/**
 	* Дебаг сообщений
 	*/

templates/framework/js/livestreet/editor.js

@@ -0,0 +1,121 @@
+/**
+ * Вспомгательные функции для текстового редактора
+ */
+
+var ls = ls || {};
+
+ls.editor = (function($) {
+	"use strict";
+
+	/**
+	 * Дефолтные опции
+	 */
+	var defaults = {
+		// Селекторы
+		sInsertImageButtonSelector:  '.js-insert-image-button',
+		sUploadImageButtonSelector:  '.js-upload-image-button',
+		sPreviewImageLoaderSelector: '.js-topic-preview-loader',
+	};
+
+	/**
+	 * Инициализация
+	 *
+	 * @param  {Object} options Опции
+	 */
+	this.init = function(options) {
+		var self = this;
+
+		this.options = $.extend({}, defaults, options);
+
+		// Вставка ссылки
+		$(this.options.sInsertImageButtonSelector).on('click', function (e) {
+			var sUrl   = $('#img_url').val(),
+				sAlign = $('#form-image-url-align').val(),
+				sTitle = $('#form-image-url-title').val();
+
+			self.insertImageUrlToEditor(sUrl, sAlign, sTitle);
+		});
+
+		// Вставка ссылки
+		$(this.options.sUploadImageButtonSelector).on('click', function (e) {
+			var sFormId   = $(this).data('form-id');
+
+			self.ajaxUploadImg(sFormId);
+		});
+
+		// Справка по разметке редактора
+		$('.js-editor-help').each(function () {
+			var oEditorHelp = $(this),
+				oTargetForm = $('#' + oEditorHelp.data('form-id'));
+
+			oEditorHelp.find('.js-tags-help-link').on('click', function (e) {
+				if ($(this).data('insert')) {
+					var sTag = $(this).data('insert');
+				} else {
+					var sTag = $(this).text();
+				}
+
+				$.markItUp({
+					target: oTargetForm, 
+					replaceWith: sTag
+				});
+
+				e.preventDefault();
+			});
+		});
+	};
+
+	/**
+	 * Вставка ссылки загруженного изображения в редактор
+	 * 
+	 * @param  {String} sUrl   Ссылка
+	 * @param  {String} sAlign Выравнивание
+	 * @param  {String} sTitle Описание
+	 */
+	this.insertImageUrlToEditor = function(sUrl, sAlign, sTitle) {
+		sAlign = sAlign == 'center' ? 'class="image-center"' : 'align="' + sAlign + '"';
+
+		$.markItUp({
+			replaceWith: '<img src="' + sUrl + '" title="' + sTitle + '" ' + sAlign + ' />'
+		});
+
+		this.hideUploadImageModal();
+	};
+
+	/**
+	 * Загрузка изображения
+	 *
+	 * @param  {String} sFormId ID формы
+	 */
+	this.ajaxUploadImg = function(sFormId) {
+		var self = this;
+
+		ls.hook.marker('ajaxUploadImgBefore');
+
+		ls.ajaxSubmit('upload/image/', sFormId, function (data){
+			if (data.bStateError) {
+				ls.msg.error(data.sMsgTitle,data.sMsg);
+			} else {
+				$.markItUp({
+					replaceWith: data.sText
+				});
+
+				self.hideUploadImageModal();
+
+				ls.hook.marker('ajaxUploadImgAfter');
+			}
+		});
+	};
+
+	/**
+	 * Закрытие окна загрузки изображения
+	 */
+	this.hideUploadImageModal = function() {
+		var oModal = $('#modal-image-upload');
+
+		oModal.find('input[type="text"], input[type="file"]').val('');
+		oModal.modal('hide');
+	};
+
+	return this;
+}).call(ls.editor || {},jQuery);

templates/framework/js/livestreet/init.js

@@ -34,26 +34,6 @@ jQuery(document).ready(function($) {
 	});
 
 
-	/**
-	 * Editor help
-	 */
-	$('.js-tags-help-link').click(function(){
-		var target=ls.registry.get('tags-help-target-id');
-		if (!target || !$('#'+target).length) {
-			return false;
-		}
-		target=$('#'+target);
-		if ($(this).data('insert')) {
-			var s=$(this).data('insert');
-		} else {
-			var s=$(this).text();
-		}
-		$.markItUp({target: target, replaceWith: s});
-		return false;
-	});
-
-
-
 	/**
 	 * Tag search
 	 */
@@ -65,19 +45,6 @@ jQuery(document).ready(function($) {
 		return false;
 	});
 
-
-	/**
-	 * Preview image
-	 */
-	$('.js-topic-preview-image').each(function () {
-		$(this).imagesLoaded(function () {
-			var $this = $(this),
-				$preview = $this.closest('.js-topic-preview-loader').removeClass('loading');
-				
-			$this.height() < $preview.height() && $this.css('top', ($preview.height() - $this.height()) / 2 );
-		});
-	});
-
 	
 	/**
 	 * IE

templates/framework/js/livestreet/settings.js

@@ -30,7 +30,7 @@ ls.settings = (function ($) {
 			{name: ls.lang.get('panel_list'), className:'editor-ol', openWith:'    <li>', closeWith:'</li>', multiline: true, openBlockWith:'<ol>\n', closeBlockWith:'\n</ol>' },
 			{name: ls.lang.get('panel_list_li'), className:'editor-li', openWith:'<li>', closeWith:'</li>' },
 			{separator:'---------------' },
-			{name: ls.lang.get('panel_image'), className:'editor-picture', key:'P', beforeInsert: function(h) { jQuery('#window_upload_img').jqmShow(); } },
+			{name: ls.lang.get('panel_image'), className:'editor-picture', key:'P', beforeInsert: function(h) { jQuery('#modal-image-upload').modal('show'); } },
 			{name: ls.lang.get('panel_video'), className:'editor-video', replaceWith:'<video>[!['+ls.lang.get('panel_video_promt')+':!:http://]!]</video>' },
 			{name: ls.lang.get('panel_url'), className:'editor-link', key:'L', openWith:'<a href="[!['+ls.lang.get('panel_url_promt')+':!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
 			{name: ls.lang.get('panel_user'), className:'editor-user', replaceWith:'<ls user="[!['+ls.lang.get('panel_user_promt')+']!]" />' },

templates/framework/js/livestreet/topic.js

@@ -1,32 +1,88 @@
+/**
+ * Топик
+ */
+
 var ls = ls || {};
 
-/**
- * Опросы
- */
 ls.topic = (function ($) {
+	"use strict";
+
+	/**
+	 * Дефолтные опции
+	 */
+	var defaults = {
+		// Роутеры
+		oRouters: {
+			preview: aRouter['ajax'] + 'preview/topic/',
+		},
+
+		// Селекторы
+		sPreviewImageSelector:               '.js-topic-preview-image',
+		sPreviewImageLoaderSelector:         '.js-topic-preview-loader',
+		sPreviewTopicTextButtonSelector:     '.js-topic-preview-text-button',
+		sPreviewTopicTextHideButtonSelector: '.js-topic-preview-text-hide-button',
+	};
+
+	/**
+	 * Инициализация
+	 *
+	 * @param  {Object} options Опции
+	 */
+	this.init = function(options) {
+		var self = this;
+
+		this.options = $.extend({}, defaults, options);
+
+		// Подгрузка избражений-превью
+		$(this.options.sPreviewImageSelector).each(function () {
+			$(this).imagesLoaded(function () {
+				var $this = $(this),
+					$preview = $this.closest(self.options.sPreviewImageLoaderSelector).removeClass('loading');
+					
+				$this.height() < $preview.height() && $this.css('top', ($preview.height() - $this.height()) / 2 );
+			});
+		});
+
+		// Превью текста
+		$(this.options.sPreviewTopicTextButtonSelector).on('click', function (e) {
+			self.showPreviewText('form-topic-add', 'topic-text-preview');
+		});
+
+		// Закрытие превью
+		$(document).on('click', this.options.sPreviewTopicTextHideButtonSelector, function (e) {
+			self.hidePreviewText();
+		});
+	};
+
+	/**
+	 * Превью текста
+	 *
+	 * @param  {String} sFormId ID формы
+	 * @param  {String} sPreviewId ID блока превью
+	 */
+	this.showPreviewText = function(sFormId, sPreviewId) {
+		var oForm = $('#' + sFormId);
+		var oPreview = $('#' + sPreviewId);
 
-	this.preview = function(form, preview) {
-		form=$('#'+form);
-		preview=$('#'+preview);
-		var url = aRouter['ajax']+'preview/topic/';
 		ls.hook.marker('previewBefore');
-		ls.ajaxSubmit(url, form, function(result) {
+
+		ls.ajaxSubmit(this.options.oRouters.preview, oForm, function(result) {
 			if (result.bStateError) {
 				ls.msg.error(null, result.sMsg);
 			} else {
-				preview.show().html(result.sText);
-				ls.hook.run('ls_topic_preview_after',[form, preview, result]);
+				oPreview.show().html(result.sText);
+
+				ls.hook.run('ls_topic_preview_after', [oForm, oPreview, result]);
 			}
 		});
 	};
 
-	this.insertImageToEditor = function(sUrl,sAlign,sTitle) {
-		sAlign=sAlign=='center' ? 'class="image-center"' : 'align="'+sAlign+'"';
-		$.markItUp({replaceWith: '<img src="'+sUrl+'" title="'+sTitle+'" '+sAlign+' />'} );
-		$('#window_upload_img').find('input[type="text"]').val('');
-		$('#window_upload_img').jqmHide();
-		return false;
+	/**
+	 * Закрытие превью
+	 */
+	this.hidePreviewText = function() {
+		$('#topic-text-preview').hide();
 	};
 
 	return this;
-}).call(ls.topic || {},jQuery);
+}).call(ls.topic || {}, jQuery);

templates/language/russian.php

@@ -274,7 +274,7 @@ return array(
 	'topic_create_submit_update' => 'Сохранить изменения',
 	'topic_create_submit_save' => 'Сохранить в черновиках',
 	'topic_create_submit_preview' => 'Предпросмотр',
-	'topic_create_submit_preview_close' => 'свернуть',
+	'topic_create_submit_preview_close' => 'Свернуть',
 	'topic_create_submit_notice' => 'Если нажать кнопку «Сохранить в черновиках», текст топика будет виден только Вам, а рядом с его заголовком будет отображаться замочек. Чтобы топик был виден всем, нажмите «Опубликовать».',
 	'topic_create_notice' => 'Не забывайте: тег <cut> сокращает длинные записи, скрывая их целиком или частично под ссылкой («читать дальше»). Скрытая часть не видна в блоге, но доступна в полной записи на странице топика.',
 	'topic_create_error' => 'Возникли технические неполадки при добавлении топика. Пожалуйста, повторите позже.',

templates/skin/developer/actions/ActionBlog/admin.tpl

@@ -54,7 +54,7 @@
 			<button type="submit" name="submit_blog_admin" class="button button-primary">{$aLang.blog_admin_users_submit}</button>
 		</form>
 
-		{include file='paging.tpl' aPaging=$aPaging}
+		{include file='pagination.tpl' aPaging=$aPaging}
 	{else}
 		{$aLang.blog_admin_users_empty}
 	{/if}

templates/skin/developer/actions/ActionBlogs/index.tpl

@@ -21,6 +21,6 @@
 		{/if}
 
 		{include file='actions/ActionBlogs/blog_list.tpl' bBlogsUseOrder=true sBlogsRootPage=$sBlogsRootPage}
-		{include file='paging.tpl' aPaging=$aPaging}
+		{include file='pagination.tpl' aPaging=$aPaging}
 	</div>
 {/block}

templates/skin/developer/actions/ActionProfile/created.notes.tpl

@@ -23,5 +23,5 @@
 		<div class="notice-empty">{$aLang.user_note_list_empty}</div>
 	{/if}
 
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {/block}

templates/skin/developer/actions/ActionTalk/favourites.tpl

@@ -11,5 +11,5 @@
 		<div class="notice-empty">{$aLang.talk_favourite_empty}</div>
 	{/if}
 
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {/block}

templates/skin/developer/actions/ActionTalk/inbox.tpl

@@ -61,5 +61,5 @@
 	{/if}
 
 				
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {/block}

templates/skin/developer/assets/css/photoset.css

@@ -19,9 +19,6 @@
 .photoset-type-default .photoset-images li     { float: left; margin: 0 9px 9px 0; position: relative; border: 3px solid #eee; }
 .photoset-type-default .photoset-images li img { vertical-align: top; }
 
-.photoset-type-default .photoset-more          { display: block; border-top: 1px solid #dbe6f0; text-align: center; padding: 10px 0; margin-bottom: 15px; text-decoration: none; background: #f3f7fa; color: #7b90a5; }
-.photoset-type-default .photoset-more:hover    { background: #eaf2f8; }
-
 
 /**
  * Загрузка изображений
@@ -34,7 +31,7 @@
 .photoset-upload h2     { font-size: 24px; margin-bottom: 15px; }
 .photoset-upload .note  { font-size: 12px; line-height: 20px; }
 
-.photoset-upload-images                               { overflow: hidden; zoom: 1; }
+.photoset-upload-images                                 { overflow: hidden; zoom: 1; }
 .photoset-upload-images-item                            { padding: 15px 15px 15px 130px; min-height: 100px; position: relative; }
 .photoset-upload-images-item.marked-as-preview          { background: #DEEEFF; }
 .photoset-upload-images-item.marked-as-preview textarea { border-color: #B3CFED; }

templates/skin/developer/assets/js/init.js

@@ -142,6 +142,29 @@ jQuery(document).ready(function($){
 	 * User Note
 	 */
 	ls.usernote.init();
+
+
+	/**
+	 * Editor
+	 */
+	ls.editor.init();
+
+
+	/**
+	 * Topic
+	 */
+	ls.topic.init();
+
+
+	/**
+	 * Photoset
+	 */
+	$('.js-photoset-type-default-image').prettyPhoto({
+		social_tools: '',
+		show_title:   false,
+		slideshow:    false,
+		deeplinking:  false
+	});
 	
 
 	// Хук конца инициализации javascript-составляющих шаблона

templates/skin/developer/comments/comment_list.tpl

@@ -8,4 +8,4 @@
 	{include file='comments/comment.tpl' bList=true}
 {/foreach}
 
-{include file='paging.tpl' aPaging=$aPaging}
+{include file='pagination.tpl' aPaging=$aPaging}

templates/skin/developer/comments/comment_tree.tpl

@@ -75,7 +75,7 @@
 {**
  * Страницы
  *}
-{include file='comments/comment_paging.tpl' aPagingCmt=$aPagingCmt}
+{include file='comments/comment_pagination.tpl' aPagingCmt=$aPagingCmt}
 
 {hook run='comment_tree_end' iTargetId=$iTargetId sTargetType=$sTargetType}
 

templates/skin/developer/forms/editor.help.tpl

@@ -2,12 +2,7 @@
  * Справка по разметке редактора
  *}
 
-<script type="text/javascript">
-	ls.registry.set('tags-help-target-id','{$sTagsTargetId}');
-</script>
-
-
-<div class="editor-help">
+<div class="editor-help js-editor-help" data-form-id="{$sTagsTargetId}">
 	<header class="editor-help-header clearfix">
 		<a href="#" class="link-dotted help-link" onclick="jQuery('#js-editor-help').toggle(); return false;">{$aLang.tags_help_link_show}</a>
 	</header>

templates/skin/developer/forms/editor.init.tpl

@@ -61,6 +61,8 @@
 				{$sSettings = 'ls.settings.get("markitup")'}
 			{/if}
 		{/if}
+		
+		<script src="{cfg name='path.static.framework'}/js/vendor/markitup/jquery.markitup.js"></script>
 
 		<script>
 			jQuery(function($) {

templates/skin/developer/forms/form.add.topic.base.tpl

@@ -105,13 +105,13 @@
 				{$aLang.topic_create_submit_update}
 			{/if}
 		</button>
-		<button type="submit" name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
+		<button type="button" name="submit_preview" class="button js-topic-preview-text-button">{$aLang.topic_create_submit_preview}</button>
 		<button type="submit" name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 	</form>
 
 
 	{* Блок с превью текста *}
-	<div class="topic-preview" style="display: none;" id="text_preview"></div>
+	<div class="topic-preview" style="display: none;" id="topic-text-preview"></div>
 
 
 	{block name='add_topic_end'}{/block}

templates/skin/developer/modals/modal.upload_image.tpl

@@ -6,7 +6,7 @@
 
 {extends file='modals/modal_base.tpl'}
 
-{block name='modal_id'}window_upload_img{/block}
+{block name='modal_id'}modal-image-upload{/block}
 {block name='modal_class'}modal-image-upload js-modal-default{/block}
 {block name='modal_title'}{$aLang.uploadimg}{/block}
 
@@ -19,16 +19,19 @@
 
 {block name='modal_content_after'}
 	<div data-type="tab-panes">
+		{**
+		 * Загрузка
+		 *}
 		<form method="POST" action="" enctype="multipart/form-data" id="tab-upload-pc" onsubmit="return false;" data-type="tab-pane" class="tab-pane" style="display: block">
 			<div class="modal-content">
 				<p><label for="img_file">{$aLang.uploadimg_file}:</label>
-				<input type="file" name="img_file" id="img_file" value="" class="input-text input-width-full" /></p>
+				<input type="file" name="img_file" id="img_file" value="" class="width-full" /></p>
 
 				{hook run="uploadimg_source"}
 
 				<p>
 					<label for="form-image-align">{$aLang.uploadimg_align}:</label>
-					<select name="align" id="form-image-align" class="input-width-full">
+					<select name="align" id="form-image-align" class="width-full">
 						<option value="">{$aLang.uploadimg_align_no}</option>
 						<option value="left">{$aLang.uploadimg_align_left}</option>
 						<option value="right">{$aLang.uploadimg_align_right}</option>
@@ -37,26 +40,28 @@
 				</p>
 
 				<p><label for="form-image-title">{$aLang.uploadimg_title}:</label>
-				<input type="text" name="title" id="form-image-title" value="" class="input-text input-width-full" /></p>
+				<input type="text" name="title" id="form-image-title" value="" class="width-full" /></p>
 
 				{hook run="uploadimg_additional"}
 			</div>
 			
 			<div class="modal-footer">
-				<button type="submit" class="button button-primary" onclick="ls.ajaxUploadImg('tab-upload-pc');">{$aLang.uploadimg_submit}</button>
+				<button type="submit" class="button button-primary js-upload-image-button" data-form-id="tab-upload-pc">{$aLang.uploadimg_submit}</button>
 				<button type="button" class="button" data-type="modal-close">{$aLang.uploadimg_cancel}</button>
 			</div>
 		</form>
 
-
+		{**
+		 * Ссылка
+		 *}
 		<form method="POST" action="" enctype="multipart/form-data" id="tab-upload-link" onsubmit="return false;" data-type="tab-pane" class="tab-pane">
 			<div class="modal-content">
 				<p><label for="img_file">{$aLang.uploadimg_url}:</label>
-				<input type="text" name="img_url" id="img_url" value="http://" class="input-text input-width-full" /></p>
+				<input type="text" name="img_url" id="img_url" value="http://" class="width-full" /></p>
 
 				<p>
 					<label for="form-image-url-align">{$aLang.uploadimg_align}:</label>
-					<select name="align" id="form-image-url-align" class="input-width-full">
+					<select name="align" id="form-image-url-align" class="width-full">
 						<option value="">{$aLang.uploadimg_align_no}</option>
 						<option value="left">{$aLang.uploadimg_align_left}</option>
 						<option value="right">{$aLang.uploadimg_align_right}</option>
@@ -65,14 +70,14 @@
 				</p>
 
 				<p><label for="form-image-url-title">{$aLang.uploadimg_title}:</label>
-					<input type="text" name="title" id="form-image-url-title" value="" class="input-text input-width-full" /></p>
+				<input type="text" name="title" id="form-image-url-title" value="" class="width-full" /></p>
 
 				{hook run="uploadimg_link_additional"}
 			</div>
 
 			<div class="modal-footer">
-				<button type="submit" class="button button-primary" onclick="ls.topic.insertImageToEditor(jQuery('#img_url').val(),jQuery('#form-image-url-align').val(),jQuery('#form-image-url-title').val());">{$aLang.uploadimg_link_submit_paste}</button>
-				<button type="submit" class="button button-primary" onclick="ls.ajaxUploadImg('tab-upload-link');">{$aLang.uploadimg_link_submit_load}</button>
+				<button type="submit" class="button button-primary js-insert-image-button">{$aLang.uploadimg_link_submit_paste}</button>
+				<button type="submit" class="button button-primary js-upload-image-button" data-form-id="tab-upload-link">{$aLang.uploadimg_link_submit_load}</button>
 				<button type="button" class="button" data-type="modal-close">{$aLang.uploadimg_cancel}</button>
 			</div>
 		</form>

templates/skin/developer/topics/topic.photoset.tpl

@@ -32,7 +32,7 @@
 		{$oTopic->getTextShort()}
 
 		{if $oTopic->getTextShort() != $oTopic->getText()}
-			{assign var=iPhotosCount value=$oTopic->getPhotosetCount()}
+			{$iPhotosCount = $oTopic->getPhotosetCount()}
 
 			<br />
 			<a href="{$oTopic->getUrl()}#cut" title="{$aLang.topic_read_more}">
@@ -51,37 +51,34 @@
 
 {* Photoset *}
 {block name='topic_content_after'}
-	{if !$bTopicList}
-		<script type="text/javascript">
-			jQuery(document).ready(function($) {	
-				$('.photoset-image').prettyPhoto({
-					social_tools:'',
-					show_title: false,
-					slideshow:false,
-					deeplinking: false
-				});
-			});
-		</script>
-		
-		
+	{if ! $bTopicList}
 		<div class="photoset photoset-type-default">
 			<h2 class="photoset-title">{$oTopic->getPhotosetCount()} {$oTopic->getPhotosetCount()|declension:$aLang.topic_photoset_count_images}</h2>
 			
 			<ul class="photoset-images" id="topic-photo-images">
-				{assign var=aPhotos value=$oTopic->getPhotosetPhotos(0, $oConfig->get('module.topic.photoset.per_page'))}
+				{$aPhotos = $oTopic->getPhotosetPhotos(0, $oConfig->get('module.topic.photoset.per_page'))}
+
 				{if count($aPhotos)}                                
 					{foreach from=$aPhotos item=oPhoto}
-						<li><a class="photoset-image" href="{$oPhoto->getWebPath(1000)}" rel="[photoset]"  title="{$oPhoto->getDescription()}"><img src="{$oPhoto->getWebPath('50crop')}" alt="{$oPhoto->getDescription()}" /></a></li>                                    
-						{assign var=iLastPhotoId value=$oPhoto->getId()}
+						<li>
+							<a class="js-photoset-type-default-image" 
+							   href="{$oPhoto->getWebPath(1000)}" 
+							   rel="[photoset]"  title="{$oPhoto->getDescription()}">
+
+							   <img src="{$oPhoto->getWebPath('50crop')}" alt="{$oPhoto->getDescription()}" /></a>
+						</li>
+
+						{$iLastPhotoId = $oPhoto->getId()}
 					{/foreach}
 				{/if}
+				
 				<script type="text/javascript">
 					ls.photoset.idLast='{$iLastPhotoId}';
 				</script>
 			</ul>
 			
 			{if count($aPhotos) < $oTopic->getPhotosetCount()}
-				<a href="javascript:ls.photoset.getMore({$oTopic->getId()})" id="topic-photo-more" class="photoset-more">{$aLang.topic_photoset_show_more} &darr;</a>
+				<a href="javascript:ls.photoset.getMore({$oTopic->getId()})" id="topic-photo-more" class="get-more">{$aLang.topic_photoset_show_more} &darr;</a>
 			{/if}
 		</div>
 	{/if}

templates/skin/developer/topics/topic_list.tpl

@@ -12,7 +12,7 @@
 		{/if}
 	{/foreach}
 
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {else}
 	{$aLang.blog_no_topic}
 {/if}

templates/skin/developer/topics/topic_preview_topic.tpl

@@ -54,5 +54,5 @@
 
 
 <button type="submit" name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
-<button type="submit" name="submit_preview" onclick="jQuery('#text_preview').html('').hide(); return false;" class="button">{$aLang.topic_create_submit_preview_close}</button>
+<button type="button" name="submit_preview" class="button js-topic-preview-text-hide-button">{$aLang.topic_create_submit_preview_close}</button>
 <button type="submit" name="submit_topic_save" class="button" onclick="jQuery('#submit_topic_save').trigger('click');">{$aLang.topic_create_submit_save}</button>

templates/skin/developer/user_list.tpl

@@ -60,4 +60,4 @@
 </table>
 
 
-{include file='paging.tpl' aPaging=$aPaging}
+{include file='pagination.tpl' aPaging=$aPaging}

templates/skin/developer/user_list_avatar.tpl

@@ -22,4 +22,4 @@
 {/if}
 
 
-{include file='paging.tpl' aPaging=$aPaging}
+{include file='pagination.tpl' aPaging=$aPaging}

templates/skin/synio/actions/ActionBlog/admin.tpl

@@ -50,7 +50,7 @@
 			<button type="submit"  name="submit_blog_admin" class="button button-primary">{$aLang.blog_admin_users_submit}</button>
 		</form>
 
-		{include file='paging.tpl' aPaging=$aPaging}
+		{include file='pagination.tpl' aPaging=$aPaging}
 	{else}
 		{$aLang.blog_admin_users_empty}
 	{/if}

templates/skin/synio/actions/ActionBlogs/index.tpl

@@ -20,6 +20,6 @@
 			{router page='blogs' assign=sBlogsRootPage}
 		{/if}
 		{include file='actions/ActionBlogs/blog_list.tpl' bBlogsUseOrder=true sBlogsRootPage=$sBlogsRootPage}
-		{include file='paging.tpl' aPaging=$aPaging}
+		{include file='pagination.tpl' aPaging=$aPaging}
 	</div>
 {/block}

templates/skin/synio/actions/ActionPeople/online.tpl

@@ -63,5 +63,5 @@
 	</table>
 
 
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {/block}

templates/skin/synio/actions/ActionProfile/created.notes.tpl

@@ -21,5 +21,5 @@
 		<div class="notice-empty">{$aLang.user_note_list_empty}</div>
 	{/if}
 
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {/block}

templates/skin/synio/actions/ActionTalk/favourites.tpl

@@ -11,5 +11,5 @@
 		<div class="notice-empty">{$aLang.talk_favourite_empty}</div>
 	{/if}
 
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {/block}

templates/skin/synio/actions/ActionTalk/inbox.tpl

@@ -58,5 +58,5 @@
 	{/if}
 
 				
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {/block}

templates/skin/synio/assets/css/photoset.css

@@ -19,9 +19,6 @@
 .photoset-type-default .photoset-images li     { float: left; margin: 0 9px 9px 0; position: relative; border: 3px solid #eee; }
 .photoset-type-default .photoset-images li img { vertical-align: top; }
 
-.photoset-type-default .photoset-more          { display: block; border-top: 1px solid #dbe6f0; text-align: center; padding: 10px 0; margin-bottom: 15px; text-decoration: none; background: #f3f7fa; color: #7b90a5; }
-.photoset-type-default .photoset-more:hover    { background: #eaf2f8; }
-
 
 /**
  * Загрузка изображений
@@ -34,16 +31,16 @@
 .photoset-upload h2     { font-size: 24px; margin-bottom: 15px; }
 .photoset-upload .note  { font-size: 12px; line-height: 20px; }
 
-.photoset-upload-images                               { overflow: hidden; zoom: 1; }
-.photoset-upload-images li                            { padding: 15px 15px 15px 130px; min-height: 100px; position: relative; }
-.photoset-upload-images li.marked-as-preview          { background: #DEEEFF; }
-.photoset-upload-images li.marked-as-preview textarea { border-color: #B3CFED; }
-.photoset-upload-images li img                        { position: absolute; top: 15px; left: 15px; }
-.photoset-upload-images li label                      { color: #aaa; }
-.photoset-upload-images li textarea                   { height: 80px; margin-bottom: 10px; }
-.photoset-upload-images li a                          { margin-right: 15px; }
-.photoset-upload-images li .mark-as-preview           { display: none; text-decoration: none; }
-.photoset-upload-images li:hover .mark-as-preview     { display: inline; }
+.photoset-upload-images                                 { overflow: hidden; zoom: 1; }
+.photoset-upload-images-item                            { padding: 15px 15px 15px 130px; min-height: 100px; position: relative; }
+.photoset-upload-images-item.marked-as-preview          { background: #DEEEFF; }
+.photoset-upload-images-item.marked-as-preview textarea { border-color: #B3CFED; }
+.photoset-upload-images-item img                        { position: absolute; top: 15px; left: 15px; }
+.photoset-upload-images-item label                      { color: #aaa; }
+.photoset-upload-images-item textarea                   { height: 80px; margin-bottom: 10px; }
+.photoset-upload-images-item a                          { margin-right: 15px; }
+.photoset-upload-images-item .mark-as-preview           { display: none; text-decoration: none; }
+.photoset-upload-images-item:hover .mark-as-preview     { display: inline; }
 
 .photoset-upload-progress          { margin: 15px; }
 .photoset-upload-progress-filename { margin-bottom: 5px; }

templates/skin/synio/assets/js/init.js

@@ -189,6 +189,29 @@ jQuery(document).ready(function($){
 					      '<i class="icon-synio-remove poll-add-item-remove js-poll-add-item-remove" title="' + ls.lang.get('delete') + '"></i>' +
 					  '</li>',
 	});
+
+
+	/**
+	 * Photoset
+	 */
+	$('.js-photoset-type-default-image').prettyPhoto({
+		social_tools: '',
+		show_title:   false,
+		slideshow:    false,
+		deeplinking:  false
+	});
+
+
+	/**
+	 * Editor
+	 */
+	ls.editor.init();
+
+
+	/**
+	 * Topic
+	 */
+	ls.topic.init();
 	
 
 	// вступление в блог

templates/skin/synio/comments/comment_list.tpl

@@ -8,4 +8,4 @@
 	{include file='comments/comment.tpl' bList=true}
 {/foreach}
 
-{include file='paging.tpl' aPaging=$aPaging}
+{include file='pagination.tpl' aPaging=$aPaging}

templates/skin/synio/comments/comment_tree.tpl

@@ -75,7 +75,7 @@
 {**
  * Страницы
  *}
-{include file='comments/comment_paging.tpl' aPagingCmt=$aPagingCmt}
+{include file='comments/comment_pagination.tpl' aPagingCmt=$aPagingCmt}
 
 {hook run='comment_tree_end' iTargetId=$iTargetId sTargetType=$sTargetType}
 

templates/skin/synio/forms/editor.help.tpl

@@ -2,12 +2,7 @@
  * Справка по разметке редактора
  *}
 
-<script type="text/javascript">
-	ls.registry.set('tags-help-target-id','{$sTagsTargetId}');
-</script>
-
-
-<div class="editor-help">
+<div class="editor-help js-editor-help" data-form-id="{$sTagsTargetId}">
 	<header class="editor-help-header clearfix">
 		<a href="#" class="link-dotted help-link" onclick="jQuery('#js-editor-help').toggle(); return false;">{$aLang.tags_help_link_show}</a>
 	</header>

templates/skin/synio/forms/editor.init.tpl

@@ -61,6 +61,8 @@
 				{$sSettings = 'ls.settings.get("markitup")'}
 			{/if}
 		{/if}
+		
+		<script src="{cfg name='path.static.framework'}/js/vendor/markitup/jquery.markitup.js"></script>
 
 		<script>
 			jQuery(function($) {

templates/skin/synio/forms/form.add.topic.base.tpl

@@ -105,13 +105,13 @@
 				{$aLang.topic_create_submit_update}
 			{/if}
 		</button>
-		<button type="submit" name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
+		<button type="button" name="submit_preview" class="button js-topic-preview-text-button">{$aLang.topic_create_submit_preview}</button>
 		<button type="submit" name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 	</form>
 
 
 	{* Блок с превью текста *}
-	<div class="topic-preview" style="display: none;" id="text_preview"></div>
+	<div class="topic-preview" style="display: none;" id="topic-text-preview"></div>
 
 
 	{block name='add_topic_end'}{/block}

templates/skin/synio/modals/modal.upload_image.tpl

@@ -6,7 +6,7 @@
 
 {extends file='modals/modal_base.tpl'}
 
-{block name='modal_id'}window_upload_img{/block}
+{block name='modal_id'}modal-image-upload{/block}
 {block name='modal_class'}modal-image-upload js-modal-default{/block}
 {block name='modal_title'}{$aLang.uploadimg}{/block}
 
@@ -19,16 +19,19 @@
 
 {block name='modal_content_after'}
 	<div data-type="tab-panes">
+		{**
+		 * Загрузка
+		 *}
 		<form method="POST" action="" enctype="multipart/form-data" id="tab-upload-pc" onsubmit="return false;" class="tab-pane" data-type="tab-pane" style="display: block">
 			<div class="modal-content">
 				<p><label for="img_file">{$aLang.uploadimg_file}:</label>
-				<input type="file" name="img_file" id="img_file" value="" class="input-text input-width-full" /></p>
+				<input type="file" name="img_file" id="img_file" value="" /></p>
 				
 				{hook run="uploadimg_source"}
 				
 				<p>
 					<label for="form-image-align">{$aLang.uploadimg_align}:</label>
-					<select name="align" id="form-image-align" class="input-width-full">
+					<select name="align" id="form-image-align" class="width-full">
 						<option value="">{$aLang.uploadimg_align_no}</option>
 						<option value="left">{$aLang.uploadimg_align_left}</option>
 						<option value="right">{$aLang.uploadimg_align_right}</option>
@@ -37,26 +40,28 @@
 				</p>
 				
 				<p><label for="form-image-title">{$aLang.uploadimg_title}:</label>
-				<input type="text" name="title" id="form-image-title" value="" class="input-text input-width-full" /></p>
+				<input type="text" name="title" id="form-image-title" value="" class="width-full" /></p>
 				
 				{hook run="uploadimg_additional"}
 			</div>
 			
 			<div class="modal-footer">
-				<button type="submit"  class="button button-primary" onclick="ls.ajaxUploadImg('tab-upload-pc');">{$aLang.uploadimg_submit}</button>
-				<button type="submit"  class="button" data-type="modal-close">{$aLang.uploadimg_cancel}</button>
+				<button type="submit" class="button button-primary js-upload-image-button" data-form-id="tab-upload-pc">{$aLang.uploadimg_submit}</button>
+				<button type="button" class="button" data-type="modal-close">{$aLang.uploadimg_cancel}</button>
 			</div>
 		</form>
-		
-		
+
+		{**
+		 * Ссылка
+		 *}
 		<form method="POST" action="" enctype="multipart/form-data" id="tab-upload-link" class="tab-pane" onsubmit="return false;" data-type="tab-pane">
 			<div class="modal-content">
 				<p><label for="img_file">{$aLang.uploadimg_url}:</label>
-				<input type="text" name="img_url" id="img_url" value="http://" class="input-text input-width-full" /></p>
+				<input type="text" name="img_url" id="img_url" value="http://" class="width-full" /></p>
 
 				<p>
 					<label for="form-image-url-align">{$aLang.uploadimg_align}:</label>
-					<select name="align" id="form-image-url-align" class="input-width-full">
+					<select name="align" id="form-image-url-align" class="width-full">
 						<option value="">{$aLang.uploadimg_align_no}</option>
 						<option value="left">{$aLang.uploadimg_align_left}</option>
 						<option value="right">{$aLang.uploadimg_align_right}</option>
@@ -65,16 +70,15 @@
 				</p>
 
 				<p><label for="form-image-url-title">{$aLang.uploadimg_title}:</label>
-					<input type="text" name="title" id="form-image-url-title" value="" class="input-text input-width-full" /></p>
+				<input type="text" name="title" id="form-image-url-title" value="" class="width-full" /></p>
 
 				{hook run="uploadimg_link_additional"}
 			</div>
 			
 			<div class="modal-footer">
-				<button type="submit"  class="button button-primary" onclick="ls.topic.insertImageToEditor(jQuery('#img_url').val(),jQuery('#form-image-url-align').val(),jQuery('#form-image-url-title').val());">{$aLang.uploadimg_link_submit_paste}</button>
-				{$aLang.or}
-				<button type="submit"  class="button button-primary" onclick="ls.ajaxUploadImg('tab-upload-link');">{$aLang.uploadimg_link_submit_load}</button>
-				<button type="submit"  class="button" data-type="modal-close">{$aLang.uploadimg_cancel}</button>
+				<button type="submit" class="button button-primary js-insert-image-button">{$aLang.uploadimg_link_submit_paste}</button>
+				<button type="submit" class="button button-primary js-upload-image-button" data-form-id="tab-upload-link">{$aLang.uploadimg_link_submit_load}</button>
+				<button type="button" class="button" data-type="modal-close">{$aLang.uploadimg_cancel}</button>
 			</div>
 		</form>
 	</div>

templates/skin/synio/settings/config/config.php

@@ -84,10 +84,10 @@ $config['block']['rule_profile'] = array(
 	'action' => array( 'profile', 'talk', 'settings' ),
 	'blocks' => array( 
 		'right' => array(
-			'blocks/block.profilePhoto.tpl'   =>array('priority' => 100),
-			'blocks/block.profileNav.tpl'     =>array('priority' => 50),
-			'blocks/block.profileNote.tpl'    =>array('priority' => 25),
-			'blocks/block.profileActions.tpl' =>array('priority' => 1),
+			'blocks/block.userPhoto.tpl'   =>array('priority' => 100),
+			'blocks/block.userNav.tpl'     =>array('priority' => 50),
+			'blocks/block.userNote.tpl'    =>array('priority' => 25),
+			'blocks/block.userActions.tpl' =>array('priority' => 1),
 		) 
 	)
 );

templates/skin/synio/topics/topic.photoset.tpl

@@ -14,10 +14,10 @@
 	{if $oMainPhoto}
 		<div class="topic-preview-image">
 			<div class="topic-preview-image-inner js-topic-preview-loader loading" onclick="window.location='{$oTopic->getUrl()}'">
-				<div class="topic-preview-image-count" id="photoset-photo-count-{$oTopic->getId()}"><i class="icon-camera icon-white"></i> {$oTopic->getPhotosetCount()}</div>
+				<div class="topic-preview-image-count"><i class="icon-camera icon-white"></i> {$oTopic->getPhotosetCount()}</div>
 				
 				{if $oMainPhoto->getDescription()}
-					<div class="topic-preview-image-desc" id="photoset-photo-desc-{$oTopic->getId()}">{$oMainPhoto->getDescription()}</div>
+					<div class="topic-preview-image-desc">{$oMainPhoto->getDescription()}</div>
 				{/if}
 
 				<img class="js-topic-preview-image" src="{$oMainPhoto->getWebPath(1000)}" alt="Topic preview" />
@@ -33,7 +33,7 @@
 		{$oTopic->getTextShort()}
 
 		{if $oTopic->getTextShort() != $oTopic->getText()}
-			{assign var=iPhotosCount value=$oTopic->getPhotosetCount()}
+			{$iPhotosCount = $oTopic->getPhotosetCount()}
 
 			<br />
 			<a href="{$oTopic->getUrl()}#cut" title="{$aLang.topic_read_more}">
@@ -52,30 +52,27 @@
 
 {* Photoset *}
 {block name='topic_content_after'}
-	{if !$bTopicList}
-		<script type="text/javascript">
-			jQuery(document).ready(function($) {	
-				$('.photoset-image').prettyPhoto({
-					social_tools:'',
-					show_title: false,
-					slideshow:false,
-					deeplinking: false
-				});
-			});
-		</script>
-		
-		
+	{if ! $bTopicList}
 		<div class="photoset photoset-type-default">
 			<h2 class="photoset-title">{$oTopic->getPhotosetCount()} {$oTopic->getPhotosetCount()|declension:$aLang.topic_photoset_count_images}</h2>
 			
 			<ul class="photoset-images" id="topic-photo-images">
-				{assign var=aPhotos value=$oTopic->getPhotosetPhotos(0, $oConfig->get('module.topic.photoset.per_page'))}
+				{$aPhotos = $oTopic->getPhotosetPhotos(0, $oConfig->get('module.topic.photoset.per_page'))}
+
 				{if count($aPhotos)}                                
 					{foreach from=$aPhotos item=oPhoto}
-						<li><a class="photoset-image" href="{$oPhoto->getWebPath(1000)}" rel="[photoset]"  title="{$oPhoto->getDescription()}"><img src="{$oPhoto->getWebPath('50crop')}" alt="{$oPhoto->getDescription()}" /></a></li>                                    
-						{assign var=iLastPhotoId value=$oPhoto->getId()}
+						<li>
+							<a class="js-photoset-type-default-image" 
+							   href="{$oPhoto->getWebPath(1000)}" 
+							   rel="[photoset]"  title="{$oPhoto->getDescription()}">
+
+							   <img src="{$oPhoto->getWebPath('50crop')}" alt="{$oPhoto->getDescription()}" /></a>
+						</li>
+
+						{$iLastPhotoId = $oPhoto->getId()}
 					{/foreach}
 				{/if}
+				
 				<script type="text/javascript">
 					ls.photoset.idLast='{$iLastPhotoId}';
 				</script>

templates/skin/synio/topics/topic_list.tpl

@@ -12,7 +12,7 @@
 		{/if}
 	{/foreach}
 
-	{include file='paging.tpl' aPaging=$aPaging}
+	{include file='pagination.tpl' aPaging=$aPaging}
 {else}
 	{$aLang.blog_no_topic}
 {/if}

templates/skin/synio/topics/topic_preview_topic.tpl

@@ -57,6 +57,6 @@
 </article>
 
 
-<button type="submit"  name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
-<button type="submit"  name="submit_preview" onclick="jQuery('#text_preview').html('').hide(); return false;" class="button">{$aLang.topic_create_submit_preview_close}</button>
-<button type="submit"  name="submit_topic_save" class="button" onclick="jQuery('#submit_topic_save').trigger('click');">{$aLang.topic_create_submit_save}</button>
+<button type="submit" name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+<button type="button" name="submit_preview" class="button js-topic-preview-text-hide-button">{$aLang.topic_create_submit_preview_close}</button>
+<button type="submit" name="submit_topic_save" class="button" onclick="jQuery('#submit_topic_save').trigger('click');">{$aLang.topic_create_submit_save}</button>

templates/skin/synio/user_list.tpl

@@ -74,4 +74,4 @@
 </table>
 
 
-{include file='paging.tpl' aPaging=$aPaging}
+{include file='pagination.tpl' aPaging=$aPaging}

templates/skin/synio/user_list_avatar.tpl

@@ -21,4 +21,4 @@
 {/if}
 
 
-{include file='paging.tpl' aPaging=$aPaging}
+{include file='pagination.tpl' aPaging=$aPaging}