Revert "temp - this commit belongs to another branch...sorry"

This reverts commit ca6000061290e13ecc5964bd7aea30c6c784d320.

Themes/default/MessageIndex.template.php

@@ -238,15 +238,17 @@ function template_main()
 			// Some columns require a different shade of the color class.
 			$alternate_class = $color_class . '2';
 
-			// TODO Markup can be cleaned up later.
+			// [WIP] There is trial code here to hide the topic icon column. Hardly anyone will miss it.
+			// [WIP] Markup can be cleaned up later. CSS can go in the CSS files later.
 			echo '
 				<tr>
-					<td class="', $color_class, ' topic_icons">
-						<div>
-							<img src="', !$topic['is_poll'] ? $topic['first_post']['icon_url'] : $settings['images_url'] .'/post/poll.png', '" alt="" />
-							', $topic['is_posted_in'] ? '<img src="'. $settings['images_url']. '/icons/profile_sm.png" alt="" class="mypost" />' : '','
-							', $topic['is_locked'] ? '<img src="'. $settings['images_url']. '/icons/quick_lock.png" alt="" class="locked" />' : '','
-							', $topic['is_sticky'] ? '<img src="'. $settings['images_url']. '/icons/quick_sticky.png" alt="" class="sticky" />' : '','
+					<td class="', $color_class, ' icon1" style="display: none;">
+						<img src="', $settings['images_url'], '/topic/', $topic['class'], '.png" alt="" />
+					</td>
+					<td class="', $color_class, ' icon2">
+						<div style="position: relative; width: 40px; margin: auto;">
+							<img src="', $topic['first_post']['icon_url'], '" alt="" />
+							', $topic['is_posted_in'] ? '<img src="'. $settings['images_url']. '/icons/profile_sm.png" alt="" style="position: absolute; z-index: 5; right: 4px; bottom: -3px;" />' : '','
 						</div>
 					</td>
 					<td class="', $alternate_class, ' subject">

Themes/default/css/index.css

@@ -849,28 +849,7 @@ div.cat_bar {
 div.title_bar {
 	background: #c5cfd9 url(../images/theme/bars.png) 0 -340px repeat-x;
 }
-.topic_icons div {
-	text-align: center;
-	position: relative;
-	width: 40px;
-	margin: auto;
-}
-.topic_icons img.mypost, .topic_icons img.locked, .topic_icons img.sticky {
-	position: absolute;
-	z-index: 5;
-}
-.topic_icons img.mypost {
-	right: 4px;
-	bottom: -3px;
-}
-.topic_icons img.locked {
-	left: 4px;
-	bottom: -4px;
-}
-.topic_icons img.sticky {
-	left: 4px;
-	top: -6px;
-}
+
 /* Info center title bars are a bit different. *//* [WIP] */
 /*div.title_barIC {
 	background: #dde3e9 url(../images/theme/bars.png) 0 0 repeat-x;