Commit 55876f68 authored by webchick's avatar webchick

Issue #821702 by droplet, mgifford, eloiv: Fixed Replace Forum Icon Column with Topic Span.

parent 6522e7ee
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
#forum td.pager { #forum td.pager {
white-space: nowrap; white-space: nowrap;
} }
#forum .icon{
#forum td.forum .icon {
background-image: url(../../misc/forum-icons.png); background-image: url(../../misc/forum-icons.png);
background-repeat: no-repeat; background-repeat: no-repeat;
float: left; /* LTR */ float: left; /* LTR */
...@@ -24,31 +23,25 @@ ...@@ -24,31 +23,25 @@
margin: 0 9px 0 0; /* LTR */ margin: 0 9px 0 0; /* LTR */
width: 24px; width: 24px;
} }
#forum td.forum .forum-status-new { #forum .title {
background-position: -24px 0; overflow: hidden;
} }
#forum div.indent { #forum div.indent {
margin-left: 20px; margin-left: 20px;
} }
#forum .icon div {
background-image: url(../../misc/forum-icons.png); #forum .topic-status-new {
background-repeat: no-repeat;
width: 24px;
height: 24px;
}
#forum .icon .topic-status-new {
background-position: -24px 0; background-position: -24px 0;
} }
#forum .icon .topic-status-hot { #forum .topic-status-hot {
background-position: -48px 0; background-position: -48px 0;
} }
#forum .icon .topic-status-hot-new { #forum .topic-status-hot-new {
background-position: -72px 0; background-position: -72px 0;
} }
#forum .icon .topic-status-sticky { #forum .topic-status-sticky {
background-position: -96px 0; background-position: -96px 0;
} }
#forum .icon .topic-status-closed { #forum .topic-status-closed {
background-position: -120px 0; background-position: -120px 0;
} }
...@@ -918,7 +918,6 @@ function forum_get_topics($tid, $sortby, $forum_per_page) { ...@@ -918,7 +918,6 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
global $user, $forum_topic_list_header; global $user, $forum_topic_list_header;
$forum_topic_list_header = array( $forum_topic_list_header = array(
NULL,
array('data' => t('Topic'), 'field' => 'f.title'), array('data' => t('Topic'), 'field' => 'f.title'),
array('data' => t('Replies'), 'field' => 'f.comment_count'), array('data' => t('Replies'), 'field' => 'f.comment_count'),
array('data' => t('Last reply'), 'field' => 'f.last_comment_timestamp'), array('data' => t('Last reply'), 'field' => 'f.last_comment_timestamp'),
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* @ingroup themeable * @ingroup themeable
*/ */
?> ?>
<div class="topic-status-<?php print $icon_class ?>" title="<?php print $icon_title ?>"> <div class="icon topic-status-<?php print $icon_class ?>" title="<?php print $icon_title ?>">
<?php if ($first_new): ?> <?php if ($first_new): ?>
<a id="new"></a> <a id="new"></a>
<?php endif; ?> <?php endif; ?>
......
...@@ -44,13 +44,15 @@ ...@@ -44,13 +44,15 @@
<tbody> <tbody>
<?php foreach ($topics as $topic): ?> <?php foreach ($topics as $topic): ?>
<tr class="<?php print $topic->zebra;?>"> <tr class="<?php print $topic->zebra;?>">
<td class="icon"><?php print $topic->icon; ?></td> <td class="topic">
<td class="title"> <?php print $topic->icon; ?>
<div> <div class="title">
<?php print $topic->title; ?> <div>
</div> <?php print $topic->title; ?>
<div> </div>
<?php print $topic->created; ?> <div>
<?php print $topic->created; ?>
</div>
</div> </div>
</td> </td>
<?php if ($topic->moved): ?> <?php if ($topic->moved): ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment