Changeset 2145

Timestamp:

11/26/2009 09:34:54 PM (16 years ago)

Author:

apeatling

Message:

Fixing up group and profile page sidebars.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/screen.css (modified) (9 diffs)
• bp-themes/bp-default/_inc/images/leftmenu_group_header.gif (modified) (previous)
• bp-themes/bp-sn-parent/groups/single/menu.php (modified) (1 diff)
• bp-themes/bp-sn-parent/profile/profile-menu.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (3 diffs)

trunk/bp-core/bp-core-templatetags.php

@@ -419 +419 @@
             return apply_filters( 'bp_word_or_name', $youtext );
     } else {
-        $nametext = sprintf( $nametext, $bp->displayed_user->fullname );
+        $fullname = (array)explode( ' ', $bp->displayed_user->fullname );
+        $nametext = sprintf( $nametext, $fullname[0] );
         if ( $echo )
             echo apply_filters( 'bp_word_or_name', $nametext );

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

@@ -471 +471 @@
     div.bp-widget h4 {
         position: relative;
-        background: url(../images/group_header.gif) repeat-x top left;
+        background: url(../images/group_header.gif) repeat-x bottom left;
         color: #fff;
         padding: 6px 10px 15px 10px;
@@ -478 +478 @@
     }
         .left-menu div.bp-widget h4 {
-            background: url(../images/leftmenu_group_header.gif) top left no-repeat;
+            background: #d5d5d5 url(../images/leftmenu_group_header.gif) bottom left no-repeat;
             color: #555;
+            padding-bottom: 20px;
         }
 
@@ -489 +490 @@
             font-weight: normal;
         }
+            .left-menu div.bp-widget h4 a {
+                color: inherit;
+                font-weight: inherit;
+            }
 
 ul.horiz-gallery {
@@ -1297 +1302 @@
         }
 
+        .activity-list li.mini .activity-content {
+            margin-right: 70px;
+        }
+
         .activity-list li.mini .activity-content p {
             margin: 0;
@@ -1303 +1312 @@
 
         .activity-list li.mini .activity-meta {
-            float: right;
+            position: absolute;
+            right: 0;
         }
 
         .activity-list li.mini .activity-comments {
             clear: left;
+            font-size: 1.1em;
+            margin-top: 30px;
         }
 
@@ -1470 +1482 @@
         font-size: 0.9em;
         background: #FFF9DB;
-        border-bottom:1px solid #FFE8C4;
-        border-right:1px solid #FFE8C4;
+        border-bottom: 1px solid #FFE8C4;
+        border-right: 1px solid #FFE8C4;
         color: #888;
         padding: 4px 8px;
@@ -1496 +1508 @@
                 margin: 0;
                 margin-bottom: 20px;
+                margin-left: -10px !important;
             }
 
         div.activity-comments ul li {
             border-top: 1px solid #eee;
-            padding: 10px 0 !important;
-            margin-left: 0;
+            padding: 10px 0 0 0 !important;
+            margin-left: 10px;
         }
             div.activity-comments ul li p:last-child {
@@ -1509 +1522 @@
             div.activity-comments > ul > li:first-child {
                 border-top: none;
-                margin-left: 0 !important;
             }
 
@@ -1517 +1529 @@
             }
 
-            div.activity-comments ul li:first-child {
-                margin-left: 10px;
-            }
-
             div.activity-comments ul li:last-child {
-                margin-bottom: -8px;
+                margin-bottom: 0;
             }
 

trunk/bp-themes/bp-sn-parent/groups/single/menu.php

@@ -43 +43 @@
 
     <div class="bp-widget">
-        <h4><?php printf( __( 'Members (%d)', 'buddypress' ), bp_get_group_total_members() ); ?> <span><a href="<?php bp_group_all_members_permalink() ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
+        <h4><a href="<?php bp_group_all_members_permalink() ?>"><?php printf( __( 'Members (%d)', 'buddypress' ), bp_get_group_total_members() ); ?></a></h4>
 
         <?php if ( bp_group_has_members( 'max=5&exclude_admins_mods=0' ) ) : ?>

trunk/bp-themes/bp-sn-parent/profile/profile-menu.php

@@ -29 +29 @@
 
                     <div class="bp-widget">
-                        <h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php bp_group_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>">&rarr;</a></span></h4>
+                        <h4><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>"><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?></a> (<?php bp_group_total_for_member() ?>)</h4>
 
                         <ul class="horiz-gallery">
@@ -57 +57 @@
 
                     <div class="bp-widget">
-                        <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> (<?php bp_friend_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>">&rarr;</a></span></h4>
+                        <h4><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>"><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?></a> (<?php bp_friend_total_for_member() ?>)</h4>
 
                         <ul class="horiz-gallery">
                         <?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
                             <li>
-                                <a href="<?php bp_friend_url() ?>"><?php bp_friend_avatar_thumb('width=30&height=30') ?></a>
+                                <a href="<?php bp_friend_url() ?>" title="<?php bp_friend_name() ?>"><?php bp_friend_avatar_thumb('width=30&height=30') ?></a>
                             </li>
                         <?php endwhile; ?>

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -118 +118 @@
     function has_fields() {
         $has_data = false;
-        $just_name = true;
 
         for ( $i = 0; $i < count( $this->group->fields ); $i++ ) {
@@ -125 +124 @@
             if ( $field->data->value != null ) {
                 $has_data = true;
-
-                if ( 1 != $field->id )
-                    $just_name = false;
             }
         }
-
-        if ( 1 == $this->group->id && $just_name )
-            return false;
 
         if ( $has_data )
@@ -156 +149 @@
         $field = $this->next_field();
 
-        if ( $field->data->value != '' ) {
+        if ( !empty( $field->data->value ) ) {
             $this->field_has_data = true;
         }