From dd6e348924fd11ae71fc634f307bc9dd392aa334 Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Sun, 7 Dec 2014 21:13:27 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixes #581
* Fixes #579
---
 .../frontend/skin/developer/actions/ActionBlog/topic.tpl        | 2 +-
 .../frontend/skin/developer/components/article/article.tpl      | 2 +-
 application/frontend/skin/developer/components/more/js/more.js  | 2 +-
 application/frontend/skin/developer/components/note/js/note.js  | 2 +-
 application/frontend/skin/developer/components/talk/js/talk.js  | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/application/frontend/skin/developer/actions/ActionBlog/topic.tpl b/application/frontend/skin/developer/actions/ActionBlog/topic.tpl
index 40422cae..2c2af362 100644
--- a/application/frontend/skin/developer/actions/ActionBlog/topic.tpl
+++ b/application/frontend/skin/developer/actions/ActionBlog/topic.tpl
@@ -10,7 +10,7 @@
 {extends 'layouts/layout.base.tpl'}
 
 {block 'layout_options' append}
-    {$layouShowSidebar = Config::Get( 'view.topic_show_sidebar' )}
+    {$layoutShowSidebar = Config::Get( 'view.topic_show_sidebar' )}
 {/block}
 
 {block 'layout_content'}
diff --git a/application/frontend/skin/developer/components/article/article.tpl b/application/frontend/skin/developer/components/article/article.tpl
index 6089fd87..6d853380 100644
--- a/application/frontend/skin/developer/components/article/article.tpl
+++ b/application/frontend/skin/developer/components/article/article.tpl
@@ -86,7 +86,7 @@
 				</div>
 
 				{* Кат *}
-				{if $article->getTextShort() != $article->getText()}
+				{if $isList && $article->getTextShort() != $article->getText()}
 					{include 'components/button/button.tpl'
 						classes = "{$component}-cut"
 						url     = "{$article->getUrl()}#cut"
diff --git a/application/frontend/skin/developer/components/more/js/more.js b/application/frontend/skin/developer/components/more/js/more.js
index de497b77..3d7c589b 100644
--- a/application/frontend/skin/developer/components/more/js/more.js
+++ b/application/frontend/skin/developer/components/more/js/more.js
@@ -39,7 +39,7 @@
 		 * @private
 		 */
 		_create: function () {
-			this.options = $.extend({}, this.options, ls.utils.getDataOptions(this.element, this.widgetName));
+			this.options = $.extend({}, this.options, ls.utils.getDataOptions(this.element, 'more'));
 			this.options.proxy = $.extend({}, this.options.proxy, ls.utils.getDataOptions(this.element, 'proxy'));
 
 			this.target = $( this.options.target );
diff --git a/application/frontend/skin/developer/components/note/js/note.js b/application/frontend/skin/developer/components/note/js/note.js
index 9ecdff9c..0f598478 100644
--- a/application/frontend/skin/developer/components/note/js/note.js
+++ b/application/frontend/skin/developer/components/note/js/note.js
@@ -46,7 +46,7 @@
 		_create: function () {
 			var _this = this;
 
-			this.options = $.extend({}, this.options, ls.utils.getDataOptions(this.element, this.widgetName));
+			this.options = $.extend({}, this.options, ls.utils.getDataOptions(this.element, 'note'));
 
 			// Получаем аякс параметры
 			this.params = ls.utils.getDataOptions(this.element, 'param');
diff --git a/application/frontend/skin/developer/components/talk/js/talk.js b/application/frontend/skin/developer/components/talk/js/talk.js
index b4c148e2..76403c59 100644
--- a/application/frontend/skin/developer/components/talk/js/talk.js
+++ b/application/frontend/skin/developer/components/talk/js/talk.js
@@ -21,8 +21,6 @@ ls.talk = (function ($) {
 	this.init = function(options) {
 		var _this = this;
 
-		this.options = $.extend({}, defaults, options);
-
 		this.elements = {
 			form: $('#talk-form'),
 			form_action: $('#talk-form-action')