Commit 770e0d54 authored by webchick's avatar webchick

#364470 by stBorchert and JohnAlbin: Made theming of 'Submitted by author, on date' easier.

parent 5c5b3a14
......@@ -610,7 +610,7 @@ function list_themes($refresh = FALSE) {
* - MODULE_preprocess_HOOK(&$variables)
* This is for modules that want to alter or provide extra variables for
* theming hooks not registered to itself. For example, if a module named
* "foo" wanted to alter the $submitted variable for the hook "node" a
* "foo" wanted to alter the $classes_array variable for the hook "node" a
* preprocess function of foo_preprocess_node() can be created to intercept
* and alter the variable.
*
......@@ -624,8 +624,8 @@ function list_themes($refresh = FALSE) {
*
* - THEME_preprocess(&$variables)
* This is for themes that want to alter or provide extra variables. For
* example, if a theme named "foo" wanted to alter the $submitted variable for
* the hook "node" a preprocess function of foo_preprocess_node() can be
* example, if a theme named "foo" wanted to alter the $classes_array variable
* for the hook "node" a preprocess function of foo_preprocess_node() can be
* created to intercept and alter the variable.
*
* - THEME_preprocess_HOOK(&$variables)
......@@ -646,7 +646,7 @@ function list_themes($refresh = FALSE) {
* - MODULE_process_HOOK(&$variables)
* This is for modules that want to alter or provide extra variables for
* theming hooks not registered to itself. For example, if a module named
* "foo" wanted to alter the $submitted variable for the hook "node" a
* "foo" wanted to alter the $classes_array variable for the hook "node" a
* process function of foo_process_node() can be created to intercept
* and alter the variable.
*
......
......@@ -148,9 +148,6 @@ function comment_theme() {
'template' => 'comment-wrapper',
'arguments' => array('content' => NULL),
),
'comment_submitted' => array(
'arguments' => array('comment' => NULL),
),
);
}
......@@ -2088,7 +2085,6 @@ function template_preprocess_comment(&$variables) {
$variables['new'] = !empty($comment->new) ? t('new') : '';
$variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : '';
$variables['signature'] = $comment->signature;
$variables['submitted'] = theme('comment_submitted', $comment);
$variables['title'] = l($comment->subject, 'comment/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
$variables['template_files'][] = 'comment-' . $variables['node']->type;
// Set status to a string representation of comment->status.
......@@ -2169,21 +2165,6 @@ function template_preprocess_comment_wrapper(&$variables) {
$variables['template_files'][] = 'comment-wrapper-' . $variables['node']->type;
}
/**
* Theme a "Submitted by ..." notice.
*
* @param $comment
* The comment.
* @ingroup themeable
*/
function theme_comment_submitted($comment) {
return t('Submitted by !username on @datetime.',
array(
'!username' => theme('username', $comment),
'@datetime' => format_date($comment->timestamp)
));
}
/**
* Return an array of viewing modes for comment listings.
*
......
......@@ -17,7 +17,6 @@
* - $signature: Authors signature.
* - $status: Comment status. Possible values are:
* comment-unpublished, comment-published or comment-preview.
* - $submitted: By line with date and time.
* - $title: Linked title.
* - $classes: String of classes that can be used to style contextually through
* CSS. It can be manipulated through the variable $classes_array from
......@@ -55,7 +54,10 @@
<h3><?php print $title ?></h3>
<div class="submitted">
<?php print $submitted ?>
<?php
print t('Submitted by !username on @datetime.',
array('!username' => $author, '@datetime' => $date));
?>
</div>
<div class="content">
......
......@@ -128,9 +128,6 @@ function node_theme() {
'node_log_message' => array(
'arguments' => array('log' => NULL),
),
'node_submitted' => array(
'arguments' => array('node' => NULL),
),
'node_admin_overview' => array(
'arguments' => array('name' => NULL, 'type' => NULL),
),
......@@ -1142,11 +1139,11 @@ function template_preprocess_node(&$variables) {
// Display post information only on certain node types.
if (variable_get('node_submitted_' . $node->type, TRUE)) {
$variables['submitted'] = theme('node_submitted', $node);
$variables['display_submitted'] = TRUE;
$variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
}
else {
$variables['submitted'] = '';
$variables['display_submitted'] = FALSE;
$variables['user_picture'] = '';
}
......@@ -2807,19 +2804,6 @@ function node_forms() {
return $forms;
}
/**
* Format the "Submitted by username on date/time" for each node
*
* @ingroup themeable
*/
function theme_node_submitted($node) {
return t('Submitted by !username on @datetime',
array(
'!username' => theme('username', $node),
'@datetime' => format_date($node->created),
));
}
/**
* Implement hook_hook_info().
*/
......
......@@ -533,7 +533,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase {
// Check that the post information is displayed.
$node = $this->drupalGetNodeByTitle($edit['title']);
$this->assertRaw(theme('node_submitted', $node), t('Post information is displayed.'));
$this->assertRaw('<span class="submitted">', t('Post information is displayed.'));
}
/**
......@@ -555,7 +555,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase {
// Check that the post information is displayed.
$node = $this->drupalGetNodeByTitle($edit['title']);
$this->assertNoRaw(theme('node_submitted', $node), t('Post information is not displayed.'));
$this->assertNoRaw('<span class="submitted">', t('Post information is not displayed.'));
}
}
......
......@@ -17,8 +17,7 @@
* - $name: Themed username of node author output from theme_username().
* - $node_url: Direct url of the current node.
* - $terms: the themed list of taxonomy term links output from theme_links().
* - $submitted: themed submission information output from
* theme_node_submitted().
* - $display_submitted: whether submission information should be displayed.
* - $classes: String of classes that can be used to style contextually through
* CSS. It can be manipulated through the variable $classes_array from
* preprocess functions. The default values can be one or more of the following:
......@@ -79,10 +78,15 @@
<h2><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
<?php endif; ?>
<?php if ($submitted || !empty($content['links']['terms'])): ?>
<?php if ($display_submitted || !empty($content['links']['terms'])): ?>
<div class="meta">
<?php if ($submitted): ?>
<span class="submitted"><?php print $submitted; ?></span>
<?php if ($display_submitted): ?>
<span class="submitted">
<?php
print t('Submitted by !username on @datetime',
array('!username' => $name, '@datetime' => $date));
?>
</span>
<?php endif; ?>
<?php if (!empty($content['links']['terms'])): ?>
......
......@@ -4,9 +4,8 @@
<div class="<?php print $classes . ' ' . $zebra; ?>">
<div class="clearfix">
<?php if ($submitted): ?>
<span class="submitted"><?php print $submitted; ?></span>
<?php endif; ?>
<span class="submitted"><?php print $date; ?><?php print $author; ?></span>
<?php if ($new) : ?>
<span class="new"><?php print drupal_ucfirst($new) ?></span>
......
......@@ -9,8 +9,8 @@
<h2><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
<?php endif; ?>
<?php if ($submitted): ?>
<span class="submitted"><?php print $submitted; ?></span>
<?php if ($display_submitted): ?>
<span class="submitted"><?php print $date; ?><?php print $name; ?></span>
<?php endif; ?>
<div class="content clearfix">
......
......@@ -79,28 +79,6 @@ function garland_menu_local_tasks() {
return menu_primary_local_tasks();
}
/**
* Format the "Submitted by username on date/time" for each comment.
*/
function garland_comment_submitted($comment) {
return t('!datetime — !username',
array(
'!username' => theme('username', $comment),
'!datetime' => format_date($comment->timestamp)
));
}
/**
* Format the "Submitted by username on date/time" for each node.
*/
function garland_node_submitted($node) {
return t('!datetime — !username',
array(
'!username' => theme('username', $node),
'!datetime' => format_date($node->created),
));
}
/**
* Generates IE CSS links for LTR and RTL languages.
*/
......
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