Commit 9327932b authored by webchick's avatar webchick

#382870 by geerlingguy, jmburnz, EclipseGc, JohnAlbin, sun, et al: Update and...

#382870 by geerlingguy, jmburnz, EclipseGc, JohnAlbin, sun, et al: Update and Polish default node.tpl.php output.
parent 523ba034
......@@ -1225,11 +1225,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['picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
$variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
}
else {
$variables['submitted'] = '';
$variables['picture'] = '';
$variables['user_picture'] = '';
}
// Gather node classes.
......
......@@ -11,8 +11,7 @@
* print a subset such as render($content['field_example']). Use
* hide($content['field_example']) to temporarily suppress the printing of a
* given element.
* - $picture: The authors picture of the node output from
* theme_user_picture().
* - $user_picture: The node author's picture from user-picture.tpl.php.
* - $date: Formatted creation date (use $created to reformat with
* format_date()).
* - $name: Themed username of node author output from theme_username().
......@@ -65,23 +64,25 @@
* @see template_process()
*/
?>
<div id="node-<?php print $node->nid; ?>" class="<?php print $classes ?> clearfix">
<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">
<?php print $picture ?>
<?php print $user_picture; ?>
<?php if (!$page): ?>
<h2><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
<?php endif; ?>
<div class="meta">
<?php if ($submitted): ?>
<span class="submitted"><?php print $submitted ?></span>
<?php if (!$page): ?>
<h2><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
<?php endif; ?>
<?php if (!empty($content['links']['terms'])): ?>
<div class="terms terms-inline"><?php render($content['links']['terms']) ?></div>
<?php endif;?>
</div>
<?php if ($submitted || !empty($content['links']['terms'])): ?>
<div class="meta">
<?php if ($submitted): ?>
<span class="submitted"><?php print $submitted; ?></span>
<?php endif; ?>
<?php if (!empty($content['links']['terms'])): ?>
<div class="terms terms-inline"><?php print render($content['links']['terms']); ?></div>
<?php endif; ?>
</div>
<?php endif; ?>
<div class="content">
<?php
......
......@@ -7,7 +7,7 @@
* block. It only shows in relation to a node displayed as a full page.
*
* Available variables:
* - $picture: Image configured for the account linking to the users page.
* - $user_picture: Image configured for the account linking to the users page.
* - $profile: Keyed array of all profile fields that have a value.
*
* Each $field in $profile contains:
......@@ -30,7 +30,7 @@
* @see template_preprocess_profile_block()
*/
?>
<?php print $picture; ?>
<?php print $user_picture; ?>
<?php foreach ($profile as $field) : ?>
<p>
......
......@@ -11,7 +11,7 @@
*
* Available variables:
* - $account: User's account object.
* - $picture: Image configured for the account linking to the users page.
* - $user_picture: Image configured for the account linking to the users page.
* - $name: User's account name linking to the users page.
* - $profile: Keyed array of all profile fields that are set as visible
* in member list pages (configured by site administrators). It also needs
......@@ -38,7 +38,7 @@
*/
?>
<div class="profile clearfix">
<?php print $picture; ?>
<?php print $user_picture; ?>
<div class="name">
<?php print $name; ?>
......
......@@ -533,7 +533,7 @@ function profile_category_access($account, $category) {
*/
function template_preprocess_profile_block(&$variables) {
$variables['picture'] = theme('user_picture', $variables['account']);
$variables['user_picture'] = theme('user_picture', $variables['account']);
$variables['profile'] = array();
// Supply filtered version of $fields that have values.
foreach ($variables['fields'] as $field) {
......@@ -557,7 +557,7 @@ function template_preprocess_profile_block(&$variables) {
*/
function template_preprocess_profile_listing(&$variables) {
$variables['picture'] = theme('user_picture', $variables['account']);
$variables['user_picture'] = theme('user_picture', $variables['account']);
$variables['name'] = theme('username', $variables['account']);
$variables['profile'] = array();
// Supply filtered version of $fields that have values.
......
......@@ -7,7 +7,7 @@
* user's account.
*
* Available variables:
* - $picture: Image set by the user or the site's default. Will be linked
* - $user_picture: Image set by the user or the site's default. Will be linked
* depending on the viewer's permission to view the users profile page.
* - $account: Array of account information. Potentially unsafe. Be sure to
* check_plain() before use.
......@@ -15,8 +15,8 @@
* @see template_preprocess_user_picture()
*/
?>
<?php if ($picture): ?>
<div class="picture">
<?php print $picture; ?>
<?php if ($user_picture): ?>
<div class="user-picture">
<?php print $user_picture; ?>
</div>
<?php endif; ?>
......@@ -11,7 +11,7 @@
clear: left;
}
.profile .picture {
.profile .user-picture {
float: left;
margin: 0 0 1em 1em;
}
......@@ -34,7 +34,7 @@
clear: both;
margin: 1em 0;
}
.profile .picture {
.profile .user-picture {
float: right; /* LTR */
margin: 0 1em 1em 0; /* LTR */
}
......
......@@ -1153,7 +1153,7 @@ function user_block_view($delta = '') {
* @see user-picture.tpl.php
*/
function template_preprocess_user_picture(&$variables) {
$variables['picture'] = '';
$variables['user_picture'] = '';
if (variable_get('user_pictures', 0)) {
$account = $variables['account'];
if (!empty($account->picture)) {
......@@ -1177,14 +1177,14 @@ function template_preprocess_user_picture(&$variables) {
if (isset($filepath)) {
$alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
if (module_exists('image') && $style = variable_get('user_picture_style', '')) {
$variables['picture'] = theme('image_style', $style, $filepath, $alt, $alt, array(), FALSE);
$variables['user_picture'] = theme('image_style', $style, $filepath, $alt, $alt, array(), FALSE);
}
else {
$variables['picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE);
$variables['user_picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE);
}
if (!empty($account->uid) && user_access('access user profiles')) {
$attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE);
$variables['picture'] = l($variables['picture'], "user/$account->uid", $attributes);
$variables['user_picture'] = l($variables['user_picture'], "user/$account->uid", $attributes);
}
}
}
......
<?php
// $Id$
?>
<div id="node-<?php print $node->nid; ?>" class="<?php print $classes ?>">
<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>">
<?php print $picture ?>
<?php if ($page == 0): ?>
<h2><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
<?php endif; ?>
<?php print $user_picture; ?>
<?php if (!$page): ?>
<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 endif; ?>
<div class="content clearfix">
<?php hide($content['links']); hide($content['comments']); print render($content); ?>
<?php
// We hide the comments and links now so that we can render them later.
hide($content['comments']);
hide($content['links']);
print render($content);
?>
</div>
<div class="clearfix">
<div class="meta">
<?php if (!empty($content['links']['terms'])): ?>
<div class="terms"><?php print render($content['links']['terms']) ?></div>
<?php endif;?>
</div>
<div class="meta">
<div class="terms"><?php print render($content['links']['terms']); ?></div>
</div>
<?php endif; ?>
<?php if (!empty($content['links'])): ?>
<div class="links"><?php print render($content['links']) ?></div>
<div class="links"><?php print render($content['links']); ?></div>
<?php endif; ?>
<?php print render($content['comments']); ?>
</div>
</div>
......@@ -206,7 +206,8 @@ ul.links li, ul.inline li {
padding-left: 0;
}
.picture, .comment .submitted {
.user-picture,
.comment .submitted {
padding-left: 0;
float: left;
clear: left;
......
......@@ -674,7 +674,8 @@ ul.links li, ul.inline li {
padding-left: 1em;
}
.picture, .comment .submitted {
.user-picture,
.comment .submitted {
float: right; /* LTR */
clear: right; /* LTR */
padding-left: 1em; /* LTR */
......
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