Skip to:
Content

BuddyPress.org

Changeset 2566


Ignore:
Timestamp:
02/03/2010 03:25:54 PM (15 years ago)
Author:
apeatling
Message:

Fixes #1783

Location:
trunk/bp-themes/bp-default
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r2558 r2566  
    295295    overflow: hidden;
    296296}
     297    div#item-header div#item-header-content { margin-left: 170px; }
     298
    297299    div#item-header h2 {
    298300        font-size: 28px;
    … …  
    382384
    383385    div#item-header div#message.info {
    384         margin-left: 170px;
    385386        line-height: 80%;
    386387    }

  • trunk/bp-themes/bp-default/_inc/global.js

    r2564 r2566  
    227227
    228228            if ( null == j.cookie('bp-activity-oldestpage') )
    229                 j.cookie('bp-activity-oldestpage', 1 );
     229                j.cookie('bp-activity-oldestpage', 1, {path: '/'} );
    230230
    231231            var oldest_page = ( j.cookie('bp-activity-oldestpage') * 1 ) + 1;

  • trunk/bp-themes/bp-default/groups/single/group-header.php

    r2353 r2566  
    1919
    2020    <?php endif; ?>
    21 </div>
     21</div><!-- #item-actions -->
    2222
    23 <?php bp_group_avatar() ?>
     23<div id="item-header-avatar">
     24    <?php bp_group_avatar() ?>
     25</div><!-- #item-header-avatar -->
    2426
    25 <h2><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></h2>
    26 <span class="highlight"><?php bp_group_type() ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ) ?></span>
     27<div id="item-header-content">
     28    <h2><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></h2>
     29    <span class="highlight"><?php bp_group_type() ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ) ?></span>
    2730
    28 <?php do_action( 'bp_before_group_header_meta' ) ?>
     31    <?php do_action( 'bp_before_group_header_meta' ) ?>
    2932
    30 <div id="item-meta">
    31     <?php bp_group_description() ?>
     33    <div id="item-meta">
     34        <?php bp_group_description() ?>
    3235
    33     <?php bp_group_join_button() ?>
     36        <?php bp_group_join_button() ?>
    3437
    35     <?php do_action( 'bp_group_header_meta' ) ?>
    36 </div>
     38        <?php do_action( 'bp_group_header_meta' ) ?>
     39    </div>
     40</div><!-- #item-header-content -->
    3741
    3842<?php do_action( 'bp_after_group_header' ) ?>

  • trunk/bp-themes/bp-default/members/single/member-header.php

    r2522 r2566  
    11<?php do_action( 'bp_before_member_header' ) ?>
    22
    3 <?php bp_displayed_user_avatar( 'type=full' ) ?>
     3<div id="item-header-avatar">
     4    <?php bp_displayed_user_avatar( 'type=full' ) ?>
     5</div><!-- #item-header-avatar -->
    46
    5 <h2 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
    6 <span class="activity"><?php bp_last_activity( bp_displayed_user_id() ) ?></span>
     7<div id="item-header-content">
    78
    8 <?php do_action( 'bp_before_member_header_meta' ) ?>
     9    <h2 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
     10    <span class="activity"><?php bp_last_activity( bp_displayed_user_id() ) ?></span>
    911
    10 <div id="item-meta">
    11     <?php if ( function_exists( 'bp_activity_latest_update' ) ) : ?>
    12         <div id="latest-update">
    13             <?php bp_activity_latest_update( bp_displayed_user_id() ) ?>
    14         </div>
    15     <?php endif; ?>
     12    <?php do_action( 'bp_before_member_header_meta' ) ?>
    1613
    17     <div id="item-buttons">
    18         <?php if ( function_exists( 'bp_add_friend_button' ) ) : ?>
    19             <?php bp_add_friend_button() ?>
    20         <?php endif; ?>
    21 
    22         <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_public_message_link' ) ) : ?>
    23             <div class="generic-button" id="post-mention">
    24                 <a href="<?php bp_send_public_message_link() ?>" title="<?php _e( 'Mention this user in a new public message, this will send the user a notification to get their attention.', 'buddypress' ) ?>"><?php _e( 'Mention this User', 'buddypress' ) ?></a>
     14    <div id="item-meta">
     15        <?php if ( function_exists( 'bp_activity_latest_update' ) ) : ?>
     16            <div id="latest-update">
     17                <?php bp_activity_latest_update( bp_displayed_user_id() ) ?>
    2518            </div>
    2619        <?php endif; ?>
    2720
    28         <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_private_message_link' ) ) : ?>
    29             <div class="generic-button" id="send-private-message">
    30                 <a href="<?php bp_send_private_message_link() ?>" title="<?php _e( 'Send a private message to this user.', 'buddypress' ) ?>"><?php _e( 'Send Private Message', 'buddypress' ) ?></a>
    31             </div>
    32         <?php endif; ?>
    33     </div>
     21        <div id="item-buttons">
     22            <?php if ( function_exists( 'bp_add_friend_button' ) ) : ?>
     23                <?php bp_add_friend_button() ?>
     24            <?php endif; ?>
    3425
    35     <?php
    36      /***
    37       * If you'd like to show specific profile fields here use:
    38       * bp_profile_field_data( 'field=About Me' ); -- Pass the name of the field
    39       */
    40     ?>
     26            <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_public_message_link' ) ) : ?>
     27                <div class="generic-button" id="post-mention">
     28                    <a href="<?php bp_send_public_message_link() ?>" title="<?php _e( 'Mention this user in a new public message, this will send the user a notification to get their attention.', 'buddypress' ) ?>"><?php _e( 'Mention this User', 'buddypress' ) ?></a>
     29                </div>
     30            <?php endif; ?>
    4131
    42     <?php do_action( 'bp_profile_header_meta' ) ?>
     32            <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_private_message_link' ) ) : ?>
     33                <div class="generic-button" id="send-private-message">
     34                    <a href="<?php bp_send_private_message_link() ?>" title="<?php _e( 'Send a private message to this user.', 'buddypress' ) ?>"><?php _e( 'Send Private Message', 'buddypress' ) ?></a>
     35                </div>
     36            <?php endif; ?>
     37        </div><!-- #item-buttons -->
    4338
    44 </div>
     39        <?php
     40         /***
     41          * If you'd like to show specific profile fields here use:
     42          * bp_profile_field_data( 'field=About Me' ); -- Pass the name of the field
     43          */
     44        ?>
     45
     46        <?php do_action( 'bp_profile_header_meta' ) ?>
     47
     48    </div><!-- #item-meta -->
     49
     50</div><!-- #item-header-content -->
    4551
    4652<?php do_action( 'bp_after_member_header' ) ?>
Note: See TracChangeset for help on using the changeset viewer.