<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2265] trunk/bp-themes/bp-default:
Updating activity permalink page design,
added right padding to activity comments.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2265</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-06 09:32:33 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updating activity permalink page design, added right padding to activity comments. Fixes #1547</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssadminbarcss">trunk/bp-themes/bp-default/_inc/css/adminbar.css</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityentryphp">trunk/bp-themes/bp-default/activity/entry.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglehomephp">trunk/bp-themes/bp-default/groups/single/home.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_incimagesactivity_arrowgif">trunk/bp-themes/bp-default/_inc/images/activity_arrow.gif</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssadminbarcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/adminbar.css (2264 => 2265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/adminbar.css        2010-01-06 08:44:03 UTC (rev 2264)
+++ trunk/bp-themes/bp-default/_inc/css/adminbar.css        2010-01-06 09:32:33 UTC (rev 2265)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">                 height: 25px;
</span><span class="cx">         }
</span><span class="cx">                 body.activity-permalink #wp-admin-bar .padder {
</span><del>-                        min-width: 500px;
</del><ins>+                        min-width: 600px;
</ins><span class="cx">                         max-width: 760px;
</span><span class="cx">                 }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2264 => 2265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css        2010-01-06 08:44:03 UTC (rev 2264)
+++ trunk/bp-themes/bp-default/_inc/css/default.css        2010-01-06 09:32:33 UTC (rev 2265)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">         padding-top: 0 !important; /* Remove the top padding space for the admin bar in this theme */
</span><span class="cx"> }
</span><span class="cx">         body.activity-permalink {
</span><del>-                min-width: 500px;
</del><ins>+                min-width: 600px;
</ins><span class="cx">                 max-width: 760px;
</span><span class="cx">         }
</span><span class="cx">
</span><span class="lines">@@ -375,6 +375,7 @@
</span><span class="cx">                 border-bottom: 1px solid #eaeaea;
</span><span class="cx">         }
</span><span class="cx">                 ul.single-line li { border: none; }
</span><ins>+                body.activity-permalink ul.item-list li { padding-top: 0; }
</ins><span class="cx">
</span><span class="cx">                 ul.item-list li img.avatar {
</span><span class="cx">                         float: left;
</span><span class="lines">@@ -980,11 +981,11 @@
</span><span class="cx">                         margin-left: 20px;
</span><span class="cx">                 }
</span><span class="cx">
</span><del>-                body.activity-permalink .activity-list li.mini .activity-avatar img.avatar,
-                body.activity-permalink .activity-list li.mini .activity-avatar img.FB_profile_pic {
-                        width: 50px;
-                        height: 50px;
-                        margin-left: 30px;
</del><ins>+                body.activity-permalink .activity-list li .activity-avatar img.avatar,
+                body.activity-permalink .activity-list li .activity-avatar img.FB_profile_pic {
+                        width: 100px;
+                        height: 100px;
+                        margin-left: 0;
</ins><span class="cx">                 }
</span><span class="cx">
</span><span class="cx">         .activity-list li.mini .activity-content {
</span><span class="lines">@@ -1000,6 +1001,10 @@
</span><span class="cx">                 position: absolute;
</span><span class="cx">                 right: 0;
</span><span class="cx">         }
</span><ins>+                body.activity-permalink .activity-list li.mini .activity-meta {
+                        position: absolute;
+                        right: 15px;
+                }
</ins><span class="cx">
</span><span class="cx">         .activity-list li.mini .activity-comments {
</span><span class="cx">                 clear: left;
</span><span class="lines">@@ -1033,11 +1038,15 @@
</span><span class="cx">         width: 60px;
</span><span class="cx">         height: 60px;
</span><span class="cx"> }
</span><ins>+                body.activity-permalink .activity-list .activity-avatar img {
+                        width: 100px;
+                        height: 100px;
+                }
</ins><span class="cx">
</span><span class="cx"> .activity-list .activity-content {
</span><span class="cx">         margin-left: 70px;
</span><span class="cx"> }
</span><del>-        body.activity-permalink .activity-content {
</del><ins>+        body.activity-permalink .activity-list li .activity-content {
</ins><span class="cx">                 -moz-border-radius: 4px;
</span><span class="cx">                 -webkit-border-radius: 4px;
</span><span class="cx">                 border-radius: 4px;
</span><span class="lines">@@ -1045,12 +1054,19 @@
</span><span class="cx">                 padding: 15px;
</span><span class="cx">                 border-bottom: 1px solid #ddd;
</span><span class="cx">                 border-right: 1px solid #ddd;
</span><del>-                margin-left: 80px;
</del><ins>+                margin-left: 135px;
</ins><span class="cx">                 font-size: 16px;
</span><span class="cx">                 line-height: 150%;
</span><del>-                overflow: hidden;
-                width: auto;
</del><ins>+                min-height: 35px;
+                margin-right: 0;
</ins><span class="cx">         }
</span><ins>+                body.activity-permalink .activity-list li .activity-content p {
+                        background: url( ../images/activity_arrow.gif ) top left no-repeat;
+                        margin-left: -35px;
+                        padding: 5px 0 0 38px;
+                        height: 35px;
+                        margin-bottom: 0;
+                }
</ins><span class="cx">
</span><span class="cx">         .activity-list .activity-content > p:first-child,
</span><span class="cx">         .activity-list .activity-content .comment-header {
</span><span class="lines">@@ -1099,6 +1115,10 @@
</span><span class="cx">         .activity-list .activity-content blockquote {
</span><span class="cx">                 margin: 15px 0 15px 5px;
</span><span class="cx">         }
</span><ins>+                body.activity-permalink .activity-content .activity-inner,
+                body.activity-permalink .activity-content blockquote {
+                        margin-top: 5px;
+                }
</ins><span class="cx">
</span><span class="cx"> .activity-list li.load-more {
</span><span class="cx">         margin: 15px 0 !important;
</span><span class="lines">@@ -1175,7 +1195,7 @@
</span><span class="cx">
</span><span class="cx">         body.activity-permalink div.activity-comments {
</span><span class="cx">                 width: auto;
</span><del>-                margin-left: 80px;
</del><ins>+                margin-left: 135px;
</ins><span class="cx">                 background: none;
</span><span class="cx">         }
</span><span class="cx">
</span><span class="lines">@@ -1190,11 +1210,11 @@
</span><span class="cx">
</span><span class="cx">         div.activity-comments ul li {
</span><span class="cx">                 border-top: 2px solid #fff;
</span><del>-                padding: 10px 0;
</del><ins>+                padding: 10px 15px 10px 0;
</ins><span class="cx">                 margin-left: 15px;
</span><span class="cx">         }
</span><span class="cx">                 body.activity-permalink div.activity-comments ul li {
</span><del>-                        padding: 15px 0;
</del><ins>+                        padding: 15px 15px 15px 0;
</ins><span class="cx">                 }
</span><span class="cx">
</span><span class="cx">                 div.activity-comments ul li p:last-child {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incimagesactivity_arrowgif"></a>
<div class="binary"><h4>Added: trunk/bp-themes/bp-default/_inc/images/activity_arrow.gif</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/bp-themes/bp-default/_inc/images/activity_arrow.gif
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="trunkbpthemesbpdefaultactivityentryphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/entry.php (2264 => 2265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/entry.php        2010-01-06 08:44:03 UTC (rev 2264)
+++ trunk/bp-themes/bp-default/activity/entry.php        2010-01-06 09:32:33 UTC (rev 2265)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><del>-<?php /* This template is used by permalink pages and AJAX functions to load in new updates */ ?>
</del><ins>+<?php /* This template is used by activity-loop.php and AJAX functions to show each activity */ ?>
+
</ins><span class="cx"> <li class="<?php bp_activity_css_class() ?>" id="activity-<?php bp_activity_id() ?>">
</span><span class="cx">         <div class="activity-avatar">
</span><del>-                <?php bp_activity_avatar( 'type=full&width=60&height=60' ) ?>
</del><ins>+                <?php bp_activity_avatar( 'type=full&width=100&height=100' ) ?>
</ins><span class="cx">         </div>
</span><span class="cx">
</span><span class="cx">         <div class="activity-content">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/home.php (2264 => 2265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/home.php        2010-01-06 08:44:03 UTC (rev 2264)
+++ trunk/bp-themes/bp-default/groups/single/home.php        2010-01-06 09:32:33 UTC (rev 2265)
</span><span class="lines">@@ -23,24 +23,26 @@
</span><span class="cx">                         <div id="item-body">
</span><span class="cx">                                 <?php do_action( 'template_notices' ) ?>
</span><span class="cx">
</span><del>-                                <?php if ( bp_is_group_admin_page() ) : ?>
</del><ins>+                                <?php if ( bp_is_group_admin_page() && bp_group_is_visible() ) : ?>
</ins><span class="cx">                                         <?php locate_template( array( 'groups/single/admin.php' ), true ) ?>
</span><span class="cx">
</span><del>-                                <?php elseif ( bp_is_group_members() ) : ?>
</del><ins>+                                <?php elseif ( bp_is_group_members() && bp_group_is_visible() ) : ?>
</ins><span class="cx">                                         <?php locate_template( array( 'groups/single/members.php' ), true ) ?>
</span><span class="cx">
</span><del>-                                <?php elseif ( bp_is_group_invites() ) : ?>
</del><ins>+                                <?php elseif ( bp_is_group_invites() && bp_group_is_visible() ) : ?>
</ins><span class="cx">                                         <?php locate_template( array( 'groups/single/send-invites.php' ), true ) ?>
</span><span class="cx">
</span><ins>+                                <?php elseif ( bp_is_group_forum() && bp_group_is_visible() ) : ?>
+                                        <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
+
</ins><span class="cx">                                 <?php elseif ( bp_is_group_membership_request() ) : ?>
</span><span class="cx">                                         <?php locate_template( array( 'groups/single/request-membership.php' ), true ) ?>
</span><span class="cx">
</span><del>-                                <?php elseif ( bp_is_group_forum() ) : ?>
-                                        <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
</del><ins>+                                <?php elseif ( bp_group_is_visible() ) : ?>
+                                        <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
</ins><span class="cx">
</span><span class="cx">                                 <?php else : ?>
</span><del>-                                        <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
-
</del><ins>+                                        <p>This group is not visible.</p>
</ins><span class="cx">                                 <?php endif; ?>
</span><span class="cx">
</span><span class="cx">                                 <?php do_action( 'bp_directory_members_content' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>