Changeset 1834
- Timestamp:
- 09/09/2009 10:20:13 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
bp-activity/bp-activity-templatetags.php (modified) (1 diff)
-
bp-activity/bp-activity-widgets.php (modified) (1 diff)
-
bp-core/deprecated/css/structure.css (modified) (5 diffs)
-
bp-forums.php (modified) (2 diffs)
-
bp-friends/bp-friends-templatetags.php (modified) (1 diff)
-
bp-groups/bp-groups-templatetags.php (modified) (1 diff)
-
bp-groups/deprecated/bp-groups-deprecated.php (modified) (4 diffs)
-
bp-wire/bp-wire-templatetags.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-templatetags.php
r1822 r1834 345 345 global $activities_template, $bp; 346 346 347 return apply_filters( 'bp_get_activity_delete_link', '<a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $activities_template->activity->id, 'bp_activity_delete_link' ) . '" class="item-button delete confirm">' . __( 'Delete', 'buddypress' ) . '</a>' );347 return apply_filters( 'bp_get_activity_delete_link', '<a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $activities_template->activity->id, 'bp_activity_delete_link' ) . '" class="item-button delete-activity confirm">' . __( 'Delete', 'buddypress' ) . '</a>' ); 348 348 } 349 349 -
trunk/bp-activity/bp-activity-widgets.php
r1819 r1834 25 25 26 26 <?php if ( bp_has_activities( 'type=sitewide&max=' . $instance['max_items'] . '&per_page=' . $instance['per_page'] ) ) : ?> 27 <div class="pagination"> 28 <div class="pag-count" id="activity-count"> 29 <?php bp_activity_pagination_count() ?> 27 28 <?php if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) ) : ?> 29 <div class="pagination"> 30 <div class="pag-count" id="activity-count"> 31 <?php bp_activity_pagination_count() ?> 32 </div> 33 34 <div class="pagination-links" id="activity-pag"> 35 <?php bp_activity_pagination_links() ?> 36 </div> 30 37 </div> 31 38 32 <div class="pagination-links" id="activity-pag"> 33 <?php bp_activity_pagination_links() ?> 34 </div> 35 </div> 36 37 <ul id="activity-filter-links"> 38 <?php bp_activity_filter_links() ?> 39 </ul> 39 <ul id="activity-filter-links"> 40 <?php bp_activity_filter_links() ?> 41 </ul> 42 <?php endif; ?> 40 43 41 44 <ul id="site-wide-stream" class="activity-list"> 42 45 <?php while ( bp_activities() ) : bp_the_activity(); ?> 43 46 <li class="<?php bp_activity_css_class() ?>"> 44 <div class="activity-avatar"> 45 <?php bp_activity_avatar() ?> 46 </div> 47 <?php if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) ) : ?> 48 <div class="activity-avatar"> 49 <?php bp_activity_avatar() ?> 50 </div> 51 <?php endif; ?> 47 52 48 53 <?php bp_activity_content() ?> -
trunk/bp-core/deprecated/css/structure.css
r1655 r1834 62 62 */ 63 63 64 64 65 .main-column { 65 66 margin-left: 200px; … … 72 73 } 73 74 74 div. bp-widget{75 div.info-group { 75 76 margin-bottom: 2em; 76 77 } 77 div. bp-widgeth4 {78 div.info-group h4 { 78 79 height: 30px; 79 80 padding: 3px 10px; … … 81 82 position: relative; 82 83 } 83 .left-menu div. bp-widget{84 .left-menu div.info-group { 84 85 margin-top: 1.5em; 85 86 } 86 87 87 div. bp-widget h4 span{88 div.info-group h4 a { 88 89 position: absolute; 89 90 top: 0.31em; … … 92 93 } 93 94 94 .left-menu div. bp-widgetimg.avatar {95 .left-menu div.info-group img.avatar { 95 96 float: left; 96 97 margin-right: 1em; … … 130 131 } 131 132 132 div. bp-widget.pagination-links {133 div.info-group .pagination-links { 133 134 margin: 0 0 5px 0; 134 135 float: none; -
trunk/bp-forums.php
r1749 r1834 132 132 'topic_last_poster' => $bp->loggedin_user->id, // accepts ids 133 133 'topic_last_poster_name' => $bp->loggedin_user->fullname, // accept names 134 'topic_start_time' => bb_current_time( 'mysql' ),135 'topic_time' => bb_current_time( 'mysql' ),134 'topic_start_time' => date( 'Y-m-d H:i:s' ), 135 'topic_time' => date( 'Y-m-d H:i:s' ), 136 136 'topic_open' => 1, 137 137 'forum_id' => 0 // accepts ids or slugs … … 247 247 'topic_id' => false, 248 248 'post_text' => '', 249 'post_time' => bb_current_time( 'mysql' ),249 'post_time' => date( 'Y-m-d H:i:s' ), 250 250 'poster_id' => $bp->loggedin_user->id, // accepts ids or names 251 251 'poster_ip' => $_SERVER['REMOTE_ADDR'], -
trunk/bp-friends/bp-friends-templatetags.php
r1655 r1834 407 407 } 408 408 ?> 409 <div class=" bp-widget">410 <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> (<?php echo BP_Friends_Friendship::total_friend_count( $bp->displayed_user->id ) ?>) <a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>"><?php _e('See All', 'buddypress') ?> »</a></h4>409 <div class="info-group"> 410 <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> (<?php echo BP_Friends_Friendship::total_friend_count( $bp->displayed_user->id ) ?>) <span><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>"><?php _e('See All', 'buddypress') ?> »</a></span></h4> 411 411 412 412 <?php if ( $friend_ids ) { ?> -
trunk/bp-groups/bp-groups-templatetags.php
r1832 r1834 708 708 return apply_filters( 'bp_get_group_all_members_permalink', bp_get_group_permalink( $group ) . '/members' ); 709 709 } 710 711 function bp_group_active_forum_topics( $total_topics = 3, $group = false ) {712 global $groups_template, $forum_template;713 714 if ( !$group )715 $group =& $groups_template->group;716 717 $forum_id = groups_get_groupmeta( $group->id, 'forum_id' );718 719 if ( $forum_id && $forum_id != '' ) {720 if ( function_exists( 'bp_forums_setup' ) ) {721 $latest_topics = bp_forums_get_forum_topics( $forum_id );722 723 if ( $latest_topics ) { ?>724 <ul class="item-list" id="recent-forum-topics"><?php725 726 $counter = 0;727 728 foreach( $latest_topics as $topic ) {729 $alt = ( $counter % 2 == 1 ) ? ' class="alt"' : '';730 $forum_template->topic = (object)$topic; ?>731 732 <li<?php echo $alt ?>>733 <div class="avatar">734 <?php bp_the_topic_poster_avatar() ?>735 </div>736 737 <a href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a>738 <span class="small">- <?php bp_the_topic_total_post_count() ?> </span>739 <p><span class="activity"><?php echo sprintf( __( 'updated %s ago', 'buddypress' ), bp_the_topic_time_since_last_post( false ) ) ?></span></p>740 741 <div class="latest-post">742 <?php _e( 'Latest by', 'buddypress' ) ?> <?php bp_the_topic_last_poster_name() ?>:743 <?php bp_the_topic_latest_post_excerpt() ?>744 </div>745 </li>746 <?php $counter++ ?>747 748 <?php } ?>749 </ul>750 <?php751 } else {752 ?>753 <div id="message" class="info">754 <p><?php _e( 'There are no active forum topics for this group', 'buddypress' ) ?></p>755 </div>756 <?php757 }758 }759 }760 }761 710 762 711 function bp_group_search_form() { -
trunk/bp-groups/deprecated/bp-groups-deprecated.php
r1826 r1834 231 231 232 232 ?> 233 <div class=" bp-widget">234 <h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php echo BP_Groups_Member::total_group_count() ?>) < a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>"><?php _e('See All', 'buddypress') ?> »</a></h4>233 <div class="info-group"> 234 <h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php echo BP_Groups_Member::total_group_count() ?>) <span><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>"><?php _e('See All', 'buddypress') ?> »</a></span></h4> 235 235 <?php if ( $group_ids ) { ?> 236 236 <ul class="horiz-gallery"> … … 242 242 } 243 243 ?> <li> 244 <a href="<?php echo bp_get_group_permalink( $group ) ?>">< img src="<?php echo attribute_escape( $group->avatar_thumb ); ?>" class="avatar" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" /></a>244 <a href="<?php echo bp_get_group_permalink( $group ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $group->id, 'object' => 'group', 'type' => 'thumb' ) ) ?></a> 245 245 <h5><a href="<?php echo bp_get_group_permalink( $group ) ?>"><?php echo attribute_escape( $group->name ) ?></a></h5> 246 246 </li> … … 256 256 <?php 257 257 } 258 259 /* DEPRECATED - use bp_has_topics() template loop */ 260 function bp_group_active_forum_topics( $total_topics = 3, $group = false ) { 261 global $groups_template, $forum_template; 262 263 if ( !$group ) 264 $group =& $groups_template->group; 265 266 $forum_id = groups_get_groupmeta( $group->id, 'forum_id' ); 267 268 if ( $forum_id && $forum_id != '' ) { 269 if ( function_exists( 'bp_forums_setup' ) ) { 270 $latest_topics = bp_forums_get_forum_topics( array( 'forum_id' => $forum_id ) ); 271 272 if ( $latest_topics ) { ?> 273 <ul class="item-list" id="recent-forum-topics"><?php 274 275 $counter = 0; 276 277 foreach( $latest_topics as $topic ) { 278 $alt = ( $counter % 2 == 1 ) ? ' class="alt"' : ''; 279 $forum_template->topic = (object)$topic; ?> 280 281 <li<?php echo $alt ?>> 282 <div class="avatar"> 283 <?php bp_the_topic_poster_avatar() ?> 284 </div> 285 286 <a href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>"><?php bp_the_topic_title() ?></a> 287 <span class="small">- <?php bp_the_topic_total_post_count() ?> </span> 288 <p><span class="activity"><?php echo sprintf( __( 'updated %s ago', 'buddypress' ), bp_the_topic_time_since_last_post( false ) ) ?></span></p> 289 290 <div class="latest-post"> 291 <?php _e( 'Latest by', 'buddypress' ) ?> <?php bp_the_topic_last_poster_name() ?>: 292 <?php bp_the_topic_latest_post_excerpt() ?> 293 </div> 294 </li> 295 <?php $counter++ ?> 296 297 <?php } ?> 298 </ul> 299 <?php 300 } else { 301 ?> 302 <div id="message" class="info"> 303 <p><?php _e( 'There are no active forum topics for this group', 'buddypress' ) ?></p> 304 </div> 305 <?php 306 } 307 } 308 } 309 } 310 258 311 259 312 /* DEPRECATED - use group invite template loop (see groups/create.php in skeleton BuddyPress theme) */ … … 479 532 <?php if ( bp_are_previous_group_creation_steps_complete( 'group-avatar' ) ) { ?> 480 533 <div class="left-menu"> 481 <?php bp_ group_current_avatar() ?>534 <?php bp_new_group_avatar() ?> 482 535 </div> 483 536 -
trunk/bp-wire/bp-wire-templatetags.php
r1830 r1834 163 163 } 164 164 165 function bp_wire_item_id( $deprecated = true ) {165 function bp_wire_item_id( $deprecated = false ) { 166 166 global $bp_item_id; 167 167 … … 363 363 if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() ) { 364 364 if ( $bp->wire->slug == $bp->current_component || $bp->profile->slug == $bp->current_component ) { 365 return apply_filters( 'bp_get_wire_delete_link', '<a class="item-button delete confirm" href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">' . __('Delete', 'buddypress') . '</a>' );365 return apply_filters( 'bp_get_wire_delete_link', '<a class="item-button delete-post confirm" href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">' . __('Delete', 'buddypress') . '</a>' ); 366 366 } else { 367 return apply_filters( 'bp_get_wire_delete_link', '<a class="item-button delete confirm" href="' . wp_nonce_url( site_url( $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">' . __('Delete', 'buddypress') . '</a>' );367 return apply_filters( 'bp_get_wire_delete_link', '<a class="item-button delete-post confirm" href="' . wp_nonce_url( site_url( $bp->{$bp->current_component}->slug . '/' . $uri . '/wire/delete/' . $wire_posts_template->wire_post->id ), 'bp_wire_delete_link' ) . '">' . __('Delete', 'buddypress') . '</a>' ); 368 368 } 369 369 }
Note: See TracChangeset
for help on using the changeset viewer.