From 1115fba0649997f77a70eb4d03b1e4ab1df2d56e Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 28 Jul 2009 10:41:20 +0000
Subject: [PATCH] - Patch #489880 by nbz, Bojhan, Gurpartap Singh: merge
'Created' column with 'Topics'.
---
modules/forum/forum-submitted.tpl.php | 5 +++--
modules/forum/forum-topic-list.tpl.php | 10 ++++++++--
modules/forum/forum.module | 1 -
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/modules/forum/forum-submitted.tpl.php b/modules/forum/forum-submitted.tpl.php
index 8695e3464bb2..c025a9862748 100644
--- a/modules/forum/forum-submitted.tpl.php
+++ b/modules/forum/forum-submitted.tpl.php
@@ -18,11 +18,12 @@
*/
?>
<?php if ($time): ?>
- <?php print t(
- '@time ago<br />by !author', array(
+ <span class="submitted">
+ <?php print t('By !author @time ago', array(
'@time' => $time,
'!author' => $author,
)); ?>
+ </span>
<?php else: ?>
<?php print t('n/a'); ?>
<?php endif; ?>
diff --git a/modules/forum/forum-topic-list.tpl.php b/modules/forum/forum-topic-list.tpl.php
index 08d9ec56bab6..9757b6049055 100644
--- a/modules/forum/forum-topic-list.tpl.php
+++ b/modules/forum/forum-topic-list.tpl.php
@@ -41,7 +41,14 @@
<?php foreach ($topics as $topic): ?>
<tr class="<?php print $topic->zebra;?>">
<td class="icon"><?php print $topic->icon; ?></td>
- <td class="title"><?php print $topic->title; ?></td>
+ <td class="title">
+ <div>
+ <?php print $topic->title; ?>
+ </div>
+ <div>
+ <?php print $topic->created; ?>
+ </div>
+ </td>
<?php if ($topic->moved): ?>
<td colspan="3"><?php print $topic->message; ?></td>
<?php else: ?>
@@ -52,7 +59,6 @@
<a href="<?php print $topic->new_url; ?>"><?php print $topic->new_text; ?></a>
<?php endif; ?>
</td>
- <td class="created"><?php print $topic->created; ?></td>
<td class="last-reply"><?php print $topic->last_reply; ?></td>
<?php endif; ?>
</tr>
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 93abb925b439..9737e881ea0d 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -691,7 +691,6 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
NULL,
array('data' => t('Topic'), 'field' => 'n.title'),
array('data' => t('Replies'), 'field' => 'ncs.comment_count'),
- array('data' => t('Created'), 'field' => 'n.created'),
array('data' => t('Last reply'), 'field' => 'ncs.last_comment_timestamp'),
);
--
GitLab