Changeset 2265

Timestamp:

01/06/2010 09:32:33 AM (15 years ago)

Author:

apeatling

Message:

Updating activity permalink page design, added right padding to activity comments. Fixes #1547

Location:

trunk/bp-themes/bp-default

Files:

• _inc/css/adminbar.css (modified) (1 diff)
• _inc/css/default.css (modified) (9 diffs)
• _inc/images/activity_arrow.gif (added)
• activity/entry.php (modified) (1 diff)
• groups/single/home.php (modified) (1 diff)

trunk/bp-themes/bp-default/_inc/css/adminbar.css

@@ -23 +23 @@
     }
         body.activity-permalink #wp-admin-bar .padder {
-            min-width: 500px;
+            min-width: 600px;
             max-width: 760px;
         }

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -17 +17 @@
 }
     body.activity-permalink {
-        min-width: 500px;
+        min-width: 600px;
         max-width: 760px;
     }
@@ -376 +376 @@
     }
         ul.single-line li { border: none; }
+        body.activity-permalink ul.item-list li { padding-top: 0; }
 
         ul.item-list li img.avatar {
@@ -981 +982 @@
         }
 
-        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;
+        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;
         }
 
@@ -1001 +1002 @@
         right: 0;
     }
+        body.activity-permalink .activity-list li.mini .activity-meta {
+            position: absolute;
+            right: 15px;
+        }
 
     .activity-list li.mini .activity-comments {
@@ -1034 +1039 @@
     height: 60px;
 }
+        body.activity-permalink .activity-list .activity-avatar img {
+            width: 100px;
+            height: 100px;
+        }
 
 .activity-list .activity-content {
     margin-left: 70px;
 }
-    body.activity-permalink .activity-content {
+    body.activity-permalink .activity-list li .activity-content {
         -moz-border-radius: 4px;
         -webkit-border-radius: 4px;
@@ -1046 +1055 @@
         border-bottom: 1px solid #ddd;
         border-right: 1px solid #ddd;
-        margin-left: 80px;
+        margin-left: 135px;
         font-size: 16px;
         line-height: 150%;
-        overflow: hidden;
-        width: auto;
-    }
+        min-height: 35px;
+        margin-right: 0;
+    }
+        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;
+        }
 
     .activity-list .activity-content > p:first-child,
@@ -1100 +1116 @@
         margin: 15px 0 15px 5px;
     }
+        body.activity-permalink .activity-content .activity-inner,
+        body.activity-permalink .activity-content blockquote {
+            margin-top: 5px;
+        }
 
 .activity-list li.load-more {
@@ -1176 +1196 @@
     body.activity-permalink div.activity-comments {
         width: auto;
-        margin-left: 80px;
+        margin-left: 135px;
         background: none;
     }
@@ -1191 +1211 @@
     div.activity-comments ul li {
         border-top: 2px solid #fff;
-        padding: 10px 0;
+        padding: 10px 15px 10px 0;
         margin-left: 15px;
     }
         body.activity-permalink div.activity-comments ul li {
-            padding: 15px 0;
+            padding: 15px 15px 15px 0;
         }
 

trunk/bp-themes/bp-default/activity/entry.php

@@ -1 @@
-<?php /* This template is used by permalink pages and AJAX functions to load in new updates */ ?>
+<?php /* This template is used by activity-loop.php and AJAX functions to show each activity */ ?>
+
 <li class="<?php bp_activity_css_class() ?>" id="activity-<?php bp_activity_id() ?>">
     <div class="activity-avatar">
-        <?php bp_activity_avatar( 'type=full&width=60&height=60' ) ?>
+        <?php bp_activity_avatar( 'type=full&width=100&height=100' ) ?>
     </div>
 

trunk/bp-themes/bp-default/groups/single/home.php

@@ -24 +24 @@
                 <?php do_action( 'template_notices' ) ?>
 
-                <?php if ( bp_is_group_admin_page() ) : ?>
+                <?php if ( bp_is_group_admin_page() && bp_group_is_visible() ) : ?>
                     <?php locate_template( array( 'groups/single/admin.php' ), true ) ?>
 
-                <?php elseif ( bp_is_group_members() ) : ?>
+                <?php elseif ( bp_is_group_members() && bp_group_is_visible() ) : ?>
                     <?php locate_template( array( 'groups/single/members.php' ), true ) ?>
 
-                <?php elseif ( bp_is_group_invites() ) : ?>
+                <?php elseif ( bp_is_group_invites() && bp_group_is_visible() ) : ?>
                     <?php locate_template( array( 'groups/single/send-invites.php' ), true ) ?>
+
+                <?php elseif ( bp_is_group_forum() && bp_group_is_visible() ) : ?>
+                    <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
 
                 <?php elseif ( bp_is_group_membership_request() ) : ?>
                     <?php locate_template( array( 'groups/single/request-membership.php' ), true ) ?>
 
-                <?php elseif ( bp_is_group_forum() ) : ?>
-                    <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
+                <?php elseif ( bp_group_is_visible() ) : ?>
+                    <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
 
                 <?php else : ?>
-                    <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
-
+                    <p>This group is not visible.</p>
                 <?php endif; ?>