<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4226] trunk/bp-themes/bp-default: Update styling of attachment template to better match rest of theme, and removes a PHP notice.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4226</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-22 11:24:11 +0000 (Fri, 22 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update styling of attachment template to better match rest of theme, and removes a PHP notice. Fixes #3164</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultattachmentphp">trunk/bp-themes/bp-default/attachment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (4225 => 4226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2011-04-21 22:37:11 UTC (rev 4225)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2011-04-22 11:24:11 UTC (rev 4226)
</span><span class="lines">@@ -1954,7 +1954,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.page,
</span><del>-div.post {
</del><ins>+div.post,
+div.attachment {
</ins><span class="cx"> margin: 0 0 40px 0;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/attachment.php (4225 => 4226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/attachment.php 2011-04-21 22:37:11 UTC (rev 4225)
+++ trunk/bp-themes/bp-default/attachment.php 2011-04-22 11:24:11 UTC (rev 4226)
</span><span class="lines">@@ -1,47 +1,75 @@
</span><span class="cx"> <?php get_header(); ?>
</span><span class="cx">
</span><span class="cx"> <div id="content">
</span><ins>+ <div class="padder">
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_attachment' ) ?>
</del><ins>+ <?php do_action( 'bp_before_attachment' ); ?>
</ins><span class="cx">
</span><del>- <div class="page" id="attachments-page">
</del><ins>+ <div class="page" id="attachments-page" role="main">
</ins><span class="cx">
</span><del>- <h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
-
</del><span class="cx"> <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_blog_post' ) ?>
</span><span class="cx">
</span><del>- <?php $attachment_link = wp_get_attachment_link($post->ID, array(450, 800)); // This also populates the iconsize for the next line ?>
- <?php $_post = &get_post($post->ID); $classname = ($_post->iconsize[0] <= 128 ? 'small' : '') . 'attachment'; // This lets us style narrow icons specially ?>
-
</del><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx">
</span><del>- <h2 class="posttitle"><a href="<?php echo get_permalink($post->post_parent); ?>" rev="attachment"><?php echo get_the_title($post->post_parent); ?></a> &rarr; <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2>
</del><ins>+ <div class="author-box">
+ <?php echo get_avatar( get_the_author_meta( 'user_email' ), '50' ); ?>
+ <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>
+ </div>
</ins><span class="cx">
</span><del>- <div class="entry">
- <p class="<?php echo $classname; ?>"><?php echo $attachment_link; ?><br /><?php echo basename($post->guid); ?></p>
</del><ins>+ <div class="post-content">
+ <h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
</ins><span class="cx">
</span><del>- <?php the_content( __('<p class="serif">Read the rest of this entry &rarr;</p>', 'buddypress' ) ); ?>
</del><ins>+ <p class="date">
+ <?php printf( __( '%1$s <span>by %2$s</span>', 'buddypress' ), get_the_date(), bp_core_get_userlink( $post->post_author ) ); ?>
+ <span class="post-utility alignright"><?php edit_post_link( __( 'Edit this entry', 'buddypress' ) ); ?></span>
+ </p>
</ins><span class="cx">
</span><del>- <?php wp_link_pages( array( 'before' => '<div class="page-link"><p>' . __( '<strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p></div>', 'next_or_number' => 'number')); ?>
</del><ins>+ <div class="entry">
+ <a href="#"><?php echo wp_get_attachment_image( $post->ID, 'large', false, array( 'class' => 'size-large aligncenter' ) ); ?></a>
+
+ <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
+ <?php the_content(); ?>
+ </div>
+
+ <p class="postmetadata">
+ <?php
+ if ( wp_attachment_is_image() ) :
+ $metadata = wp_get_attachment_metadata();
+ printf( __( 'Full size is %s pixels', 'buddypress' ),
+ sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+ wp_get_attachment_url(),
+ esc_attr( __( 'Link to full size image', 'buddypress' ) ),
+ $metadata['width'],
+ $metadata['height']
+ )
+ );
+ endif;
+ ?>
+ <span class="comments"><?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></span>
+ </p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_blog_post' ) ?>
</span><span class="cx">
</span><del>- <?php comments_template(); ?>
</del><ins>+ <?php comments_template(); ?>
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; else: ?>
</span><span class="cx">
</span><span class="cx"> <p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ) ?></p>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><del>- </div>
</del><span class="cx">
</span><ins>+ </div>
+
</ins><span class="cx"> <?php do_action( 'bp_after_attachment' ) ?>
</span><span class="cx">
</span><del>- </div>
</del><ins>+ </div><!-- .padder -->
+ </div><!-- #content -->
</ins><span class="cx">
</span><del>-<?php get_footer(); ?>
</del><ins>+ <?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>