Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #489880 by nbz, Bojhan, Gurpartap Singh: merge 'Created' column with 'Topics'.

merge-requests/26/head
Dries Buytaert 2009-07-28 10:41:20 +00:00
parent 82d912d863
commit 1115fba064
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/forum/forum-submitted.tpl.php
View File

@ -18,11 +18,12 @@
*/ */
?> ?>
<?php if ($time): ?> <?php if ($time): ?>
<?php print t( <span class="submitted">
'@time ago<br />by !author', array( <?php print t('By !author @time ago', array(
'@time' => $time, '@time' => $time,
'!author' => $author, '!author' => $author,
)); ?> )); ?>
</span>
<?php else: ?> <?php else: ?>
<?php print t('n/a'); ?> <?php print t('n/a'); ?>
<?php endif; ?> <?php endif; ?>

10
modules/forum/forum-topic-list.tpl.php
View File

@ -41,7 +41,14 @@
<?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="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): ?> <?php if ($topic->moved): ?>
<td colspan="3"><?php print $topic->message; ?></td> <td colspan="3"><?php print $topic->message; ?></td>
<?php else: ?> <?php else: ?>
@ -52,7 +59,6 @@
<a href="<?php print $topic->new_url; ?>"><?php print $topic->new_text; ?></a> <a href="<?php print $topic->new_url; ?>"><?php print $topic->new_text; ?></a>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="created"><?php print $topic->created; ?></td>
<td class="last-reply"><?php print $topic->last_reply; ?></td> <td class="last-reply"><?php print $topic->last_reply; ?></td>
<?php endif; ?> <?php endif; ?>
</tr> </tr>

1
modules/forum/forum.module
View File

@ -691,7 +691,6 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
NULL, NULL,
array('data' => t('Topic'), 'field' => 'n.title'), array('data' => t('Topic'), 'field' => 'n.title'),
array('data' => t('Replies'), 'field' => 'ncs.comment_count'), 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'), array('data' => t('Last reply'), 'field' => 'ncs.last_comment_timestamp'),
); );