Changeset 5737
- Timestamp:
- 02/12/2012 08:09:34 PM (13 years ago)
- Location:
- trunk/bp-themes/bp-default
- Files:
-
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-themes/bp-default/404.php
r4534 r5737 1 <?php get_header() ?>1 <?php get_header(); ?> 2 2 3 3 <div id="content"> … … 13 13 </div> 14 14 15 <?php do_action( 'bp_after_404' ) ?>15 <?php do_action( 'bp_after_404' ); ?> 16 16 </div><!-- .padder --> 17 17 </div><!-- #content --> 18 18 19 <?php get_footer() ?>19 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/_inc/ajax.php
r5729 r5737 180 180 if ( bp_has_activities ( 'include=' . $activity_id ) ) : ?> 181 181 <?php while ( bp_activities() ) : bp_the_activity(); ?> 182 <?php locate_template( array( 'activity/entry.php' ), true ) ?>182 <?php locate_template( array( 'activity/entry.php' ), true ); ?> 183 183 <?php endwhile; ?> 184 184 <?php endif; … … 577 577 <div class="message-box new-message"> 578 578 <div class="message-metadata"> 579 <?php do_action( 'bp_before_message_meta' ) ?>579 <?php do_action( 'bp_before_message_meta' ); ?> 580 580 <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?> 581 581 582 <strong><a href="<?php echo bp_loggedin_user_domain() ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) )?></span></strong>583 584 <?php do_action( 'bp_after_message_meta' ) ?>582 <strong><a href="<?php echo bp_loggedin_user_domain(); ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ); ?></span></strong> 583 584 <?php do_action( 'bp_after_message_meta' ); ?> 585 585 </div> 586 586 587 <?php do_action( 'bp_before_message_content' ) ?>587 <?php do_action( 'bp_before_message_content' ); ?> 588 588 589 589 <div class="message-content"> 590 <?php echo stripslashes( apply_filters( 'bp_get_the_thread_message_content', $_REQUEST['content'] ) ) ?>590 <?php echo stripslashes( apply_filters( 'bp_get_the_thread_message_content', $_REQUEST['content'] ) ); ?> 591 591 </div> 592 592 593 <?php do_action( 'bp_after_message_content' ) ?>593 <?php do_action( 'bp_after_message_content' ); ?> 594 594 595 595 <div class="clear"></div> -
trunk/bp-themes/bp-default/activity/comment.php
r5256 r5737 35 35 <?php if ( is_user_logged_in() && bp_activity_can_comment_reply( bp_activity_current_comment() ) ) : ?> 36 36 37 <a href="#acomment-<?php bp_activity_comment_id(); ?>" class="acomment-reply bp-primary-action" id="acomment-reply-<?php bp_activity_id() ?>-from-<?php bp_activity_comment_id()?>"><?php _e( 'Reply', 'buddypress' ); ?></a>37 <a href="#acomment-<?php bp_activity_comment_id(); ?>" class="acomment-reply bp-primary-action" id="acomment-reply-<?php bp_activity_id(); ?>-from-<?php bp_activity_comment_id(); ?>"><?php _e( 'Reply', 'buddypress' ); ?></a> 38 38 39 39 <?php endif; ?> -
trunk/bp-themes/bp-default/activity/entry.php
r5019 r5737 66 66 <?php if ( !bp_get_activity_is_favorite() ) : ?> 67 67 68 <a href="<?php bp_activity_favorite_link(); ?>" class="button fav bp-secondary-action" title="<?php esc_attr_e( 'Mark as Favorite', 'buddypress' ); ?>"><?php _e( 'Favorite', 'buddypress' ) ?></a>68 <a href="<?php bp_activity_favorite_link(); ?>" class="button fav bp-secondary-action" title="<?php esc_attr_e( 'Mark as Favorite', 'buddypress' ); ?>"><?php _e( 'Favorite', 'buddypress' ); ?></a> 69 69 70 70 <?php else : ?> 71 71 72 <a href="<?php bp_activity_unfavorite_link(); ?>" class="button unfav bp-secondary-action" title="<?php esc_attr_e( 'Remove Favorite', 'buddypress' ); ?>"><?php _e( 'Remove Favorite', 'buddypress' ) ?></a>72 <a href="<?php bp_activity_unfavorite_link(); ?>" class="button unfav bp-secondary-action" title="<?php esc_attr_e( 'Remove Favorite', 'buddypress' ); ?>"><?php _e( 'Remove Favorite', 'buddypress' ); ?></a> 73 73 74 74 <?php endif; ?> -
trunk/bp-themes/bp-default/activity/index.php
r5638 r5737 43 43 <?php if ( is_user_logged_in() ) : ?> 44 44 45 <?php do_action( 'bp_before_activity_type_tab_friends' ) ?>45 <?php do_action( 'bp_before_activity_type_tab_friends' ); ?> 46 46 47 47 <?php if ( bp_is_active( 'friends' ) ) : ?> … … 55 55 <?php endif; ?> 56 56 57 <?php do_action( 'bp_before_activity_type_tab_groups' ) ?>57 <?php do_action( 'bp_before_activity_type_tab_groups' ); ?> 58 58 59 59 <?php if ( bp_is_active( 'groups' ) ) : ?> … … 87 87 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 88 88 <ul> 89 <li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ); ?></a></li>89 <li class="feed"><a href="<?php bp_sitewide_activity_feed_link(); ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ); ?></a></li> 90 90 91 91 <?php do_action( 'bp_activity_syndication_options' ); ?> -
trunk/bp-themes/bp-default/activity/post-form.php
r4714 r5737 40 40 <div id="whats-new-post-in-box"> 41 41 42 <?php _e( 'Post in', 'buddypress' ) ?>:42 <?php _e( 'Post in', 'buddypress' ); ?>: 43 43 44 44 <select id="whats-new-post-in" name="whats-new-post-in"> -
trunk/bp-themes/bp-default/archive.php
r4528 r5737 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_before_archive' ) ?>6 <?php do_action( 'bp_before_archive' ); ?> 7 7 8 8 <div class="page" id="blog-archives" role="main"> … … 16 16 <?php while (have_posts()) : the_post(); ?> 17 17 18 <?php do_action( 'bp_before_blog_post' ) ?>18 <?php do_action( 'bp_before_blog_post' ); ?> 19 19 20 20 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> … … 22 22 <div class="author-box"> 23 23 <?php echo get_avatar( get_the_author_meta( 'user_email' ), '50' ); ?> 24 <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>24 <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ); ?></p> 25 25 </div> 26 26 27 27 <div class="post-content"> 28 <h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' )?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>28 <h2 class="posttitle"><a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ); ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2> 29 29 30 30 <p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p> … … 40 40 </div> 41 41 42 <?php do_action( 'bp_after_blog_post' ) ?>42 <?php do_action( 'bp_after_blog_post' ); ?> 43 43 44 44 <?php endwhile; ?> … … 48 48 <?php else : ?> 49 49 50 <h2 class="center"><?php _e( 'Not Found', 'buddypress' ) ?></h2>51 <?php get_search_form() ?>50 <h2 class="center"><?php _e( 'Not Found', 'buddypress' ); ?></h2> 51 <?php get_search_form(); ?> 52 52 53 53 <?php endif; ?> … … 55 55 </div> 56 56 57 <?php do_action( 'bp_after_archive' ) ?>57 <?php do_action( 'bp_after_archive' ); ?> 58 58 59 59 </div><!-- .padder --> 60 60 </div><!-- #content --> 61 61 62 <?php get_sidebar() ?>62 <?php get_sidebar(); ?> 63 63 64 64 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/attachment.php
r4529 r5737 10 10 <?php if (have_posts()) : while (have_posts()) : the_post(); ?> 11 11 12 <?php do_action( 'bp_before_blog_post' ) ?>12 <?php do_action( 'bp_before_blog_post' ); ?> 13 13 14 14 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> … … 20 20 21 21 <div class="post-content"> 22 <h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' )?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>22 <h2 class="posttitle"><a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ); ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2> 23 23 24 24 <p class="date"> … … 54 54 </div> 55 55 56 <?php do_action( 'bp_after_blog_post' ) ?>56 <?php do_action( 'bp_after_blog_post' ); ?> 57 57 58 58 <?php comments_template(); ?> … … 60 60 <?php endwhile; else: ?> 61 61 62 <p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ) ?></p>62 <p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ); ?></p> 63 63 64 64 <?php endif; ?> … … 66 66 </div> 67 67 68 <?php do_action( 'bp_after_attachment' ) ?>68 <?php do_action( 'bp_after_attachment' ); ?> 69 69 70 70 </div><!-- .padder --> -
trunk/bp-themes/bp-default/blogs/create.php
r5549 r5737 21 21 <?php do_action( 'template_notices' ); ?> 22 22 23 <h3><?php _e( 'Create a Site', 'buddypress' ); ?> <a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) ?>"><?php _e( 'Site Directory', 'buddypress' ); ?></a></h3>23 <h3><?php _e( 'Create a Site', 'buddypress' ); ?> <a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ); ?>"><?php _e( 'Site Directory', 'buddypress' ); ?></a></h3> 24 24 25 25 <?php do_action( 'bp_before_create_blog_content' ); ?> -
trunk/bp-themes/bp-default/blogs/index.php
r5371 r5737 33 33 <div class="item-list-tabs" role="navigation"> 34 34 <ul> 35 <li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>/<?php bp_blogs_root_slug() ?>"><?php printf( __( 'All Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li>35 <li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>/<?php bp_blogs_root_slug(); ?>"><?php printf( __( 'All Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li> 36 36 37 37 <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?> 38 38 39 <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug() ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>39 <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug(); ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li> 40 40 41 41 <?php endif; ?> -
trunk/bp-themes/bp-default/comments.php
r5729 r5737 22 22 23 23 <h3> 24 <?php printf( _n( '1 response to %2$s', '%1$s responses to %2$s', $num_comments, 'buddypress' ), number_format_i18n( $num_comments ), '<em>' . get_the_title() . '</em>' ) ?>24 <?php printf( _n( '1 response to %2$s', '%1$s responses to %2$s', $num_comments, 'buddypress' ), number_format_i18n( $num_comments ), '<em>' . get_the_title() . '</em>' ); ?> 25 25 </h3> 26 26 27 <?php do_action( 'bp_before_blog_comment_list' ) ?>27 <?php do_action( 'bp_before_blog_comment_list' ); ?> 28 28 29 29 <ol class="commentlist"> 30 <?php wp_list_comments( array( 'callback' => 'bp_dtheme_blog_comments', 'type' => 'comment' ) ) ?>30 <?php wp_list_comments( array( 'callback' => 'bp_dtheme_blog_comments', 'type' => 'comment' ) ); ?> 31 31 </ol><!-- .comment-list --> 32 32 33 <?php do_action( 'bp_after_blog_comment_list' ) ?>33 <?php do_action( 'bp_after_blog_comment_list' ); ?> 34 34 35 35 <?php if ( get_option( 'page_comments' ) ) : ?> 36 36 <div class="comment-navigation paged-navigation"> 37 <?php paginate_comments_links() ?>37 <?php paginate_comments_links(); ?> 38 38 </div> 39 39 <?php endif; ?> … … 44 44 <?php if ( pings_open() && !comments_open() && ( is_single() || is_page() ) ) : ?> 45 45 <p class="comments-closed pings-open"> 46 <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress' ), trackback_url( '0' ) ) ?>46 <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress' ), trackback_url( '0' ) ); ?> 47 47 </p> 48 48 <?php elseif ( !comments_open() && ( is_single() || is_page() ) ) : ?> 49 49 <p class="comments-closed"> 50 <?php _e( 'Comments are closed.', 'buddypress' ) ?>50 <?php _e( 'Comments are closed.', 'buddypress' ); ?> 51 51 </p> 52 52 <?php endif; ?> … … 55 55 56 56 <?php if ( comments_open() ) : ?> 57 <?php comment_form() ?>57 <?php comment_form(); ?> 58 58 <?php endif; ?> 59 59 60 60 <?php if ( !empty( $num_trackbacks ) ) : ?> 61 61 <div id="trackbacks"> 62 <h3><?php printf( _n( '1 trackback', '%d trackbacks', $num_trackbacks, 'buddypress' ), number_format_i18n( $num_trackbacks ) ) ?></h3>62 <h3><?php printf( _n( '1 trackback', '%d trackbacks', $num_trackbacks, 'buddypress' ), number_format_i18n( $num_trackbacks ) ); ?></h3> 63 63 64 64 <ul id="trackbacklist"> … … 67 67 <?php if ( 'comment' != get_comment_type() ) : ?> 68 68 <li> 69 <h5><?php comment_author_link() ?></h5>70 <em>on <?php comment_date() ?></em>69 <h5><?php comment_author_link(); ?></h5> 70 <em>on <?php comment_date(); ?></em> 71 71 </li> 72 72 <?php endif; ?> -
trunk/bp-themes/bp-default/forums/index.php
r5329 r5737 95 95 <form action="" method="post" id="forum-topic-form" class="standard-form"> 96 96 97 <?php do_action( 'groups_forum_new_topic_before' ) ?>97 <?php do_action( 'groups_forum_new_topic_before' ); ?> 98 98 99 99 <a name="post-new"></a> … … 143 143 <div id="message" class="info"> 144 144 145 <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( bp_get_groups_root_slug() . '/create/' ) ) ?></p>145 <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( bp_get_groups_root_slug() . '/create/' ) ); ?></p> 146 146 147 147 </div> -
trunk/bp-themes/bp-default/functions.php
r5736 r5737 229 229 position: relative; 230 230 color: #fff; 231 background: url(<?php header_image() ?>);231 background: url(<?php header_image(); ?>); 232 232 -moz-border-radius-bottomleft: 6px; 233 233 -webkit-border-bottom-left-radius: 6px; … … 247 247 } 248 248 #headimg h1 a{ 249 color:#<?php header_textcolor() ?>;249 color:#<?php header_textcolor(); ?>; 250 250 text-decoration: none; 251 251 border-bottom: none; 252 252 } 253 253 #headimg #desc{ 254 color:#<?php header_textcolor() ?>;254 color:#<?php header_textcolor(); ?>; 255 255 font-size:1em; 256 256 margin-top:-0.5em; … … 266 266 } 267 267 #headimg h1 a, #headimg #desc { 268 color:#<?php echo HEADER_TEXTCOLOR ?>;268 color:#<?php echo HEADER_TEXTCOLOR; ?>; 269 269 } 270 270 <?php } ?> … … 358 358 #header h1, #header #desc { display: none; } 359 359 <?php } else { ?> 360 #header h1 a, #desc { color:#<?php header_textcolor() ?>; }360 #header h1 a, #desc { color:#<?php header_textcolor(); ?>; } 361 361 <?php } ?> 362 362 </style> … … 462 462 ?> 463 463 464 <li <?php comment_class() ?> id="comment-<?php comment_ID()?>">464 <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>"> 465 465 <div class="comment-avatar-box"> 466 466 <div class="avb"> 467 <a href="<?php echo get_comment_author_url() ?>" rel="nofollow">467 <a href="<?php echo get_comment_author_url(); ?>" rel="nofollow"> 468 468 <?php if ( $comment->user_id ) : ?> 469 <?php echo bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => $avatar_size, 'height' => $avatar_size, 'email' => $comment->comment_author_email ) ) ?>469 <?php echo bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => $avatar_size, 'height' => $avatar_size, 'email' => $comment->comment_author_email ) ); ?> 470 470 <?php else : ?> 471 <?php echo get_avatar( $comment, $avatar_size ) ?>471 <?php echo get_avatar( $comment, $avatar_size ); ?> 472 472 <?php endif; ?> 473 473 </a> … … 490 490 <?php endif; ?> 491 491 492 <?php comment_text() ?>492 <?php comment_text(); ?> 493 493 </div> 494 494 … … 499 499 500 500 <?php if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) : ?> 501 <?php printf( '<a class="button comment-edit-link bp-secondary-action" href="%1$s" title="%2$s">%3$s</a> ', get_edit_comment_link( $comment->comment_ID ), esc_attr__( 'Edit comment', 'buddypress' ), __( 'Edit', 'buddypress' ) ) ?>501 <?php printf( '<a class="button comment-edit-link bp-secondary-action" href="%1$s" title="%2$s">%3$s</a> ', get_edit_comment_link( $comment->comment_ID ), esc_attr__( 'Edit comment', 'buddypress' ), __( 'Edit', 'buddypress' ) ); ?> 502 502 <?php endif; ?> 503 503 … … 569 569 570 570 <div id="message" class="updated fade"> 571 <p><?php printf( __( 'Theme activated! This theme contains <a href="%s">custom header image</a> support and <a href="%s">sidebar widgets</a>.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?></p>571 <p><?php printf( __( 'Theme activated! This theme contains <a href="%s">custom header image</a> support and <a href="%s">sidebar widgets</a>.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ); ?></p> 572 572 </div> 573 573 … … 674 674 <div class="avb"> 675 675 <?php if ( bp_loggedin_user_id() ) : ?> 676 <a href="<?php echo bp_loggedin_user_domain() ?>">677 <?php echo get_avatar( bp_loggedin_user_id(), 50 ) ?>676 <a href="<?php echo bp_loggedin_user_domain(); ?>"> 677 <?php echo get_avatar( bp_loggedin_user_id(), 50 ); ?> 678 678 </a> 679 679 <?php else : ?> 680 <?php echo get_avatar( 0, 50 ) ?>680 <?php echo get_avatar( 0, 50 ); ?> 681 681 <?php endif; ?> 682 682 </div> -
trunk/bp-themes/bp-default/groups/create.php
r5549 r5737 42 42 <input type="text" name="group-name" id="group-name" aria-required="true" value="<?php bp_new_group_name(); ?>" /> 43 43 44 <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ) ?></label>44 <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label> 45 45 <textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_new_group_description(); ?></textarea> 46 46 … … 113 113 <h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4> 114 114 115 <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ) ?></p>115 <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p> 116 116 117 117 <div class="radio"> 118 118 <label> 119 <input type="radio" name="group-invite-status" value="members"<?php bp_group_show_invite_status_setting( 'members' ) ?> />120 <strong><?php _e( 'All group members', 'buddypress' ) ?></strong>119 <input type="radio" name="group-invite-status" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> 120 <strong><?php _e( 'All group members', 'buddypress' ); ?></strong> 121 121 </label> 122 122 123 123 <label> 124 <input type="radio" name="group-invite-status" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ) ?> />125 <strong><?php _e( 'Group admins and mods only', 'buddypress' ) ?></strong>124 <input type="radio" name="group-invite-status" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> 125 <strong><?php _e( 'Group admins and mods only', 'buddypress' ); ?></strong> 126 126 </label> 127 127 128 128 <label> 129 <input type="radio" name="group-invite-status" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ) ?> />130 <strong><?php _e( 'Group admins only', 'buddypress' ) ?></strong>129 <input type="radio" name="group-invite-status" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> 130 <strong><?php _e( 'Group admins only', 'buddypress' ); ?></strong> 131 131 </label> 132 132 </div> -
trunk/bp-themes/bp-default/groups/index.php
r4994 r5737 27 27 <div id="group-dir-search" class="dir-search" role="search"> 28 28 29 <?php bp_directory_groups_search_form() ?>29 <?php bp_directory_groups_search_form(); ?> 30 30 31 31 </div><!-- #group-dir-search --> -
trunk/bp-themes/bp-default/groups/single/activity.php
r4454 r5737 1 1 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 2 2 <ul> 3 <li class="feed"><a href="<?php bp_group_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' )?></a></li>3 <li class="feed"><a href="<?php bp_group_activity_feed_link(); ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ); ?></a></li> 4 4 5 <?php do_action( 'bp_group_activity_syndication_options' ) ?>5 <?php do_action( 'bp_group_activity_syndication_options' ); ?> 6 6 7 7 <li id="activity-filter-select" class="last"> 8 8 <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label> 9 9 <select id="activity-filter-by"> 10 <option value="-1"><?php _e( 'Everything', 'buddypress' ) ?></option>11 <option value="activity_update"><?php _e( 'Updates', 'buddypress' ) ?></option>10 <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option> 11 <option value="activity_update"><?php _e( 'Updates', 'buddypress' ); ?></option> 12 12 13 13 <?php if ( bp_is_active( 'forums' ) ) : ?> 14 <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ) ?></option>15 <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ) ?></option>14 <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ); ?></option> 15 <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ); ?></option> 16 16 <?php endif; ?> 17 17 18 <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ) ?></option>18 <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option> 19 19 20 <?php do_action( 'bp_group_activity_filter_options' ) ?>20 <?php do_action( 'bp_group_activity_filter_options' ); ?> 21 21 </select> 22 22 </li> … … 24 24 </div><!-- .item-list-tabs --> 25 25 26 <?php do_action( 'bp_before_group_activity_post_form' ) ?>26 <?php do_action( 'bp_before_group_activity_post_form' ); ?> 27 27 28 28 <?php if ( is_user_logged_in() && bp_group_is_member() ) : ?> 29 <?php locate_template( array( 'activity/post-form.php'), true ) ?>29 <?php locate_template( array( 'activity/post-form.php'), true ); ?> 30 30 <?php endif; ?> 31 31 32 <?php do_action( 'bp_after_group_activity_post_form' ) ?>33 <?php do_action( 'bp_before_group_activity_content' ) ?>32 <?php do_action( 'bp_after_group_activity_post_form' ); ?> 33 <?php do_action( 'bp_before_group_activity_content' ); ?> 34 34 35 35 <div class="activity single-group" role="main"> 36 <?php locate_template( array( 'activity/activity-loop.php' ), true ) ?>36 <?php locate_template( array( 'activity/activity-loop.php' ), true ); ?> 37 37 </div><!-- .activity.single-group --> 38 38 39 <?php do_action( 'bp_after_group_activity_content' ) ?>39 <?php do_action( 'bp_after_group_activity_content' ); ?> -
trunk/bp-themes/bp-default/groups/single/admin.php
r5618 r5737 5 5 </div><!-- .item-list-tabs --> 6 6 7 <form action="<?php bp_group_admin_form_action() ?>" name="group-settings-form" id="group-settings-form" class="standard-form" method="post" enctype="multipart/form-data" role="main">8 9 <?php do_action( 'bp_before_group_admin_content' ) ?>7 <form action="<?php bp_group_admin_form_action(); ?>" name="group-settings-form" id="group-settings-form" class="standard-form" method="post" enctype="multipart/form-data" role="main"> 8 9 <?php do_action( 'bp_before_group_admin_content' ); ?> 10 10 11 11 <?php /* Edit Group Details */ ?> … … 15 15 16 16 <label for="group-name"><?php _e( 'Group Name (required)', 'buddypress' ); ?></label> 17 <input type="text" name="group-name" id="group-name" value="<?php bp_group_name() ?>" aria-required="true" />17 <input type="text" name="group-name" id="group-name" value="<?php bp_group_name(); ?>" aria-required="true" /> 18 18 19 19 <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label> 20 <textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_group_description_editable() ?></textarea>21 22 <?php do_action( 'groups_custom_group_fields_editable' ) ?>20 <textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_group_description_editable(); ?></textarea> 21 22 <?php do_action( 'groups_custom_group_fields_editable' ); ?> 23 23 24 24 <p> … … 30 30 <?php do_action( 'bp_after_group_details_admin' ); ?> 31 31 32 <p><input type="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="save" name="save" /></p>33 <?php wp_nonce_field( 'groups_edit_group_details' ) ?>32 <p><input type="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="save" name="save" /></p> 33 <?php wp_nonce_field( 'groups_edit_group_details' ); ?> 34 34 35 35 <?php endif; ?> … … 45 45 46 46 <div class="checkbox"> 47 <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php bp_group_show_forum_setting() ?> /> <?php _e( 'Enable discussion forum', 'buddypress' )?></label>47 <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php bp_group_show_forum_setting(); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label> 48 48 </div> 49 49 … … 58 58 <div class="radio"> 59 59 <label> 60 <input type="radio" name="group-status" value="public"<?php bp_group_show_status_setting( 'public' ) ?> />61 <strong><?php _e( 'This is a public group', 'buddypress' ) ?></strong>60 <input type="radio" name="group-status" value="public"<?php bp_group_show_status_setting( 'public' ); ?> /> 61 <strong><?php _e( 'This is a public group', 'buddypress' ); ?></strong> 62 62 <ul> 63 <li><?php _e( 'Any site member can join this group.', 'buddypress' ) ?></li>64 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ) ?></li>65 <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ) ?></li>63 <li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li> 64 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li> 65 <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li> 66 66 </ul> 67 67 </label> 68 68 69 69 <label> 70 <input type="radio" name="group-status" value="private"<?php bp_group_show_status_setting( 'private' ) ?> />71 <strong><?php _e( 'This is a private group', 'buddypress' ) ?></strong>70 <input type="radio" name="group-status" value="private"<?php bp_group_show_status_setting( 'private' ); ?> /> 71 <strong><?php _e( 'This is a private group', 'buddypress' ); ?></strong> 72 72 <ul> 73 <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ) ?></li>74 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ) ?></li>75 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ) ?></li>73 <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li> 74 <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li> 75 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li> 76 76 </ul> 77 77 </label> 78 78 79 79 <label> 80 <input type="radio" name="group-status" value="hidden"<?php bp_group_show_status_setting( 'hidden' ) ?> />81 <strong><?php _e( 'This is a hidden group', 'buddypress' ) ?></strong>80 <input type="radio" name="group-status" value="hidden"<?php bp_group_show_status_setting( 'hidden' ); ?> /> 81 <strong><?php _e( 'This is a hidden group', 'buddypress' ); ?></strong> 82 82 <ul> 83 <li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ) ?></li>84 <li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ) ?></li>85 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ) ?></li>83 <li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li> 84 <li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li> 85 <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li> 86 86 </ul> 87 87 </label> … … 92 92 <h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4> 93 93 94 <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ) ?></p>94 <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p> 95 95 96 96 <div class="radio"> 97 97 <label> 98 <input type="radio" name="group-invite-status" value="members"<?php bp_group_show_invite_status_setting( 'members' ) ?> />99 <strong><?php _e( 'All group members', 'buddypress' ) ?></strong>98 <input type="radio" name="group-invite-status" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> 99 <strong><?php _e( 'All group members', 'buddypress' ); ?></strong> 100 100 </label> 101 101 102 102 <label> 103 <input type="radio" name="group-invite-status" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ) ?> />104 <strong><?php _e( 'Group admins and mods only', 'buddypress' ) ?></strong>103 <input type="radio" name="group-invite-status" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> 104 <strong><?php _e( 'Group admins and mods only', 'buddypress' ); ?></strong> 105 105 </label> 106 106 107 107 <label> 108 <input type="radio" name="group-invite-status" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ) ?> />109 <strong><?php _e( 'Group admins only', 'buddypress' ) ?></strong>108 <input type="radio" name="group-invite-status" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> 109 <strong><?php _e( 'Group admins only', 'buddypress' ); ?></strong> 110 110 </label> 111 111 </div> … … 115 115 <?php do_action( 'bp_after_group_settings_admin' ); ?> 116 116 117 <p><input type="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="save" name="save" /></p>118 <?php wp_nonce_field( 'groups_edit_group_settings' ) ?>117 <p><input type="submit" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" id="save" name="save" /></p> 118 <?php wp_nonce_field( 'groups_edit_group_settings' ); ?> 119 119 120 120 <?php endif; ?> … … 125 125 <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?> 126 126 127 <p><?php _e("Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress') ?></p>127 <p><?php _e("Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress'); ?></p> 128 128 129 129 <p> 130 130 <input type="file" name="file" id="file" /> 131 <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />131 <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ); ?>" /> 132 132 <input type="hidden" name="action" id="action" value="bp_avatar_upload" /> 133 133 </p> … … 135 135 <?php if ( bp_get_group_has_avatar() ) : ?> 136 136 137 <p><?php _e( "If you'd like to remove the existing avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ) ?></p>137 <p><?php _e( "If you'd like to remove the existing avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p> 138 138 139 139 <?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Avatar', 'buddypress' ), 'link_text' => __( 'Delete Avatar', 'buddypress' ) ) ); ?> … … 141 141 <?php endif; ?> 142 142 143 <?php wp_nonce_field( 'bp_avatar_upload' ) ?>143 <?php wp_nonce_field( 'bp_avatar_upload' ); ?> 144 144 145 145 <?php endif; ?> … … 147 147 <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?> 148 148 149 <h3><?php _e( 'Crop Avatar', 'buddypress' ) ?></h3>150 151 <img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' )?>" />149 <h3><?php _e( 'Crop Avatar', 'buddypress' ); ?></h3> 150 151 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ); ?>" /> 152 152 153 153 <div id="avatar-crop-pane"> 154 <img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' )?>" />154 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ); ?>" /> 155 155 </div> 156 156 157 <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />158 159 <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />157 <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ); ?>" /> 158 159 <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src(); ?>" /> 160 160 <input type="hidden" id="x" name="x" /> 161 161 <input type="hidden" id="y" name="y" /> … … 163 163 <input type="hidden" id="h" name="h" /> 164 164 165 <?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>165 <?php wp_nonce_field( 'bp_avatar_cropstore' ); ?> 166 166 167 167 <?php endif; ?> … … 183 183 <?php while ( bp_members() ) : bp_the_member(); ?> 184 184 <li> 185 <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ) ?>185 <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ); ?> 186 186 <h5> 187 187 <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a> 188 188 <?php if ( count( bp_group_admin_ids( false, 'array' ) ) > 1 ) : ?> 189 189 <span class="small"> 190 <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ) ?>"><?php _e( 'Demote to Member', 'buddypress' )?></a>190 <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a> 191 191 </span> 192 192 <?php endif; ?> … … 203 203 <?php if ( bp_group_has_moderators() ) : ?> 204 204 <div class="bp-widget"> 205 <h4><?php _e( 'Moderators', 'buddypress' ) ?></h4>205 <h4><?php _e( 'Moderators', 'buddypress' ); ?></h4> 206 206 207 207 <?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?> … … 210 210 <?php while ( bp_members() ) : bp_the_member(); ?> 211 211 <li> 212 <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ) ?>212 <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ); ?> 213 213 <h5> 214 214 <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a> 215 215 <span class="small"> 216 <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ) ?>" class="button confirm mod-promote-to-admin" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>217 <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ) ?>"><?php _e( 'Demote to Member', 'buddypress' )?></a>216 <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ); ?>" class="button confirm mod-promote-to-admin" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a> 217 <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a> 218 218 </span> 219 219 </h5> … … 238 238 239 239 <div id="member-count" class="pag-count"> 240 <?php bp_group_member_pagination_count() ?>240 <?php bp_group_member_pagination_count(); ?> 241 241 </div> 242 242 243 243 <div id="member-admin-pagination" class="pagination-links"> 244 <?php bp_group_member_admin_pagination() ?>244 <?php bp_group_member_admin_pagination(); ?> 245 245 </div> 246 246 … … 253 253 254 254 <li class="<?php bp_group_member_css_class(); ?>"> 255 <?php bp_group_member_avatar_mini() ?>255 <?php bp_group_member_avatar_mini(); ?> 256 256 257 257 <h5> 258 <?php bp_group_member_link() ?>258 <?php bp_group_member_link(); ?> 259 259 260 260 <?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'buddypress'); ?> … … 264 264 <?php if ( bp_get_group_member_is_banned() ) : ?> 265 265 266 <a href="<?php bp_group_member_unban_link() ?>" class="button confirm member-unban" title="<?php _e( 'Unban this member', 'buddypress' )?>"><?php _e( 'Remove Ban', 'buddypress' ); ?></a>266 <a href="<?php bp_group_member_unban_link(); ?>" class="button confirm member-unban" title="<?php _e( 'Unban this member', 'buddypress' ); ?>"><?php _e( 'Remove Ban', 'buddypress' ); ?></a> 267 267 268 268 <?php else : ?> 269 269 270 <a href="<?php bp_group_member_ban_link() ?>" class="button confirm member-ban" title="<?php _e( 'Kick and ban this member', 'buddypress' ); ?>"><?php _e( 'Kick & Ban', 'buddypress' ); ?></a>271 <a href="<?php bp_group_member_promote_mod_link() ?>" class="button confirm member-promote-to-mod" title="<?php _e( 'Promote to Mod', 'buddypress' ); ?>"><?php _e( 'Promote to Mod', 'buddypress' ); ?></a>272 <a href="<?php bp_group_member_promote_admin_link() ?>" class="button confirm member-promote-to-admin" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>270 <a href="<?php bp_group_member_ban_link(); ?>" class="button confirm member-ban" title="<?php _e( 'Kick and ban this member', 'buddypress' ); ?>"><?php _e( 'Kick & Ban', 'buddypress' ); ?></a> 271 <a href="<?php bp_group_member_promote_mod_link(); ?>" class="button confirm member-promote-to-mod" title="<?php _e( 'Promote to Mod', 'buddypress' ); ?>"><?php _e( 'Promote to Mod', 'buddypress' ); ?></a> 272 <a href="<?php bp_group_member_promote_admin_link(); ?>" class="button confirm member-promote-to-admin" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a> 273 273 274 274 <?php endif; ?> 275 275 276 <a href="<?php bp_group_member_remove_link() ?>" class="button confirm" title="<?php _e( 'Remove this member', 'buddypress' ); ?>"><?php _e( 'Remove from group', 'buddypress' ); ?></a>276 <a href="<?php bp_group_member_remove_link(); ?>" class="button confirm" title="<?php _e( 'Remove this member', 'buddypress' ); ?>"><?php _e( 'Remove from group', 'buddypress' ); ?></a> 277 277 278 278 <?php do_action( 'bp_group_manage_members_admin_item' ); ?> … … 310 310 311 311 <li> 312 <?php bp_group_request_user_avatar_thumb() ?>313 <h4><?php bp_group_request_user_link() ?> <span class="comments"><?php bp_group_request_comment()?></span></h4>314 <span class="activity"><?php bp_group_request_time_since_requested() ?></span>312 <?php bp_group_request_user_avatar_thumb(); ?> 313 <h4><?php bp_group_request_user_link(); ?> <span class="comments"><?php bp_group_request_comment(); ?></span></h4> 314 <span class="activity"><?php bp_group_request_time_since_requested(); ?></span> 315 315 316 316 <?php do_action( 'bp_group_membership_requests_admin_item' ); ?> … … 358 358 359 359 <div class="submit"> 360 <input type="submit" disabled="disabled" value="<?php _e( 'Delete Group', 'buddypress' ) ?>" id="delete-group-button" name="delete-group-button" />361 </div> 362 363 <?php wp_nonce_field( 'groups_delete_group' ) ?>360 <input type="submit" disabled="disabled" value="<?php _e( 'Delete Group', 'buddypress' ); ?>" id="delete-group-button" name="delete-group-button" /> 361 </div> 362 363 <?php wp_nonce_field( 'groups_delete_group' ); ?> 364 364 365 365 <?php endif; ?> 366 366 367 367 <?php /* This is important, don't forget it */ ?> 368 <input type="hidden" name="group-id" id="group-id" value="<?php bp_group_id() ?>" />369 370 <?php do_action( 'bp_after_group_admin_content' ) ?>368 <input type="hidden" name="group-id" id="group-id" value="<?php bp_group_id(); ?>" /> 369 370 <?php do_action( 'bp_after_group_admin_content' ); ?> 371 371 372 372 </form><!-- #group-settings-form --> -
trunk/bp-themes/bp-default/groups/single/forum.php
r5184 r5737 17 17 18 18 <li> 19 <a href="#post-new" class="show-hide-new"><?php _e( 'New Topic', 'buddypress' ) ?></a>19 <a href="#post-new" class="show-hide-new"><?php _e( 'New Topic', 'buddypress' ); ?></a> 20 20 </li> 21 21 … … 25 25 26 26 <li> 27 <a href="<?php bp_forums_directory_permalink() ?>"><?php _e( 'Forum Directory', 'buddypress')?></a>27 <a href="<?php bp_forums_directory_permalink(); ?>"><?php _e( 'Forum Directory', 'buddypress'); ?></a> 28 28 </li> 29 29 … … 49 49 <div class="forums single-forum" role="main"> 50 50 51 <?php locate_template( array( 'forums/forums-loop.php' ), true ) ?>51 <?php locate_template( array( 'forums/forums-loop.php' ), true ); ?> 52 52 53 53 </div><!-- .forums.single-forum --> … … 55 55 <?php endif; ?> 56 56 57 <?php do_action( 'bp_after_group_forum_content' ) ?>57 <?php do_action( 'bp_after_group_forum_content' ); ?> 58 58 59 59 <?php if ( !bp_is_group_forum_topic_edit() && !bp_is_group_forum_topic() ) : ?> … … 64 64 <div id="new-topic-post"> 65 65 66 <?php do_action( 'bp_before_group_forum_post_new' ) ?>66 <?php do_action( 'bp_before_group_forum_post_new' ); ?> 67 67 68 68 <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?> 69 <p><?php _e( 'You will auto join this group when you start a new topic.', 'buddypress' ) ?></p>69 <p><?php _e( 'You will auto join this group when you start a new topic.', 'buddypress' ); ?></p> 70 70 <?php endif; ?> 71 71 72 72 <p id="post-new"></p> 73 <h4><?php _e( 'Post a New Topic:', 'buddypress' ) ?></h4>73 <h4><?php _e( 'Post a New Topic:', 'buddypress' ); ?></h4> 74 74 75 <label><?php _e( 'Title:', 'buddypress' ) ?></label>75 <label><?php _e( 'Title:', 'buddypress' ); ?></label> 76 76 <input type="text" name="topic_title" id="topic_title" value="" /> 77 77 78 <label><?php _e( 'Content:', 'buddypress' ) ?></label>78 <label><?php _e( 'Content:', 'buddypress' ); ?></label> 79 79 <textarea name="topic_text" id="topic_text"></textarea> 80 80 81 <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>81 <label><?php _e( 'Tags (comma separated):', 'buddypress' ); ?></label> 82 82 <input type="text" name="topic_tags" id="topic_tags" value="" /> 83 83 84 <?php do_action( 'bp_after_group_forum_post_new' ) ?>84 <?php do_action( 'bp_after_group_forum_post_new' ); ?> 85 85 86 86 <div class="submit"> 87 <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ) ?>" />87 <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ); ?>" /> 88 88 </div> 89 89 90 <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>90 <?php wp_nonce_field( 'bp_forums_new_topic' ); ?> 91 91 </div><!-- #new-topic-post --> 92 92 </form><!-- #forum-topic-form --> -
trunk/bp-themes/bp-default/groups/single/forum/edit.php
r5349 r5737 51 51 <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text(); ?></textarea> 52 52 53 <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>54 <input type="text" name="topic_tags" id="topic_tags" value="<?php bp_forum_topic_tag_list() ?>" />53 <label><?php _e( 'Tags (comma separated):', 'buddypress' ); ?></label> 54 <input type="text" name="topic_tags" id="topic_tags" value="<?php bp_forum_topic_tag_list(); ?>" /> 55 55 56 56 <?php do_action( 'bp_group_after_edit_forum_topic' ); ?> … … 70 70 <textarea name="post_text" id="post_text"><?php bp_the_topic_post_edit_text(); ?></textarea> 71 71 72 <?php do_action( 'bp_group_after_edit_forum_post' ) ?>72 <?php do_action( 'bp_group_after_edit_forum_post' ); ?> 73 73 74 74 <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" /></p> -
trunk/bp-themes/bp-default/groups/single/forum/topic.php
r5388 r5737 1 1 <?php do_action( 'bp_before_group_forum_topic' ); ?> 2 2 3 <form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form" class="standard-form">3 <form action="<?php bp_forum_topic_action(); ?>" method="post" id="forum-topic-form" class="standard-form"> 4 4 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 5 5 <ul> … … 7 7 8 8 <li> 9 <a href="<?php bp_forum_topic_new_reply_link() ?>" class="new-reply-link"><?php _e( 'New Reply', 'buddypress' )?></a>9 <a href="<?php bp_forum_topic_new_reply_link(); ?>" class="new-reply-link"><?php _e( 'New Reply', 'buddypress' ); ?></a> 10 10 </li> 11 11 … … 15 15 16 16 <li> 17 <a href="<?php bp_forums_directory_permalink() ?>"><?php _e( 'Forum Directory', 'buddypress')?></a>17 <a href="<?php bp_forums_directory_permalink(); ?>"><?php _e( 'Forum Directory', 'buddypress'); ?></a> 18 18 </li> 19 19 … … 24 24 25 25 <div id="topic-meta"> 26 <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count()?>)</h3>26 <h3><?php bp_the_topic_title(); ?> (<?php bp_the_topic_total_post_count(); ?>)</h3> 27 27 28 28 <?php if ( bp_forum_topic_has_tags() ) : ?> … … 30 30 <div class="topic-tags"> 31 31 32 <?php _e( 'Topic tags:', 'buddypress' ) ?> <?php bp_forum_topic_tag_list()?>32 <?php _e( 'Topic tags:', 'buddypress' ); ?> <?php bp_forum_topic_tag_list(); ?> 33 33 34 34 </div> … … 40 40 <div class="last admin-links"> 41 41 42 <?php bp_the_topic_admin_links() ?>42 <?php bp_the_topic_admin_links(); ?> 43 43 44 44 </div> … … 57 57 <div id="post-count-top" class="pag-count"> 58 58 59 <?php bp_the_topic_pagination_count() ?>59 <?php bp_the_topic_pagination_count(); ?> 60 60 61 61 </div> … … 63 63 <div class="pagination-links" id="topic-pag-top"> 64 64 65 <?php bp_the_topic_pagination() ?>65 <?php bp_the_topic_pagination(); ?> 66 66 67 67 </div> … … 69 69 </div> 70 70 71 <?php do_action( 'bp_before_group_forum_topic_posts' ) ?>71 <?php do_action( 'bp_before_group_forum_topic_posts' ); ?> 72 72 73 73 <ul id="topic-post-list" class="item-list" role="main"> 74 74 <?php while ( bp_forum_topic_posts() ) : bp_the_forum_topic_post(); ?> 75 75 76 <li id="post-<?php bp_the_topic_post_id() ?>" class="<?php bp_the_topic_post_css_class()?>">76 <li id="post-<?php bp_the_topic_post_id(); ?>" class="<?php bp_the_topic_post_css_class(); ?>"> 77 77 <div class="poster-meta"> 78 <a href="<?php bp_the_topic_post_poster_link() ?>">79 <?php bp_the_topic_post_poster_avatar( 'width=40&height=40' ) ?>78 <a href="<?php bp_the_topic_post_poster_link(); ?>"> 79 <?php bp_the_topic_post_poster_avatar( 'width=40&height=40' ); ?> 80 80 </a> 81 <?php echo sprintf( __( '%1$s said %2$s:', 'buddypress' ), bp_get_the_topic_post_poster_name(), bp_get_the_topic_post_time_since() ) ?>81 <?php echo sprintf( __( '%1$s said %2$s:', 'buddypress' ), bp_get_the_topic_post_poster_name(), bp_get_the_topic_post_time_since() ); ?> 82 82 </div> 83 83 84 84 <div class="post-content"> 85 <?php bp_the_topic_post_content() ?>85 <?php bp_the_topic_post_content(); ?> 86 86 </div> 87 87 88 88 <div class="admin-links"> 89 89 <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_post_is_mine() ) : ?> 90 <?php bp_the_topic_post_admin_links() ?>90 <?php bp_the_topic_post_admin_links(); ?> 91 91 <?php endif; ?> 92 92 93 93 <?php do_action( 'bp_group_forum_post_meta' ); ?> 94 94 95 <a href="#post-<?php bp_the_topic_post_id() ?>" title="<?php _e( 'Permanent link to this post', 'buddypress' )?>">#</a>95 <a href="#post-<?php bp_the_topic_post_id(); ?>" title="<?php _e( 'Permanent link to this post', 'buddypress' ); ?>">#</a> 96 96 </div> 97 97 </li> … … 100 100 </ul><!-- #topic-post-list --> 101 101 102 <?php do_action( 'bp_after_group_forum_topic_posts' ) ?>102 <?php do_action( 'bp_after_group_forum_topic_posts' ); ?> 103 103 104 104 <div class="pagination no-ajax"> 105 105 106 106 <div id="post-count-bottom" class="pag-count"> 107 <?php bp_the_topic_pagination_count() ?>107 <?php bp_the_topic_pagination_count(); ?> 108 108 </div> 109 109 110 110 <div class="pagination-links" id="topic-pag-bottom"> 111 <?php bp_the_topic_pagination() ?>111 <?php bp_the_topic_pagination(); ?> 112 112 </div> 113 113 … … 117 117 118 118 <div id="message" class="info"> 119 <p><?php _e( 'There are no posts for this topic.', 'buddypress' ) ?></p>119 <p><?php _e( 'There are no posts for this topic.', 'buddypress' ); ?></p> 120 120 </div> 121 121 … … 132 132 133 133 <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?> 134 <p><?php _e( 'You will auto join this group when you reply to this topic.', 'buddypress' ) ?></p>134 <p><?php _e( 'You will auto join this group when you reply to this topic.', 'buddypress' ); ?></p> 135 135 <?php endif; ?> 136 136 137 <?php do_action( 'groups_forum_new_reply_before' ) ?>137 <?php do_action( 'groups_forum_new_reply_before' ); ?> 138 138 139 <h4><?php _e( 'Add a reply:', 'buddypress' ) ?></h4>139 <h4><?php _e( 'Add a reply:', 'buddypress' ); ?></h4> 140 140 141 141 <textarea name="reply_text" id="reply_text"></textarea> 142 142 143 143 <div class="submit"> 144 <input type="submit" name="submit_reply" id="submit" value="<?php _e( 'Post Reply', 'buddypress' ) ?>" />144 <input type="submit" name="submit_reply" id="submit" value="<?php _e( 'Post Reply', 'buddypress' ); ?>" /> 145 145 </div> 146 146 147 <?php do_action( 'groups_forum_new_reply_after' ) ?>147 <?php do_action( 'groups_forum_new_reply_after' ); ?> 148 148 149 <?php wp_nonce_field( 'bp_forums_new_reply' ) ?>149 <?php wp_nonce_field( 'bp_forums_new_reply' ); ?> 150 150 </div> 151 151 … … 153 153 154 154 <div id="message" class="info"> 155 <p><?php _e( 'This topic is closed, replies are no longer accepted.', 'buddypress' ) ?></p>155 <p><?php _e( 'This topic is closed, replies are no longer accepted.', 'buddypress' ); ?></p> 156 156 </div> 157 157 … … 164 164 </form><!-- #forum-topic-form --> 165 165 166 <?php do_action( 'bp_after_group_forum_topic' ) ?>166 <?php do_action( 'bp_after_group_forum_topic' ); ?> -
trunk/bp-themes/bp-default/groups/single/group-header.php
r4678 r5737 18 18 do_action( 'bp_before_group_menu_mods' ); ?> 19 19 20 <h3><?php _e( 'Group Mods' , 'buddypress' ) ?></h3>20 <h3><?php _e( 'Group Mods' , 'buddypress' ); ?></h3> 21 21 22 22 <?php bp_group_list_mods(); -
trunk/bp-themes/bp-default/groups/single/home.php
r4961 r5737 6 6 <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?> 7 7 8 <?php do_action( 'bp_before_group_home_content' ) ?>8 <?php do_action( 'bp_before_group_home_content' ); ?> 9 9 10 10 <div id="item-header" role="complementary"> -
trunk/bp-themes/bp-default/groups/single/plugins.php
r5077 r5737 1 <?php get_header( 'buddypress' ) ?>1 <?php get_header( 'buddypress' ); ?> 2 2 3 3 <div id="content"> … … 5 5 <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?> 6 6 7 <?php do_action( 'bp_before_group_plugin_template' ) ?>7 <?php do_action( 'bp_before_group_plugin_template' ); ?> 8 8 9 9 <div id="item-header"> 10 <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>10 <?php locate_template( array( 'groups/single/group-header.php' ), true ); ?> 11 11 </div><!-- #item-header --> 12 12 … … 14 14 <div class="item-list-tabs no-ajax" id="object-nav" role="navigation"> 15 15 <ul> 16 <?php bp_get_options_nav() ?>16 <?php bp_get_options_nav(); ?> 17 17 18 <?php do_action( 'bp_group_plugin_options_nav' ) ?>18 <?php do_action( 'bp_group_plugin_options_nav' ); ?> 19 19 </ul> 20 20 </div> … … 23 23 <div id="item-body"> 24 24 25 <?php do_action( 'bp_before_group_body' ) ?>25 <?php do_action( 'bp_before_group_body' ); ?> 26 26 27 <?php do_action( 'bp_template_content' ) ?>27 <?php do_action( 'bp_template_content' ); ?> 28 28 29 <?php do_action( 'bp_after_group_body' ) ?>29 <?php do_action( 'bp_after_group_body' ); ?> 30 30 </div><!-- #item-body --> 31 31 32 <?php do_action( 'bp_after_group_plugin_template' ) ?>32 <?php do_action( 'bp_after_group_plugin_template' ); ?> 33 33 34 34 <?php endwhile; endif; ?> … … 37 37 </div><!-- #content --> 38 38 39 <?php get_sidebar( 'buddypress' ) ?>39 <?php get_sidebar( 'buddypress' ); ?> 40 40 41 <?php get_footer( 'buddypress' ) ?>41 <?php get_footer( 'buddypress' ); ?> -
trunk/bp-themes/bp-default/groups/single/request-membership.php
r4675 r5737 1 <?php do_action( 'bp_before_group_request_membership_content' ) ?>1 <?php do_action( 'bp_before_group_request_membership_content' ); ?> 2 2 3 3 <?php if ( !bp_group_has_requested_membership() ) : ?> 4 4 <p><?php printf( __( "You are requesting to become a member of the group '%s'.", "buddypress" ), bp_get_group_name( false ) ); ?></p> 5 5 6 <form action="<?php bp_group_form_action('request-membership') ?>" method="post" name="request-membership-form" id="request-membership-form" class="standard-form">6 <form action="<?php bp_group_form_action('request-membership'); ?>" method="post" name="request-membership-form" id="request-membership-form" class="standard-form"> 7 7 <label for="group-request-membership-comments"><?php _e( 'Comments (optional)', 'buddypress' ); ?></label> 8 8 <textarea name="group-request-membership-comments" id="group-request-membership-comments"></textarea> 9 9 10 <?php do_action( 'bp_group_request_membership_content' ) ?>10 <?php do_action( 'bp_group_request_membership_content' ); ?> 11 11 12 <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php _e( 'Send Request', 'buddypress' ) ?>" />12 <p><input type="submit" name="group-request-send" id="group-request-send" value="<?php _e( 'Send Request', 'buddypress' ); ?>" /> 13 13 14 <?php wp_nonce_field( 'groups_request_membership' ) ?>14 <?php wp_nonce_field( 'groups_request_membership' ); ?> 15 15 </form><!-- #request-membership-form --> 16 16 <?php endif; ?> 17 17 18 <?php do_action( 'bp_after_group_request_membership_content' ) ?>18 <?php do_action( 'bp_after_group_request_membership_content' ); ?> -
trunk/bp-themes/bp-default/groups/single/send-invites.php
r3955 r5737 1 <?php do_action( 'bp_before_group_send_invites_content' ) ?>1 <?php do_action( 'bp_before_group_send_invites_content' ); ?> 2 2 3 3 <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?> 4 4 5 <form action="<?php bp_group_send_invite_form_action() ?>" method="post" id="send-invite-form" class="standard-form" role="main">5 <form action="<?php bp_group_send_invite_form_action(); ?>" method="post" id="send-invite-form" class="standard-form" role="main"> 6 6 7 7 <div class="left-menu"> … … 9 9 <div id="invite-list"> 10 10 <ul> 11 <?php bp_new_group_invite_friend_list() ?>11 <?php bp_new_group_invite_friend_list(); ?> 12 12 </ul> 13 13 14 <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ) ?>14 <?php wp_nonce_field( 'groups_invite_uninvite_user', '_wpnonce_invite_uninvite_user' ); ?> 15 15 </div> 16 16 … … 23 23 </div> 24 24 25 <?php do_action( 'bp_before_group_send_invites_list' ) ?>25 <?php do_action( 'bp_before_group_send_invites_list' ); ?> 26 26 27 27 <?php /* The ID 'friend-list' is important for AJAX support. */ ?> … … 31 31 <?php while ( bp_group_invites() ) : bp_group_the_invite(); ?> 32 32 33 <li id="<?php bp_group_invite_item_id() ?>">34 <?php bp_group_invite_user_avatar() ?>33 <li id="<?php bp_group_invite_item_id(); ?>"> 34 <?php bp_group_invite_user_avatar(); ?> 35 35 36 <h4><?php bp_group_invite_user_link() ?></h4>37 <span class="activity"><?php bp_group_invite_user_last_active() ?></span>36 <h4><?php bp_group_invite_user_link(); ?></h4> 37 <span class="activity"><?php bp_group_invite_user_last_active(); ?></span> 38 38 39 <?php do_action( 'bp_group_send_invites_item' ) ?>39 <?php do_action( 'bp_group_send_invites_item' ); ?> 40 40 41 41 <div class="action"> 42 <a class="button remove" href="<?php bp_group_invite_user_remove_invite_url() ?>" id="<?php bp_group_invite_item_id() ?>"><?php _e( 'Remove Invite', 'buddypress' )?></a>42 <a class="button remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php _e( 'Remove Invite', 'buddypress' ); ?></a> 43 43 44 <?php do_action( 'bp_group_send_invites_item_action' ) ?>44 <?php do_action( 'bp_group_send_invites_item_action' ); ?> 45 45 </div> 46 46 </li> … … 51 51 </ul><!-- #friend-list --> 52 52 53 <?php do_action( 'bp_after_group_send_invites_list' ) ?>53 <?php do_action( 'bp_after_group_send_invites_list' ); ?> 54 54 55 55 </div><!-- .main-column --> … … 58 58 59 59 <div class="submit"> 60 <input type="submit" name="submit" id="submit" value="<?php _e( 'Send Invites', 'buddypress' ) ?>" />60 <input type="submit" name="submit" id="submit" value="<?php _e( 'Send Invites', 'buddypress' ); ?>" /> 61 61 </div> 62 62 63 <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites') ?>63 <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites'); ?> 64 64 65 65 <?php /* This is important, don't forget it */ ?> 66 <input type="hidden" name="group_id" id="group_id" value="<?php bp_group_id() ?>" />66 <input type="hidden" name="group_id" id="group_id" value="<?php bp_group_id(); ?>" /> 67 67 68 68 </form><!-- #send-invite-form --> … … 76 76 <?php endif; ?> 77 77 78 <?php do_action( 'bp_after_group_send_invites_content' ) ?>78 <?php do_action( 'bp_after_group_send_invites_content' ); ?> -
trunk/bp-themes/bp-default/header.php
r5736 r5737 12 12 </head> 13 13 14 <body <?php body_class() ?> id="bp-default">14 <body <?php body_class(); ?> id="bp-default"> 15 15 16 <?php do_action( 'bp_before_header' ) ?>16 <?php do_action( 'bp_before_header' ); ?> 17 17 18 18 <div id="header"> -
trunk/bp-themes/bp-default/index.php
r4961 r5737 1 <?php get_header() ?>1 <?php get_header(); ?> 2 2 3 3 <div id="content"> 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_before_blog_home' ) ?>6 <?php do_action( 'bp_before_blog_home' ); ?> 7 7 8 <?php do_action( 'template_notices' ) ?>8 <?php do_action( 'template_notices' ); ?> 9 9 10 10 <div class="page" id="blog-latest" role="main"> … … 16 16 <?php while (have_posts()) : the_post(); ?> 17 17 18 <?php do_action( 'bp_before_blog_post' ) ?>18 <?php do_action( 'bp_before_blog_post' ); ?> 19 19 20 20 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> … … 22 22 <div class="author-box"> 23 23 <?php echo get_avatar( get_the_author_meta( 'user_email' ), '50' ); ?> 24 <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>24 <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ); ?></p> 25 25 26 26 <?php if ( is_sticky() ) : ?> … … 30 30 31 31 <div class="post-content"> 32 <h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' )?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>32 <h2 class="posttitle"><a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ); ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2> 33 33 34 34 <p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p> … … 44 44 </div> 45 45 46 <?php do_action( 'bp_after_blog_post' ) ?>46 <?php do_action( 'bp_after_blog_post' ); ?> 47 47 48 48 <?php endwhile; ?> … … 52 52 <?php else : ?> 53 53 54 <h2 class="center"><?php _e( 'Not Found', 'buddypress' ) ?></h2>55 <p class="center"><?php _e( 'Sorry, but you are looking for something that isn\'t here.', 'buddypress' ) ?></p>54 <h2 class="center"><?php _e( 'Not Found', 'buddypress' ); ?></h2> 55 <p class="center"><?php _e( 'Sorry, but you are looking for something that isn\'t here.', 'buddypress' ); ?></p> 56 56 57 <?php get_search_form() ?>57 <?php get_search_form(); ?> 58 58 59 59 <?php endif; ?> 60 60 </div> 61 61 62 <?php do_action( 'bp_after_blog_home' ) ?>62 <?php do_action( 'bp_after_blog_home' ); ?> 63 63 64 64 </div><!-- .padder --> 65 65 </div><!-- #content --> 66 66 67 <?php get_sidebar() ?>67 <?php get_sidebar(); ?> 68 68 69 <?php get_footer() ?>69 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/links.php
r3771 r5737 5 5 ?> 6 6 7 <?php get_header() ?>7 <?php get_header(); ?> 8 8 9 9 <div id="content"> 10 10 <div class="padder"> 11 11 12 <?php do_action( 'bp_before_blog_links' ) ?>12 <?php do_action( 'bp_before_blog_links' ); ?> 13 13 14 14 <div class="page" id="blog-latest" role="main"> 15 15 16 <h2 class="pagetitle"><?php _e( 'Links', 'buddypress' ) ?></h2>16 <h2 class="pagetitle"><?php _e( 'Links', 'buddypress' ); ?></h2> 17 17 18 18 <ul id="links-list"> … … 22 22 </div> 23 23 24 <?php do_action( 'bp_after_blog_links' ) ?>24 <?php do_action( 'bp_after_blog_links' ); ?> 25 25 26 26 </div> -
trunk/bp-themes/bp-default/members/single/activity.php
r4961 r5737 13 13 <ul> 14 14 15 <?php bp_get_options_nav() ?>15 <?php bp_get_options_nav(); ?> 16 16 17 17 <li id="activity-filter-select" class="last"> 18 18 <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label> 19 19 <select id="activity-filter-by"> 20 <option value="-1"><?php _e( 'Everything', 'buddypress' ) ?></option>21 <option value="activity_update"><?php _e( 'Updates', 'buddypress' ) ?></option>20 <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option> 21 <option value="activity_update"><?php _e( 'Updates', 'buddypress' ); ?></option> 22 22 23 23 <?php … … 25 25 if ( bp_is_active( 'blogs' ) ) : ?> 26 26 27 <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ) ?></option>28 <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ) ?></option>27 <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ); ?></option> 28 <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ); ?></option> 29 29 30 30 <?php … … 33 33 if ( bp_is_active( 'friends' ) ) : ?> 34 34 35 <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ) ?></option>35 <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ); ?></option> 36 36 37 37 <?php endif; … … 41 41 if ( bp_is_active( 'forums' ) ) : ?> 42 42 43 <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ) ?></option>44 <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ) ?></option>43 <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ); ?></option> 44 <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ); ?></option> 45 45 46 46 <?php endif; … … 48 48 if ( bp_is_active( 'groups' ) ) : ?> 49 49 50 <option value="created_group"><?php _e( 'New Groups', 'buddypress' ) ?></option>51 <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ) ?></option>50 <option value="created_group"><?php _e( 'New Groups', 'buddypress' ); ?></option> 51 <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option> 52 52 53 53 <?php endif; -
trunk/bp-themes/bp-default/members/single/activity/permalink.php
r5255 r5737 1 <?php get_header( 'buddypress' ) ?>1 <?php get_header( 'buddypress' ); ?> 2 2 3 3 <?php do_action( 'template_notices' ); ?> … … 9 9 <?php while ( bp_activities() ) : bp_the_activity(); ?> 10 10 11 <?php locate_template( array( 'activity/entry.php' ), true ) ?>11 <?php locate_template( array( 'activity/entry.php' ), true ); ?> 12 12 13 13 <?php endwhile; ?> … … 17 17 </div> 18 18 19 <?php get_footer( 'buddypress' ) ?>19 <?php get_footer( 'buddypress' ); ?> -
trunk/bp-themes/bp-default/members/single/forums.php
r5047 r5737 12 12 <div class="item-list-tabs no-ajax" id="subnav" role="navigation"> 13 13 <ul> 14 <?php bp_get_options_nav() ?>14 <?php bp_get_options_nav(); ?> 15 15 16 16 <li id="forums-order-select" class="last filter"> -
trunk/bp-themes/bp-default/members/single/friends.php
r4452 r5737 18 18 <li id="members-order-select" class="last filter"> 19 19 20 <label for="members-all"><?php _e( 'Order By:', 'buddypress' ) ?></label>20 <label for="members-all"><?php _e( 'Order By:', 'buddypress' ); ?></label> 21 21 <select id="members-all"> 22 <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>23 <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>24 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>22 <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option> 23 <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ); ?></option> 24 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option> 25 25 26 <?php do_action( 'bp_member_blog_order_options' ) ?>26 <?php do_action( 'bp_member_blog_order_options' ); ?> 27 27 28 28 </select> -
trunk/bp-themes/bp-default/members/single/friends/requests.php
r5728 r5737 1 <?php do_action( 'bp_before_member_friend_requests_content' ) ?>1 <?php do_action( 'bp_before_member_friend_requests_content' ); ?> 2 2 3 3 <?php if ( bp_has_members( 'type=alphabetical&include=' . bp_get_friendship_requests() ) ) : ?> … … 22 22 <?php while ( bp_members() ) : bp_the_member(); ?> 23 23 24 <li id="friendship-<?php bp_friend_friendship_id() ?>">24 <li id="friendship-<?php bp_friend_friendship_id(); ?>"> 25 25 <div class="item-avatar"> 26 <a href="<?php bp_member_link() ?>"><?php bp_member_avatar()?></a>26 <a href="<?php bp_member_link(); ?>"><?php bp_member_avatar(); ?></a> 27 27 </div> 28 28 29 29 <div class="item"> 30 <div class="item-title"><a href="<?php bp_member_link() ?>"><?php bp_member_name()?></a></div>31 <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>30 <div class="item-title"><a href="<?php bp_member_link(); ?>"><?php bp_member_name(); ?></a></div> 31 <div class="item-meta"><span class="activity"><?php bp_member_last_active(); ?></span></div> 32 32 </div> 33 33 34 <?php do_action( 'bp_friend_requests_item' ) ?>34 <?php do_action( 'bp_friend_requests_item' ); ?> 35 35 36 36 <div class="action"> 37 <a class="button accept" href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ); ?></a> 38 <a class="button reject" href="<?php bp_friend_reject_request_link() ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>37 <a class="button accept" href="<?php bp_friend_accept_request_link(); ?>"><?php _e( 'Accept', 'buddypress' ); ?></a> 38 <a class="button reject" href="<?php bp_friend_reject_request_link(); ?>"><?php _e( 'Reject', 'buddypress' ); ?></a> 39 39 40 <?php do_action( 'bp_friend_requests_item_action' ) ?>40 <?php do_action( 'bp_friend_requests_item_action' ); ?> 41 41 </div> 42 42 </li> … … 45 45 </ul> 46 46 47 <?php do_action( 'bp_friend_requests_content' ) ?>47 <?php do_action( 'bp_friend_requests_content' ); ?> 48 48 49 49 <div id="pag-bottom" class="pagination no-ajax"> … … 71 71 <?php endif;?> 72 72 73 <?php do_action( 'bp_after_member_friend_requests_content' ) ?>73 <?php do_action( 'bp_after_member_friend_requests_content' ); ?> -
trunk/bp-themes/bp-default/members/single/groups.php
r4452 r5737 25 25 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option> 26 26 27 <?php do_action( 'bp_member_group_order_options' ) ?>27 <?php do_action( 'bp_member_group_order_options' ); ?> 28 28 29 29 </select> -
trunk/bp-themes/bp-default/members/single/groups/invites.php
r3771 r5737 1 <?php do_action( 'bp_before_group_invites_content' ) ?>1 <?php do_action( 'bp_before_group_invites_content' ); ?> 2 2 3 3 <?php if ( bp_has_groups( 'type=invites&user_id=' . bp_loggedin_user_id() ) ) : ?> … … 9 9 <li> 10 10 <div class="item-avatar"> 11 <a href="<?php bp_group_permalink() ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' )?></a>11 <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' ); ?></a> 12 12 </div> 13 13 14 <h4><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a><span class="small"> - <?php printf( __( '%s members', 'buddypress' ), bp_group_total_members( false ) )?></span></h4>14 <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( __( '%s members', 'buddypress' ), bp_group_total_members( false ) ); ?></span></h4> 15 15 16 16 <p class="desc"> 17 <?php bp_group_description_excerpt() ?>17 <?php bp_group_description_excerpt(); ?> 18 18 </p> 19 19 20 <?php do_action( 'bp_group_invites_item' ) ?>20 <?php do_action( 'bp_group_invites_item' ); ?> 21 21 22 22 <div class="action"> 23 <a class="button accept" href="<?php bp_group_accept_invite_link() ?>"><?php _e( 'Accept', 'buddypress' )?></a> 24 <a class="button reject confirm" href="<?php bp_group_reject_invite_link() ?>"><?php _e( 'Reject', 'buddypress' )?></a>23 <a class="button accept" href="<?php bp_group_accept_invite_link(); ?>"><?php _e( 'Accept', 'buddypress' ); ?></a> 24 <a class="button reject confirm" href="<?php bp_group_reject_invite_link(); ?>"><?php _e( 'Reject', 'buddypress' ); ?></a> 25 25 26 <?php do_action( 'bp_group_invites_item_action' ) ?>26 <?php do_action( 'bp_group_invites_item_action' ); ?> 27 27 28 28 </div> … … 35 35 36 36 <div id="message" class="info" role="main"> 37 <p><?php _e( 'You have no outstanding group invites.', 'buddypress' ) ?></p>37 <p><?php _e( 'You have no outstanding group invites.', 'buddypress' ); ?></p> 38 38 </div> 39 39 40 40 <?php endif;?> 41 41 42 <?php do_action( 'bp_after_group_invites_content' ) ?>42 <?php do_action( 'bp_after_group_invites_content' ); ?> -
trunk/bp-themes/bp-default/members/single/messages/compose.php
r5329 r5737 1 <form action="<?php bp_messages_form_action('compose') ?>" method="post" id="send_message_form" class="standard-form" role="main">1 <form action="<?php bp_messages_form_action('compose'); ?>" method="post" id="send_message_form" class="standard-form" role="main"> 2 2 3 <?php do_action( 'bp_before_messages_compose_content' ) ?>3 <?php do_action( 'bp_before_messages_compose_content' ); ?> 4 4 5 <label for="send-to-input"><?php _e("Send To (Username or Friend's Name)", 'buddypress') ?></label>5 <label for="send-to-input"><?php _e("Send To (Username or Friend's Name)", 'buddypress'); ?></label> 6 6 <ul class="first acfb-holder"> 7 7 <li> 8 <?php bp_message_get_recipient_tabs() ?>8 <?php bp_message_get_recipient_tabs(); ?> 9 9 <input type="text" name="send-to-input" class="send-to-input" id="send-to-input" /> 10 10 </li> … … 12 12 13 13 <?php if ( bp_current_user_can( 'bp_moderate' ) ) : ?> 14 <input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( "This is a notice to all users.", "buddypress" ) ?>14 <input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( "This is a notice to all users.", "buddypress" ); ?> 15 15 <?php endif; ?> 16 16 17 <label for="subject"><?php _e( 'Subject', 'buddypress') ?></label>18 <input type="text" name="subject" id="subject" value="<?php bp_messages_subject_value() ?>" />17 <label for="subject"><?php _e( 'Subject', 'buddypress'); ?></label> 18 <input type="text" name="subject" id="subject" value="<?php bp_messages_subject_value(); ?>" /> 19 19 20 <label for="content"><?php _e( 'Message', 'buddypress') ?></label>21 <textarea name="content" id="message_content" rows="15" cols="40"><?php bp_messages_content_value() ?></textarea>20 <label for="content"><?php _e( 'Message', 'buddypress'); ?></label> 21 <textarea name="content" id="message_content" rows="15" cols="40"><?php bp_messages_content_value(); ?></textarea> 22 22 23 <input type="hidden" name="send_to_usernames" id="send-to-usernames" value="<?php bp_message_get_recipient_usernames(); ?>" class="<?php bp_message_get_recipient_usernames() ?>" />23 <input type="hidden" name="send_to_usernames" id="send-to-usernames" value="<?php bp_message_get_recipient_usernames(); ?>" class="<?php bp_message_get_recipient_usernames(); ?>" /> 24 24 25 <?php do_action( 'bp_after_messages_compose_content' ) ?>25 <?php do_action( 'bp_after_messages_compose_content' ); ?> 26 26 27 27 <div class="submit"> 28 <input type="submit" value="<?php _e( "Send Message", 'buddypress' ) ?>" name="send" id="send" />28 <input type="submit" value="<?php _e( "Send Message", 'buddypress' ); ?>" name="send" id="send" /> 29 29 </div> 30 30 31 <?php wp_nonce_field( 'messages_send_message' ) ?>31 <?php wp_nonce_field( 'messages_send_message' ); ?> 32 32 </form> 33 33 -
trunk/bp-themes/bp-default/members/single/messages/messages-loop.php
r4287 r5737 1 <?php do_action( 'bp_before_member_messages_loop' ) ?>1 <?php do_action( 'bp_before_member_messages_loop' ); ?> 2 2 3 3 <?php if ( bp_has_message_threads() ) : ?> … … 6 6 7 7 <div class="pag-count" id="messages-dir-count"> 8 <?php bp_messages_pagination_count() ?>8 <?php bp_messages_pagination_count(); ?> 9 9 </div> 10 10 11 11 <div class="pagination-links" id="messages-dir-pag"> 12 <?php bp_messages_pagination() ?>12 <?php bp_messages_pagination(); ?> 13 13 </div> 14 14 15 15 </div><!-- .pagination --> 16 16 17 <?php do_action( 'bp_after_member_messages_pagination' ) ?>18 <?php do_action( 'bp_before_member_messages_threads' ) ?>17 <?php do_action( 'bp_after_member_messages_pagination' ); ?> 18 <?php do_action( 'bp_before_member_messages_threads' ); ?> 19 19 20 20 <table id="message-threads" class="messages-notices"> 21 21 <?php while ( bp_message_threads() ) : bp_message_thread(); ?> 22 22 23 <tr id="m-<?php bp_message_thread_id() ?>" class="<?php bp_message_css_class(); ?><?php if ( bp_message_thread_has_unread() ) : ?> unread"<?php else: ?> read"<?php endif; ?>>23 <tr id="m-<?php bp_message_thread_id(); ?>" class="<?php bp_message_css_class(); ?><?php if ( bp_message_thread_has_unread() ) : ?> unread"<?php else: ?> read"<?php endif; ?>> 24 24 <td width="1%" class="thread-count"> 25 <span class="unread-count"><?php bp_message_thread_unread_count() ?></span>25 <span class="unread-count"><?php bp_message_thread_unread_count(); ?></span> 26 26 </td> 27 <td width="1%" class="thread-avatar"><?php bp_message_thread_avatar() ?></td>27 <td width="1%" class="thread-avatar"><?php bp_message_thread_avatar(); ?></td> 28 28 29 29 <?php if ( 'sentbox' != bp_current_action() ) : ?> 30 30 <td width="30%" class="thread-from"> 31 <?php _e( 'From:', 'buddypress' ); ?> <?php bp_message_thread_from() ?><br />32 <span class="activity"><?php bp_message_thread_last_post_date() ?></span>31 <?php _e( 'From:', 'buddypress' ); ?> <?php bp_message_thread_from(); ?><br /> 32 <span class="activity"><?php bp_message_thread_last_post_date(); ?></span> 33 33 </td> 34 34 <?php else: ?> 35 35 <td width="30%" class="thread-from"> 36 <?php _e( 'To:', 'buddypress' ); ?> <?php bp_message_thread_to() ?><br />37 <span class="activity"><?php bp_message_thread_last_post_date() ?></span>36 <?php _e( 'To:', 'buddypress' ); ?> <?php bp_message_thread_to(); ?><br /> 37 <span class="activity"><?php bp_message_thread_last_post_date(); ?></span> 38 38 </td> 39 39 <?php endif; ?> 40 40 41 41 <td width="50%" class="thread-info"> 42 <p><a href="<?php bp_message_thread_view_link() ?>" title="<?php _e( "View Message", "buddypress" ); ?>"><?php bp_message_thread_subject()?></a></p>43 <p class="thread-excerpt"><?php bp_message_thread_excerpt() ?></p>42 <p><a href="<?php bp_message_thread_view_link(); ?>" title="<?php _e( "View Message", "buddypress" ); ?>"><?php bp_message_thread_subject(); ?></a></p> 43 <p class="thread-excerpt"><?php bp_message_thread_excerpt(); ?></p> 44 44 </td> 45 45 46 <?php do_action( 'bp_messages_inbox_list_item' ) ?>46 <?php do_action( 'bp_messages_inbox_list_item' ); ?> 47 47 48 48 <td width="13%" class="thread-options"> 49 <input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id() ?>" />50 <a class="button confirm" href="<?php bp_message_thread_delete_link() ?>" title="<?php _e( "Delete Message", "buddypress" ); ?>"><?php _e( 'Delete', 'buddypress' )?></a> 49 <input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id(); ?>" /> 50 <a class="button confirm" href="<?php bp_message_thread_delete_link(); ?>" title="<?php _e( "Delete Message", "buddypress" ); ?>"><?php _e( 'Delete', 'buddypress' ); ?></a> 51 51 </td> 52 52 </tr> … … 56 56 57 57 <div class="messages-options-nav"> 58 <?php bp_messages_options() ?>58 <?php bp_messages_options(); ?> 59 59 </div><!-- .messages-options-nav --> 60 60 61 <?php do_action( 'bp_after_member_messages_threads' ) ?>61 <?php do_action( 'bp_after_member_messages_threads' ); ?> 62 62 63 <?php do_action( 'bp_after_member_messages_options' ) ?>63 <?php do_action( 'bp_after_member_messages_options' ); ?> 64 64 65 65 <?php else: ?> … … 71 71 <?php endif;?> 72 72 73 <?php do_action( 'bp_after_member_messages_loop' ) ?>73 <?php do_action( 'bp_after_member_messages_loop' ); ?> -
trunk/bp-themes/bp-default/members/single/messages/notices-loop.php
r4287 r5737 1 <?php do_action( 'bp_before_notices_loop' ) ?>1 <?php do_action( 'bp_before_notices_loop' ); ?> 2 2 3 3 <?php if ( bp_has_message_threads() ) : ?> … … 6 6 7 7 <div class="pag-count" id="messages-dir-count"> 8 <?php bp_messages_pagination_count() ?>8 <?php bp_messages_pagination_count(); ?> 9 9 </div> 10 10 11 11 <div class="pagination-links" id="messages-dir-pag"> 12 <?php bp_messages_pagination() ?>12 <?php bp_messages_pagination(); ?> 13 13 </div> 14 14 15 15 </div><!-- .pagination --> 16 16 17 <?php do_action( 'bp_after_notices_pagination' ) ?>18 <?php do_action( 'bp_before_notices' ) ?>17 <?php do_action( 'bp_after_notices_pagination' ); ?> 18 <?php do_action( 'bp_before_notices' ); ?> 19 19 20 20 <table id="message-threads" class="messages-notices"> 21 21 <?php while ( bp_message_threads() ) : bp_message_thread(); ?> 22 <tr id="notice-<?php bp_message_notice_id() ?>" class="<?php bp_message_css_class(); ?>">22 <tr id="notice-<?php bp_message_notice_id(); ?>" class="<?php bp_message_css_class(); ?>"> 23 23 <td width="1%"> 24 24 </td> 25 25 <td width="38%"> 26 <strong><?php bp_message_notice_subject() ?></strong>27 <?php bp_message_notice_text() ?>26 <strong><?php bp_message_notice_subject(); ?></strong> 27 <?php bp_message_notice_text(); ?> 28 28 </td> 29 29 <td width="21%"> 30 <strong><?php bp_message_is_active_notice() ?></strong>31 <span class="activity"><?php _e("Sent:", "buddypress"); ?> <?php bp_message_notice_post_date() ?></span>30 <strong><?php bp_message_is_active_notice(); ?></strong> 31 <span class="activity"><?php _e("Sent:", "buddypress"); ?> <?php bp_message_notice_post_date(); ?></span> 32 32 </td> 33 33 34 <?php do_action( 'bp_notices_list_item' ) ?>34 <?php do_action( 'bp_notices_list_item' ); ?> 35 35 36 36 <td width="10%"> 37 <a class="button" href="<?php bp_message_activate_deactivate_link() ?>" class="confirm"><?php bp_message_activate_deactivate_text()?></a>38 <a class="button" href="<?php bp_message_notice_delete_link() ?>" class="confirm" title="<?php _e( "Delete Message", "buddypress" ); ?>">x</a>37 <a class="button" href="<?php bp_message_activate_deactivate_link(); ?>" class="confirm"><?php bp_message_activate_deactivate_text(); ?></a> 38 <a class="button" href="<?php bp_message_notice_delete_link(); ?>" class="confirm" title="<?php _e( "Delete Message", "buddypress" ); ?>">x</a> 39 39 </td> 40 40 </tr> … … 42 42 </table><!-- #message-threads --> 43 43 44 <?php do_action( 'bp_after_notices' ) ?>44 <?php do_action( 'bp_after_notices' ); ?> 45 45 46 46 <?php else: ?> … … 52 52 <?php endif;?> 53 53 54 <?php do_action( 'bp_after_notices_loop' ) ?>54 <?php do_action( 'bp_after_notices_loop' ); ?> -
trunk/bp-themes/bp-default/members/single/messages/single.php
r4800 r5737 1 1 <div id="message-thread" role="main"> 2 2 3 <?php do_action( 'bp_before_message_thread_content' ) ?>3 <?php do_action( 'bp_before_message_thread_content' ); ?> 4 4 5 5 <?php if ( bp_thread_has_messages() ) : ?> 6 6 7 <h3 id="message-subject"><?php bp_the_thread_subject() ?></h3>7 <h3 id="message-subject"><?php bp_the_thread_subject(); ?></h3> 8 8 9 9 <p id="message-recipients"> … … 16 16 <?php else : ?> 17 17 18 <?php printf( __( 'Conversation between %s and you.', 'buddypress' ), bp_get_the_thread_recipients() ) ?>18 <?php printf( __( 'Conversation between %s and you.', 'buddypress' ), bp_get_the_thread_recipients() ); ?> 19 19 20 20 <?php endif; ?> … … 22 22 </span> 23 23 24 <a class="button confirm" href="<?php bp_the_thread_delete_link() ?>" title="<?php _e( "Delete Message", "buddypress" ); ?>"><?php _e( 'Delete', 'buddypress' )?></a> 24 <a class="button confirm" href="<?php bp_the_thread_delete_link(); ?>" title="<?php _e( "Delete Message", "buddypress" ); ?>"><?php _e( 'Delete', 'buddypress' ); ?></a> 25 25 </p> 26 26 27 <?php do_action( 'bp_before_message_thread_list' ) ?>27 <?php do_action( 'bp_before_message_thread_list' ); ?> 28 28 29 29 <?php while ( bp_thread_messages() ) : bp_thread_the_message(); ?> … … 33 33 <div class="message-metadata"> 34 34 35 <?php do_action( 'bp_before_message_meta' ) ?>35 <?php do_action( 'bp_before_message_meta' ); ?> 36 36 37 <?php bp_the_thread_message_sender_avatar( 'type=thumb&width=30&height=30' ) ?>38 <strong><a href="<?php bp_the_thread_message_sender_link() ?>" title="<?php bp_the_thread_message_sender_name() ?>"><?php bp_the_thread_message_sender_name() ?></a> <span class="activity"><?php bp_the_thread_message_time_since()?></span></strong>37 <?php bp_the_thread_message_sender_avatar( 'type=thumb&width=30&height=30' ); ?> 38 <strong><a href="<?php bp_the_thread_message_sender_link(); ?>" title="<?php bp_the_thread_message_sender_name(); ?>"><?php bp_the_thread_message_sender_name(); ?></a> <span class="activity"><?php bp_the_thread_message_time_since(); ?></span></strong> 39 39 40 <?php do_action( 'bp_after_message_meta' ) ?>40 <?php do_action( 'bp_after_message_meta' ); ?> 41 41 42 42 </div><!-- .message-metadata --> 43 43 44 <?php do_action( 'bp_before_message_content' ) ?>44 <?php do_action( 'bp_before_message_content' ); ?> 45 45 46 46 <div class="message-content"> 47 47 48 <?php bp_the_thread_message_content() ?>48 <?php bp_the_thread_message_content(); ?> 49 49 50 50 </div><!-- .message-content --> 51 51 52 <?php do_action( 'bp_after_message_content' ) ?>52 <?php do_action( 'bp_after_message_content' ); ?> 53 53 54 54 <div class="clear"></div> … … 58 58 <?php endwhile; ?> 59 59 60 <?php do_action( 'bp_after_message_thread_list' ) ?>60 <?php do_action( 'bp_after_message_thread_list' ); ?> 61 61 62 <?php do_action( 'bp_before_message_thread_reply' ) ?>62 <?php do_action( 'bp_before_message_thread_reply' ); ?> 63 63 64 <form id="send-reply" action="<?php bp_messages_form_action() ?>" method="post" class="standard-form">64 <form id="send-reply" action="<?php bp_messages_form_action(); ?>" method="post" class="standard-form"> 65 65 66 66 <div class="message-box"> … … 68 68 <div class="message-metadata"> 69 69 70 <?php do_action( 'bp_before_message_meta' ) ?>70 <?php do_action( 'bp_before_message_meta' ); ?> 71 71 72 72 <div class="avatar-box"> 73 <?php bp_loggedin_user_avatar( 'type=thumb&height=30&width=30' ) ?>73 <?php bp_loggedin_user_avatar( 'type=thumb&height=30&width=30' ); ?> 74 74 75 <strong><?php _e( 'Send a Reply', 'buddypress' ) ?></strong>75 <strong><?php _e( 'Send a Reply', 'buddypress' ); ?></strong> 76 76 </div> 77 77 78 <?php do_action( 'bp_after_message_meta' ) ?>78 <?php do_action( 'bp_after_message_meta' ); ?> 79 79 80 80 </div><!-- .message-metadata --> … … 82 82 <div class="message-content"> 83 83 84 <?php do_action( 'bp_before_message_reply_box' ) ?>84 <?php do_action( 'bp_before_message_reply_box' ); ?> 85 85 86 86 <textarea name="content" id="message_content" rows="15" cols="40"></textarea> 87 87 88 <?php do_action( 'bp_after_message_reply_box' ) ?>88 <?php do_action( 'bp_after_message_reply_box' ); ?> 89 89 90 90 <div class="submit"> 91 <input type="submit" name="send" value="<?php _e( 'Send Reply', 'buddypress' ) ?>" id="send_reply_button"/>91 <input type="submit" name="send" value="<?php _e( 'Send Reply', 'buddypress' ); ?>" id="send_reply_button"/> 92 92 </div> 93 93 94 94 <input type="hidden" id="thread_id" name="thread_id" value="<?php bp_the_thread_id(); ?>" /> 95 95 <input type="hidden" id="messages_order" name="messages_order" value="<?php bp_thread_messages_order(); ?>" /> 96 <?php wp_nonce_field( 'messages_send_message', 'send_message_nonce' ) ?>96 <?php wp_nonce_field( 'messages_send_message', 'send_message_nonce' ); ?> 97 97 98 98 </div><!-- .message-content --> … … 102 102 </form><!-- #send-reply --> 103 103 104 <?php do_action( 'bp_after_message_thread_reply' ) ?>104 <?php do_action( 'bp_after_message_thread_reply' ); ?> 105 105 106 106 <?php endif; ?> 107 107 108 <?php do_action( 'bp_after_message_thread_content' ) ?>108 <?php do_action( 'bp_after_message_thread_content' ); ?> 109 109 110 110 </div> -
trunk/bp-themes/bp-default/members/single/profile/change-avatar.php
r4495 r5737 1 <h4><?php _e( 'Change Avatar', 'buddypress' ) ?></h4>1 <h4><?php _e( 'Change Avatar', 'buddypress' ); ?></h4> 2 2 3 <?php do_action( 'bp_before_profile_avatar_upload_content' ) ?>3 <?php do_action( 'bp_before_profile_avatar_upload_content' ); ?> 4 4 5 5 <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?> 6 6 7 <p><?php _e( 'Your avatar will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress') ?></p>7 <p><?php _e( 'Your avatar will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress'); ?></p> 8 8 9 9 <form action="" method="post" id="avatar-upload-form" class="standard-form" enctype="multipart/form-data"> … … 11 11 <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?> 12 12 13 <?php wp_nonce_field( 'bp_avatar_upload' ) ?>14 <p><?php _e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Image\' to proceed.', 'buddypress' ) ?></p>13 <?php wp_nonce_field( 'bp_avatar_upload' ); ?> 14 <p><?php _e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Image\' to proceed.', 'buddypress' ); ?></p> 15 15 16 16 <p id="avatar-upload"> 17 17 <input type="file" name="file" id="file" /> 18 <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />18 <input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ); ?>" /> 19 19 <input type="hidden" name="action" id="action" value="bp_avatar_upload" /> 20 20 </p> 21 21 22 22 <?php if ( bp_get_user_has_avatar() ) : ?> 23 <p><?php _e( "If you'd like to delete your current avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ) ?></p>24 <p><a class="button edit" href="<?php bp_avatar_delete_link() ?>" title="<?php _e( 'Delete Avatar', 'buddypress' ) ?>"><?php _e( 'Delete My Avatar', 'buddypress' )?></a></p>23 <p><?php _e( "If you'd like to delete your current avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p> 24 <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php _e( 'Delete Avatar', 'buddypress' ); ?>"><?php _e( 'Delete My Avatar', 'buddypress' ); ?></a></p> 25 25 <?php endif; ?> 26 26 … … 29 29 <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?> 30 30 31 <h5><?php _e( 'Crop Your New Avatar', 'buddypress' ) ?></h5>31 <h5><?php _e( 'Crop Your New Avatar', 'buddypress' ); ?></h5> 32 32 33 <img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' )?>" />33 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ); ?>" /> 34 34 35 35 <div id="avatar-crop-pane"> 36 <img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' )?>" />36 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ); ?>" /> 37 37 </div> 38 38 39 <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />39 <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ); ?>" /> 40 40 41 <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />41 <input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src(); ?>" /> 42 42 <input type="hidden" id="x" name="x" /> 43 43 <input type="hidden" id="y" name="y" /> … … 45 45 <input type="hidden" id="h" name="h" /> 46 46 47 <?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>47 <?php wp_nonce_field( 'bp_avatar_cropstore' ); ?> 48 48 49 49 <?php endif; ?> … … 53 53 <?php else : ?> 54 54 55 <p><?php _e( 'Your avatar will be used on your profile and throughout the site. To change your avatar, please create an account with <a href="http://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'buddypress' ) ?></p>55 <p><?php _e( 'Your avatar will be used on your profile and throughout the site. To change your avatar, please create an account with <a href="http://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'buddypress' ); ?></p> 56 56 57 57 <?php endif; ?> 58 58 59 <?php do_action( 'bp_after_profile_avatar_upload_content' ) ?>59 <?php do_action( 'bp_after_profile_avatar_upload_content' ); ?> -
trunk/bp-themes/bp-default/members/single/profile/edit.php
r4449 r5737 20 20 <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?> 21 21 22 <div<?php bp_field_css_class( 'editfield' ) ?>>22 <div<?php bp_field_css_class( 'editfield' ); ?>> 23 23 24 24 <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?> … … 31 31 <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?> 32 32 33 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label>33 <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 34 34 <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>><?php bp_the_profile_field_edit_value(); ?></textarea> 35 35 … … 40 40 <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 41 41 <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>> 42 <?php bp_the_profile_field_options() ?>42 <?php bp_the_profile_field_options(); ?> 43 43 </select> 44 44 … … 47 47 <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?> 48 48 49 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name()?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label>50 <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name()?>" multiple="multiple" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>>49 <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 50 <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" multiple="multiple" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>> 51 51 52 52 <?php bp_the_profile_field_options(); ?> … … 99 99 </select> 100 100 101 <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name(); ?>_month" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>>101 <select name="<?php bp_the_profile_field_input_name(); ?>_month" id="<?php bp_the_profile_field_input_name(); ?>_month" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>> 102 102 103 103 <?php bp_the_profile_field_options( 'type=month' ); ?> … … 105 105 </select> 106 106 107 <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name(); ?>_year" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>>107 <select name="<?php bp_the_profile_field_input_name(); ?>_year" id="<?php bp_the_profile_field_input_name(); ?>_year" <?php if ( bp_get_the_profile_field_is_required() ) : ?>aria-required="true"<?php endif; ?>> 108 108 109 109 <?php bp_the_profile_field_options( 'type=year' ); ?> -
trunk/bp-themes/bp-default/members/single/profile/profile-wp.php
r4895 r5737 1 <?php do_action( 'bp_before_profile_loop_content' ) ?>1 <?php do_action( 'bp_before_profile_loop_content' ); ?> 2 2 3 3 <?php $ud = get_userdata( bp_displayed_user_id() ); ?> 4 4 5 <?php do_action( 'bp_before_profile_field_content' ) ?>5 <?php do_action( 'bp_before_profile_field_content' ); ?> 6 6 7 7 <div class="bp-widget wp-profile"> … … 67 67 </div> 68 68 69 <?php do_action( 'bp_after_profile_field_content' ) ?>69 <?php do_action( 'bp_after_profile_field_content' ); ?> 70 70 71 <?php do_action( 'bp_profile_field_buttons' ) ?>71 <?php do_action( 'bp_profile_field_buttons' ); ?> 72 72 73 <?php do_action( 'bp_after_profile_loop_content' ) ?>73 <?php do_action( 'bp_after_profile_loop_content' ); ?> -
trunk/bp-themes/bp-default/members/single/settings/delete-account.php
r4675 r5737 9 9 ?> 10 10 11 <?php get_header( 'buddypress' ) ?>11 <?php get_header( 'buddypress' ); ?> 12 12 13 13 <div id="content"> … … 61 61 62 62 <div class="submit"> 63 <input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?>" id="delete-account-button" name="delete-account-button" />63 <input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ); ?>" id="delete-account-button" name="delete-account-button" /> 64 64 </div> 65 65 … … 78 78 </div><!-- #content --> 79 79 80 <?php get_sidebar( 'buddypress' ) ?>80 <?php get_sidebar( 'buddypress' ); ?> 81 81 82 <?php get_footer( 'buddypress' ) ?>82 <?php get_footer( 'buddypress' ); ?> -
trunk/bp-themes/bp-default/members/single/settings/general.php
r4347 r5737 9 9 ?> 10 10 11 <?php get_header( 'buddypress' ) ?>11 <?php get_header( 'buddypress' ); ?> 12 12 13 13 <div id="content"> … … 50 50 <h3><?php _e( 'General Settings', 'buddypress' ); ?></h3> 51 51 52 <?php do_action( 'bp_template_content' ) ?>52 <?php do_action( 'bp_template_content' ); ?> 53 53 54 54 <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form"> … … 85 85 </div><!-- #content --> 86 86 87 <?php get_sidebar( 'buddypress' ) ?>87 <?php get_sidebar( 'buddypress' ); ?> 88 88 89 <?php get_footer( 'buddypress' ) ?>89 <?php get_footer( 'buddypress' ); ?> -
trunk/bp-themes/bp-default/members/single/settings/notifications.php
r4347 r5737 9 9 ?> 10 10 11 <?php get_header( 'buddypress' ) ?>11 <?php get_header( 'buddypress' ); ?> 12 12 13 13 <div id="content"> … … 50 50 <h3><?php _e( 'Email Notification', 'buddypress' ); ?></h3> 51 51 52 <?php do_action( 'bp_template_content' ) ?>52 <?php do_action( 'bp_template_content' ); ?> 53 53 54 54 <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form"> … … 78 78 </div><!-- #content --> 79 79 80 <?php get_sidebar( 'buddypress' ) ?>80 <?php get_sidebar( 'buddypress' ); ?> 81 81 82 <?php get_footer( 'buddypress' ) ?>82 <?php get_footer( 'buddypress' ); ?> -
trunk/bp-themes/bp-default/onecolumn-page.php
r4907 r5737 10 10 */ 11 11 12 get_header() ?>12 get_header(); ?> 13 13 14 14 <div id="content"> 15 15 <div class="padder one-column"> 16 16 17 <?php do_action( 'bp_before_blog_page' ) ?>17 <?php do_action( 'bp_before_blog_page' ); ?> 18 18 19 19 <div class="page" id="blog-page" role="main"> … … 42 42 </div><!-- .page --> 43 43 44 <?php do_action( 'bp_after_blog_page' ) ?>44 <?php do_action( 'bp_after_blog_page' ); ?> 45 45 46 46 </div><!-- .padder --> -
trunk/bp-themes/bp-default/page.php
r4426 r5737 1 <?php get_header() ?>1 <?php get_header(); ?> 2 2 3 3 <div id="content"> 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_before_blog_page' ) ?>6 <?php do_action( 'bp_before_blog_page' ); ?> 7 7 8 8 <div class="page" id="blog-page" role="main"> … … 31 31 </div><!-- .page --> 32 32 33 <?php do_action( 'bp_after_blog_page' ) ?>33 <?php do_action( 'bp_after_blog_page' ); ?> 34 34 35 35 </div><!-- .padder --> 36 36 </div><!-- #content --> 37 37 38 <?php get_sidebar() ?>38 <?php get_sidebar(); ?> 39 39 40 40 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/registration/activate.php
r4675 r5737 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_before_activation_page' ) ?>6 <?php do_action( 'bp_before_activation_page' ); ?> 7 7 8 8 <div class="page" id="activate-page"> … … 10 10 <?php if ( bp_account_was_activated() ) : ?> 11 11 12 <h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ) ?></h2>12 <h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ); ?></h2> 13 13 14 <?php do_action( 'bp_before_activate_content' ) ?>14 <?php do_action( 'bp_before_activate_content' ); ?> 15 15 16 16 <?php if ( isset( $_GET['e'] ) ) : ?> 17 <p><?php _e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ) ?></p>17 <p><?php _e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ); ?></p> 18 18 <?php else : ?> 19 <p><?php _e( 'Your account was activated successfully! You can now log in with the username and password you provided when you signed up.', 'buddypress' ) ?></p>19 <p><?php _e( 'Your account was activated successfully! You can now log in with the username and password you provided when you signed up.', 'buddypress' ); ?></p> 20 20 <?php endif; ?> 21 21 22 22 <?php else : ?> 23 23 24 <h3><?php _e( 'Activate your Account', 'buddypress' ) ?></h3>24 <h3><?php _e( 'Activate your Account', 'buddypress' ); ?></h3> 25 25 26 <?php do_action( 'bp_before_activate_content' ) ?>26 <?php do_action( 'bp_before_activate_content' ); ?> 27 27 28 <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ) ?></p>28 <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p> 29 29 30 30 <form action="" method="get" class="standard-form" id="activation-form"> 31 31 32 <label for="key"><?php _e( 'Activation Key:', 'buddypress' ) ?></label>32 <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label> 33 33 <input type="text" name="key" id="key" value="" /> 34 34 35 35 <p class="submit"> 36 <input type="submit" name="submit" value="<?php _e( 'Activate', 'buddypress' ) ?>" />36 <input type="submit" name="submit" value="<?php _e( 'Activate', 'buddypress' ); ?>" /> 37 37 </p> 38 38 … … 41 41 <?php endif; ?> 42 42 43 <?php do_action( 'bp_after_activate_content' ) ?>43 <?php do_action( 'bp_after_activate_content' ); ?> 44 44 45 45 </div><!-- .page --> 46 46 47 <?php do_action( 'bp_after_activation_page' ) ?>47 <?php do_action( 'bp_after_activation_page' ); ?> 48 48 49 49 </div><!-- .padder --> 50 50 </div><!-- #content --> 51 51 52 <?php get_sidebar( 'buddypress' ) ?>52 <?php get_sidebar( 'buddypress' ); ?> 53 53 54 54 <?php get_footer( 'buddypress' ); ?> -
trunk/bp-themes/bp-default/registration/register.php
r5380 r5737 1 <?php get_header( 'buddypress' ) ?>1 <?php get_header( 'buddypress' ); ?> 2 2 3 3 <div id="content"> 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_before_register_page' ) ?>6 <?php do_action( 'bp_before_register_page' ); ?> 7 7 8 8 <div class="page" id="register-page"> … … 11 11 12 12 <?php if ( 'registration-disabled' == bp_get_current_signup_step() ) : ?> 13 <?php do_action( 'template_notices' ) ?>14 <?php do_action( 'bp_before_registration_disabled' ) ?>13 <?php do_action( 'template_notices' ); ?> 14 <?php do_action( 'bp_before_registration_disabled' ); ?> 15 15 16 16 <p><?php _e( 'User registration is currently not allowed.', 'buddypress' ); ?></p> … … 21 21 <?php if ( 'request-details' == bp_get_current_signup_step() ) : ?> 22 22 23 <h2><?php _e( 'Create an Account', 'buddypress' ) ?></h2>24 25 <?php do_action( 'template_notices' ) ?>26 27 <p><?php _e( 'Registering for this site is easy, just fill in the fields below and we\'ll get a new account set up for you in no time.', 'buddypress' ) ?></p>28 29 <?php do_action( 'bp_before_account_details_fields' ) ?>23 <h2><?php _e( 'Create an Account', 'buddypress' ); ?></h2> 24 25 <?php do_action( 'template_notices' ); ?> 26 27 <p><?php _e( 'Registering for this site is easy, just fill in the fields below and we\'ll get a new account set up for you in no time.', 'buddypress' ); ?></p> 28 29 <?php do_action( 'bp_before_account_details_fields' ); ?> 30 30 31 31 <div class="register-section" id="basic-details-section"> … … 33 33 <?php /***** Basic Account Details ******/ ?> 34 34 35 <h4><?php _e( 'Account Details', 'buddypress' ) ?></h4>36 37 <label for="signup_username"><?php _e( 'Username', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' )?></label>38 <?php do_action( 'bp_signup_username_errors' ) ?>39 <input type="text" name="signup_username" id="signup_username" value="<?php bp_signup_username_value() ?>" />40 41 <label for="signup_email"><?php _e( 'Email Address', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' )?></label>42 <?php do_action( 'bp_signup_email_errors' ) ?>43 <input type="text" name="signup_email" id="signup_email" value="<?php bp_signup_email_value() ?>" />44 45 <label for="signup_password"><?php _e( 'Choose a Password', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' )?></label>46 <?php do_action( 'bp_signup_password_errors' ) ?>35 <h4><?php _e( 'Account Details', 'buddypress' ); ?></h4> 36 37 <label for="signup_username"><?php _e( 'Username', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label> 38 <?php do_action( 'bp_signup_username_errors' ); ?> 39 <input type="text" name="signup_username" id="signup_username" value="<?php bp_signup_username_value(); ?>" /> 40 41 <label for="signup_email"><?php _e( 'Email Address', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label> 42 <?php do_action( 'bp_signup_email_errors' ); ?> 43 <input type="text" name="signup_email" id="signup_email" value="<?php bp_signup_email_value(); ?>" /> 44 45 <label for="signup_password"><?php _e( 'Choose a Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label> 46 <?php do_action( 'bp_signup_password_errors' ); ?> 47 47 <input type="password" name="signup_password" id="signup_password" value="" /> 48 48 49 <label for="signup_password_confirm"><?php _e( 'Confirm Password', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' )?></label>50 <?php do_action( 'bp_signup_password_confirm_errors' ) ?>49 <label for="signup_password_confirm"><?php _e( 'Confirm Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label> 50 <?php do_action( 'bp_signup_password_confirm_errors' ); ?> 51 51 <input type="password" name="signup_password_confirm" id="signup_password_confirm" value="" /> 52 52 53 53 </div><!-- #basic-details-section --> 54 54 55 <?php do_action( 'bp_after_account_details_fields' ) ?>55 <?php do_action( 'bp_after_account_details_fields' ); ?> 56 56 57 57 <?php /***** Extra Profile Details ******/ ?> … … 59 59 <?php if ( bp_is_active( 'xprofile' ) ) : ?> 60 60 61 <?php do_action( 'bp_before_signup_profile_fields' ) ?>61 <?php do_action( 'bp_before_signup_profile_fields' ); ?> 62 62 63 63 <div class="register-section" id="profile-details-section"> 64 64 65 <h4><?php _e( 'Profile Details', 'buddypress' ) ?></h4>65 <h4><?php _e( 'Profile Details', 'buddypress' ); ?></h4> 66 66 67 67 <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?> … … 74 74 <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?> 75 75 76 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' )?><?php endif; ?></label>77 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>78 <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="<?php bp_the_profile_field_edit_value()?>" />76 <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 77 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?> 78 <input type="text" name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" value="<?php bp_the_profile_field_edit_value(); ?>" /> 79 79 80 80 <?php endif; ?> … … 82 82 <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?> 83 83 84 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' )?><?php endif; ?></label>85 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>86 <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_edit_value()?></textarea>84 <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 85 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?> 86 <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_edit_value(); ?></textarea> 87 87 88 88 <?php endif; ?> … … 90 90 <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?> 91 91 92 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' )?><?php endif; ?></label>93 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>94 <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name()?>">95 <?php bp_the_profile_field_options() ?>92 <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 93 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?> 94 <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>"> 95 <?php bp_the_profile_field_options(); ?> 96 96 </select> 97 97 … … 100 100 <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?> 101 101 102 <label for="<?php bp_the_profile_field_input_name() ?>"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' )?><?php endif; ?></label>103 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>104 <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name()?>" multiple="multiple">105 <?php bp_the_profile_field_options() ?>102 <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 103 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?> 104 <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" multiple="multiple"> 105 <?php bp_the_profile_field_options(); ?> 106 106 </select> 107 107 … … 111 111 112 112 <div class="radio"> 113 <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' )?><?php endif; ?></span>114 115 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>116 <?php bp_the_profile_field_options() ?>113 <span class="label"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></span> 114 115 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?> 116 <?php bp_the_profile_field_options(); ?> 117 117 118 118 <?php if ( !bp_get_the_profile_field_is_required() ) : ?> 119 <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' )?></a>119 <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name(); ?>' );"><?php _e( 'Clear', 'buddypress' ); ?></a> 120 120 <?php endif; ?> 121 121 </div> … … 126 126 127 127 <div class="checkbox"> 128 <span class="label"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' )?><?php endif; ?></span>129 130 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>131 <?php bp_the_profile_field_options() ?>128 <span class="label"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></span> 129 130 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?> 131 <?php bp_the_profile_field_options(); ?> 132 132 </div> 133 133 … … 137 137 138 138 <div class="datebox"> 139 <label for="<?php bp_the_profile_field_input_name() ?>_day"><?php bp_the_profile_field_name() ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' )?><?php endif; ?></label>140 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ) ?>141 142 <select name="<?php bp_the_profile_field_input_name() ?>_day" id="<?php bp_the_profile_field_input_name()?>_day">143 <?php bp_the_profile_field_options( 'type=day' ) ?>139 <label for="<?php bp_the_profile_field_input_name(); ?>_day"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label> 140 <?php do_action( 'bp_' . bp_get_the_profile_field_input_name() . '_errors' ); ?> 141 142 <select name="<?php bp_the_profile_field_input_name(); ?>_day" id="<?php bp_the_profile_field_input_name(); ?>_day"> 143 <?php bp_the_profile_field_options( 'type=day' ); ?> 144 144 </select> 145 145 146 <select name="<?php bp_the_profile_field_input_name() ?>_month" id="<?php bp_the_profile_field_input_name()?>_month">147 <?php bp_the_profile_field_options( 'type=month' ) ?>146 <select name="<?php bp_the_profile_field_input_name(); ?>_month" id="<?php bp_the_profile_field_input_name(); ?>_month"> 147 <?php bp_the_profile_field_options( 'type=month' ); ?> 148 148 </select> 149 149 150 <select name="<?php bp_the_profile_field_input_name() ?>_year" id="<?php bp_the_profile_field_input_name()?>_year">151 <?php bp_the_profile_field_options( 'type=year' ) ?>150 <select name="<?php bp_the_profile_field_input_name(); ?>_year" id="<?php bp_the_profile_field_input_name(); ?>_year"> 151 <?php bp_the_profile_field_options( 'type=year' ); ?> 152 152 </select> 153 153 </div> … … 155 155 <?php endif; ?> 156 156 157 <?php do_action( 'bp_custom_profile_edit_fields' ) ?>158 159 <p class="description"><?php bp_the_profile_field_description() ?></p>157 <?php do_action( 'bp_custom_profile_edit_fields' ); ?> 158 159 <p class="description"><?php bp_the_profile_field_description(); ?></p> 160 160 161 161 </div> … … 163 163 <?php endwhile; ?> 164 164 165 <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />165 <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids(); ?>" /> 166 166 167 167 <?php endwhile; endif; endif; ?> … … 169 169 </div><!-- #profile-details-section --> 170 170 171 <?php do_action( 'bp_after_signup_profile_fields' ) ?>171 <?php do_action( 'bp_after_signup_profile_fields' ); ?> 172 172 173 173 <?php endif; ?> … … 175 175 <?php if ( bp_get_blog_signup_allowed() ) : ?> 176 176 177 <?php do_action( 'bp_before_blog_details_fields' ) ?>177 <?php do_action( 'bp_before_blog_details_fields' ); ?> 178 178 179 179 <?php /***** Blog Creation Details ******/ ?> … … 181 181 <div class="register-section" id="blog-details-section"> 182 182 183 <h4><?php _e( 'Blog Details', 'buddypress' ) ?></h4>184 185 <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new site', 'buddypress' ) ?></p>183 <h4><?php _e( 'Blog Details', 'buddypress' ); ?></h4> 184 185 <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new site', 'buddypress' ); ?></p> 186 186 187 187 <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>> 188 188 189 <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' )?></label>190 <?php do_action( 'bp_signup_blog_url_errors' ) ?>189 <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label> 190 <?php do_action( 'bp_signup_blog_url_errors' ); ?> 191 191 192 192 <?php if ( is_subdomain_install() ) : ?> 193 http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" /> .<?php bp_blogs_subdomain_base()?>193 http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> .<?php bp_blogs_subdomain_base(); ?> 194 194 <?php else : ?> 195 <?php echo site_url() ?>/ <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value()?>" />195 <?php echo site_url(); ?>/ <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> 196 196 <?php endif; ?> 197 197 198 <label for="signup_blog_title"><?php _e( 'Site Title', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' )?></label>199 <?php do_action( 'bp_signup_blog_title_errors' ) ?>200 <input type="text" name="signup_blog_title" id="signup_blog_title" value="<?php bp_signup_blog_title_value() ?>" />201 202 <span class="label"><?php _e( 'I would like my site to appear in search engines, and in public listings around this network.', 'buddypress' ) ?>:</span>203 <?php do_action( 'bp_signup_blog_privacy_errors' ) ?>204 205 <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_public" value="public"<?php if ( 'public' == bp_get_signup_blog_privacy_value() || !bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes', 'buddypress' ) ?></label>206 <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_private" value="private"<?php if ( 'private' == bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'No', 'buddypress' ) ?></label>198 <label for="signup_blog_title"><?php _e( 'Site Title', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label> 199 <?php do_action( 'bp_signup_blog_title_errors' ); ?> 200 <input type="text" name="signup_blog_title" id="signup_blog_title" value="<?php bp_signup_blog_title_value(); ?>" /> 201 202 <span class="label"><?php _e( 'I would like my site to appear in search engines, and in public listings around this network.', 'buddypress' ); ?>:</span> 203 <?php do_action( 'bp_signup_blog_privacy_errors' ); ?> 204 205 <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_public" value="public"<?php if ( 'public' == bp_get_signup_blog_privacy_value() || !bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes', 'buddypress' ); ?></label> 206 <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_private" value="private"<?php if ( 'private' == bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'No', 'buddypress' ); ?></label> 207 207 208 208 </div> … … 210 210 </div><!-- #blog-details-section --> 211 211 212 <?php do_action( 'bp_after_blog_details_fields' ) ?>212 <?php do_action( 'bp_after_blog_details_fields' ); ?> 213 213 214 214 <?php endif; ?> 215 215 216 <?php do_action( 'bp_before_registration_submit_buttons' ) ?>216 <?php do_action( 'bp_before_registration_submit_buttons' ); ?> 217 217 218 218 <div class="submit"> 219 <input type="submit" name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?>" />219 <input type="submit" name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ); ?>" /> 220 220 </div> 221 221 222 <?php do_action( 'bp_after_registration_submit_buttons' ) ?>223 224 <?php wp_nonce_field( 'bp_new_signup' ) ?>222 <?php do_action( 'bp_after_registration_submit_buttons' ); ?> 223 224 <?php wp_nonce_field( 'bp_new_signup' ); ?> 225 225 226 226 <?php endif; // request-details signup step ?> … … 228 228 <?php if ( 'completed-confirmation' == bp_get_current_signup_step() ) : ?> 229 229 230 <h2><?php _e( 'Sign Up Complete!', 'buddypress' ) ?></h2>231 232 <?php do_action( 'template_notices' ) ?>233 <?php do_action( 'bp_before_registration_confirmed' ) ?>230 <h2><?php _e( 'Sign Up Complete!', 'buddypress' ); ?></h2> 231 232 <?php do_action( 'template_notices' ); ?> 233 <?php do_action( 'bp_before_registration_confirmed' ); ?> 234 234 235 235 <?php if ( bp_registration_needs_activation() ) : ?> 236 <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ) ?></p>236 <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ); ?></p> 237 237 <?php else : ?> 238 <p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ) ?></p>238 <p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ); ?></p> 239 239 <?php endif; ?> 240 240 241 <?php do_action( 'bp_after_registration_confirmed' ) ?>241 <?php do_action( 'bp_after_registration_confirmed' ); ?> 242 242 243 243 <?php endif; // completed-confirmation signup step ?> 244 244 245 <?php do_action( 'bp_custom_signup_steps' ) ?>245 <?php do_action( 'bp_custom_signup_steps' ); ?> 246 246 247 247 </form> … … 249 249 </div> 250 250 251 <?php do_action( 'bp_after_register_page' ) ?>251 <?php do_action( 'bp_after_register_page' ); ?> 252 252 253 253 </div><!-- .padder --> 254 254 </div><!-- #content --> 255 255 256 <?php get_sidebar( 'buddypress' ) ?>256 <?php get_sidebar( 'buddypress' ); ?> 257 257 258 258 <script type="text/javascript"> … … 267 267 </script> 268 268 269 <?php get_footer( 'buddypress' ) ?>269 <?php get_footer( 'buddypress' ); ?> -
trunk/bp-themes/bp-default/search.php
r4528 r5737 1 <?php get_header() ?>1 <?php get_header(); ?> 2 2 3 3 <div id="content"> 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_before_blog_search' ) ?>6 <?php do_action( 'bp_before_blog_search' ); ?> 7 7 8 8 <div class="page" id="blog-search" role="main"> 9 9 10 <h2 class="pagetitle"><?php _e( 'Site', 'buddypress' ) ?></h2>10 <h2 class="pagetitle"><?php _e( 'Site', 'buddypress' ); ?></h2> 11 11 12 12 <?php if (have_posts()) : ?> 13 13 14 <h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ) ?></h3>14 <h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ); ?></h3> 15 15 16 16 <?php bp_dtheme_content_nav( 'nav-above' ); ?> … … 18 18 <?php while (have_posts()) : the_post(); ?> 19 19 20 <?php do_action( 'bp_before_blog_post' ) ?>20 <?php do_action( 'bp_before_blog_post' ); ?> 21 21 22 22 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>> … … 24 24 <div class="author-box"> 25 25 <?php echo get_avatar( get_the_author_meta( 'email' ), '50' ); ?> 26 <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>26 <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ); ?></p> 27 27 </div> 28 28 29 29 <div class="post-content"> 30 <h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' )?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>30 <h2 class="posttitle"><a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ); ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2> 31 31 32 32 <p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p> … … 41 41 </div> 42 42 43 <?php do_action( 'bp_after_blog_post' ) ?>43 <?php do_action( 'bp_after_blog_post' ); ?> 44 44 45 45 <?php endwhile; ?> … … 49 49 <?php else : ?> 50 50 51 <h2 class="center"><?php _e( 'No posts found. Try a different search?', 'buddypress' ) ?></h2>52 <?php get_search_form() ?>51 <h2 class="center"><?php _e( 'No posts found. Try a different search?', 'buddypress' ); ?></h2> 52 <?php get_search_form(); ?> 53 53 54 54 <?php endif; ?> … … 56 56 </div> 57 57 58 <?php do_action( 'bp_after_blog_search' ) ?>58 <?php do_action( 'bp_after_blog_search' ); ?> 59 59 60 60 </div><!-- .padder --> 61 61 </div><!-- #content --> 62 62 63 <?php get_sidebar() ?>63 <?php get_sidebar(); ?> 64 64 65 <?php get_footer() ?>65 <?php get_footer(); ?> -
trunk/bp-themes/bp-default/searchform.php
r3771 r5737 1 <?php do_action( 'bp_before_blog_search_form' ) ?>1 <?php do_action( 'bp_before_blog_search_form' ); ?> 2 2 3 <form role="search" method="get" id="searchform" action="<?php echo home_url() ?>/">3 <form role="search" method="get" id="searchform" action="<?php echo home_url(); ?>/"> 4 4 <input type="text" value="<?php the_search_query(); ?>" name="s" id="s" /> 5 <input type="submit" id="searchsubmit" value="<?php _e( 'Search', 'buddypress' ) ?>" />5 <input type="submit" id="searchsubmit" value="<?php _e( 'Search', 'buddypress' ); ?>" /> 6 6 7 <?php do_action( 'bp_blog_search_form' ) ?>7 <?php do_action( 'bp_blog_search_form' ); ?> 8 8 </form> 9 9 10 <?php do_action( 'bp_after_blog_search_form' ) ?>10 <?php do_action( 'bp_after_blog_search_form' ); ?> -
trunk/bp-themes/bp-default/sidebar-footer.php
r3771 r5737 1 1 <?php 2 /* The footer widget area is triggered if any of the areas 3 * have widgets. So let's check that first. 2 /** 3 * The footer widget area is triggered if any of the areas 4 * have widgets. 4 5 * 5 * If none of the sidebars have widgets, then let'sbail early.6 * If none of the sidebars have widgets, bail early. 6 7 */ 7 8 if ( ! is_active_sidebar( 'first-footer-widget-area' ) … … 10 11 && ! is_active_sidebar( 'fourth-footer-widget-area' ) 11 12 ) 12 return; 13 // If we get this far, we have widgets. Let do this. 14 ?> 13 return; ?> 15 14 16 15 <div id="footer-widget-area" role="complementary"> 17 16 18 <?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?> 19 <div id="first" class="widget-area"> 20 <ul class="xoxo"> 21 <?php dynamic_sidebar( 'first-footer-widget-area' ); ?> 22 </ul> 23 </div><!-- #first .widget-area --> 24 <?php endif; ?> 17 <?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?> 25 18 26 <?php if ( is_active_sidebar( 'second-footer-widget-area' ) ) : ?> 27 <div id="second" class="widget-area"> 28 <ul class="xoxo"> 29 <?php dynamic_sidebar( 'second-footer-widget-area' ); ?> 30 </ul> 31 </div><!-- #second .widget-area --> 32 <?php endif; ?> 19 <div id="first" class="widget-area"> 20 <ul class="xoxo"> 21 <?php dynamic_sidebar( 'first-footer-widget-area' ); ?> 22 </ul> 23 </div><!-- #first .widget-area --> 33 24 34 <?php if ( is_active_sidebar( 'third-footer-widget-area' ) ) : ?> 35 <div id="third" class="widget-area"> 36 <ul class="xoxo"> 37 <?php dynamic_sidebar( 'third-footer-widget-area' ); ?> 38 </ul> 39 </div><!-- #third .widget-area --> 40 <?php endif; ?> 25 <?php endif; ?> 41 26 42 <?php if ( is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?> 43 <div id="fourth" class="widget-area"> 44 <ul class="xoxo"> 45 <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?> 46 </ul> 47 </div><!-- #fourth .widget-area --> 48 <?php endif; ?> 27 <?php if ( is_active_sidebar( 'second-footer-widget-area' ) ) : ?> 28 29 <div id="second" class="widget-area"> 30 <ul class="xoxo"> 31 <?php dynamic_sidebar( 'second-footer-widget-area' ); ?> 32 </ul> 33 </div><!-- #second .widget-area --> 34 35 <?php endif; ?> 36 37 <?php if ( is_active_sidebar( 'third-footer-widget-area' ) ) : ?> 38 39 <div id="third" class="widget-area"> 40 <ul class="xoxo"> 41 <?php dynamic_sidebar( 'third-footer-widget-area' ); ?> 42 </ul> 43 </div><!-- #third .widget-area --> 44 45 <?php endif; ?> 46 47 <?php if ( is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?> 48 49 <div id="fourth" class="widget-area"> 50 <ul class="xoxo"> 51 <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?> 52 </ul> 53 </div><!-- #fourth .widget-area --> 54 55 <?php endif; ?> 49 56 50 57 </div><!-- #footer-widget-area --> -
trunk/bp-themes/bp-default/sidebar.php
r5072 r5737 1 <?php do_action( 'bp_before_sidebar' ) ?>1 <?php do_action( 'bp_before_sidebar' ); ?> 2 2 3 3 <div id="sidebar" role="complementary"> 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_inside_before_sidebar' ) ?>6 <?php do_action( 'bp_inside_before_sidebar' ); ?> 7 7 8 8 <?php if ( is_user_logged_in() ) : ?> 9 9 10 <?php do_action( 'bp_before_sidebar_me' ) ?>10 <?php do_action( 'bp_before_sidebar_me' ); ?> 11 11 12 12 <div id="sidebar-me"> 13 <a href="<?php echo bp_loggedin_user_domain() ?>">14 <?php bp_loggedin_user_avatar( 'type=thumb&width=40&height=40' ) ?>13 <a href="<?php echo bp_loggedin_user_domain(); ?>"> 14 <?php bp_loggedin_user_avatar( 'type=thumb&width=40&height=40' ); ?> 15 15 </a> 16 16 17 17 <h4><?php echo bp_core_get_userlink( bp_loggedin_user_id() ); ?></h4> 18 <a class="button logout" href="<?php echo wp_logout_url( bp_get_root_domain() ) ?>"><?php _e( 'Log Out', 'buddypress' )?></a>18 <a class="button logout" href="<?php echo wp_logout_url( bp_get_root_domain() ); ?>"><?php _e( 'Log Out', 'buddypress' ); ?></a> 19 19 20 <?php do_action( 'bp_sidebar_me' ) ?>20 <?php do_action( 'bp_sidebar_me' ); ?> 21 21 </div> 22 22 23 <?php do_action( 'bp_after_sidebar_me' ) ?>23 <?php do_action( 'bp_after_sidebar_me' ); ?> 24 24 25 25 <?php if ( bp_is_active( 'messages' ) ) : ?> … … 29 29 <?php else : ?> 30 30 31 <?php do_action( 'bp_before_sidebar_login_form' ) ?>31 <?php do_action( 'bp_before_sidebar_login_form' ); ?> 32 32 33 33 <?php if ( bp_get_signup_allowed() ) : ?> … … 35 35 <p id="login-text"> 36 36 37 <?php printf( __( 'Please <a href="%s" title="Create an account">create an account</a> to get started.', 'buddypress' ), site_url( bp_get_signup_slug() . '/' ) ) ?>37 <?php printf( __( 'Please <a href="%s" title="Create an account">create an account</a> to get started.', 'buddypress' ), site_url( bp_get_signup_slug() . '/' ) ); ?> 38 38 39 39 </p> … … 41 41 <?php endif; ?> 42 42 43 <form name="login-form" id="sidebar-login-form" class="standard-form" action="<?php echo site_url( 'wp-login.php', 'login_post' ) ?>" method="post">44 <label><?php _e( 'Username', 'buddypress' ) ?><br />43 <form name="login-form" id="sidebar-login-form" class="standard-form" action="<?php echo site_url( 'wp-login.php', 'login_post' ); ?>" method="post"> 44 <label><?php _e( 'Username', 'buddypress' ); ?><br /> 45 45 <input type="text" name="log" id="sidebar-user-login" class="input" value="<?php if ( isset( $user_login) ) echo esc_attr(stripslashes($user_login)); ?>" tabindex="97" /></label> 46 46 47 <label><?php _e( 'Password', 'buddypress' ) ?><br />47 <label><?php _e( 'Password', 'buddypress' ); ?><br /> 48 48 <input type="password" name="pwd" id="sidebar-user-pass" class="input" value="" tabindex="98" /></label> 49 49 50 <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="sidebar-rememberme" value="forever" tabindex="99" /> <?php _e( 'Remember Me', 'buddypress' ) ?></label></p>50 <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="sidebar-rememberme" value="forever" tabindex="99" /> <?php _e( 'Remember Me', 'buddypress' ); ?></label></p> 51 51 52 <?php do_action( 'bp_sidebar_login_form' ) ?>52 <?php do_action( 'bp_sidebar_login_form' ); ?> 53 53 <input type="submit" name="wp-submit" id="sidebar-wp-submit" value="<?php _e( 'Log In', 'buddypress' ); ?>" tabindex="100" /> 54 54 <input type="hidden" name="testcookie" value="1" /> 55 55 </form> 56 56 57 <?php do_action( 'bp_after_sidebar_login_form' ) ?>57 <?php do_action( 'bp_after_sidebar_login_form' ); ?> 58 58 59 59 <?php endif; ?> … … 62 62 if ( bp_is_active( 'forums' ) && bp_is_forums_component() && bp_is_directory() ) : ?> 63 63 <div id="forum-directory-tags" class="widget tags"> 64 <h3 class="widgettitle"><?php _e( 'Forum Topic Tags', 'buddypress' ) ?></h3>64 <h3 class="widgettitle"><?php _e( 'Forum Topic Tags', 'buddypress' ); ?></h3> 65 65 <div id="tag-text"><?php bp_forums_tag_heat_map(); ?></div> 66 66 </div> 67 67 <?php endif; ?> 68 68 69 <?php dynamic_sidebar( 'sidebar-1' ) ?>69 <?php dynamic_sidebar( 'sidebar-1' ); ?> 70 70 71 <?php do_action( 'bp_inside_after_sidebar' ) ?>71 <?php do_action( 'bp_inside_after_sidebar' ); ?> 72 72 73 73 </div><!-- .padder --> 74 74 </div><!-- #sidebar --> 75 75 76 <?php do_action( 'bp_after_sidebar' ) ?>76 <?php do_action( 'bp_after_sidebar' ); ?> -
trunk/bp-themes/bp-default/single.php
r4529 r5737 1 <?php get_header() ?>1 <?php get_header(); ?> 2 2 3 3 <div id="content"> 4 4 <div class="padder"> 5 5 6 <?php do_action( 'bp_before_blog_single_post' ) ?>6 <?php do_action( 'bp_before_blog_single_post' ); ?> 7 7 8 8 <div class="page" id="blog-single" role="main"> … … 43 43 <?php endwhile; else: ?> 44 44 45 <p><?php _e( 'Sorry, no posts matched your criteria.', 'buddypress' ) ?></p>45 <p><?php _e( 'Sorry, no posts matched your criteria.', 'buddypress' ); ?></p> 46 46 47 47 <?php endif; ?> … … 49 49 </div> 50 50 51 <?php do_action( 'bp_after_blog_single_post' ) ?>51 <?php do_action( 'bp_after_blog_single_post' ); ?> 52 52 53 53 </div><!-- .padder --> 54 54 </div><!-- #content --> 55 55 56 <?php get_sidebar() ?>56 <?php get_sidebar(); ?> 57 57 58 <?php get_footer() ?>58 <?php get_footer(); ?>
Note: See TracChangeset
for help on using the changeset viewer.