From 37696bd6070589cefc36dd9f1f1a577ab5b53b56 Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Fri, 24 May 2013 00:06:21 +0700
Subject: [PATCH] =?UTF-8?q?Fixes=20#280:=20=D0=9F=D1=80=D0=BE=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BB=20topic=5Ftype=20=D0=B2=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=85=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=82=D0=BE=D0=BF=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/skin/developer/actions/ActionLink/add.tpl     | 3 +++
 templates/skin/developer/actions/ActionPhotoset/add.tpl | 2 ++
 templates/skin/developer/actions/ActionQuestion/add.tpl | 3 +++
 templates/skin/developer/add.topic.base.tpl             | 2 +-
 templates/skin/synio/actions/ActionLink/add.tpl         | 3 +++
 templates/skin/synio/actions/ActionPhotoset/add.tpl     | 2 ++
 templates/skin/synio/actions/ActionQuestion/add.tpl     | 3 +++
 templates/skin/synio/add.topic.base.tpl                 | 2 +-
 templates/skin/synio/topics/topic_preview_topic.tpl     | 6 +++++-
 9 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/templates/skin/developer/actions/ActionLink/add.tpl b/templates/skin/developer/actions/ActionLink/add.tpl
index 224c5e35..e3c92d86 100644
--- a/templates/skin/developer/actions/ActionLink/add.tpl
+++ b/templates/skin/developer/actions/ActionLink/add.tpl
@@ -6,6 +6,9 @@
 
 {extends file='add.topic.base.tpl'}
 
+
+{block name='add_topic_type'}link{/block}
+
 {block name='add_topic_form_text_before'}
 	<p><label for="topic_link_url">{$aLang.topic_link_create_url}:</label>
 	<input type="text" id="topic_link_url" name="topic_link_url" value="{$_aRequest.topic_link_url}" class="width-full" />
diff --git a/templates/skin/developer/actions/ActionPhotoset/add.tpl b/templates/skin/developer/actions/ActionPhotoset/add.tpl
index dcda0df1..d9edecc8 100644
--- a/templates/skin/developer/actions/ActionPhotoset/add.tpl
+++ b/templates/skin/developer/actions/ActionPhotoset/add.tpl
@@ -7,6 +7,8 @@
 {extends file='add.topic.base.tpl'}
 
 
+{block name='add_topic_type'}photoset{/block}
+
 {block name='add_topic_header_after'}
 	{include file='modals/modal.photoset_add_photo.tpl'}
 {/block}
diff --git a/templates/skin/developer/actions/ActionQuestion/add.tpl b/templates/skin/developer/actions/ActionQuestion/add.tpl
index 85fd3ad6..86f9cac3 100644
--- a/templates/skin/developer/actions/ActionQuestion/add.tpl
+++ b/templates/skin/developer/actions/ActionQuestion/add.tpl
@@ -6,6 +6,9 @@
 
 {extends file='add.topic.base.tpl'}
 
+
+{block name='add_topic_type'}question{/block}
+
 {block name='add_topic_form_text_before'}
 	<div class="poll-add">
 		<label>{$aLang.topic_question_create_answers}:</label>
diff --git a/templates/skin/developer/add.topic.base.tpl b/templates/skin/developer/add.topic.base.tpl
index 4a1b4b5f..222cd5be 100644
--- a/templates/skin/developer/add.topic.base.tpl
+++ b/templates/skin/developer/add.topic.base.tpl
@@ -85,7 +85,7 @@
 
 	{* Скрытые поля *}
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
-	<input type="hidden" name="topic_type" value="topic" />
+	<input type="hidden" name="topic_type" value="{block name='add_topic_type'}topic{/block}" />
 	
 
 	{* Кнопки *}
diff --git a/templates/skin/synio/actions/ActionLink/add.tpl b/templates/skin/synio/actions/ActionLink/add.tpl
index 224c5e35..e3c92d86 100644
--- a/templates/skin/synio/actions/ActionLink/add.tpl
+++ b/templates/skin/synio/actions/ActionLink/add.tpl
@@ -6,6 +6,9 @@
 
 {extends file='add.topic.base.tpl'}
 
+
+{block name='add_topic_type'}link{/block}
+
 {block name='add_topic_form_text_before'}
 	<p><label for="topic_link_url">{$aLang.topic_link_create_url}:</label>
 	<input type="text" id="topic_link_url" name="topic_link_url" value="{$_aRequest.topic_link_url}" class="width-full" />
diff --git a/templates/skin/synio/actions/ActionPhotoset/add.tpl b/templates/skin/synio/actions/ActionPhotoset/add.tpl
index dcda0df1..d9edecc8 100644
--- a/templates/skin/synio/actions/ActionPhotoset/add.tpl
+++ b/templates/skin/synio/actions/ActionPhotoset/add.tpl
@@ -7,6 +7,8 @@
 {extends file='add.topic.base.tpl'}
 
 
+{block name='add_topic_type'}photoset{/block}
+
 {block name='add_topic_header_after'}
 	{include file='modals/modal.photoset_add_photo.tpl'}
 {/block}
diff --git a/templates/skin/synio/actions/ActionQuestion/add.tpl b/templates/skin/synio/actions/ActionQuestion/add.tpl
index b4240d42..b3ab4512 100644
--- a/templates/skin/synio/actions/ActionQuestion/add.tpl
+++ b/templates/skin/synio/actions/ActionQuestion/add.tpl
@@ -6,6 +6,9 @@
 
 {extends file='add.topic.base.tpl'}
 
+
+{block name='add_topic_type'}question{/block}
+
 {block name='add_topic_form_text_before'}
 	<div class="poll-add">
 		<label>{$aLang.topic_question_create_answers}:</label>
diff --git a/templates/skin/synio/add.topic.base.tpl b/templates/skin/synio/add.topic.base.tpl
index 340dba5c..5c589305 100644
--- a/templates/skin/synio/add.topic.base.tpl
+++ b/templates/skin/synio/add.topic.base.tpl
@@ -85,7 +85,7 @@
 
 	{* Скрытые поля *}
 	<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
-	<input type="hidden" name="topic_type" value="topic" />
+	<input type="hidden" name="topic_type" value="{block name='add_topic_type'}topic{/block}" />
 	
 
 	{* Кнопки *}
diff --git a/templates/skin/synio/topics/topic_preview_topic.tpl b/templates/skin/synio/topics/topic_preview_topic.tpl
index e87487f6..168c7a0d 100644
--- a/templates/skin/synio/topics/topic_preview_topic.tpl
+++ b/templates/skin/synio/topics/topic_preview_topic.tpl
@@ -44,7 +44,11 @@
 		</ul>
 
 		<ul class="topic-info">
-			<li class="topic-info-author"><a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
+			<li class="topic-info-author">
+				<a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="avatar" class="avatar" /></a>
+				<a rel="author" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+			</li>
+
 			{hook run='topic_preview_show_info' topic=$oTopic}
 		</ul>