Skip to:
Content

BuddyPress.org

Changeset 5737


Ignore:
Timestamp:
02/12/2012 08:09:34 PM (13 years ago)
Author:
johnjamesjacoby
Message:

Add ending semicolons to bp-default where omitted. Fixes #4002.

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(); ?>
    22
    33    <div id="content">
     
    1313            </div>
    1414
    15             <?php do_action( 'bp_after_404' ) ?>
     15            <?php do_action( 'bp_after_404' ); ?>
    1616        </div><!-- .padder -->
    1717    </div><!-- #content -->
    1818
    19 <?php get_footer() ?>
     19<?php get_footer(); ?>
  • trunk/bp-themes/bp-default/_inc/ajax.php

    r5729 r5737  
    180180    if ( bp_has_activities ( 'include=' . $activity_id ) ) : ?>
    181181        <?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 ); ?>
    183183        <?php endwhile; ?>
    184184     <?php endif;
     
    577577        <div class="message-box new-message">
    578578            <div class="message-metadata">
    579                 <?php do_action( 'bp_before_message_meta' ) ?>
     579                <?php do_action( 'bp_before_message_meta' ); ?>
    580580                <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?>
    581581
    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' ); ?>
    585585            </div>
    586586
    587             <?php do_action( 'bp_before_message_content' ) ?>
     587            <?php do_action( 'bp_before_message_content' ); ?>
    588588
    589589            <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'] ) ); ?>
    591591            </div>
    592592
    593             <?php do_action( 'bp_after_message_content' ) ?>
     593            <?php do_action( 'bp_after_message_content' ); ?>
    594594
    595595            <div class="clear"></div>
  • trunk/bp-themes/bp-default/activity/comment.php

    r5256 r5737  
    3535        <?php if ( is_user_logged_in() && bp_activity_can_comment_reply( bp_activity_current_comment() ) ) : ?>
    3636
    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>
    3838
    3939        <?php endif; ?>
  • trunk/bp-themes/bp-default/activity/entry.php

    r5019 r5737  
    6666                    <?php if ( !bp_get_activity_is_favorite() ) : ?>
    6767
    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>
    6969
    7070                    <?php else : ?>
    7171
    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>
    7373
    7474                    <?php endif; ?>
  • trunk/bp-themes/bp-default/activity/index.php

    r5638 r5737  
    4343                    <?php if ( is_user_logged_in() ) : ?>
    4444
    45                         <?php do_action( 'bp_before_activity_type_tab_friends' ) ?>
     45                        <?php do_action( 'bp_before_activity_type_tab_friends' ); ?>
    4646
    4747                        <?php if ( bp_is_active( 'friends' ) ) : ?>
     
    5555                        <?php endif; ?>
    5656
    57                         <?php do_action( 'bp_before_activity_type_tab_groups' ) ?>
     57                        <?php do_action( 'bp_before_activity_type_tab_groups' ); ?>
    5858
    5959                        <?php if ( bp_is_active( 'groups' ) ) : ?>
     
    8787            <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
    8888                <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>
    9090
    9191                    <?php do_action( 'bp_activity_syndication_options' ); ?>
  • trunk/bp-themes/bp-default/activity/post-form.php

    r4714 r5737  
    4040                <div id="whats-new-post-in-box">
    4141
    42                     <?php _e( 'Post in', 'buddypress' ) ?>:
     42                    <?php _e( 'Post in', 'buddypress' ); ?>:
    4343
    4444                    <select id="whats-new-post-in" name="whats-new-post-in">
  • trunk/bp-themes/bp-default/archive.php

    r4528 r5737  
    44        <div class="padder">
    55
    6         <?php do_action( 'bp_before_archive' ) ?>
     6        <?php do_action( 'bp_before_archive' ); ?>
    77
    88        <div class="page" id="blog-archives" role="main">
     
    1616                <?php while (have_posts()) : the_post(); ?>
    1717
    18                     <?php do_action( 'bp_before_blog_post' ) ?>
     18                    <?php do_action( 'bp_before_blog_post' ); ?>
    1919
    2020                    <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     
    2222                        <div class="author-box">
    2323                            <?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>
    2525                        </div>
    2626
    2727                        <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>
    2929
    3030                            <p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p>
     
    4040                    </div>
    4141
    42                     <?php do_action( 'bp_after_blog_post' ) ?>
     42                    <?php do_action( 'bp_after_blog_post' ); ?>
    4343
    4444                <?php endwhile; ?>
     
    4848            <?php else : ?>
    4949
    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(); ?>
    5252
    5353            <?php endif; ?>
     
    5555        </div>
    5656
    57         <?php do_action( 'bp_after_archive' ) ?>
     57        <?php do_action( 'bp_after_archive' ); ?>
    5858
    5959        </div><!-- .padder -->
    6060    </div><!-- #content -->
    6161
    62     <?php get_sidebar() ?>
     62    <?php get_sidebar(); ?>
    6363
    6464<?php get_footer(); ?>
  • trunk/bp-themes/bp-default/attachment.php

    r4529 r5737  
    1010                <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
    1111
    12                     <?php do_action( 'bp_before_blog_post' ) ?>
     12                    <?php do_action( 'bp_before_blog_post' ); ?>
    1313
    1414                    <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     
    2020
    2121                        <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>
    2323
    2424                            <p class="date">
     
    5454                    </div>
    5555
    56                     <?php do_action( 'bp_after_blog_post' ) ?>
     56                    <?php do_action( 'bp_after_blog_post' ); ?>
    5757
    5858                    <?php comments_template(); ?>
     
    6060                <?php endwhile; else: ?>
    6161
    62                     <p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ) ?></p>
     62                    <p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ); ?></p>
    6363
    6464                <?php endif; ?>
     
    6666            </div>
    6767
    68         <?php do_action( 'bp_after_attachment' ) ?>
     68        <?php do_action( 'bp_after_attachment' ); ?>
    6969
    7070        </div><!-- .padder -->
  • trunk/bp-themes/bp-default/blogs/create.php

    r5549 r5737  
    2121        <?php do_action( 'template_notices' ); ?>
    2222
    23             <h3><?php _e( 'Create a Site', 'buddypress' ); ?> &nbsp;<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' ); ?> &nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ); ?>"><?php _e( 'Site Directory', 'buddypress' ); ?></a></h3>
    2424
    2525        <?php do_action( 'bp_before_create_blog_content' ); ?>
  • trunk/bp-themes/bp-default/blogs/index.php

    r5371 r5737  
    3333            <div class="item-list-tabs" role="navigation">
    3434                <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>
    3636
    3737                    <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
    3838
    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>
    4040
    4141                    <?php endif; ?>
  • trunk/bp-themes/bp-default/comments.php

    r5729 r5737  
    2222
    2323        <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>' ); ?>
    2525        </h3>
    2626
    27         <?php do_action( 'bp_before_blog_comment_list' ) ?>
     27        <?php do_action( 'bp_before_blog_comment_list' ); ?>
    2828
    2929        <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' ) ); ?>
    3131        </ol><!-- .comment-list -->
    3232
    33         <?php do_action( 'bp_after_blog_comment_list' ) ?>
     33        <?php do_action( 'bp_after_blog_comment_list' ); ?>
    3434
    3535        <?php if ( get_option( 'page_comments' ) ) : ?>
    3636            <div class="comment-navigation paged-navigation">
    37                 <?php paginate_comments_links() ?>
     37                <?php paginate_comments_links(); ?>
    3838            </div>
    3939        <?php endif; ?>
     
    4444    <?php if ( pings_open() && !comments_open() && ( is_single() || is_page() ) ) : ?>
    4545        <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' ) ); ?>
    4747        </p>
    4848    <?php elseif ( !comments_open() && ( is_single() || is_page() ) ) : ?>
    4949        <p class="comments-closed">
    50             <?php _e( 'Comments are closed.', 'buddypress' ) ?>
     50            <?php _e( 'Comments are closed.', 'buddypress' ); ?>
    5151        </p>
    5252    <?php endif; ?>
     
    5555
    5656<?php if ( comments_open() ) : ?>
    57     <?php comment_form() ?>
     57    <?php comment_form(); ?>
    5858<?php endif; ?>
    5959
    6060<?php if ( !empty( $num_trackbacks ) ) : ?>
    6161    <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>
    6363
    6464        <ul id="trackbacklist">
     
    6767                <?php if ( 'comment' != get_comment_type() ) : ?>
    6868                    <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>
    7171                    </li>
    7272                <?php endif; ?>
  • trunk/bp-themes/bp-default/forums/index.php

    r5329 r5737  
    9595                        <form action="" method="post" id="forum-topic-form" class="standard-form">
    9696
    97                             <?php do_action( 'groups_forum_new_topic_before' ) ?>
     97                            <?php do_action( 'groups_forum_new_topic_before' ); ?>
    9898
    9999                            <a name="post-new"></a>
     
    143143                        <div id="message" class="info">
    144144
    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>
    146146
    147147                        </div>
  • trunk/bp-themes/bp-default/functions.php

    r5736 r5737  
    229229            position: relative;
    230230            color: #fff;
    231             background: url(<?php header_image() ?>);
     231            background: url(<?php header_image(); ?>);
    232232            -moz-border-radius-bottomleft: 6px;
    233233            -webkit-border-bottom-left-radius: 6px;
     
    247247        }
    248248        #headimg h1 a{
    249             color:#<?php header_textcolor() ?>;
     249            color:#<?php header_textcolor(); ?>;
    250250            text-decoration: none;
    251251            border-bottom: none;
    252252        }
    253253        #headimg #desc{
    254             color:#<?php header_textcolor() ?>;
     254            color:#<?php header_textcolor(); ?>;
    255255            font-size:1em;
    256256            margin-top:-0.5em;
     
    266266        }
    267267        #headimg h1 a, #headimg #desc {
    268             color:#<?php echo HEADER_TEXTCOLOR ?>;
     268            color:#<?php echo HEADER_TEXTCOLOR; ?>;
    269269        }
    270270        <?php } ?>
     
    358358        #header h1, #header #desc { display: none; }
    359359        <?php } else { ?>
    360         #header h1 a, #desc { color:#<?php header_textcolor() ?>; }
     360        #header h1 a, #desc { color:#<?php header_textcolor(); ?>; }
    361361        <?php } ?>
    362362    </style>
     
    462462    ?>
    463463
    464     <li <?php comment_class() ?> id="comment-<?php comment_ID() ?>">
     464    <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
    465465        <div class="comment-avatar-box">
    466466            <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">
    468468                    <?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 ) ); ?>
    470470                    <?php else : ?>
    471                         <?php echo get_avatar( $comment, $avatar_size ) ?>
     471                        <?php echo get_avatar( $comment, $avatar_size ); ?>
    472472                    <?php endif; ?>
    473473                </a>
     
    490490                <?php endif; ?>
    491491
    492                 <?php comment_text() ?>
     492                <?php comment_text(); ?>
    493493            </div>
    494494
     
    499499
    500500                    <?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' ) ); ?>
    502502                    <?php endif; ?>
    503503
     
    569569
    570570    <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>
    572572    </div>
    573573
     
    674674        <div class="avb">
    675675            <?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 ); ?>
    678678                </a>
    679679            <?php else : ?>
    680                 <?php echo get_avatar( 0, 50 ) ?>
     680                <?php echo get_avatar( 0, 50 ); ?>
    681681            <?php endif; ?>
    682682        </div>
  • trunk/bp-themes/bp-default/groups/create.php

    r5549 r5737  
    4242                    <input type="text" name="group-name" id="group-name" aria-required="true" value="<?php bp_new_group_name(); ?>" />
    4343
    44                     <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ) ?></label>
     44                    <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label>
    4545                    <textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_new_group_description(); ?></textarea>
    4646
     
    113113                    <h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4>
    114114
    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>
    116116
    117117                    <div class="radio">
    118118                        <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>
    121121                        </label>
    122122
    123123                        <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>
    126126                        </label>
    127127
    128128                        <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>
    131131                        </label>
    132132                    </div>
  • trunk/bp-themes/bp-default/groups/index.php

    r4994 r5737  
    2727            <div id="group-dir-search" class="dir-search" role="search">
    2828
    29                 <?php bp_directory_groups_search_form() ?>
     29                <?php bp_directory_groups_search_form(); ?>
    3030
    3131            </div><!-- #group-dir-search -->
  • trunk/bp-themes/bp-default/groups/single/activity.php

    r4454 r5737  
    11<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
    22    <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>
    44
    5         <?php do_action( 'bp_group_activity_syndication_options' ) ?>
     5        <?php do_action( 'bp_group_activity_syndication_options' ); ?>
    66
    77        <li id="activity-filter-select" class="last">
    88            <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
    99            <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>
    1212
    1313                <?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>
    1616                <?php endif; ?>
    1717
    18                 <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ) ?></option>
     18                <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option>
    1919
    20                 <?php do_action( 'bp_group_activity_filter_options' ) ?>
     20                <?php do_action( 'bp_group_activity_filter_options' ); ?>
    2121            </select>
    2222        </li>
     
    2424</div><!-- .item-list-tabs -->
    2525
    26 <?php do_action( 'bp_before_group_activity_post_form' ) ?>
     26<?php do_action( 'bp_before_group_activity_post_form' ); ?>
    2727
    2828<?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 ); ?>
    3030<?php endif; ?>
    3131
    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' ); ?>
    3434
    3535<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 ); ?>
    3737</div><!-- .activity.single-group -->
    3838
    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  
    55</div><!-- .item-list-tabs -->
    66
    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' ); ?>
    1010
    1111<?php /* Edit Group Details */ ?>
     
    1515
    1616    <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" />
    1818
    1919    <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' ); ?>
    2323
    2424    <p>
     
    3030    <?php do_action( 'bp_after_group_details_admin' ); ?>
    3131
    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' ); ?>
    3434
    3535<?php endif; ?>
     
    4545
    4646            <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>
    4848            </div>
    4949
     
    5858    <div class="radio">
    5959        <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>
    6262            <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>
    6666            </ul>
    6767        </label>
    6868
    6969        <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>
    7272            <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>
    7676            </ul>
    7777        </label>
    7878
    7979        <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>
    8282            <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>
    8686            </ul>
    8787        </label>
     
    9292    <h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4>
    9393
    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>
    9595
    9696    <div class="radio">
    9797        <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>
    100100        </label>
    101101
    102102        <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>
    105105        </label>
    106106       
    107107        <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>
    110110        </label>
    111111    </div>
     
    115115    <?php do_action( 'bp_after_group_settings_admin' ); ?>
    116116
    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' ); ?>
    119119
    120120<?php endif; ?>
     
    125125    <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
    126126
    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>
    128128
    129129            <p>
    130130                <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' ); ?>" />
    132132                <input type="hidden" name="action" id="action" value="bp_avatar_upload" />
    133133            </p>
     
    135135            <?php if ( bp_get_group_has_avatar() ) : ?>
    136136
    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>
    138138
    139139                <?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' ) ) ); ?>
     
    141141            <?php endif; ?>
    142142
    143             <?php wp_nonce_field( 'bp_avatar_upload' ) ?>
     143            <?php wp_nonce_field( 'bp_avatar_upload' ); ?>
    144144
    145145    <?php endif; ?>
     
    147147    <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    148148
    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' ); ?>" />
    152152
    153153        <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' ); ?>" />
    155155        </div>
    156156
    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(); ?>" />
    160160        <input type="hidden" id="x" name="x" />
    161161        <input type="hidden" id="y" name="y" />
     
    163163        <input type="hidden" id="h" name="h" />
    164164
    165         <?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>
     165        <?php wp_nonce_field( 'bp_avatar_cropstore' ); ?>
    166166
    167167    <?php endif; ?>
     
    183183            <?php while ( bp_members() ) : bp_the_member(); ?>
    184184            <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() ) ) ); ?>
    186186                <h5>
    187187                    <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
    188188                    <?php if ( count( bp_group_admin_ids( false, 'array' ) ) > 1 ) : ?>
    189189                    <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>
    191191                    </span>         
    192192                    <?php endif; ?>
     
    203203    <?php if ( bp_group_has_moderators() ) : ?>
    204204        <div class="bp-widget">
    205             <h4><?php _e( 'Moderators', 'buddypress' ) ?></h4>     
     205            <h4><?php _e( 'Moderators', 'buddypress' ); ?></h4>     
    206206           
    207207            <?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?>
     
    210210                    <?php while ( bp_members() ) : bp_the_member(); ?>                 
    211211                    <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() ) ) ); ?>
    213213                        <h5>
    214214                            <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
    215215                            <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>
    218218                            </span>     
    219219                        </h5>       
     
    238238
    239239                    <div id="member-count" class="pag-count">
    240                         <?php bp_group_member_pagination_count() ?>
     240                        <?php bp_group_member_pagination_count(); ?>
    241241                    </div>
    242242
    243243                    <div id="member-admin-pagination" class="pagination-links">
    244                         <?php bp_group_member_admin_pagination() ?>
     244                        <?php bp_group_member_admin_pagination(); ?>
    245245                    </div>
    246246
     
    253253
    254254                    <li class="<?php bp_group_member_css_class(); ?>">
    255                         <?php bp_group_member_avatar_mini() ?>
     255                        <?php bp_group_member_avatar_mini(); ?>
    256256
    257257                        <h5>
    258                             <?php bp_group_member_link() ?>
     258                            <?php bp_group_member_link(); ?>
    259259
    260260                            <?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'buddypress'); ?>
     
    264264                            <?php if ( bp_get_group_member_is_banned() ) : ?>
    265265
    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>
    267267
    268268                            <?php else : ?>
    269269
    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 &amp; 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 &amp; 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>
    273273
    274274                            <?php endif; ?>
    275275
    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>
    277277
    278278                                <?php do_action( 'bp_group_manage_members_admin_item' ); ?>
     
    310310
    311311                <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>
    315315
    316316                    <?php do_action( 'bp_group_membership_requests_admin_item' ); ?>
     
    358358
    359359    <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' ); ?>
    364364
    365365<?php endif; ?>
    366366
    367367<?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' ); ?>
    371371
    372372</form><!-- #group-settings-form -->
  • trunk/bp-themes/bp-default/groups/single/forum.php

    r5184 r5737  
    1717
    1818                <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>
    2020                </li>
    2121
     
    2525
    2626                <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>
    2828                </li>
    2929
     
    4949    <div class="forums single-forum" role="main">
    5050
    51         <?php locate_template( array( 'forums/forums-loop.php' ), true ) ?>
     51        <?php locate_template( array( 'forums/forums-loop.php' ), true ); ?>
    5252
    5353    </div><!-- .forums.single-forum -->
     
    5555<?php endif; ?>
    5656
    57 <?php do_action( 'bp_after_group_forum_content' ) ?>
     57<?php do_action( 'bp_after_group_forum_content' ); ?>
    5858
    5959<?php if ( !bp_is_group_forum_topic_edit() && !bp_is_group_forum_topic() ) : ?>
     
    6464            <div id="new-topic-post">
    6565
    66                 <?php do_action( 'bp_before_group_forum_post_new' ) ?>
     66                <?php do_action( 'bp_before_group_forum_post_new' ); ?>
    6767
    6868                <?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>
    7070                <?php endif; ?>
    7171
    7272                <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>
    7474
    75                 <label><?php _e( 'Title:', 'buddypress' ) ?></label>
     75                <label><?php _e( 'Title:', 'buddypress' ); ?></label>
    7676                <input type="text" name="topic_title" id="topic_title" value="" />
    7777
    78                 <label><?php _e( 'Content:', 'buddypress' ) ?></label>
     78                <label><?php _e( 'Content:', 'buddypress' ); ?></label>
    7979                <textarea name="topic_text" id="topic_text"></textarea>
    8080
    81                 <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
     81                <label><?php _e( 'Tags (comma separated):', 'buddypress' ); ?></label>
    8282                <input type="text" name="topic_tags" id="topic_tags" value="" />
    8383
    84                 <?php do_action( 'bp_after_group_forum_post_new' ) ?>
     84                <?php do_action( 'bp_after_group_forum_post_new' ); ?>
    8585
    8686                <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' ); ?>" />
    8888                </div>
    8989
    90                 <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>
     90                <?php wp_nonce_field( 'bp_forums_new_topic' ); ?>
    9191            </div><!-- #new-topic-post -->
    9292        </form><!-- #forum-topic-form -->
  • trunk/bp-themes/bp-default/groups/single/forum/edit.php

    r5349 r5737  
    5151                <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text(); ?></textarea>
    5252
    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(); ?>" />
    5555
    5656                <?php do_action( 'bp_group_after_edit_forum_topic' ); ?>
     
    7070                <textarea name="post_text" id="post_text"><?php bp_the_topic_post_edit_text(); ?></textarea>
    7171
    72                 <?php do_action( 'bp_group_after_edit_forum_post' ) ?>
     72                <?php do_action( 'bp_group_after_edit_forum_post' ); ?>
    7373
    7474                <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  
    11<?php do_action( 'bp_before_group_forum_topic' ); ?>
    22
    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">
    44    <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
    55        <ul>
     
    77   
    88                <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>
    1010                </li>
    1111   
     
    1515   
    1616                <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>
    1818                </li>
    1919   
     
    2424   
    2525    <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>
    2727   
    2828        <?php if ( bp_forum_topic_has_tags() ) : ?>
     
    3030            <div class="topic-tags">
    3131   
    32                 <?php _e( 'Topic tags:', 'buddypress' ) ?> <?php bp_forum_topic_tag_list() ?>
     32                <?php _e( 'Topic tags:', 'buddypress' ); ?> <?php bp_forum_topic_tag_list(); ?>
    3333   
    3434            </div>
     
    4040            <div class="last admin-links">
    4141   
    42                 <?php bp_the_topic_admin_links() ?>
     42                <?php bp_the_topic_admin_links(); ?>
    4343   
    4444            </div>
     
    5757            <div id="post-count-top" class="pag-count">
    5858
    59                 <?php bp_the_topic_pagination_count() ?>
     59                <?php bp_the_topic_pagination_count(); ?>
    6060
    6161            </div>
     
    6363            <div class="pagination-links" id="topic-pag-top">
    6464
    65                 <?php bp_the_topic_pagination() ?>
     65                <?php bp_the_topic_pagination(); ?>
    6666
    6767            </div>
     
    6969        </div>
    7070
    71         <?php do_action( 'bp_before_group_forum_topic_posts' ) ?>
     71        <?php do_action( 'bp_before_group_forum_topic_posts' ); ?>
    7272
    7373        <ul id="topic-post-list" class="item-list" role="main">
    7474            <?php while ( bp_forum_topic_posts() ) : bp_the_forum_topic_post(); ?>
    7575
    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(); ?>">
    7777                    <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' ); ?>
    8080                        </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() ); ?>
    8282                    </div>
    8383
    8484                    <div class="post-content">
    85                         <?php bp_the_topic_post_content() ?>
     85                        <?php bp_the_topic_post_content(); ?>
    8686                    </div>
    8787
    8888                    <div class="admin-links">
    8989                        <?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(); ?>
    9191                        <?php endif; ?>
    9292
    9393                        <?php do_action( 'bp_group_forum_post_meta' ); ?>
    9494
    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>
    9696                    </div>
    9797                </li>
     
    100100        </ul><!-- #topic-post-list -->
    101101
    102         <?php do_action( 'bp_after_group_forum_topic_posts' ) ?>
     102        <?php do_action( 'bp_after_group_forum_topic_posts' ); ?>
    103103
    104104        <div class="pagination no-ajax">
    105105
    106106            <div id="post-count-bottom" class="pag-count">
    107                 <?php bp_the_topic_pagination_count() ?>
     107                <?php bp_the_topic_pagination_count(); ?>
    108108            </div>
    109109
    110110            <div class="pagination-links" id="topic-pag-bottom">
    111                 <?php bp_the_topic_pagination() ?>
     111                <?php bp_the_topic_pagination(); ?>
    112112            </div>
    113113
     
    117117   
    118118        <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>
    120120        </div>
    121121   
     
    132132
    133133                    <?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>
    135135                    <?php endif; ?>
    136136
    137                     <?php do_action( 'groups_forum_new_reply_before' ) ?>
     137                    <?php do_action( 'groups_forum_new_reply_before' ); ?>
    138138
    139                     <h4><?php _e( 'Add a reply:', 'buddypress' ) ?></h4>
     139                    <h4><?php _e( 'Add a reply:', 'buddypress' ); ?></h4>
    140140
    141141                    <textarea name="reply_text" id="reply_text"></textarea>
    142142
    143143                    <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' ); ?>" />
    145145                    </div>
    146146
    147                     <?php do_action( 'groups_forum_new_reply_after' ) ?>
     147                    <?php do_action( 'groups_forum_new_reply_after' ); ?>
    148148
    149                     <?php wp_nonce_field( 'bp_forums_new_reply' ) ?>
     149                    <?php wp_nonce_field( 'bp_forums_new_reply' ); ?>
    150150                </div>
    151151
     
    153153
    154154                <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>
    156156                </div>
    157157
     
    164164</form><!-- #forum-topic-form -->
    165165
    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  
    1818            do_action( 'bp_before_group_menu_mods' ); ?>
    1919
    20             <h3><?php _e( 'Group Mods' , 'buddypress' ) ?></h3>
     20            <h3><?php _e( 'Group Mods' , 'buddypress' ); ?></h3>
    2121
    2222            <?php bp_group_list_mods();
  • trunk/bp-themes/bp-default/groups/single/home.php

    r4961 r5737  
    66            <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
    77
    8             <?php do_action( 'bp_before_group_home_content' ) ?>
     8            <?php do_action( 'bp_before_group_home_content' ); ?>
    99
    1010            <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' ); ?>
    22
    33    <div id="content">
     
    55            <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
    66
    7             <?php do_action( 'bp_before_group_plugin_template' ) ?>
     7            <?php do_action( 'bp_before_group_plugin_template' ); ?>
    88
    99            <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 ); ?>
    1111            </div><!-- #item-header -->
    1212
     
    1414                <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
    1515                    <ul>
    16                         <?php bp_get_options_nav() ?>
     16                        <?php bp_get_options_nav(); ?>
    1717
    18                         <?php do_action( 'bp_group_plugin_options_nav' ) ?>
     18                        <?php do_action( 'bp_group_plugin_options_nav' ); ?>
    1919                    </ul>
    2020                </div>
     
    2323            <div id="item-body">
    2424
    25                 <?php do_action( 'bp_before_group_body' ) ?>
     25                <?php do_action( 'bp_before_group_body' ); ?>
    2626
    27                 <?php do_action( 'bp_template_content' ) ?>
     27                <?php do_action( 'bp_template_content' ); ?>
    2828
    29                 <?php do_action( 'bp_after_group_body' ) ?>
     29                <?php do_action( 'bp_after_group_body' ); ?>
    3030            </div><!-- #item-body -->
    3131
    32             <?php do_action( 'bp_after_group_plugin_template' ) ?>
     32            <?php do_action( 'bp_after_group_plugin_template' ); ?>
    3333
    3434            <?php endwhile; endif; ?>
     
    3737    </div><!-- #content -->
    3838
    39     <?php get_sidebar( 'buddypress' ) ?>
     39    <?php get_sidebar( 'buddypress' ); ?>
    4040
    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' ); ?>
    22
    33<?php if ( !bp_group_has_requested_membership() ) : ?>
    44    <p><?php printf( __( "You are requesting to become a member of the group '%s'.", "buddypress" ), bp_get_group_name( false ) ); ?></p>
    55
    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">
    77        <label for="group-request-membership-comments"><?php _e( 'Comments (optional)', 'buddypress' ); ?></label>
    88        <textarea name="group-request-membership-comments" id="group-request-membership-comments"></textarea>
    99
    10         <?php do_action( 'bp_group_request_membership_content' ) ?>
     10        <?php do_action( 'bp_group_request_membership_content' ); ?>
    1111
    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' ); ?>" />
    1313
    14         <?php wp_nonce_field( 'groups_request_membership' ) ?>
     14        <?php wp_nonce_field( 'groups_request_membership' ); ?>
    1515    </form><!-- #request-membership-form -->
    1616<?php endif; ?>
    1717
    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' ); ?>
    22
    33<?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
    44
    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">
    66
    77        <div class="left-menu">
     
    99            <div id="invite-list">
    1010                <ul>
    11                     <?php bp_new_group_invite_friend_list() ?>
     11                    <?php bp_new_group_invite_friend_list(); ?>
    1212                </ul>
    1313
    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' ); ?>
    1515            </div>
    1616
     
    2323            </div>
    2424
    25             <?php do_action( 'bp_before_group_send_invites_list' ) ?>
     25            <?php do_action( 'bp_before_group_send_invites_list' ); ?>
    2626
    2727            <?php /* The ID 'friend-list' is important for AJAX support. */ ?>
     
    3131                <?php while ( bp_group_invites() ) : bp_group_the_invite(); ?>
    3232
    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(); ?>
    3535
    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>
    3838
    39                         <?php do_action( 'bp_group_send_invites_item' ) ?>
     39                        <?php do_action( 'bp_group_send_invites_item' ); ?>
    4040
    4141                        <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>
    4343
    44                             <?php do_action( 'bp_group_send_invites_item_action' ) ?>
     44                            <?php do_action( 'bp_group_send_invites_item_action' ); ?>
    4545                        </div>
    4646                    </li>
     
    5151            </ul><!-- #friend-list -->
    5252
    53             <?php do_action( 'bp_after_group_send_invites_list' ) ?>
     53            <?php do_action( 'bp_after_group_send_invites_list' ); ?>
    5454
    5555        </div><!-- .main-column -->
     
    5858
    5959        <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' ); ?>" />
    6161        </div>
    6262
    63         <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites') ?>
     63        <?php wp_nonce_field( 'groups_send_invites', '_wpnonce_send_invites'); ?>
    6464
    6565        <?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(); ?>" />
    6767
    6868    </form><!-- #send-invite-form -->
     
    7676<?php endif; ?>
    7777
    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  
    1212    </head>
    1313
    14     <body <?php body_class() ?> id="bp-default">
     14    <body <?php body_class(); ?> id="bp-default">
    1515
    16         <?php do_action( 'bp_before_header' ) ?>
     16        <?php do_action( 'bp_before_header' ); ?>
    1717
    1818        <div id="header">
  • trunk/bp-themes/bp-default/index.php

    r4961 r5737  
    1 <?php get_header() ?>
     1<?php get_header(); ?>
    22
    33    <div id="content">
    44        <div class="padder">
    55
    6         <?php do_action( 'bp_before_blog_home' ) ?>
     6        <?php do_action( 'bp_before_blog_home' ); ?>
    77
    8         <?php do_action( 'template_notices' ) ?>
     8        <?php do_action( 'template_notices' ); ?>
    99
    1010        <div class="page" id="blog-latest" role="main">
     
    1616                <?php while (have_posts()) : the_post(); ?>
    1717
    18                     <?php do_action( 'bp_before_blog_post' ) ?>
     18                    <?php do_action( 'bp_before_blog_post' ); ?>
    1919
    2020                    <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     
    2222                        <div class="author-box">
    2323                            <?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>
    2525
    2626                            <?php if ( is_sticky() ) : ?>
     
    3030
    3131                        <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>
    3333
    3434                            <p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p>
     
    4444                    </div>
    4545
    46                     <?php do_action( 'bp_after_blog_post' ) ?>
     46                    <?php do_action( 'bp_after_blog_post' ); ?>
    4747
    4848                <?php endwhile; ?>
     
    5252            <?php else : ?>
    5353
    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>
    5656
    57                 <?php get_search_form() ?>
     57                <?php get_search_form(); ?>
    5858
    5959            <?php endif; ?>
    6060        </div>
    6161
    62         <?php do_action( 'bp_after_blog_home' ) ?>
     62        <?php do_action( 'bp_after_blog_home' ); ?>
    6363
    6464        </div><!-- .padder -->
    6565    </div><!-- #content -->
    6666
    67     <?php get_sidebar() ?>
     67    <?php get_sidebar(); ?>
    6868
    69 <?php get_footer() ?>
     69<?php get_footer(); ?>
  • trunk/bp-themes/bp-default/links.php

    r3771 r5737  
    55?>
    66
    7 <?php get_header() ?>
     7<?php get_header(); ?>
    88
    99    <div id="content">
    1010        <div class="padder">
    1111
    12         <?php do_action( 'bp_before_blog_links' ) ?>
     12        <?php do_action( 'bp_before_blog_links' ); ?>
    1313
    1414        <div class="page" id="blog-latest" role="main">
    1515
    16             <h2 class="pagetitle"><?php _e( 'Links', 'buddypress' ) ?></h2>
     16            <h2 class="pagetitle"><?php _e( 'Links', 'buddypress' ); ?></h2>
    1717
    1818            <ul id="links-list">
     
    2222        </div>
    2323
    24         <?php do_action( 'bp_after_blog_links' ) ?>
     24        <?php do_action( 'bp_after_blog_links' ); ?>
    2525
    2626        </div>
  • trunk/bp-themes/bp-default/members/single/activity.php

    r4961 r5737  
    1313    <ul>
    1414
    15         <?php bp_get_options_nav() ?>
     15        <?php bp_get_options_nav(); ?>
    1616
    1717        <li id="activity-filter-select" class="last">
    1818            <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
    1919            <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>
    2222
    2323                <?php
     
    2525                    if ( bp_is_active( 'blogs' ) ) : ?>
    2626
    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>
    2929
    3030                    <?php
     
    3333                    if ( bp_is_active( 'friends' ) ) : ?>
    3434
    35                         <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ) ?></option>
     35                        <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ); ?></option>
    3636
    3737                    <?php endif;
     
    4141                if ( bp_is_active( 'forums' ) ) : ?>
    4242
    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>
    4545
    4646                <?php endif;
     
    4848                if ( bp_is_active( 'groups' ) ) : ?>
    4949
    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>
    5252
    5353                <?php endif;
  • trunk/bp-themes/bp-default/members/single/activity/permalink.php

    r5255 r5737  
    1 <?php get_header( 'buddypress' ) ?>
     1<?php get_header( 'buddypress' ); ?>
    22
    33<?php do_action( 'template_notices' ); ?>
     
    99        <?php while ( bp_activities() ) : bp_the_activity(); ?>
    1010
    11             <?php locate_template( array( 'activity/entry.php' ), true ) ?>
     11            <?php locate_template( array( 'activity/entry.php' ), true ); ?>
    1212
    1313        <?php endwhile; ?>
     
    1717</div>
    1818
    19 <?php get_footer( 'buddypress' ) ?>
     19<?php get_footer( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/members/single/forums.php

    r5047 r5737  
    1212<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
    1313    <ul>
    14         <?php bp_get_options_nav() ?>
     14        <?php bp_get_options_nav(); ?>
    1515
    1616        <li id="forums-order-select" class="last filter">
  • trunk/bp-themes/bp-default/members/single/friends.php

    r4452 r5737  
    1818            <li id="members-order-select" class="last filter">
    1919
    20                 <label for="members-all"><?php _e( 'Order By:', 'buddypress' ) ?></label>
     20                <label for="members-all"><?php _e( 'Order By:', 'buddypress' ); ?></label>
    2121                <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>
    2525
    26                     <?php do_action( 'bp_member_blog_order_options' ) ?>
     26                    <?php do_action( 'bp_member_blog_order_options' ); ?>
    2727
    2828                </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' ); ?>
    22
    33<?php if ( bp_has_members( 'type=alphabetical&include=' . bp_get_friendship_requests() ) ) : ?>
     
    2222        <?php while ( bp_members() ) : bp_the_member(); ?>
    2323
    24             <li id="friendship-<?php bp_friend_friendship_id() ?>">
     24            <li id="friendship-<?php bp_friend_friendship_id(); ?>">
    2525                <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>
    2727                </div>
    2828
    2929                <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>
    3232                </div>
    3333
    34                 <?php do_action( 'bp_friend_requests_item' ) ?>
     34                <?php do_action( 'bp_friend_requests_item' ); ?>
    3535
    3636                <div class="action">
    37                     <a class="button accept" href="<?php bp_friend_accept_request_link() ?>"><?php _e( 'Accept', 'buddypress' ); ?></a> &nbsp;
    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> &nbsp;
     38                    <a class="button reject" href="<?php bp_friend_reject_request_link(); ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
    3939
    40                     <?php do_action( 'bp_friend_requests_item_action' ) ?>
     40                    <?php do_action( 'bp_friend_requests_item_action' ); ?>
    4141                </div>
    4242            </li>
     
    4545    </ul>
    4646
    47     <?php do_action( 'bp_friend_requests_content' ) ?>
     47    <?php do_action( 'bp_friend_requests_content' ); ?>
    4848
    4949    <div id="pag-bottom" class="pagination no-ajax">
     
    7171<?php endif;?>
    7272
    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  
    2525                    <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
    2626
    27                     <?php do_action( 'bp_member_group_order_options' ) ?>
     27                    <?php do_action( 'bp_member_group_order_options' ); ?>
    2828
    2929                </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' ); ?>
    22
    33<?php if ( bp_has_groups( 'type=invites&user_id=' . bp_loggedin_user_id() ) ) : ?>
     
    99            <li>
    1010                <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>
    1212                </div>
    1313
    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>
    1515
    1616                <p class="desc">
    17                     <?php bp_group_description_excerpt() ?>
     17                    <?php bp_group_description_excerpt(); ?>
    1818                </p>
    1919
    20                 <?php do_action( 'bp_group_invites_item' ) ?>
     20                <?php do_action( 'bp_group_invites_item' ); ?>
    2121
    2222                <div class="action">
    23                     <a class="button accept" href="<?php bp_group_accept_invite_link() ?>"><?php _e( 'Accept', 'buddypress' ) ?></a> &nbsp;
    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> &nbsp;
     24                    <a class="button reject confirm" href="<?php bp_group_reject_invite_link(); ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
    2525
    26                     <?php do_action( 'bp_group_invites_item_action' ) ?>
     26                    <?php do_action( 'bp_group_invites_item_action' ); ?>
    2727
    2828                </div>
     
    3535
    3636    <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>
    3838    </div>
    3939
    4040<?php endif;?>
    4141
    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">
    22
    3     <?php do_action( 'bp_before_messages_compose_content' ) ?>
     3    <?php do_action( 'bp_before_messages_compose_content' ); ?>
    44
    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>
    66    <ul class="first acfb-holder">
    77        <li>
    8             <?php bp_message_get_recipient_tabs() ?>
     8            <?php bp_message_get_recipient_tabs(); ?>
    99            <input type="text" name="send-to-input" class="send-to-input" id="send-to-input" />
    1010        </li>
     
    1212
    1313    <?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" ); ?>
    1515    <?php endif; ?>
    1616
    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(); ?>" />
    1919
    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>
    2222
    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(); ?>" />
    2424
    25     <?php do_action( 'bp_after_messages_compose_content' ) ?>
     25    <?php do_action( 'bp_after_messages_compose_content' ); ?>
    2626
    2727    <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" />
    2929    </div>
    3030
    31     <?php wp_nonce_field( 'messages_send_message' ) ?>
     31    <?php wp_nonce_field( 'messages_send_message' ); ?>
    3232</form>
    3333
  • 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' ); ?>
    22
    33<?php if ( bp_has_message_threads() ) : ?>
     
    66
    77        <div class="pag-count" id="messages-dir-count">
    8             <?php bp_messages_pagination_count() ?>
     8            <?php bp_messages_pagination_count(); ?>
    99        </div>
    1010
    1111        <div class="pagination-links" id="messages-dir-pag">
    12             <?php bp_messages_pagination() ?>
     12            <?php bp_messages_pagination(); ?>
    1313        </div>
    1414
    1515    </div><!-- .pagination -->
    1616
    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' ); ?>
    1919
    2020    <table id="message-threads" class="messages-notices">
    2121        <?php while ( bp_message_threads() ) : bp_message_thread(); ?>
    2222
    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; ?>>
    2424                <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>
    2626                </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>
    2828
    2929                <?php if ( 'sentbox' != bp_current_action() ) : ?>
    3030                    <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>
    3333                    </td>
    3434                <?php else: ?>
    3535                    <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>
    3838                    </td>
    3939                <?php endif; ?>
    4040
    4141                <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>
    4444                </td>
    4545
    46                 <?php do_action( 'bp_messages_inbox_list_item' ) ?>
     46                <?php do_action( 'bp_messages_inbox_list_item' ); ?>
    4747
    4848                <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> &nbsp;
     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> &nbsp;
    5151                </td>
    5252            </tr>
     
    5656
    5757    <div class="messages-options-nav">
    58         <?php bp_messages_options() ?>
     58        <?php bp_messages_options(); ?>
    5959    </div><!-- .messages-options-nav -->
    6060
    61     <?php do_action( 'bp_after_member_messages_threads' ) ?>
     61    <?php do_action( 'bp_after_member_messages_threads' ); ?>
    6262
    63     <?php do_action( 'bp_after_member_messages_options' ) ?>
     63    <?php do_action( 'bp_after_member_messages_options' ); ?>
    6464
    6565<?php else: ?>
     
    7171<?php endif;?>
    7272
    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' ); ?>
    22
    33<?php if ( bp_has_message_threads() ) : ?>
     
    66
    77        <div class="pag-count" id="messages-dir-count">
    8             <?php bp_messages_pagination_count() ?>
     8            <?php bp_messages_pagination_count(); ?>
    99        </div>
    1010
    1111        <div class="pagination-links" id="messages-dir-pag">
    12             <?php bp_messages_pagination() ?>
     12            <?php bp_messages_pagination(); ?>
    1313        </div>
    1414
    1515    </div><!-- .pagination -->
    1616
    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' ); ?>
    1919
    2020    <table id="message-threads" class="messages-notices">
    2121        <?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(); ?>">
    2323                <td width="1%">
    2424                </td>
    2525                <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(); ?>
    2828                </td>
    2929                <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>
    3232                </td>
    3333
    34                 <?php do_action( 'bp_notices_list_item' ) ?>
     34                <?php do_action( 'bp_notices_list_item' ); ?>
    3535
    3636                <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>
    3939                </td>
    4040            </tr>
     
    4242    </table><!-- #message-threads -->
    4343
    44     <?php do_action( 'bp_after_notices' ) ?>
     44    <?php do_action( 'bp_after_notices' ); ?>
    4545
    4646<?php else: ?>
     
    5252<?php endif;?>
    5353
    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  
    11<div id="message-thread" role="main">
    22
    3     <?php do_action( 'bp_before_message_thread_content' ) ?>
     3    <?php do_action( 'bp_before_message_thread_content' ); ?>
    44
    55    <?php if ( bp_thread_has_messages() ) : ?>
    66
    7         <h3 id="message-subject"><?php bp_the_thread_subject() ?></h3>
     7        <h3 id="message-subject"><?php bp_the_thread_subject(); ?></h3>
    88
    99        <p id="message-recipients">
     
    1616                <?php else : ?>
    1717
    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() ); ?>
    1919
    2020                <?php endif; ?>
     
    2222            </span>
    2323
    24             <a class="button confirm" href="<?php bp_the_thread_delete_link() ?>" title="<?php _e( "Delete Message", "buddypress" ); ?>"><?php _e( 'Delete', 'buddypress' ) ?></a> &nbsp;
     24            <a class="button confirm" href="<?php bp_the_thread_delete_link(); ?>" title="<?php _e( "Delete Message", "buddypress" ); ?>"><?php _e( 'Delete', 'buddypress' ); ?></a> &nbsp;
    2525        </p>
    2626
    27         <?php do_action( 'bp_before_message_thread_list' ) ?>
     27        <?php do_action( 'bp_before_message_thread_list' ); ?>
    2828
    2929        <?php while ( bp_thread_messages() ) : bp_thread_the_message(); ?>
     
    3333                <div class="message-metadata">
    3434
    35                     <?php do_action( 'bp_before_message_meta' ) ?>
     35                    <?php do_action( 'bp_before_message_meta' ); ?>
    3636
    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>
    3939
    40                     <?php do_action( 'bp_after_message_meta' ) ?>
     40                    <?php do_action( 'bp_after_message_meta' ); ?>
    4141
    4242                </div><!-- .message-metadata -->
    4343
    44                 <?php do_action( 'bp_before_message_content' ) ?>
     44                <?php do_action( 'bp_before_message_content' ); ?>
    4545
    4646                <div class="message-content">
    4747
    48                     <?php bp_the_thread_message_content() ?>
     48                    <?php bp_the_thread_message_content(); ?>
    4949
    5050                </div><!-- .message-content -->
    5151
    52                 <?php do_action( 'bp_after_message_content' ) ?>
     52                <?php do_action( 'bp_after_message_content' ); ?>
    5353
    5454                <div class="clear"></div>
     
    5858        <?php endwhile; ?>
    5959
    60         <?php do_action( 'bp_after_message_thread_list' ) ?>
     60        <?php do_action( 'bp_after_message_thread_list' ); ?>
    6161
    62         <?php do_action( 'bp_before_message_thread_reply' ) ?>
     62        <?php do_action( 'bp_before_message_thread_reply' ); ?>
    6363
    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">
    6565
    6666            <div class="message-box">
     
    6868                <div class="message-metadata">
    6969
    70                     <?php do_action( 'bp_before_message_meta' ) ?>
     70                    <?php do_action( 'bp_before_message_meta' ); ?>
    7171
    7272                    <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' ); ?>
    7474
    75                         <strong><?php _e( 'Send a Reply', 'buddypress' ) ?></strong>
     75                        <strong><?php _e( 'Send a Reply', 'buddypress' ); ?></strong>
    7676                    </div>
    7777
    78                     <?php do_action( 'bp_after_message_meta' ) ?>
     78                    <?php do_action( 'bp_after_message_meta' ); ?>
    7979
    8080                </div><!-- .message-metadata -->
     
    8282                <div class="message-content">
    8383
    84                     <?php do_action( 'bp_before_message_reply_box' ) ?>
     84                    <?php do_action( 'bp_before_message_reply_box' ); ?>
    8585
    8686                    <textarea name="content" id="message_content" rows="15" cols="40"></textarea>
    8787
    88                     <?php do_action( 'bp_after_message_reply_box' ) ?>
     88                    <?php do_action( 'bp_after_message_reply_box' ); ?>
    8989
    9090                    <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"/>
    9292                    </div>
    9393
    9494                    <input type="hidden" id="thread_id" name="thread_id" value="<?php bp_the_thread_id(); ?>" />
    9595                    <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' ); ?>
    9797
    9898                </div><!-- .message-content -->
     
    102102        </form><!-- #send-reply -->
    103103
    104         <?php do_action( 'bp_after_message_thread_reply' ) ?>
     104        <?php do_action( 'bp_after_message_thread_reply' ); ?>
    105105
    106106    <?php endif; ?>
    107107
    108     <?php do_action( 'bp_after_message_thread_content' ) ?>
     108    <?php do_action( 'bp_after_message_thread_content' ); ?>
    109109
    110110</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>
    22
    3 <?php do_action( 'bp_before_profile_avatar_upload_content' ) ?>
     3<?php do_action( 'bp_before_profile_avatar_upload_content' ); ?>
    44
    55<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
    66
    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>
    88
    99    <form action="" method="post" id="avatar-upload-form" class="standard-form" enctype="multipart/form-data">
     
    1111        <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
    1212
    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>
    1515
    1616            <p id="avatar-upload">
    1717                <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' ); ?>" />
    1919                <input type="hidden" name="action" id="action" value="bp_avatar_upload" />
    2020            </p>
    2121
    2222            <?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>
    2525            <?php endif; ?>
    2626
     
    2929        <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    3030
    31             <h5><?php _e( 'Crop Your New Avatar', 'buddypress' ) ?></h5>
     31            <h5><?php _e( 'Crop Your New Avatar', 'buddypress' ); ?></h5>
    3232
    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' ); ?>" />
    3434
    3535            <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' ); ?>" />
    3737            </div>
    3838
    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' ); ?>" />
    4040
    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(); ?>" />
    4242            <input type="hidden" id="x" name="x" />
    4343            <input type="hidden" id="y" name="y" />
     
    4545            <input type="hidden" id="h" name="h" />
    4646
    47             <?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>
     47            <?php wp_nonce_field( 'bp_avatar_cropstore' ); ?>
    4848
    4949        <?php endif; ?>
     
    5353<?php else : ?>
    5454
    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>
    5656
    5757<?php endif; ?>
    5858
    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  
    2020        <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
    2121
    22             <div<?php bp_field_css_class( 'editfield' ) ?>>
     22            <div<?php bp_field_css_class( 'editfield' ); ?>>
    2323
    2424                <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
     
    3131                <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
    3232
    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>
    3434                    <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>
    3535
     
    4040                    <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>
    4141                    <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(); ?>
    4343                    </select>
    4444
     
    4747                <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
    4848
    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; ?>>
    5151
    5252                        <?php bp_the_profile_field_options(); ?>
     
    9999                        </select>
    100100
    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; ?>>
    102102
    103103                            <?php bp_the_profile_field_options( 'type=month' ); ?>
     
    105105                        </select>
    106106
    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; ?>>
    108108
    109109                            <?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' ); ?>
    22
    33<?php $ud = get_userdata( bp_displayed_user_id() ); ?>
    44
    5 <?php do_action( 'bp_before_profile_field_content' ) ?>
     5<?php do_action( 'bp_before_profile_field_content' ); ?>
    66
    77    <div class="bp-widget wp-profile">
     
    6767    </div>
    6868
    69 <?php do_action( 'bp_after_profile_field_content' ) ?>
     69<?php do_action( 'bp_after_profile_field_content' ); ?>
    7070
    71 <?php do_action( 'bp_profile_field_buttons' ) ?>
     71<?php do_action( 'bp_profile_field_buttons' ); ?>
    7272
    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  
    99?>
    1010
    11 <?php get_header( 'buddypress' ) ?>
     11<?php get_header( 'buddypress' ); ?>
    1212
    1313    <div id="content">
     
    6161
    6262                    <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" />
    6464                    </div>
    6565
     
    7878    </div><!-- #content -->
    7979
    80 <?php get_sidebar( 'buddypress' ) ?>
     80<?php get_sidebar( 'buddypress' ); ?>
    8181
    82 <?php get_footer( 'buddypress' ) ?>
     82<?php get_footer( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/members/single/settings/general.php

    r4347 r5737  
    99?>
    1010
    11 <?php get_header( 'buddypress' ) ?>
     11<?php get_header( 'buddypress' ); ?>
    1212
    1313    <div id="content">
     
    5050                <h3><?php _e( 'General Settings', 'buddypress' ); ?></h3>
    5151
    52                 <?php do_action( 'bp_template_content' ) ?>
     52                <?php do_action( 'bp_template_content' ); ?>
    5353
    5454                <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form">
     
    8585    </div><!-- #content -->
    8686
    87 <?php get_sidebar( 'buddypress' ) ?>
     87<?php get_sidebar( 'buddypress' ); ?>
    8888
    89 <?php get_footer( 'buddypress' ) ?>
     89<?php get_footer( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/members/single/settings/notifications.php

    r4347 r5737  
    99?>
    1010
    11 <?php get_header( 'buddypress' ) ?>
     11<?php get_header( 'buddypress' ); ?>
    1212
    1313    <div id="content">
     
    5050                <h3><?php _e( 'Email Notification', 'buddypress' ); ?></h3>
    5151
    52                 <?php do_action( 'bp_template_content' ) ?>
     52                <?php do_action( 'bp_template_content' ); ?>
    5353
    5454                <form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
     
    7878    </div><!-- #content -->
    7979
    80 <?php get_sidebar( 'buddypress' ) ?>
     80<?php get_sidebar( 'buddypress' ); ?>
    8181
    82 <?php get_footer( 'buddypress' ) ?>
     82<?php get_footer( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/onecolumn-page.php

    r4907 r5737  
    1010 */
    1111
    12 get_header() ?>
     12get_header(); ?>
    1313
    1414    <div id="content">
    1515        <div class="padder one-column">
    1616
    17         <?php do_action( 'bp_before_blog_page' ) ?>
     17        <?php do_action( 'bp_before_blog_page' ); ?>
    1818
    1919        <div class="page" id="blog-page" role="main">
     
    4242        </div><!-- .page -->
    4343
    44         <?php do_action( 'bp_after_blog_page' ) ?>
     44        <?php do_action( 'bp_after_blog_page' ); ?>
    4545
    4646        </div><!-- .padder -->
  • trunk/bp-themes/bp-default/page.php

    r4426 r5737  
    1 <?php get_header() ?>
     1<?php get_header(); ?>
    22
    33    <div id="content">
    44        <div class="padder">
    55
    6         <?php do_action( 'bp_before_blog_page' ) ?>
     6        <?php do_action( 'bp_before_blog_page' ); ?>
    77
    88        <div class="page" id="blog-page" role="main">
     
    3131        </div><!-- .page -->
    3232
    33         <?php do_action( 'bp_after_blog_page' ) ?>
     33        <?php do_action( 'bp_after_blog_page' ); ?>
    3434
    3535        </div><!-- .padder -->
    3636    </div><!-- #content -->
    3737
    38     <?php get_sidebar() ?>
     38    <?php get_sidebar(); ?>
    3939
    4040<?php get_footer(); ?>
  • trunk/bp-themes/bp-default/registration/activate.php

    r4675 r5737  
    44        <div class="padder">
    55
    6         <?php do_action( 'bp_before_activation_page' ) ?>
     6        <?php do_action( 'bp_before_activation_page' ); ?>
    77
    88        <div class="page" id="activate-page">
     
    1010            <?php if ( bp_account_was_activated() ) : ?>
    1111
    12                 <h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ) ?></h2>
     12                <h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ); ?></h2>
    1313
    14                 <?php do_action( 'bp_before_activate_content' ) ?>
     14                <?php do_action( 'bp_before_activate_content' ); ?>
    1515
    1616                <?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>
    1818                <?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>
    2020                <?php endif; ?>
    2121
    2222            <?php else : ?>
    2323
    24                 <h3><?php _e( 'Activate your Account', 'buddypress' ) ?></h3>
     24                <h3><?php _e( 'Activate your Account', 'buddypress' ); ?></h3>
    2525
    26                 <?php do_action( 'bp_before_activate_content' ) ?>
     26                <?php do_action( 'bp_before_activate_content' ); ?>
    2727
    28                 <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ) ?></p>
     28                <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
    2929
    3030                <form action="" method="get" class="standard-form" id="activation-form">
    3131
    32                     <label for="key"><?php _e( 'Activation Key:', 'buddypress' ) ?></label>
     32                    <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label>
    3333                    <input type="text" name="key" id="key" value="" />
    3434
    3535                    <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' ); ?>" />
    3737                    </p>
    3838
     
    4141            <?php endif; ?>
    4242
    43             <?php do_action( 'bp_after_activate_content' ) ?>
     43            <?php do_action( 'bp_after_activate_content' ); ?>
    4444
    4545        </div><!-- .page -->
    4646
    47         <?php do_action( 'bp_after_activation_page' ) ?>
     47        <?php do_action( 'bp_after_activation_page' ); ?>
    4848
    4949        </div><!-- .padder -->
    5050    </div><!-- #content -->
    5151
    52     <?php get_sidebar( 'buddypress' ) ?>
     52    <?php get_sidebar( 'buddypress' ); ?>
    5353
    5454<?php get_footer( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/registration/register.php

    r5380 r5737  
    1 <?php get_header( 'buddypress' ) ?>
     1<?php get_header( 'buddypress' ); ?>
    22
    33    <div id="content">
    44        <div class="padder">
    55
    6         <?php do_action( 'bp_before_register_page' ) ?>
     6        <?php do_action( 'bp_before_register_page' ); ?>
    77
    88        <div class="page" id="register-page">
     
    1111
    1212            <?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' ); ?>
    1515
    1616                    <p><?php _e( 'User registration is currently not allowed.', 'buddypress' ); ?></p>
     
    2121            <?php if ( 'request-details' == bp_get_current_signup_step() ) : ?>
    2222
    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' ); ?>
    3030
    3131                <div class="register-section" id="basic-details-section">
     
    3333                    <?php /***** Basic Account Details ******/ ?>
    3434
    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' ); ?>
    4747                    <input type="password" name="signup_password" id="signup_password" value="" />
    4848
    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' ); ?>
    5151                    <input type="password" name="signup_password_confirm" id="signup_password_confirm" value="" />
    5252
    5353                </div><!-- #basic-details-section -->
    5454
    55                 <?php do_action( 'bp_after_account_details_fields' ) ?>
     55                <?php do_action( 'bp_after_account_details_fields' ); ?>
    5656
    5757                <?php /***** Extra Profile Details ******/ ?>
     
    5959                <?php if ( bp_is_active( 'xprofile' ) ) : ?>
    6060
    61                     <?php do_action( 'bp_before_signup_profile_fields' ) ?>
     61                    <?php do_action( 'bp_before_signup_profile_fields' ); ?>
    6262
    6363                    <div class="register-section" id="profile-details-section">
    6464
    65                         <h4><?php _e( 'Profile Details', 'buddypress' ) ?></h4>
     65                        <h4><?php _e( 'Profile Details', 'buddypress' ); ?></h4>
    6666
    6767                        <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
     
    7474                                <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
    7575
    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(); ?>" />
    7979
    8080                                <?php endif; ?>
     
    8282                                <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
    8383
    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>
    8787
    8888                                <?php endif; ?>
     
    9090                                <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
    9191
    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(); ?>
    9696                                    </select>
    9797
     
    100100                                <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
    101101
    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(); ?>
    106106                                    </select>
    107107
     
    111111
    112112                                    <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(); ?>
    117117
    118118                                        <?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>
    120120                                        <?php endif; ?>
    121121                                    </div>
     
    126126
    127127                                    <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(); ?>
    132132                                    </div>
    133133
     
    137137
    138138                                    <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' ); ?>
    144144                                        </select>
    145145
    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' ); ?>
    148148                                        </select>
    149149
    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' ); ?>
    152152                                        </select>
    153153                                    </div>
     
    155155                                <?php endif; ?>
    156156
    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>
    160160
    161161                            </div>
     
    163163                        <?php endwhile; ?>
    164164
    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(); ?>" />
    166166
    167167                        <?php endwhile; endif; endif; ?>
     
    169169                    </div><!-- #profile-details-section -->
    170170
    171                     <?php do_action( 'bp_after_signup_profile_fields' ) ?>
     171                    <?php do_action( 'bp_after_signup_profile_fields' ); ?>
    172172
    173173                <?php endif; ?>
     
    175175                <?php if ( bp_get_blog_signup_allowed() ) : ?>
    176176
    177                     <?php do_action( 'bp_before_blog_details_fields' ) ?>
     177                    <?php do_action( 'bp_before_blog_details_fields' ); ?>
    178178
    179179                    <?php /***** Blog Creation Details ******/ ?>
     
    181181                    <div class="register-section" id="blog-details-section">
    182182
    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>
    186186
    187187                        <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
    188188
    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' ); ?>
    191191
    192192                            <?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(); ?>
    194194                            <?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(); ?>" />
    196196                            <?php endif; ?>
    197197
    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>
    207207
    208208                        </div>
     
    210210                    </div><!-- #blog-details-section -->
    211211
    212                     <?php do_action( 'bp_after_blog_details_fields' ) ?>
     212                    <?php do_action( 'bp_after_blog_details_fields' ); ?>
    213213
    214214                <?php endif; ?>
    215215
    216                 <?php do_action( 'bp_before_registration_submit_buttons' ) ?>
     216                <?php do_action( 'bp_before_registration_submit_buttons' ); ?>
    217217
    218218                <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' ); ?>" />
    220220                </div>
    221221
    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' ); ?>
    225225
    226226            <?php endif; // request-details signup step ?>
     
    228228            <?php if ( 'completed-confirmation' == bp_get_current_signup_step() ) : ?>
    229229
    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' ); ?>
    234234
    235235                <?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>
    237237                <?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>
    239239                <?php endif; ?>
    240240
    241                 <?php do_action( 'bp_after_registration_confirmed' ) ?>
     241                <?php do_action( 'bp_after_registration_confirmed' ); ?>
    242242
    243243            <?php endif; // completed-confirmation signup step ?>
    244244
    245             <?php do_action( 'bp_custom_signup_steps' ) ?>
     245            <?php do_action( 'bp_custom_signup_steps' ); ?>
    246246
    247247            </form>
     
    249249        </div>
    250250
    251         <?php do_action( 'bp_after_register_page' ) ?>
     251        <?php do_action( 'bp_after_register_page' ); ?>
    252252
    253253        </div><!-- .padder -->
    254254    </div><!-- #content -->
    255255
    256     <?php get_sidebar( 'buddypress' ) ?>
     256    <?php get_sidebar( 'buddypress' ); ?>
    257257
    258258    <script type="text/javascript">
     
    267267    </script>
    268268
    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(); ?>
    22
    33    <div id="content">
    44        <div class="padder">
    55
    6         <?php do_action( 'bp_before_blog_search' ) ?>
     6        <?php do_action( 'bp_before_blog_search' ); ?>
    77
    88        <div class="page" id="blog-search" role="main">
    99
    10             <h2 class="pagetitle"><?php _e( 'Site', 'buddypress' ) ?></h2>
     10            <h2 class="pagetitle"><?php _e( 'Site', 'buddypress' ); ?></h2>
    1111
    1212            <?php if (have_posts()) : ?>
    1313
    14                 <h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ) ?></h3>
     14                <h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ); ?></h3>
    1515
    1616                <?php bp_dtheme_content_nav( 'nav-above' ); ?>
     
    1818                <?php while (have_posts()) : the_post(); ?>
    1919
    20                     <?php do_action( 'bp_before_blog_post' ) ?>
     20                    <?php do_action( 'bp_before_blog_post' ); ?>
    2121
    2222                    <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     
    2424                        <div class="author-box">
    2525                            <?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>
    2727                        </div>
    2828
    2929                        <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>
    3131
    3232                            <p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p>
     
    4141                    </div>
    4242
    43                     <?php do_action( 'bp_after_blog_post' ) ?>
     43                    <?php do_action( 'bp_after_blog_post' ); ?>
    4444
    4545                <?php endwhile; ?>
     
    4949            <?php else : ?>
    5050
    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(); ?>
    5353
    5454            <?php endif; ?>
     
    5656        </div>
    5757
    58         <?php do_action( 'bp_after_blog_search' ) ?>
     58        <?php do_action( 'bp_after_blog_search' ); ?>
    5959
    6060        </div><!-- .padder -->
    6161    </div><!-- #content -->
    6262
    63     <?php get_sidebar() ?>
     63    <?php get_sidebar(); ?>
    6464
    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' ); ?>
    22
    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(); ?>/">
    44    <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' ); ?>" />
    66
    7     <?php do_action( 'bp_blog_search_form' ) ?>
     7    <?php do_action( 'bp_blog_search_form' ); ?>
    88</form>
    99
    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  
    11<?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.
    45     *
    5      * If none of the sidebars have widgets, then let's bail early.
     6     * If none of the sidebars have widgets, bail early.
    67     */
    78    if (   ! is_active_sidebar( 'first-footer-widget-area'  )
     
    1011        && ! is_active_sidebar( 'fourth-footer-widget-area' )
    1112    )
    12         return;
    13     // If we get this far, we have widgets. Let do this.
    14 ?>
     13    return; ?>
    1514
    1615            <div id="footer-widget-area" role="complementary">
    1716
    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' ) ) : ?>
    2518
    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 -->
    3324
    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; ?>
    4126
    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; ?>
    4956
    5057            </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' ); ?>
    22
    33<div id="sidebar" role="complementary">
    44    <div class="padder">
    55
    6     <?php do_action( 'bp_inside_before_sidebar' ) ?>
     6    <?php do_action( 'bp_inside_before_sidebar' ); ?>
    77
    88    <?php if ( is_user_logged_in() ) : ?>
    99
    10         <?php do_action( 'bp_before_sidebar_me' ) ?>
     10        <?php do_action( 'bp_before_sidebar_me' ); ?>
    1111
    1212        <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' ); ?>
    1515            </a>
    1616
    1717            <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>
    1919
    20             <?php do_action( 'bp_sidebar_me' ) ?>
     20            <?php do_action( 'bp_sidebar_me' ); ?>
    2121        </div>
    2222
    23         <?php do_action( 'bp_after_sidebar_me' ) ?>
     23        <?php do_action( 'bp_after_sidebar_me' ); ?>
    2424
    2525        <?php if ( bp_is_active( 'messages' ) ) : ?>
     
    2929    <?php else : ?>
    3030
    31         <?php do_action( 'bp_before_sidebar_login_form' ) ?>
     31        <?php do_action( 'bp_before_sidebar_login_form' ); ?>
    3232
    3333        <?php if ( bp_get_signup_allowed() ) : ?>
     
    3535            <p id="login-text">
    3636
    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() . '/' ) ); ?>
    3838
    3939            </p>
     
    4141        <?php endif; ?>
    4242
    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 />
    4545            <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>
    4646
    47             <label><?php _e( 'Password', 'buddypress' ) ?><br />
     47            <label><?php _e( 'Password', 'buddypress' ); ?><br />
    4848            <input type="password" name="pwd" id="sidebar-user-pass" class="input" value="" tabindex="98" /></label>
    4949
    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>
    5151
    52             <?php do_action( 'bp_sidebar_login_form' ) ?>
     52            <?php do_action( 'bp_sidebar_login_form' ); ?>
    5353            <input type="submit" name="wp-submit" id="sidebar-wp-submit" value="<?php _e( 'Log In', 'buddypress' ); ?>" tabindex="100" />
    5454            <input type="hidden" name="testcookie" value="1" />
    5555        </form>
    5656
    57         <?php do_action( 'bp_after_sidebar_login_form' ) ?>
     57        <?php do_action( 'bp_after_sidebar_login_form' ); ?>
    5858
    5959    <?php endif; ?>
     
    6262    if ( bp_is_active( 'forums' ) && bp_is_forums_component() && bp_is_directory() ) : ?>
    6363        <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>
    6565            <div id="tag-text"><?php bp_forums_tag_heat_map(); ?></div>
    6666        </div>
    6767    <?php endif; ?>
    6868
    69     <?php dynamic_sidebar( 'sidebar-1' ) ?>
     69    <?php dynamic_sidebar( 'sidebar-1' ); ?>
    7070
    71     <?php do_action( 'bp_inside_after_sidebar' ) ?>
     71    <?php do_action( 'bp_inside_after_sidebar' ); ?>
    7272
    7373    </div><!-- .padder -->
    7474</div><!-- #sidebar -->
    7575
    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(); ?>
    22
    33    <div id="content">
    44        <div class="padder">
    55
    6             <?php do_action( 'bp_before_blog_single_post' ) ?>
     6            <?php do_action( 'bp_before_blog_single_post' ); ?>
    77
    88            <div class="page" id="blog-single" role="main">
     
    4343            <?php endwhile; else: ?>
    4444
    45                 <p><?php _e( 'Sorry, no posts matched your criteria.', 'buddypress' ) ?></p>
     45                <p><?php _e( 'Sorry, no posts matched your criteria.', 'buddypress' ); ?></p>
    4646
    4747            <?php endif; ?>
     
    4949        </div>
    5050
    51         <?php do_action( 'bp_after_blog_single_post' ) ?>
     51        <?php do_action( 'bp_after_blog_single_post' ); ?>
    5252
    5353        </div><!-- .padder -->
    5454    </div><!-- #content -->
    5555
    56     <?php get_sidebar() ?>
     56    <?php get_sidebar(); ?>
    5757
    58 <?php get_footer() ?>
     58<?php get_footer(); ?>
Note: See TracChangeset for help on using the changeset viewer.