<!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][6551] trunk/bp-templates/bp-legacy: Activity:</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><a href="http://buddypress.trac.wordpress.org/changeset/6551">6551</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-12-01 01:21:17 +0000 (Sat, 01 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Activity:
* Tweak "in reply to" output.
* Tweak some related CSS in bp-legacy.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressactivityentryphp">trunk/bp-templates/bp-legacy/buddypress/activity/entry.php</a></li>
<li><a href="#trunkbptemplatesbplegacycssbuddypresscss">trunk/bp-templates/bp-legacy/css/buddypress.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbptemplatesbplegacybuddypressactivityentryphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/activity/entry.php (6550 => 6551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/activity/entry.php 2012-12-01 00:36:30 UTC (rev 6550)
+++ trunk/bp-templates/bp-legacy/buddypress/activity/entry.php 2012-12-01 01:21:17 UTC (rev 6551)
</span><span class="lines">@@ -31,14 +31,6 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( 'activity_comment' == bp_get_activity_type() ) : ?>
-
- <div class="activity-inreplyto">
- <strong><?php _e( 'In reply to: ', 'buddypress' ); ?></strong><?php bp_activity_parent_content(); ?> <a href="<?php bp_activity_thread_permalink(); ?>" class="view" title="<?php _e( 'View Thread / Permalink', 'buddypress' ); ?>"><?php _e( 'View', 'buddypress' ); ?></a>
- </div>
-
- <?php endif; ?>
-
</del><span class="cx"> <?php if ( bp_activity_has_content() ) : ?>
</span><span class="cx">
</span><span class="cx"> <div class="activity-inner">
</span><span class="lines">@@ -49,6 +41,14 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><ins>+ <?php if ( bp_get_activity_type() == 'activity_comment' ) : ?>
+
+ <div class="activity-inreplyto">
+ <a href="<?php bp_activity_thread_permalink(); ?>" class="view" title="<?php _e( 'View Conversation', 'buddypress' ); ?>"><?php _e( 'View Conversation', 'buddypress' ); ?></a>
+ </div>
+
+ <?php endif; ?>
+
</ins><span class="cx"> <?php do_action( 'bp_activity_entry_content' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span></span></pre></div>
<a id="trunkbptemplatesbplegacycssbuddypresscss"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/css/buddypress.css (6550 => 6551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/css/buddypress.css 2012-12-01 00:36:30 UTC (rev 6550)
+++ trunk/bp-templates/bp-legacy/css/buddypress.css 2012-12-01 01:21:17 UTC (rev 6551)
</span><span class="lines">@@ -199,9 +199,6 @@
</span><span class="cx"> #buddypress .activity-list li .activity-inreplyto {
</span><span class="cx"> color: #888;
</span><span class="cx"> font-size: 80%;
</span><del>- margin-left: 5px;
- margin-top: 5px;
- padding-left: 25px;
</del><span class="cx"> }
</span><span class="cx"> #buddypress .activity-list li .activity-inreplyto > p {
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -1149,6 +1146,7 @@
</span><span class="cx">
</span><span class="cx"> #buddypress div.item-list-tabs ul {
</span><span class="cx"> margin: 0;
</span><ins>+ padding: 0;
</ins><span class="cx"> }
</span><span class="cx"> #buddypress div.item-list-tabs ul li {
</span><span class="cx"> float: left;
</span><span class="lines">@@ -1160,7 +1158,7 @@
</span><span class="cx"> }
</span><span class="cx"> #buddypress div.item-list-tabs ul li.last {
</span><span class="cx"> float: right;
</span><del>- margin: 7px 10px 0 0;
</del><ins>+ margin: 7px 0 0;
</ins><span class="cx"> }
</span><span class="cx"> #buddypress div.item-list-tabs#subnav ul li.last {
</span><span class="cx"> margin-top: 4px;
</span></span></pre>
</div>
</div>
</body>
</html>