diff options
| -rw-r--r-- | includes/theme.inc | 3 | ||||
| -rw-r--r-- | modules/comment/comment.module | 18 | ||||
| -rw-r--r-- | modules/node/node.module | 16 | ||||
| -rw-r--r-- | themes/garland/comment.tpl.php | 2 | ||||
| -rw-r--r-- | themes/garland/node.tpl.php | 4 | ||||
| -rw-r--r-- | themes/garland/template.php | 16 |
6 files changed, 51 insertions, 8 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 950d8f293..569c5d256 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1609,7 +1609,7 @@ function template_preprocess_node(&$variables) { // Display info only on certain node types. if (theme_get_setting('toggle_node_info_' . $node->type)) { - $variables['submitted'] = t('Submitted by !a on @b.', array('!a' => theme('username', $node), '@b' => format_date($node->created))); + $variables['submitted'] = theme('node_submitted', $node); $variables['picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : ''; } else { @@ -1637,3 +1637,4 @@ function template_preprocess_block(&$variables) { $variables['template_files'][] = 'block-' . $variables['block']->module; $variables['template_files'][] = 'block-' . $variables['block']->module .'-'. $variables['block']->delta; } + diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 495637b94..f7141b1d0 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -184,6 +184,9 @@ function comment_theme() { 'comment_wrapper' => array( 'arguments' => array('content' => NULL), ), + 'comment_submitted' => array( + 'arguments' => array('comment' => NULL), + ), ); } @@ -1853,9 +1856,7 @@ function template_preprocess_comment(&$variables) { $variables['new'] = $comment->new ? t('new') : ''; $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : ''; $variables['signature'] = $comment->signature; - $variables['submitted'] = t('Submitted by !a on @b.', - array('!a' => theme('username', $comment), - '@b' => format_date($comment->timestamp))); + $variables['submitted'] = theme('comment_submitted', $comment); $variables['title'] = l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")); $variables['template_files'][] = 'comment-'. $node->type; } @@ -1917,6 +1918,17 @@ function theme_comment_wrapper($content) { return '<div id="comments">'. $content .'</div>'; } +/** + * Make the submitted variable themable + */ +function theme_comment_submitted($comment) { + return t('Submitted by !username on @datetime.', + array( + '!username' => theme('username', $comment), + '@datetime' => format_date($comment->timestamp) + )); +} + function _comment_delete_thread($comment) { if (!is_object($comment) || !is_numeric($comment->cid)) { watchdog('content', 'Can not delete non-existent comment.', WATCHDOG_WARNING); diff --git a/modules/node/node.module b/modules/node/node.module index c1eadf292..d8949dd65 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -84,6 +84,9 @@ function node_theme() { 'node_log_message' => array( 'arguments' => array('log' => NULL), ), + 'node_submitted' => array( + 'arguments' => array('node' => NULL), + ), ); } @@ -3205,6 +3208,17 @@ function node_forms() { } /** + * Format the "Submitted by username on date/time" for each node + */ +function theme_node_submitted($node) { + return t('Submitted by !username on @datetime', + array( + '!username' => theme('username', $node), + '@datetime' => format_date($node->created), + )); +} + +/** * Implementation of hook_hook_info(). */ function node_hook_info() { @@ -3477,4 +3491,4 @@ function node_unpublish_by_keyword_action($node, $context) { break; } } -}
\ No newline at end of file +} diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php index a28a1c551..b6c1af73d 100644 --- a/themes/garland/comment.tpl.php +++ b/themes/garland/comment.tpl.php @@ -2,7 +2,7 @@ <div class="clear-block"> <?php if ($submitted): ?> - <span class="submitted"><?php print t('!date — !username', array('!username' => theme('username', $comment), '!date' => format_date($comment->timestamp))); ?></span> + <span class="submitted"><?php print $submitted; ?></span> <?php endif; ?> <?php if ($comment->new) : ?> diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php index 56af23654..f0e24936c 100644 --- a/themes/garland/node.tpl.php +++ b/themes/garland/node.tpl.php @@ -9,7 +9,7 @@ <?php endif; ?> <?php if ($submitted): ?> - <span class="submitted"><?php print t('!date — !username', array('!username' => theme('username', $node), '!date' => format_date($node->created))); ?></span> + <span class="submitted"><?php print $submitted; ?></span> <?php endif; ?> <div class="content"> @@ -28,4 +28,4 @@ <?php endif; ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/themes/garland/template.php b/themes/garland/template.php index 3efbff7b9..cf605f5b4 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -83,3 +83,19 @@ function phptemplate_menu_local_tasks() { return $output; } + +function phptemplate_comment_submitted($comment) { + return t('!datetime — !username', + array( + '!username' => theme('username', $comment), + '!datetime' => format_date($comment->timestamp) + )); +} + +function phptemplate_node_submitted($node) { + return t('!datetime — !username', + array( + '!username' => theme('username', $node), + '!datetime' => format_date($node->created), + )); +} |