Browse Source

Merge pull request #441 from smfrunic/release-2.1

Adds moved topic to the topic icons at the bottom
Michael Eshom 11 years ago
parent
commit
8454578059

+ 2 - 1
Themes/default/MessageIndex.template.php

@@ -380,7 +380,8 @@ function template_main()
 		echo '
 			<p class="floatleft">', !empty($modSettings['enableParticipation']) && $context['user']['is_logged'] ? '
 				<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="" class="centericon" /> ' . $txt['participation_caption'] . '<br />' : '', '
-				'. ($modSettings['pollMode'] == '1' ? '<img src="' . $settings['images_url'] . '/topic/normal_poll.png" alt="" class="centericon" /> ' . $txt['poll'] : '') . '
+				'. ($modSettings['pollMode'] == '1' ? '<img src="' . $settings['images_url'] . '/topic/normal_poll.png" alt="" class="centericon" /> ' . $txt['poll'] : '') . '<br />
+				<img src="' . $settings['images_url'] . '/post/moved.png" alt="" class="centericon sizefix" /> ' . $txt['moved_topic'] . '<br />
 			</p>
 			<p>
 				<img src="' . $settings['images_url'] . '/icons/quick_lock.png" alt="" class="centericon" /> ' . $txt['locked_topic'] . '<br />' . ($modSettings['enableStickyTopics'] == '1' ? '

+ 4 - 0
Themes/default/css/index.css

@@ -3301,6 +3301,10 @@ dl {
 img.centericon {
 	vertical-align: middle;
 }
+.sizefix {
+	width: 16px;
+	height: 16px;
+}
 .ignoreboards {
 	margin: 0 2%;
 	padding: 0;

+ 1 - 0
Themes/default/languages/index.english.php

@@ -297,6 +297,7 @@ $txt['very_hot_topics'] = 'Very Hot Topic (More than %1$d replies)';
 $txt['locked_topic'] = 'Locked Topic';
 $txt['normal_topic'] = 'Normal Topic';
 $txt['participation_caption'] = 'Topic you have posted in';
+$txt['moved_topic'] = 'Moved Topic';
 
 $txt['go_caps'] = 'GO';