Skip to:
Content

BuddyPress.org

Changeset 11855


Ignore:
Timestamp:
02/11/2018 03:38:01 PM (4 years ago)
Author:
djpaul
Message:

Templates, Nouveau: whitespace changes.

Location:
trunk/src/bp-templates/bp-nouveau
Files:
83 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-templates/bp-nouveau/buddypress-functions.php

    r11697 r11855  
    175175        add_action( 'bp_actions', array( $this, 'neutralize_core_template_notices' ), 6 );
    176176
    177 
    178177        /** Scripts ***********************************************************/
    179178
    180         add_action( 'bp_enqueue_scripts', array( $this, 'register_scripts'  ), 2 ); // Register theme JS
     179        add_action( 'bp_enqueue_scripts', array( $this, 'register_scripts' ), 2 ); // Register theme JS
    181180
    182181        // We won't use this.
    183182        remove_action( 'bp_enqueue_scripts', 'bp_core_confirmation_js' );
    184183
    185         add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_styles'   ) ); // Enqueue theme CSS
    186         add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_scripts'  ) ); // Enqueue theme JS
     184        add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); // Enqueue theme CSS
     185        add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); // Enqueue theme JS
    187186        add_filter( 'bp_enqueue_scripts', array( $this, 'localize_scripts' ) ); // Enqueue theme script localization
    188 
    189187
    190188        /** Body no-js Class **************************************************/
     
    206204        // Set the BP Uri for the Ajax customizer preview
    207205        add_filter( 'bp_uri', array( $this, 'customizer_set_uri' ), 10, 1 );
    208 
    209206
    210207        /** Override **********************************************************/
     
    400397            'view'                => __( 'View', 'buddypress' ),
    401398            'object_nav_parent'   => '#buddypress',
    402             'time_since'        => array(
    403                 'sometime'  => _x( 'sometime', 'javascript time since', 'buddypress' ),
    404                 'now'       => _x( 'right now', 'javascript time since', 'buddypress' ),
    405                 'ago'       => _x( '% ago', 'javascript time since', 'buddypress' ),
    406                 'separator' => _x( ',', 'Separator in javascript time since', 'buddypress' ),
    407                 'year'      => _x( '% year', 'javascript time since singular', 'buddypress' ),
    408                 'years'     => _x( '% years', 'javascript time since plural', 'buddypress' ),
    409                 'month'     => _x( '% month', 'javascript time since singular', 'buddypress' ),
    410                 'months'    => _x( '% months', 'javascript time since plural', 'buddypress' ),
    411                 'week'      => _x( '% week', 'javascript time since singular', 'buddypress' ),
    412                 'weeks'     => _x( '% weeks', 'javascript time since plural', 'buddypress' ),
    413                 'day'       => _x( '% day', 'javascript time since singular', 'buddypress' ),
    414                 'days'      => _x( '% days', 'javascript time since plural', 'buddypress' ),
    415                 'hour'      => _x( '% hour', 'javascript time since singular', 'buddypress' ),
    416                 'hours'     => _x( '% hours', 'javascript time since plural', 'buddypress' ),
    417                 'minute'    => _x( '% minute', 'javascript time since singular', 'buddypress' ),
    418                 'minutes'   => _x( '% minutes', 'javascript time since plural', 'buddypress' ),
    419                 'second'    => _x( '% second', 'javascript time since singular', 'buddypress' ),
    420                 'seconds'   => _x( '% seconds', 'javascript time since plural', 'buddypress' ),
     399            'time_since'          => array(
     400                'sometime'    => _x( 'sometime', 'javascript time since', 'buddypress' ),
     401                'now'         => _x( 'right now', 'javascript time since', 'buddypress' ),
     402                'ago'         => _x( '% ago', 'javascript time since', 'buddypress' ),
     403                'separator'   => _x( ',', 'Separator in javascript time since', 'buddypress' ),
     404                'year'        => _x( '% year', 'javascript time since singular', 'buddypress' ),
     405                'years'       => _x( '% years', 'javascript time since plural', 'buddypress' ),
     406                'month'       => _x( '% month', 'javascript time since singular', 'buddypress' ),
     407                'months'      => _x( '% months', 'javascript time since plural', 'buddypress' ),
     408                'week'        => _x( '% week', 'javascript time since singular', 'buddypress' ),
     409                'weeks'       => _x( '% weeks', 'javascript time since plural', 'buddypress' ),
     410                'day'         => _x( '% day', 'javascript time since singular', 'buddypress' ),
     411                'days'        => _x( '% days', 'javascript time since plural', 'buddypress' ),
     412                'hour'        => _x( '% hour', 'javascript time since singular', 'buddypress' ),
     413                'hours'       => _x( '% hours', 'javascript time since plural', 'buddypress' ),
     414                'minute'      => _x( '% minute', 'javascript time since singular', 'buddypress' ),
     415                'minutes'     => _x( '% minutes', 'javascript time since plural', 'buddypress' ),
     416                'second'      => _x( '% second', 'javascript time since singular', 'buddypress' ),
     417                'seconds'     => _x( '% seconds', 'javascript time since plural', 'buddypress' ),
    421418                'time_chunks' => array(
    422419                    'a_year'   => YEAR_IN_SECONDS,
  • trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment.php

    r11686 r11855  
    77 */
    88
    9  ?>
     9    ?>
    1010
    1111<li id="acomment-<?php bp_activity_comment_id(); ?>" class="comment-item" data-bp-activity-comment-id="<?php bp_activity_comment_id(); ?>">
     
    2424    <div class="acomment-content"><?php bp_activity_comment_content(); ?></div>
    2525
    26     <?php bp_nouveau_activity_comment_buttons( array( 'container' => 'div' ) );?>
     26    <?php bp_nouveau_activity_comment_buttons( array( 'container' => 'div' ) ); ?>
    2727
    2828    <?php bp_nouveau_activity_recurse_comments( bp_activity_current_comment() ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/activity/widget.php

    r11686 r11855  
    3737                    </blockquote>
    3838
    39                 <?php else: ?>
     39                <?php else : ?>
    4040
    4141                    <p><?php bp_activity_action(); ?></p>
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/camera.php

    r11719 r11855  
    1212    <# if ( ! data.user_media ) { #>
    1313        <div id="bp-webcam-message">
    14             <p class="warning"><?php esc_html_e( 'Your browser does not support this feature.', 'buddypress' );?></p>
     14            <p class="warning"><?php esc_html_e( 'Your browser does not support this feature.', 'buddypress' ); ?></p>
    1515        </div>
    1616    <# } else { #>
     
    1919            <div id="avatar-crop-pane" class="avatar" style="width:{{data.w}}px; height:{{data.h}}px"></div>
    2020            <div id="avatar-crop-actions">
    21                 <button type="button" class="button avatar-webcam-capture"><?php esc_html_e( 'Capture', 'buddypress' );?></button>
    22                 <button type="button" class="button avatar-webcam-save"><?php esc_html_e( 'Save', 'buddypress' );?></button>
     21                <button type="button" class="button avatar-webcam-capture"><?php esc_html_e( 'Capture', 'buddypress' ); ?></button>
     22                <button type="button" class="button avatar-webcam-save"><?php esc_html_e( 'Save', 'buddypress' ); ?></button>
    2323            </div>
    2424        </div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/uploader.php

    r11686 r11855  
    2020                    <p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
    2121                    <p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
    22                     <p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php esc_html_e( 'Select your File', 'buddypress' ); ?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
     22                    <p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text'; ?>"><?php esc_html_e( 'Select your File', 'buddypress' ); ?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
    2323                </div>
    2424            </div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/blogs/blogs-loop.php

    r11686 r11855  
    6060    <?php bp_nouveau_pagination( 'bottom' ); ?>
    6161
    62 <?php else:
     62<?php
     63else :
    6364
    6465    bp_nouveau_user_feedback( 'blogs-loop-none' );
    6566
    66 endif; ?>
     67endif;
     68?>
    6769
    6870<?php bp_nouveau_after_loop(); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/blogs/create.php

    r11686 r11855  
    1616    <?php bp_show_blog_signup_form(); ?>
    1717
    18 <?php else:
     18<?php
     19else :
    1920
    2021    bp_nouveau_user_feedback( 'blogs-no-signup' );
    2122
    22 endif; ?>
     23endif;
     24?>
    2325
    2426<?php
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php

    r11854 r11855  
    5959    <div class="action">
    6060        <# if ( undefined === data.is_sent || ( false === data.is_sent && true === data.can_edit ) ) { #>
    61             <button type="button" class="button invite-button group-add-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php esc_attr_e( 'Invite / Uninvite', 'buddypress' );?>">
     61            <button type="button" class="button invite-button group-add-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php esc_attr_e( 'Invite / Uninvite', 'buddypress' ); ?>">
    6262                <span class="icons"></span>
    63                 <span class="bp-screen-reader-text"><?php esc_html_e( 'Invite/Uninvite', 'buddypress' );?></span>
     63                <span class="bp-screen-reader-text"><?php esc_html_e( 'Invite/Uninvite', 'buddypress' ); ?></span>
    6464            </button>
    6565        <# } #>
    6666
    6767        <# if ( undefined !== data.can_edit && true === data.can_edit ) { #>
    68             <button type="button" class="button invite-button group-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php esc_attr_e( 'Remove', 'buddypress' );?>">
     68            <button type="button" class="button invite-button group-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php esc_attr_e( 'Remove', 'buddypress' ); ?>">
    6969                <span class=" icons"></span>
    70                 <span class="bp-screen-reader-text"><?php esc_html_e( 'Remove', 'buddypress' );?></span>
     70                <span class="bp-screen-reader-text"><?php esc_html_e( 'Remove', 'buddypress' ); ?></span>
    7171            </button>
    7272        <# } #>
     
    111111    <# if ( 1 !== data.page ) { #>
    112112        <button type="button" id="bp-invites-prev-page" class="button invite-button">
    113             <span class="bp-screen-reader-text"><?php esc_html_e( 'Previous', 'buddypress' );?></span>
     113            <span class="bp-screen-reader-text"><?php esc_html_e( 'Previous', 'buddypress' ); ?></span>
    114114        </button>
    115115    <# } #>
     
    117117    <# if ( data.total_page !== data.page ) { #>
    118118        <button type="button" id="bp-invites-next-page" class="button invite-button">
    119             <span class="bp-screen-reader-text"><?php esc_html_e( 'Next', 'buddypress' );?></span>
     119            <span class="bp-screen-reader-text"><?php esc_html_e( 'Next', 'buddypress' ); ?></span>
    120120        </button>
    121121    <# } #>
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php

    r11854 r11855  
    5252    );
    5353    // Temporarly filter the editor
    54     remove_filter( 'mce_buttons', 'bp_nouveau_mce_buttons', 10, 1 ); ?>
     54    remove_filter( 'mce_buttons', 'bp_nouveau_mce_buttons', 10, 1 );
     55    ?>
    5556</script>
    5657
     
    5960        <button id="bp-messages-prev-page"class="button messages-button">
    6061            <span class="dashicons dashicons-arrow-left"></span>
    61             <span class="bp-screen-reader-text"><?php esc_html_e( 'Prev', 'buddypress' );?></span>
     62            <span class="bp-screen-reader-text"><?php esc_html_e( 'Prev', 'buddypress' ); ?></span>
    6263        </button>
    6364    <# } #>
     
    6667        <button id="bp-messages-next-page"class="button messages-button">
    6768            <span class="dashicons dashicons-arrow-right"></span>
    68             <span class="bp-screen-reader-text"><?php esc_html_e( 'Next', 'buddypress' );?></span>
     69            <span class="bp-screen-reader-text"><?php esc_html_e( 'Next', 'buddypress' ); ?></span>
    6970        </button>
    7071    <# } #>
     
    160161                <div class="actions">
    161162
    162                     <button type="button" class="message-action-delete bp-tooltip bp-icons" data-bp-action="delete" data-bp-tooltip="<?php esc_attr_e( 'Delete conversation.', 'buddypress' );?>">
    163                         <span class="bp-screen-reader-text"><?php esc_html_e( 'Delete conversation.', 'buddypress' );?></span>
     163                    <button type="button" class="message-action-delete bp-tooltip bp-icons" data-bp-action="delete" data-bp-tooltip="<?php esc_attr_e( 'Delete conversation.', 'buddypress' ); ?>">
     164                        <span class="bp-screen-reader-text"><?php esc_html_e( 'Delete conversation.', 'buddypress' ); ?></span>
    164165                    </button>
    165166
     
    167168
    168169                        <# if ( false !== data.is_starred ) { #>
    169                             <a role="button" class="message-action-unstar bp-tooltip bp-icons" href="{{data.star_link}}" data-bp-action="unstar" aria-pressed="true" data-bp-tooltip="<?php esc_attr_e( 'Unstar Conversation', 'buddypress' );?>">
    170                                 <span class="bp-screen-reader-text"><?php esc_html_e( 'Unstar Conversation', 'buddypress' );?></span>
     170                            <a role="button" class="message-action-unstar bp-tooltip bp-icons" href="{{data.star_link}}" data-bp-action="unstar" aria-pressed="true" data-bp-tooltip="<?php esc_attr_e( 'Unstar Conversation', 'buddypress' ); ?>">
     171                                <span class="bp-screen-reader-text"><?php esc_html_e( 'Unstar Conversation', 'buddypress' ); ?></span>
    171172                            </a>
    172173                        <# } else { #>
    173                             <a role="button" class="message-action-star bp-tooltip bp-icons" href="{{data.star_link}}" data-bp-action="star" aria-pressed="false" data-bp-tooltip="<?php esc_attr_e( 'Star Conversation', 'buddypress' );?>">
    174                                 <span class="bp-screen-reader-text"><?php esc_html_e( 'Star Conversation', 'buddypress' );?></span>
     174                            <a role="button" class="message-action-star bp-tooltip bp-icons" href="{{data.star_link}}" data-bp-action="star" aria-pressed="false" data-bp-tooltip="<?php esc_attr_e( 'Star Conversation', 'buddypress' ); ?>">
     175                                <span class="bp-screen-reader-text"><?php esc_html_e( 'Star Conversation', 'buddypress' ); ?></span>
    175176                            </a>
    176177                        <# } #>
     
    178179                    <# } #>
    179180
    180                     <a href="#view/{{data.id}}" class="message-action-view bp-tooltip bp-icons" data-bp-tooltip="<?php esc_attr_e( 'View full conversation and reply.', 'buddypress' );?>">
    181                         <span class="bp-screen-reader-text"><?php esc_html_e( 'View full conversation and reply.', 'buddypress' );?></span>
     181                    <a href="#view/{{data.id}}" class="message-action-view bp-tooltip bp-icons" data-bp-tooltip="<?php esc_attr_e( 'View full conversation and reply.', 'buddypress' ); ?>">
     182                        <span class="bp-screen-reader-text"><?php esc_html_e( 'View full conversation and reply.', 'buddypress' ); ?></span>
    182183                    </a>
    183184                </div>
     
    209210        <div class="actions">
    210211
    211             <button type="button" class="message-action-delete bp-tooltip bp-icons" data-bp-action="delete" data-bp-tooltip="<?php esc_attr_e( 'Delete conversation.', 'buddypress' );?>">
    212                 <span class="bp-screen-reader-text"><?php esc_html_e( 'Delete conversation.', 'buddypress' );?></span>
     212            <button type="button" class="message-action-delete bp-tooltip bp-icons" data-bp-action="delete" data-bp-tooltip="<?php esc_attr_e( 'Delete conversation.', 'buddypress' ); ?>">
     213                <span class="bp-screen-reader-text"><?php esc_html_e( 'Delete conversation.', 'buddypress' ); ?></span>
    213214            </button>
    214215
     
    235236
    236237                <# if ( false !== data.is_starred ) { #>
    237                     <button type="button" class="message-action-unstar bp-tooltip bp-icons" data-bp-star-link="{{data.star_link}}" data-bp-action="unstar" data-bp-tooltip="<?php esc_attr_e( 'Unstar Message', 'buddypress' );?>">
    238                         <span class="bp-screen-reader-text"><?php esc_html_e( 'Unstar Message', 'buddypress' );?></span>
     238                    <button type="button" class="message-action-unstar bp-tooltip bp-icons" data-bp-star-link="{{data.star_link}}" data-bp-action="unstar" data-bp-tooltip="<?php esc_attr_e( 'Unstar Message', 'buddypress' ); ?>">
     239                        <span class="bp-screen-reader-text"><?php esc_html_e( 'Unstar Message', 'buddypress' ); ?></span>
    239240                    </button>
    240241                <# } else { #>
    241                     <button type="button" class="message-action-star bp-tooltip bp-icons" data-bp-star-link="{{data.star_link}}" data-bp-action="star" data-bp-tooltip="<?php esc_attr_e( 'Star Message', 'buddypress' );?>">
    242                         <span class="bp-screen-reader-text"><?php esc_html_e( 'Star Message', 'buddypress' );?></span>
     242                    <button type="button" class="message-action-star bp-tooltip bp-icons" data-bp-star-link="{{data.star_link}}" data-bp-action="star" data-bp-tooltip="<?php esc_attr_e( 'Star Message', 'buddypress' ); ?>">
     243                        <span class="bp-screen-reader-text"><?php esc_html_e( 'Star Message', 'buddypress' ); ?></span>
    243244                    </button>
    244245                <# } #>
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/nav/directory-nav.php

    r11686 r11855  
    2929        </ul><!-- .component-navigation -->
    3030
    31     <?php endif ; ?>
     31    <?php endif; ?>
    3232
    3333</nav><!-- .bp-navs -->
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/notices/template-notices.php

    r11686 r11855  
    1414        <button type="button" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Close', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'buddypress' ); ?>" data-bp-close="<?php bp_nouveau_dismiss_button_type(); ?>"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button>
    1515
    16     <?php endif ; ?>
     16    <?php endif; ?>
    1717</aside>
  • trunk/src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php

    r11686 r11855  
    1111    <div class="subnav-search clearfix">
    1212
    13         <?php if ( 'activity' === bp_current_component() ) :?>
     13        <?php if ( 'activity' === bp_current_component() ) : ?>
    1414            <div class="feed"><a href="<?php bp_sitewide_activity_feed_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>"><span class="bp-screen-reader-text"><?php _e( 'RSS', 'buddypress' ); ?></span></a></div>
    1515        <?php endif; ?>
     
    2323            <?php bp_get_template_part( 'common/filters/user-screens-filters' ); ?>
    2424        <?php elseif ( 'groups' === bp_current_component() ) : ?>
    25             <?php bp_get_template_part( 'common/filters/groups-screens-filters' );  ?>
     25            <?php bp_get_template_part( 'common/filters/groups-screens-filters' ); ?>
    2626        <?php else : ?>
    2727            <?php bp_get_template_part( 'common/filters/directory-filters' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/create.php

    r11686 r11855  
    66bp_nouveau_groups_create_hook( 'before', 'page' ); ?>
    77
    8     <h2 class="bp-subhead"><?php _e( 'Create A New Group','buddypress' ); ?></h2>
     8    <h2 class="bp-subhead"><?php _e( 'Create A New Group', 'buddypress' ); ?></h2>
    99
    1010    <?php bp_nouveau_groups_create_hook( 'before', 'content_template' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/groups-loop.php

    r11686 r11855  
    1111
    1212<?php if ( bp_get_current_group_directory_type() ) : ?>
    13     <p class="current-group-type"><?php bp_current_group_directory_type_message() ?></p>
     13    <p class="current-group-type"><?php bp_current_group_directory_type_message(); ?></p>
    1414<?php endif; ?>
    1515
     
    5151                    <?php bp_nouveau_groups_loop_item(); ?>
    5252
    53                     <?php bp_nouveau_groups_loop_buttons( ); ?>
     53                    <?php bp_nouveau_groups_loop_buttons(); ?>
    5454
    5555                </div>
     
    6565    <?php bp_nouveau_pagination( 'bottom' ); ?>
    6666
    67 <?php else:
     67<?php
     68else :
    6869
    6970    bp_nouveau_user_feedback( 'groups-loop-none' );
    7071
    71 endif; ?>
     72endif;
     73?>
    7274
    7375<?php bp_nouveau_after_loop(); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php

    r11686 r11855  
    2222        </label>
    2323    </p>
    24 <?php endif ; ?>
     24<?php endif; ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-avatar.php

    r11686 r11855  
    1111
    1212<?php if ( ! bp_is_group_create() ) : ?>
    13     <?php if ( ! bp_get_group_has_avatar() ): ?>
    14         <p class="bp-help-text"><?php _e("Add an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
    15     <?php else: ?>
    16         <p class="bp-help-text"><?php _e("Edit or update your avatar image for this group.", 'buddypress' ); ?></p>
     13    <?php if ( ! bp_get_group_has_avatar() ) : ?>
     14        <p class="bp-help-text"><?php _e( 'Add an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.', 'buddypress' ); ?></p>
     15    <?php else : ?>
     16        <p class="bp-help-text"><?php _e( 'Edit or update your avatar image for this group.', 'buddypress' ); ?></p>
    1717    <?php endif; ?>
    1818<?php endif; ?>
     
    3232    <?php endif; ?>
    3333
    34             <p class="bp-help-text"><?php _e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
     34            <p class="bp-help-text"><?php _e( 'Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.', 'buddypress' ); ?></p>
    3535
    3636            <p>
     
    8989    ?>
    9090
    91 <?php endif;
     91<?php
     92endif;
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-cover-image.php

    r11686 r11855  
    1919    <h2 class="bp-screen-title"><?php _e( 'Change Cover Image', 'buddypress' ); ?></h2>
    2020
    21 <?php endif ; ?>
     21<?php endif; ?>
    2222
    2323<p><?php _e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php

    r11686 r11855  
    4949
    5050<?php // Group type selection ?>
    51 <?php if ( $group_types = bp_groups_get_group_types( array( 'show_in_create_screen' => true ), 'objects' ) ): ?>
     51<?php if ( $group_types = bp_groups_get_group_types( array( 'show_in_create_screen' => true ), 'objects' ) ) : ?>
    5252
    5353    <fieldset class="group-create-types">
     
    6161                    <input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', $type->name ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php checked( bp_groups_has_group_type( bp_get_current_group_id(), $type->name ) ); ?>/> <?php echo esc_html( $type->labels['name'] ); ?>
    6262                    <?php
    63                         if ( ! empty( $type->description ) ) {
    64                             printf( '&ndash; %s', '<span class="bp-group-type-desc">' . esc_html( $type->description ) . '</span>' );
    65                         }
     63                    if ( ! empty( $type->description ) ) {
     64                        printf( '&ndash; %s', '<span class="bp-group-type-desc">' . esc_html( $type->description ) . '</span>' );
     65                    }
    6666                    ?>
    6767                </label>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/admin/manage-members.php

    r11686 r11855  
    1717    <dt class="admin-section section-title"><?php _e( 'Administrators', 'buddypress' ); ?></dt>
    1818
    19     <?php if ( bp_has_members( '&include='. bp_group_admin_ids() ) ) : ?>
     19    <?php if ( bp_has_members( '&include=' . bp_group_admin_ids() ) ) : ?>
    2020        <dd class="admin-listing">
    2121            <ul id="admins-list" class="item-list single-line">
     
    3535                        </p>
    3636
    37                         <?php endif; ?>
     37                    <?php endif; ?>
    3838
    3939                </li>
     
    7373        <?php endif; ?>
    7474    </dd>
    75 <?php endif ?>
     75    <?php endif ?>
    7676
    7777
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php

    r11686 r11855  
    3232            <?php bp_nouveau_group_hook( 'before', 'header_meta' ); ?>
    3333
    34             <?php if ( bp_nouveau_group_has_meta_extra() ): ?>
     34            <?php if ( bp_nouveau_group_has_meta_extra() ) : ?>
    3535                <div class="item-meta">
    3636
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php

    r11686 r11855  
    3434
    3535        </div><!-- .group-description -->
    36     <?php endif ; ?>
     36    <?php endif; ?>
    3737
    3838    <?php if ( bp_nouveau_groups_do_group_boxes() ) : ?>
     
    4242
    4343        </div><!-- .bp-plugin-widgets -->
    44     <?php endif ;?>
     44    <?php endif; ?>
    4545
    4646    <?php if ( is_active_sidebar( 'sidebar-buddypress-groups' ) ) : ?>
     
    5050
    5151        </div><!-- .bp-sidebar.bp-widget-area -->
    52     <?php endif ; ?>
     52    <?php endif; ?>
    5353
    5454</div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php

    r11686 r11855  
    2727    <?php bp_nouveau_group_hook( 'before', 'header_meta' ); ?>
    2828
    29     <?php if ( bp_nouveau_group_has_meta_extra() ): ?>
     29    <?php if ( bp_nouveau_group_has_meta_extra() ) : ?>
    3030        <div class="item-meta">
    3131
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/members-loop.php

    r11812 r11855  
    1111    <?php bp_nouveau_group_hook( 'before', 'members_content' ); ?>
    1212
    13     <?php bp_nouveau_pagination( 'top' ) ; ?>
     13    <?php bp_nouveau_pagination( 'top' ); ?>
    1414
    1515    <?php bp_nouveau_group_hook( 'before', 'members_list' ); ?>
     
    5555    <?php bp_nouveau_group_hook( 'after', 'members_list' ); ?>
    5656
    57     <?php bp_nouveau_pagination( 'bottom' ) ; ?>
     57    <?php bp_nouveau_pagination( 'bottom' ); ?>
    5858
    5959    <?php bp_nouveau_group_hook( 'after', 'members_content' ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/admin-subnav.php

    r11686 r11855  
    2929        </ul>
    3030
    31     <?php endif ; ?>
     31    <?php endif; ?>
    3232
    3333</nav><!-- #isubnav -->
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php

    r11686 r11855  
    3131            </ul>
    3232
    33         <?php endif ; ?>
     33        <?php endif; ?>
    3434
    3535    </nav>
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/request-membership.php

    r11686 r11855  
    2323<?php endif; ?>
    2424
    25 <?php bp_nouveau_group_hook( 'after', 'request_membership_content' );
     25<?php
     26bp_nouveau_group_hook( 'after', 'request_membership_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/requests-loop.php

    r11686 r11855  
    99<?php if ( bp_group_has_membership_requests( bp_ajax_querystring( 'membership_requests' ) ) ) : ?>
    1010
    11     <?php bp_nouveau_pagination( 'top' ) ; ?>
     11    <?php bp_nouveau_pagination( 'top' ); ?>
    1212
    1313    <ul id="request-list" class="item-list bp-list">
     
    2727    </ul>
    2828
    29     <?php bp_nouveau_pagination( 'bottom' ) ; ?>
     29    <?php bp_nouveau_pagination( 'bottom' ); ?>
    3030
    3131    <?php else:
  • trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/send-invites.php

    r11686 r11855  
    66 */
    77// Runs do_action & calls common/js-templates/invites/index
    8 bp_nouveau_group_invites_interface(); ?>
     8bp_nouveau_group_invites_interface();
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php

    r11766 r11855  
    4444
    4545    <?php bp_nouveau_activation_hook( 'after', 'page' ); ?>
    46 
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/index.php

    r11686 r11855  
    66?>
    77
    8     <?php bp_nouveau_before_members_directory_content() ?>
     8    <?php bp_nouveau_before_members_directory_content(); ?>
    99
    1010    <?php if ( ! bp_nouveau_is_object_nav_in_sidebar() ) : ?>
     
    2222        </div><!-- #members-dir-list -->
    2323
    24         <?php bp_nouveau_after_members_directory_content() ?>
     24        <?php bp_nouveau_after_members_directory_content(); ?>
    2525    </div><!-- // .screen-content -->
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/members-loop.php

    r11686 r11855  
    1111
    1212<?php if ( bp_get_current_member_type() ) : ?>
    13     <p class="current-member-type"><?php bp_current_member_type_message() ?></p>
     13    <p class="current-member-type"><?php bp_current_member_type_message(); ?></p>
    1414<?php endif; ?>
    1515
     
    4141                                <?php bp_nouveau_member_meta(); ?>
    4242                            </p><!-- #item-meta -->
    43                         <?php endif ; ?>
     43                        <?php endif; ?>
    4444
    4545                        <?php bp_nouveau_members_loop_buttons( array( 'container' => 'ul', 'button_element' => 'button' ) ); ?>
     
    6666    <?php bp_nouveau_pagination( 'bottom' ); ?>
    6767
    68 <?php else:
     68<?php
     69else :
    6970
    7071    bp_nouveau_user_feedback( 'members-loop-none' );
    7172
    72 endif; ?>
     73endif;
     74?>
    7375
    7476<?php bp_nouveau_after_loop(); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/activity.php

    r11825 r11855  
    3333</div><!-- .activity -->
    3434
    35 <?php bp_nouveau_member_hook( 'after', 'activity_content' );
     35<?php
     36bp_nouveau_member_hook( 'after', 'activity_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/blogs.php

    r11686 r11855  
    2121
    2222    // Home/My Blogs
    23     case 'my-sites' :
    24 
    25         bp_nouveau_member_hook( 'before', 'blogs_content' ); ?>
     23    case 'my-sites':
     24        bp_nouveau_member_hook( 'before', 'blogs_content' );
     25        ?>
    2626
    2727        <div class="blogs myblogs" data-bp-list="blogs">
     
    3131        </div><!-- .blogs.myblogs -->
    3232
    33         <?php bp_nouveau_member_hook( 'after', 'blogs_content' );
     33        <?php
     34        bp_nouveau_member_hook( 'after', 'blogs_content' );
    3435        break;
    3536
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/cover-image-header.php

    r11686 r11855  
    3535
    3636                </div><!-- #item-meta -->
    37             <?php endif ; ?>
     37            <?php endif; ?>
    3838
    3939        </div><!-- #item-header-content -->
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/default-front.php

    r11852 r11855  
    1414            <strong><?php esc_html_e( 'Manage the members default front page', 'buddypress' ); ?></strong>
    1515            <button type="button" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Close', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'buddypress' ); ?>" data-bp-close="remove"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button><br/>
    16             <?php printf(
    17                 esc_html__( 'You can set the preferences of the %s or add %s to it.', 'buddypress' ),
     16            <?php
     17            printf(
     18                esc_html__( 'You can set the preferences of the %1$s or add %2$s to it.', 'buddypress' ),
    1819                bp_nouveau_members_get_customizer_option_link(),
    1920                bp_nouveau_members_get_customizer_widgets_link()
    20             ); ?>
     21            );
     22            ?>
    2123        </div>
    2224
     
    3133                    <?php bp_nouveau_member_description( bp_displayed_user_id() ); ?>
    3234                </blockquote><!-- .member-bio -->
    33             <?php endif ; ?>
     35            <?php endif; ?>
    3436
    3537            <?php if ( bp_is_my_profile() ) :
     
    3739                bp_nouveau_member_description_edit_link();
    3840
    39             endif ; ?>
     41            endif;
     42            ?>
    4043
    4144        </div><!-- .member-description -->
    4245
    43     <?php endif ; ?>
     46    <?php endif; ?>
    4447
    4548    <?php if ( is_active_sidebar( 'sidebar-buddypress-members' ) ) : ?>
     
    4952        </div><!-- .bp-sidebar.bp-widget-area -->
    5053
    51     <?php endif ; ?>
     54    <?php endif; ?>
    5255
    5356</div>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/friends.php

    r11686 r11855  
    1313            <?php bp_get_template_part( 'members/single/parts/item-subnav' ); ?>
    1414
    15         <?php endif ; ?>
     15        <?php endif; ?>
    1616    </ul>
    1717</nav><!-- .bp-navs -->
     
    2323
    2424    // Home/My Friends
    25     case 'my-friends' :
    26 
    27         bp_nouveau_member_hook( 'before', 'friends_content' ); ?>
     25    case 'my-friends':
     26        bp_nouveau_member_hook( 'before', 'friends_content' );
     27        ?>
    2828
    2929        <div class="members friends" data-bp-list="members">
     
    3333        </div><!-- .members.friends -->
    3434
    35         <?php bp_nouveau_member_hook( 'after', 'friends_content' );
     35        <?php
     36        bp_nouveau_member_hook( 'after', 'friends_content' );
    3637        break;
    3738
    38     case 'requests' :
     39    case 'requests':
    3940        bp_get_template_part( 'members/single/friends/requests' );
    4041        break;
    4142
    4243    // Any other
    43     default :
     44    default:
    4445        bp_get_template_part( 'members/single/plugins' );
    4546        break;
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/friends/requests.php

    r11686 r11855  
    3737    <?php bp_nouveau_pagination( 'bottom' ); ?>
    3838
    39 <?php else:
     39<?php
     40else :
    4041
    4142    bp_nouveau_user_feedback( 'member-requests-none' );
    4243
    43 endif;?>
     44endif;
     45?>
    4446
    45 <?php bp_nouveau_member_hook( 'after', 'friend_requests_content' );
     47<?php
     48bp_nouveau_member_hook( 'after', 'friend_requests_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/groups.php

    r11686 r11855  
    1414            <?php bp_get_template_part( 'members/single/parts/item-subnav' ); ?>
    1515
    16         <?php endif ; ?>
     16        <?php endif; ?>
    1717
    1818    </ul>
     
    3131
    3232    // Home/My Groups
    33     case 'my-groups' :
    34 
    35         bp_nouveau_member_hook( 'before', 'groups_content' ); ?>
     33    case 'my-groups':
     34        bp_nouveau_member_hook( 'before', 'groups_content' );
     35        ?>
    3636
    3737        <div class="groups mygroups" data-bp-list="groups">
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/groups/invites.php

    r11686 r11855  
    2020                <?php if ( ! bp_disable_group_avatar_uploads() ) : ?>
    2121                    <div class="item-avatar">
    22                         <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar(  ); ?></a>
     22                        <a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar(); ?></a>
    2323                    </div>
    2424                <?php endif; ?>
     
    2727                        <h2 class="list-title groups-title"><?php bp_group_link(); ?></h2>
    2828                        <p class="meta group-details">
    29                             <span class="small"> - <?php printf( _nx( '%d member', '%d members', bp_get_group_total_members( false ),'Group member count', 'buddypress' ), bp_get_group_total_members( false ) ); ?></span>
     29                            <span class="small"> - <?php printf( _nx( '%d member', '%d members', bp_get_group_total_members( false ), 'Group member count', 'buddypress' ), bp_get_group_total_members( false ) ); ?></span>
    3030                        </p>
    3131
     
    4545    </ul>
    4646
    47 <?php else:
     47<?php
     48else :
    4849
    4950    bp_nouveau_user_feedback( 'member-invites-none' );
    5051
    51 endif;?>
     52endif;
     53?>
    5254
    53 <?php bp_nouveau_group_hook( 'after', 'invites_content' );
     55<?php
     56bp_nouveau_group_hook( 'after', 'invites_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/member-header.php

    r11686 r11855  
    2929
    3030        </div><!-- #item-meta -->
    31     <?php endif ; ?>
     31    <?php endif; ?>
    3232
    3333    <?php bp_nouveau_member_header_buttons( array( 'container_classes' => array( 'member-header-actions' ) ) ); ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/messages.php

    r11686 r11855  
    1313</nav><!-- .bp-navs -->
    1414
    15 <?php if ( ! in_array( bp_current_action(), array( 'inbox', 'sentbox', 'starred', 'view', 'compose', 'notices' ), true ) ) :
     15<?php
     16if ( ! in_array( bp_current_action(), array( 'inbox', 'sentbox', 'starred', 'view', 'compose', 'notices' ), true ) ) :
    1617
    1718    bp_get_template_part( 'members/single/plugins' );
     
    2122    bp_nouveau_messages_member_interface();
    2223
    23 endif ;?>
    24 
     24endif;
     25?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/notifications.php

    r11686 r11855  
    1818switch ( bp_current_action() ) :
    1919
    20     case 'unread' :
    21     case 'read'   : ?>
     20    case 'unread':
     21    case 'read':
     22    ?>
    2223
    2324
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/notifications/notifications-loop.php

    r11686 r11855  
    4949    </form>
    5050
    51     <?php bp_nouveau_pagination( 'bottom' );
     51    <?php
     52    bp_nouveau_pagination( 'bottom' );
    5253
    5354else :
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php

    r11686 r11855  
    3131            </ul>
    3232
    33         <?php endif ; ?>
     33        <?php endif; ?>
    3434
    3535    </nav>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-subnav.php

    r11686 r11855  
    2323    <?php endwhile; ?>
    2424
    25 <?php endif ; ?>
     25<?php endif; ?>
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/plugins.php

    r11686 r11855  
    3131<?php endif; ?>
    3232
    33 <?php bp_nouveau_plugin_hook( 'content' );
     33<?php
     34bp_nouveau_plugin_hook( 'content' );
    3435
    3536bp_nouveau_member_hook( 'after', 'plugin_template' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile.php

    r11686 r11855  
    1919<div class="profile <?php echo bp_current_action(); ?>">
    2020
    21 <?php switch ( bp_current_action() ) :
     21<?php
     22switch ( bp_current_action() ) :
    2223
    2324    // Edit
     
    5354        bp_get_template_part( 'members/single/plugins' );
    5455        break;
    55 endswitch; ?>
     56endswitch;
     57?>
    5658</div><!-- .profile -->
    5759
    58 <?php bp_nouveau_xprofile_hook( 'after', 'profile_content' );
     60<?php
     61bp_nouveau_xprofile_hook( 'after', 'profile_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/change-avatar.php

    r11686 r11855  
    6969     * @since 2.3.0
    7070     */
    71     bp_avatar_get_templates(); ?>
     71    bp_avatar_get_templates();
     72    ?>
    7273
    7374<?php else : ?>
     
    7778<?php endif; ?>
    7879
    79 <?php bp_nouveau_xprofile_hook( 'after', 'avatar_upload_content' );
     80<?php
     81bp_nouveau_xprofile_hook( 'after', 'avatar_upload_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/edit.php

    r11686 r11855  
    2121
    2222            </ul>
    23         <?php endif ;?>
     23        <?php endif; ?>
    2424
    2525        <h2 class="screen-heading profile-group-title edit"><?php printf( __( 'Editing \'%s\' Profile Group', 'buddypress' ), bp_get_the_profile_group_name() ); ?></h2>
     
    5050</form>
    5151
    52 <?php endwhile; endif;
     52    <?php
     53    endwhile;
     54
     55endif;
    5356
    5457bp_nouveau_xprofile_hook( 'after', 'edit_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-loop.php

    r11686 r11855  
    5555<?php endif; ?>
    5656
    57 <?php bp_nouveau_xprofile_hook( 'after', 'loop_content' );
     57<?php
     58bp_nouveau_xprofile_hook( 'after', 'loop_content' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings.php

    r11686 r11855  
    1616    </nav>
    1717
    18 <?php endif;
     18<?php
     19endif;
    1920
    2021switch ( bp_current_action() ) :
    21     case 'notifications'  :
    22         bp_get_template_part( 'members/single/settings/notifications'  );
     22    case 'notifications':
     23        bp_get_template_part( 'members/single/settings/notifications' );
    2324        break;
    24     case 'capabilities'   :
    25         bp_get_template_part( 'members/single/settings/capabilities'   );
     25    case 'capabilities':
     26        bp_get_template_part( 'members/single/settings/capabilities' );
    2627        break;
    27     case 'delete-account' :
     28    case 'delete-account':
    2829        bp_get_template_part( 'members/single/settings/delete-account' );
    2930        break;
    30     case 'general'        :
    31         bp_get_template_part( 'members/single/settings/general'        );
     31    case 'general':
     32        bp_get_template_part( 'members/single/settings/general' );
    3233        break;
    33     case 'profile'        :
    34         bp_get_template_part( 'members/single/settings/profile'        );
     34    case 'profile':
     35        bp_get_template_part( 'members/single/settings/profile' );
    3536        break;
    36     case 'invites'        :
    37         bp_get_template_part( 'members/single/settings/group-invites'  );
     37    case 'invites':
     38        bp_get_template_part( 'members/single/settings/group-invites' );
    3839        break;
    3940    default:
    40         bp_get_template_part( 'members/single/plugins'                 );
     41        bp_get_template_part( 'members/single/plugins' );
    4142        break;
    4243endswitch;
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php

    r11686 r11855  
    2323</form>
    2424
    25 <?php bp_nouveau_member_hook( 'after', 'settings_template' );
     25<?php
     26bp_nouveau_member_hook( 'after', 'settings_template' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php

    r11686 r11855  
    2525</form>
    2626
    27 <?php bp_nouveau_member_hook( 'after', 'settings_template' );
     27<?php
     28bp_nouveau_member_hook( 'after', 'settings_template' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php

    r11686 r11855  
    4545</form>
    4646
    47 <?php bp_nouveau_member_hook( 'after', 'settings_template' );
     47<?php
     48bp_nouveau_member_hook( 'after', 'settings_template' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/group-invites.php

    r11686 r11855  
    1111</h2>
    1212
    13 <?php if ( 1 === bp_nouveau_groups_get_group_invites_setting() ) {
     13<?php
     14if ( 1 === bp_nouveau_groups_get_group_invites_setting() ) {
    1415     bp_nouveau_user_feedback( 'member-group-invites-friends-only' );
    1516} else {
    1617     bp_nouveau_user_feedback( 'member-group-invites-all' );
    17 } ?>
     18}
     19?>
    1820
    1921
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/notifications.php

    r11686 r11855  
    1818<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications' ); ?>" method="post" class="standard-form" id="settings-form">
    1919
    20     <?php bp_nouveau_member_email_notice_settings() ; ?>
     20    <?php bp_nouveau_member_email_notice_settings(); ?>
    2121
    2222    <?php bp_nouveau_submit_button( 'member-notifications-settings' ); ?>
     
    2424</form>
    2525
    26 <?php bp_nouveau_member_hook( 'after', 'settings_template' );
     26<?php
     27bp_nouveau_member_hook( 'after', 'settings_template' );
  • trunk/src/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php

    r11686 r11855  
    5858</form>
    5959
    60 <?php bp_nouveau_member_hook( 'after', 'settings_template' );
     60<?php
     61bp_nouveau_member_hook( 'after', 'settings_template' );
  • trunk/src/bp-templates/bp-nouveau/includes/activity/ajax.php

    r11686 r11855  
    138138            '<div class="bp-feedback bp-messages error">%s</div>',
    139139            esc_html__( 'There was a problem when deleting. Please try again.', 'buddypress' )
    140         )
     140        ),
    141141    );
    142142
     
    325325    // Swap the current comment with the activity item we just loaded.
    326326    if ( isset( $activities_template->activities[0] ) ) {
    327         $activities_template->activity = new stdClass();
    328         $activities_template->activity->id = $activities_template->activities[0]->item_id;
     327        $activities_template->activity                  = new stdClass();
     328        $activities_template->activity->id              = $activities_template->activities[0]->item_id;
    329329        $activities_template->activity->current_comment = $activities_template->activities[0];
    330330
    331331        // Because the whole tree has not been loaded, we manually
    332332        // determine depth.
    333         $depth = 1;
     333        $depth     = 1;
    334334        $parent_id = (int) $activities_template->activities[0]->secondary_item_id;
    335335        while ( $parent_id !== (int) $activities_template->activities[0]->item_id ) {
    336336            $depth++;
    337             $p_obj = new BP_Activity_Activity( $parent_id );
     337            $p_obj     = new BP_Activity_Activity( $parent_id );
    338338            $parent_id = (int) $p_obj->secondary_item_id;
    339339        }
     
    413413    $is_private  = false;
    414414
    415 
    416415    // Try to get the item id from posted variables.
    417416    if ( ! empty( $_POST['item_id'] ) ) {
     
    421420    // Try to get the object from posted variables.
    422421    if ( ! empty( $_POST['object'] ) ) {
    423         $object  = sanitize_key( $_POST['object'] );
     422        $object = sanitize_key( $_POST['object'] );
    424423
    425424    // If the object is not set and we're in a group, set the item id and the object
    426425    } elseif ( bp_is_group() ) {
    427426        $item_id = bp_get_current_group_id();
    428         $object = 'group';
    429         $status = groups_get_current_group()->status;
     427        $object  = 'group';
     428        $status  = groups_get_current_group()->status;
    430429    }
    431430
  • trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

    r11686 r11855  
    355355    }
    356356
    357     $user_id = bp_loggedin_user_id();
     357    $user_id    = bp_loggedin_user_id();
    358358    $my_classes = array();
    359359
     
    370370    // Add specific classes to perform specific actions on the client side.
    371371    if ( $scope && bp_is_activity_directory() ) {
    372         $component  = bp_get_activity_object_name();
     372        $component = bp_get_activity_object_name();
    373373
    374374        /*
     
    425425
    426426function bp_nouveau_activity_time_since( $time_since, $activity = null ) {
    427     if ( ! isset ( $activity->date_recorded ) ) {
     427    if ( ! isset( $activity->date_recorded ) ) {
    428428        return $time_since;
    429429    }
    430430
    431     return apply_filters( 'bp_nouveau_activity_time_since', sprintf(
    432         '<time class="time-since" datetime="%1$s" data-bp-timestamp="%2$d">%3$s</time>',
    433         esc_attr( $activity->date_recorded ),
    434         esc_attr( strtotime( $activity->date_recorded ) ),
    435         esc_attr( bp_core_time_since( $activity->date_recorded ) )
    436     ) );
     431    return apply_filters(
     432        'bp_nouveau_activity_time_since', sprintf(
     433            '<time class="time-since" datetime="%1$s" data-bp-timestamp="%2$d">%3$s</time>',
     434            esc_attr( $activity->date_recorded ),
     435            esc_attr( strtotime( $activity->date_recorded ) ),
     436            esc_attr( bp_core_time_since( $activity->date_recorded ) )
     437        )
     438    );
    437439}
    438440
     
    441443 */
    442444function bp_nouveau_activity_allowed_tags( $activity_allowedtags = array() ) {
    443     $activity_allowedtags['time'] = array();
    444     $activity_allowedtags['time']['class'] = array();
    445     $activity_allowedtags['time']['datetime'] = array();
     445    $activity_allowedtags['time']                      = array();
     446    $activity_allowedtags['time']['class']             = array();
     447    $activity_allowedtags['time']['datetime']          = array();
    446448    $activity_allowedtags['time']['data-bp-timestamp'] = array();
    447449
  • trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php

    r11686 r11855  
    8282
    8383        if ( bp_is_akismet_active() && isset( $bp->activity->akismet ) ) {
    84             remove_action( 'bp_activity_entry_meta',      array( $bp->activity->akismet, 'add_activity_spam_button'        ) );
     84            remove_action( 'bp_activity_entry_meta', array( $bp->activity->akismet, 'add_activity_spam_button' ) );
    8585            remove_action( 'bp_activity_comment_options', array( $bp->activity->akismet, 'add_activity_comment_spam_button' ) );
    8686        }
     
    100100        add_filter( 'bp_core_get_js_strings', 'bp_nouveau_activity_localize_scripts', 10, 1 );
    101101
    102         add_filter( 'bp_get_activity_action_pre_meta', 'bp_nouveau_activity_secondary_avatars',  10, 2 );
    103         add_filter( 'bp_get_activity_css_class',       'bp_nouveau_activity_scope_newest_class', 10, 1 );
    104         add_filter( 'bp_activity_time_since',          'bp_nouveau_activity_time_since',        10, 2 );
    105         add_filter( 'bp_activity_allowed_tags',        'bp_nouveau_activity_allowed_tags',      10, 1 );
     102        add_filter( 'bp_get_activity_action_pre_meta', 'bp_nouveau_activity_secondary_avatars', 10, 2 );
     103        add_filter( 'bp_get_activity_css_class', 'bp_nouveau_activity_scope_newest_class', 10, 1 );
     104        add_filter( 'bp_activity_time_since', 'bp_nouveau_activity_time_since', 10, 2 );
     105        add_filter( 'bp_activity_allowed_tags', 'bp_nouveau_activity_allowed_tags', 10, 1 );
    106106    }
    107107}
  • trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

    r11850 r11855  
    695695    do_action( 'bp_activity_comment_options' );
    696696
    697     $output .= ob_get_clean();
     697    $output     .= ob_get_clean();
    698698    $has_content = trim( $output, ' ' );
    699699    if ( ! $has_content ) {
  • trunk/src/bp-templates/bp-nouveau/includes/activity/widgets.php

    r11686 r11855  
    7373
    7474            // Add classes to the container
    75             $args['before_widget'] = str_replace( 'bp-latest-activities', join( ' ', $classes  ), $args['before_widget'] );
     75            $args['before_widget'] = str_replace( 'bp-latest-activities', join( ' ', $classes ), $args['before_widget'] );
    7676        }
    7777
     
    175175                <?php foreach ( bp_nouveau_get_activity_filters() as $key => $name ) : ?>
    176176                    <option value="<?php echo esc_attr( $key ); ?>" <?php selected( in_array( $key, $type ) ); ?>><?php echo esc_html( $name ); ?></option>
    177                 <?php endforeach ; ?>
     177                <?php endforeach; ?>
    178178            </select>
    179179        </p>
  • trunk/src/bp-templates/bp-nouveau/includes/ajax.php

    r11821 r11855  
    7878    }
    7979
    80     /*
     80    /*
    8181     * AJAX requests happen too early to be seen by bp_update_is_directory()
    8282     * so we do it manually here to ensure templates load with the correct
  • trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php

    r11686 r11855  
    212212 * @since 1.2.0
    213213 */
    214 function bp_nouveau_blog_loop_item_has_lastest_post( $classes) {
     214function bp_nouveau_blog_loop_item_has_lastest_post( $classes ) {
    215215    if ( bp_get_blog_latest_post_title() ) {
    216216        $classes[] = 'has-latest-post';
  • trunk/src/bp-templates/bp-nouveau/includes/classes.php

    r11686 r11855  
    6363
    6464            // Just don't set the button if a param is missing
    65             if ( empty( $r['id'] ) || empty( $r['component'] )  || empty( $r['link_text'] ) ) {
     65            if ( empty( $r['id'] ) || empty( $r['component'] ) || empty( $r['link_text'] ) ) {
    6666                continue;
    6767            }
     
    150150            }
    151151
    152             $buttons[ $button['id'] ] = bp_get_button( $button);
     152            $buttons[ $button['id'] ] = bp_get_button( $button );
    153153        }
    154154
     
    194194        $widget_ops = array(
    195195            'description' => __( 'Displays BuddyPress primary nav in the sidebar of your site. Make sure to use it as the first widget of the sidebar and only once.', 'buddypress' ),
    196             'classname'   => 'widget_nav_menu buddypress_object_nav'
     196            'classname'   => 'widget_nav_menu buddypress_object_nav',
    197197        );
    198198
     
    231231        $title = '';
    232232
    233         if ( ! empty( $item_nav_args[ 'bp_nouveau_widget_title' ] ) ) {
     233        if ( ! empty( $item_nav_args['bp_nouveau_widget_title'] ) ) {
    234234            $title = '';
    235235
     
    273273     */
    274274    public function update( $new_instance, $old_instance ) {
    275         $instance = $old_instance;
     275        $instance                            = $old_instance;
    276276        $instance['bp_nouveau_widget_title'] = (bool) $new_instance['bp_nouveau_widget_title'];
    277277
  • trunk/src/bp-templates/bp-nouveau/includes/customizer-controls.php

    r11686 r11855  
    6262                <?php echo esc_html( $guide ); ?>
    6363            </p>
    64         <?php endif ; ?>
     64        <?php endif; ?>
    6565
    6666        <?php if ( ! empty( $item_nav ) ) : ?>
    67             <ul id="<?php echo esc_attr( $id ); ?>" class="ui-sortable" style="margin-top: 0px; height: 500px;" data-bp-type="<?php echo esc_attr( $this->type ) ; ?>">
     67            <ul id="<?php echo esc_attr( $id ); ?>" class="ui-sortable" style="margin-top: 0px; height: 500px;" data-bp-type="<?php echo esc_attr( $this->type ); ?>">
    6868
    6969                <?php
    7070                $i = 0;
    71                 foreach ( $item_nav as $item) :
     71                foreach ( $item_nav as $item ) :
    7272                    $i += 1;
    7373                ?>
     
    7676                            <div class="menu-item-handle ui-sortable-handle">
    7777                                <span class="item-title" aria-hidden="true">
    78                                     <span class="menu-item-title"><?php echo esc_html( _bp_strip_spans_from_title( $item->name ) ) ; ?></span>
     78                                    <span class="menu-item-title"><?php echo esc_html( _bp_strip_spans_from_title( $item->name ) ); ?></span>
    7979                                </span>
    8080                            </div>
    8181                        </div>
    8282                    </li>
    83                 <?php endforeach ; ?>
     83                <?php endforeach; ?>
    8484
    8585            </ul>
    8686        <?php endif; ?>
    8787
    88             <input id="<?php echo esc_attr( 'bp_item_' . $this->type ) ; ?>" type="hidden" value="" data-customize-setting-link="<?php echo esc_attr( $setting );?>" />
     88            <input id="<?php echo esc_attr( 'bp_item_' . $this->type ); ?>" type="hidden" value="" data-customize-setting-link="<?php echo esc_attr( $setting ); ?>" />
    8989
    9090        <?php
  • trunk/src/bp-templates/bp-nouveau/includes/customizer.php

    r11686 r11855  
    325325    // Add the controls to the customizer's section
    326326    foreach ( $controls as $id_control => $control_args ) {
    327         if ( empty( $control_args['class'] ) )  {
     327        if ( empty( $control_args['class'] ) ) {
    328328            $wp_customize->add_control( $id_control, $control_args );
    329329        } else {
  • trunk/src/bp-templates/bp-nouveau/includes/functions.php

    r11807 r11855  
    7373            $qs[] = 'component_action=' . $post_query['filter'];
    7474        } else {
    75             $qs[] = 'type='   . $post_query['filter'];
     75            $qs[] = 'type=' . $post_query['filter'];
    7676            $qs[] = 'action=' . $post_query['filter'];
    7777        }
     
    8585    if ( 'personal' === $post_query['scope'] ) {
    8686        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
    87         $qs[] = 'user_id=' . $user_id;
     87        $qs[]    = 'user_id=' . $user_id;
    8888    }
    8989
     
    101101    if ( ! empty( $post_query['exclude_just_posted'] ) ) {
    102102        $just_posted = wp_parse_id_list( $post_query['exclude_just_posted'] );
    103         $qs[] = 'exclude=' . implode( ',', $just_posted );
     103        $qs[]        = 'exclude=' . implode( ',', $just_posted );
    104104    }
    105105
     
    157157 * @return string
    158158 */
    159 function bp_nouveau_ajax_button( $output ='', $button = null, $before ='', $after = '', $r = array() ) {
     159function bp_nouveau_ajax_button( $output = '', $button = null, $before = '', $after = '', $r = array() ) {
    160160    if ( empty( $button->component ) ) {
    161161        return $output;
     
    259259    // Actually merge some classes defaults and $args
    260260    // @todo This is temp, we need certain classes but maybe improve this approach.
    261     $default_classes = array( 'action' );
     261    $default_classes        = array( 'action' );
    262262    $r['container_classes'] = array_merge( $r['container_classes'], $default_classes );
    263263
     
    266266    }
    267267
    268     $container          = $r['container'];
    269     $container_id       = '';
    270     $container_classes  = '';
    271     $output             = $r['output'];
     268    $container         = $r['container'];
     269    $container_id      = '';
     270    $container_classes = '';
     271    $output            = $r['output'];
    272272
    273273    if ( ! empty( $r['container_id'] ) ) {
     
    276276
    277277    if ( ! empty( $r['container_classes'] ) && is_array( $r['container_classes'] ) ) {
    278         $container_classes = ' class="' . join( ' ', array_map( 'sanitize_html_class', $r['container_classes'] ) ) .'"';
     278        $container_classes = ' class="' . join( ' ', array_map( 'sanitize_html_class', $r['container_classes'] ) ) . '"';
    279279    }
    280280
     
    791791            }
    792792
    793             $k = str_replace( array( '[', ']' ), array( '_', '' ), $key );
     793            $k            = str_replace( array( '[', ']' ), array( '_', '' ), $key );
    794794            $retval[ $k ] = $setting;
    795795        }
    796796
    797797    // Used when it's an early regular request
    798     } elseif ( isset( $temporary_setting['bp_nouveau_appearance[' . $option . ']'] ) ) {
    799         $retval = $temporary_setting['bp_nouveau_appearance[' . $option . ']'];
     798    } elseif ( isset( $temporary_setting[ 'bp_nouveau_appearance[' . $option . ']' ] ) ) {
     799        $retval = $temporary_setting[ 'bp_nouveau_appearance[' . $option . ']' ];
    800800
    801801    // Used when it's an ajax request
     
    971971        /* Cover image */
    972972        #buddypress #item-header-cover-image {
    973             min-height: ' . $params["height"] . 'px;
     973            min-height: ' . $params['height'] . 'px;
    974974            margin-bottom: 1em;
    975975        }
     
    982982
    983983        #buddypress #header-cover-image {
    984             height: ' . $params["height"] . 'px;
     984            height: ' . $params['height'] . 'px;
    985985            ' . $cover_image . '
    986986        }
     
    996996
    997997        #buddypress #item-header-cover-image #item-header-avatar {
    998             margin-top: '. $avatar_offset .'px;
     998            margin-top: ' . $avatar_offset . 'px;
    999999            float: left;
    10001000            overflow: visible;
     
    10121012        body.single-item.groups #buddypress div#item-header #item-header-cover-image #item-header-content,
    10131013        body.single-item.groups #buddypress div#item-header #item-header-cover-image #item-actions {
    1014             margin-top: ' . $params["height"] . 'px;
     1014            margin-top: ' . $params['height'] . 'px;
    10151015            margin-left: 0;
    10161016            clear: none;
     
    12971297    } elseif ( 'member-friends-loading' === $feedback_id && bp_is_my_profile() ) {
    12981298        $feedback_messages['member-friends-loading']['message'] = __( 'Loading your friends, please wait.', 'buddypress' );
    1299     }  elseif ( 'member-groups-loading' === $feedback_id && bp_is_my_profile() ) {
     1299    } elseif ( 'member-groups-loading' === $feedback_id && bp_is_my_profile() ) {
    13001300        $feedback_messages['member-groups-loading']['message'] = __( 'Loading the groups you are a member of, please wait.', 'buddypress' );
    13011301    }
  • trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php

    r11686 r11855  
    313313                );
    314314            }
    315 
    316315        }
    317316
  • trunk/src/bp-templates/bp-nouveau/includes/groups/classes.php

    r11686 r11855  
    3030    public function setup_hooks() {
    3131        add_action( 'bp_pre_user_query_construct', array( $this, 'build_exclude_args' ) );
    32         add_action( 'bp_pre_user_query',           array( $this, 'build_meta_query'  ) );
     32        add_action( 'bp_pre_user_query', array( $this, 'build_meta_query' ) );
    3333    }
    3434
     
    8585
    8686        // Group id
    87         $sql['where'][] = $wpdb->prepare( "group_id = %d", $this->query_vars['group_id'] );
     87        $sql['where'][] = $wpdb->prepare( 'group_id = %d', $this->query_vars['group_id'] );
    8888
    8989        if ( false === $this->query_vars['is_confirmed'] ) {
    90             $sql['where'][] = $wpdb->prepare( "is_confirmed = %d", (int) $this->query_vars['is_confirmed'] );
    91             $sql['where'][] = "inviter_id != 0";
     90            $sql['where'][] = $wpdb->prepare( 'is_confirmed = %d', (int) $this->query_vars['is_confirmed'] );
     91            $sql['where'][] = 'inviter_id != 0';
    9292        }
    9393
     
    9696
    9797        /** ORDER BY clause ***************************************************/
    98         $sql['orderby'] = "ORDER BY date_modified";
    99         $sql['order']   = "DESC";
     98        $sql['orderby'] = 'ORDER BY date_modified';
     99        $sql['order']   = 'DESC';
    100100
    101101        /** LIMIT clause ******************************************************/
     
    112112
    113113            $invites_meta_query = new WP_Meta_Query( $this->query_vars['meta_query'] );
    114             $meta_sql = $invites_meta_query->get_sql( 'user', 'u', 'ID' );
     114            $meta_sql           = $invites_meta_query->get_sql( 'user', 'u', 'ID' );
    115115
    116116            if ( empty( $meta_sql['join'] ) || empty( $meta_sql['where'] ) ) {
     
    133133        }
    134134
    135         $bp  = buddypress();
     135        $bp = buddypress();
    136136
    137137        return $wpdb->get_col( $wpdb->prepare( "SELECT inviter_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
     
    293293                if ( ! empty( $extension->params ) && ! array_diff_key( $required_params, $extension->params ) ) {
    294294                    $nav_items[ $extension->params['slug'] ] = array(
    295                         'name'            => $extension->params['name'],
    296                         'slug'            => $extension->params['slug'],
    297                         'parent_slug'     => $this->group->slug,
    298                         'position'        => $extension->params['nav_item_position'],
     295                        'name'        => $extension->params['name'],
     296                        'slug'        => $extension->params['slug'],
     297                        'parent_slug' => $this->group->slug,
     298                        'position'    => $extension->params['nav_item_position'],
    299299                    );
    300300                }
  • trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php

    r11807 r11855  
    2020function bp_nouveau_message_markup_wrapper( $message, $type ) {
    2121
    22     if( ! $message )
     22    if ( ! $message ) {
    2323        return false;
     24    }
    2425
    2526    $message = '<div class="bp-feedback ' . $type . '"><span class="bp-icon" aria-hidden="true"></span><p>' . $message . '</p></div>';
     
    253254        if ( ! empty( $r['per_page'] ) ) {
    254255            $response->meta = array(
    255                 'total_page'   => ceil( (int) $query->total_users / (int) $r['per_page'] ),
    256                 'page' => (int) $r['page'],
     256                'total_page' => ceil( (int) $query->total_users / (int) $r['per_page'] ),
     257                'page'       => (int) $r['page'],
    257258            );
    258259        }
     
    269270    if ( bp_is_active( 'friends' ) && isset( $steps['group-invites'] ) ) {
    270271        // Simply change the name
    271         $steps['group-invites']['name'] = _x( 'Invite',  'Group screen nav', 'buddypress' );
     272        $steps['group-invites']['name'] = _x( 'Invite', 'Group screen nav', 'buddypress' );
    272273        return $steps;
    273274    }
     
    275276    // Add the create step if friends component is not active
    276277    $steps['group-invites'] = array(
    277         'name'     => _x( 'Invite',  'Group screen nav', 'buddypress' ),
    278         'position' => 30
     278        'name'     => _x( 'Invite', 'Group screen nav', 'buddypress' ),
     279        'position' => 30,
    279280    );
    280281
     
    855856function bp_nouveau_group_locate_template_part( $template = '' ) {
    856857    $current_group = groups_get_current_group();
    857     $bp_nouveau     = bp_nouveau();
     858    $bp_nouveau    = bp_nouveau();
    858859
    859860    if ( ! $template || empty( $current_group->id ) ) {
     
    877878            }
    878879
    879             $bp_nouveau->groups->current_group_hierarchy[] = 'groups/single/%s-group-type-' . sanitize_file_name( $current_group_type )   . '.php';
     880            $bp_nouveau->groups->current_group_hierarchy[] = 'groups/single/%s-group-type-' . sanitize_file_name( $current_group_type ) . '.php';
    880881        }
    881882
     
    997998function bp_nouveau_groups_add_home_widget_filters() {
    998999    add_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_group_activity_widget_overrides', 10, 1 );
    999     add_filter( 'bp_before_has_groups_parse_args',  'bp_nouveau_group_groups_widget_overrides',  10, 1 );
    1000     add_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_group_members_widget_overrides',  10, 1 );
     1000    add_filter( 'bp_before_has_groups_parse_args', 'bp_nouveau_group_groups_widget_overrides', 10, 1 );
     1001    add_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_group_members_widget_overrides', 10, 1 );
    10011002
    10021003    do_action( 'bp_nouveau_groups_add_home_widget_filters' );
     
    10101011function bp_nouveau_groups_remove_home_widget_filters() {
    10111012    remove_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_group_activity_widget_overrides', 10, 1 );
    1012     remove_filter( 'bp_before_has_groups_parse_args',  'bp_nouveau_group_groups_widget_overrides',  10, 1 );
    1013     remove_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_group_members_widget_overrides',  10, 1 );
     1013    remove_filter( 'bp_before_has_groups_parse_args', 'bp_nouveau_group_groups_widget_overrides', 10, 1 );
     1014    remove_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_group_members_widget_overrides', 10, 1 );
    10141015
    10151016    do_action( 'bp_nouveau_groups_remove_home_widget_filters' );
  • trunk/src/bp-templates/bp-nouveau/includes/groups/loader.php

    r11686 r11855  
    8080
    8181        // Actions to check whether we are in the Group's default front page sidebar
    82         add_action( 'dynamic_sidebar_before', array( $this, 'group_home_sidebar_set'   ), 10, 1 );
    83         add_action( 'dynamic_sidebar_after',  array( $this, 'group_home_sidebar_unset' ), 10, 1 );
     82        add_action( 'dynamic_sidebar_before', array( $this, 'group_home_sidebar_set' ), 10, 1 );
     83        add_action( 'dynamic_sidebar_after', array( $this, 'group_home_sidebar_unset' ), 10, 1 );
    8484
    8585        // Add a new nav item to settings to let users choose their group invites preferences
  • trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php

    r11716 r11855  
    214214
    215215    if ( ! bp_get_groups_current_create_step() ) {
    216         $keys = array_keys( $bp->groups->group_creation_steps );
     216        $keys                            = array_keys( $bp->groups->group_creation_steps );
    217217        $bp->groups->current_create_step = array_shift( $keys );
    218218    }
     
    263263
    264264function bp_nouveau_group_manage_screen() {
    265     $action          = bp_action_variable(0);
     265    $action          = bp_action_variable( 0 );
    266266    $is_group_create = bp_is_group_create();
    267267    $output          = '';
    268268
    269269    if ( $is_group_create ) {
    270         $action = bp_action_variable(1);
     270        $action = bp_action_variable( 1 );
    271271    }
    272272
     
    446446    $bp_nouveau = bp_nouveau();
    447447
    448     $output = join( ' ', bp_nouveau_get_groups_buttons( $args) );
     448    $output = join( ' ', bp_nouveau_get_groups_buttons( $args ) );
    449449
    450450    // On the group's header we need to reset the group button's global.
     
    11521152         * @since 1.1.0
    11531153         */
    1154         do_action( 'bp_before_group_status_message' ); ?>
     1154        do_action( 'bp_before_group_status_message' );
     1155        ?>
    11551156
    11561157        <div id="message" class="info">
  • trunk/src/bp-templates/bp-nouveau/includes/members/functions.php

    r11686 r11855  
    105105            $action = 'bp_member_friends_order_options';
    106106        }
    107 
    108107    } else {
    109108        $filters = array(
    110             'last_joined' => __( 'Newest', 'buddypress' ),
    111             'first_joined' => __( 'Oldest','buddypress' ),
     109            'last_joined'  => __( 'Newest', 'buddypress' ),
     110            'first_joined' => __( 'Oldest', 'buddypress' ),
    112111        );
    113112
     
    117116
    118117        $filters['alphabetical'] = __( 'Alphabetical', 'buddypress' );
    119         $action = 'bp_groups_members_order_options';
     118        $action                  = 'bp_groups_members_order_options';
    120119    }
    121120
     
    270269            }
    271270
    272             $bp_nouveau->members->displayed_user_hierarchy[] = 'members/single/%s-member-type-' . sanitize_file_name( $displayed_user_member_type )   . '.php';
     271            $bp_nouveau->members->displayed_user_hierarchy[] = 'members/single/%s-member-type-' . sanitize_file_name( $displayed_user_member_type ) . '.php';
    273272        }
    274273
     
    398397function bp_nouveau_members_add_home_widget_filters() {
    399398    add_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_member_activity_widget_overrides', 10, 1 );
    400     add_filter( 'bp_before_has_groups_parse_args',  'bp_nouveau_member_groups_widget_overrides',  10, 1 );
    401     add_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_member_members_widget_overrides',  10, 1 );
     399    add_filter( 'bp_before_has_groups_parse_args', 'bp_nouveau_member_groups_widget_overrides', 10, 1 );
     400    add_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_member_members_widget_overrides', 10, 1 );
    402401
    403402    do_action( 'bp_nouveau_members_add_home_widget_filters' );
     
    411410function bp_nouveau_members_remove_home_widget_filters() {
    412411    remove_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_member_activity_widget_overrides', 10, 1 );
    413     remove_filter( 'bp_before_has_groups_parse_args',  'bp_nouveau_member_groups_widget_overrides',  10, 1 );
    414     remove_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_member_members_widget_overrides',  10, 1 );
     412    remove_filter( 'bp_before_has_groups_parse_args', 'bp_nouveau_member_groups_widget_overrides', 10, 1 );
     413    remove_filter( 'bp_before_has_members_parse_args', 'bp_nouveau_member_members_widget_overrides', 10, 1 );
    415414
    416415    do_action( 'bp_nouveau_members_remove_home_widget_filters' );
  • trunk/src/bp-templates/bp-nouveau/includes/members/loader.php

    r11686 r11855  
    4343     */
    4444    protected function includes() {
    45         require( trailingslashit( $this->dir ) . 'functions.php'     );
     45        require( trailingslashit( $this->dir ) . 'functions.php' );
    4646        require( trailingslashit( $this->dir ) . 'template-tags.php' );
    4747    }
     
    7070
    7171        // Actions to check whether we are in the member's default front page sidebar
    72         add_action( 'dynamic_sidebar_before', array( $this, 'user_home_sidebar_set'   ), 10, 1 );
    73         add_action( 'dynamic_sidebar_after',  array( $this, 'user_home_sidebar_unset' ), 10, 1 );
     72        add_action( 'dynamic_sidebar_before', array( $this, 'user_home_sidebar_set' ), 10, 1 );
     73        add_action( 'dynamic_sidebar_after', array( $this, 'user_home_sidebar_unset' ), 10, 1 );
    7474    }
    7575
  • trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php

    r11686 r11855  
    183183
    184184    $args['type'] = 'loop';
    185     $action = 'bp_directory_members_actions';
     185    $action       = 'bp_directory_members_actions';
    186186
    187187    // Specific case for group members.
    188188    if ( bp_is_active( 'groups' ) && bp_is_group_members() ) {
    189189        $args['type'] = 'group_member';
    190         $action = 'bp_group_members_list_item_action';
     190        $action       = 'bp_group_members_list_item_action';
    191191
    192192    } elseif ( bp_is_active( 'friends' ) && bp_is_user_friend_requests() ) {
    193193        $args['type'] = 'friendship_request';
    194         $action = 'bp_friend_requests_item_action';
     194        $action       = 'bp_friend_requests_item_action';
    195195    }
    196196
     
    731731    // @todo This hack is too brittle.
    732732    add_filter( 'the_author_description', 'make_clickable', 9 );
    733     add_filter( 'the_author_description', 'wpautop'           );
    734     add_filter( 'the_author_description', 'wptexturize'       );
    735     add_filter( 'the_author_description', 'convert_smilies'   );
    736     add_filter( 'the_author_description', 'convert_chars'     );
    737     add_filter( 'the_author_description', 'stripslashes'      );
     733    add_filter( 'the_author_description', 'wpautop' );
     734    add_filter( 'the_author_description', 'wptexturize' );
     735    add_filter( 'the_author_description', 'convert_smilies' );
     736    add_filter( 'the_author_description', 'convert_chars' );
     737    add_filter( 'the_author_description', 'stripslashes' );
    738738
    739739    the_author_meta( 'description', $user_id );
    740740
    741741    remove_filter( 'the_author_description', 'make_clickable', 9 );
    742     remove_filter( 'the_author_description', 'wpautop'           );
    743     remove_filter( 'the_author_description', 'wptexturize'       );
    744     remove_filter( 'the_author_description', 'convert_smilies'   );
    745     remove_filter( 'the_author_description', 'convert_chars'     );
    746     remove_filter( 'the_author_description', 'stripslashes'      );
     742    remove_filter( 'the_author_description', 'wpautop' );
     743    remove_filter( 'the_author_description', 'wptexturize' );
     744    remove_filter( 'the_author_description', 'convert_smilies' );
     745    remove_filter( 'the_author_description', 'convert_chars' );
     746    remove_filter( 'the_author_description', 'stripslashes' );
    747747}
    748748
     
    865865
    866866    // Keep it for a later use.
    867     $bp_nouveau = bp_nouveau();
     867    $bp_nouveau                            = bp_nouveau();
    868868    $bp_nouveau->members->wp_profile       = $user_profile_fields;
    869869    $bp_nouveau->members->wp_profile_index = 0;
     
    901901
    902902    $bp_nouveau->members->wp_profile_current = $bp_nouveau->members->wp_profile[ $bp_nouveau->members->wp_profile_index ];
    903     $bp_nouveau->members->wp_profile_index += 1;
     903    $bp_nouveau->members->wp_profile_index  += 1;
    904904}
    905905
  • trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php

    r11773 r11855  
    210210    }
    211211
    212     $threads = new stdClass;
     212    $threads       = new stdClass;
    213213    $threads->meta = array(
    214214        'total_page' => ceil( (int) $messages_template->total_thread_count / (int) $messages_template->pag_num ),
    215         'page'       => $messages_template->pag_page
     215        'page'       => $messages_template->pag_page,
    216216    );
    217217
    218218    $threads->threads = array();
    219     $i = 0;
     219    $i                = 0;
    220220
    221221    while ( bp_message_threads() ) : bp_message_thread();
     
    352352    if ( empty( $_POST['js_thread'] ) ) {
    353353        $thread->thread = array(
    354             'id'            => bp_get_the_thread_id(),
    355             'subject'       => html_entity_decode( bp_get_the_thread_subject() ),
     354            'id'      => bp_get_the_thread_id(),
     355            'subject' => html_entity_decode( bp_get_the_thread_subject() ),
    356356        );
    357357
  • trunk/src/bp-templates/bp-nouveau/includes/messages/classes.php

    r11741 r11855  
    210210            <?php if ( isset( $_GET['success'] ) || isset( $_GET['error'] ) ) : ?>
    211211
    212                 <div id="message" class="<?php echo isset( $_GET['success'] ) ? 'updated' : 'error' ; ?>">
     212                <div id="message" class="<?php echo isset( $_GET['success'] ) ? 'updated' : 'error'; ?>">
    213213
    214214                    <p>
    215                         <?php if ( isset( $_GET['error'] ) ) :
     215                        <?php
     216                        if ( isset( $_GET['error'] ) ) :
    216217                            esc_html_e( 'Notice was not created. Please try again.', 'buddypress' );
    217                         else:
     218                        else :
    218219                            esc_html_e( 'Notice successfully created.', 'buddypress' );
    219                         endif; ?>
     220                        endif;
     221                        ?>
    220222                    </p>
    221223
  • trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php

    r11686 r11855  
    127127 */
    128128function bp_nouveau_message_search_form() {
    129     $query_arg = bp_core_get_component_search_query_arg( 'messages' );
     129    $query_arg   = bp_core_get_component_search_query_arg( 'messages' );
    130130    $placeholder = bp_get_search_default_text( 'messages' );
    131131
    132132    $search_form_html = '<form action="" method="get" id="search-messages-form">
    133         <label for="messages_search"><input type="text" name="' . esc_attr( $query_arg ) . '" id="messages_search" placeholder="'. esc_attr( $placeholder ) .'" /></label>
     133        <label for="messages_search"><input type="text" name="' . esc_attr( $query_arg ) . '" id="messages_search" placeholder="' . esc_attr( $placeholder ) . '" /></label>
    134134        <input type="submit" id="messages_search_submit" name="messages_search_submit" value="' . esc_attr_e( 'Search', 'buddypress' ) . '" />
    135135    </form>';
     
    225225    }
    226226
    227     $notice_notification = new stdClass;
     227    $notice_notification                    = new stdClass;
    228228    $notice_notification->id                = 0;
    229229    $notice_notification->user_id           = $user_id;
     
    292292                stripslashes( $notice->message )
    293293            );
    294             $bp->template_message = $message;
     294            $bp->template_message      = $message;
    295295            $bp->template_message_type = 'bp-sitewide-notice';
    296296        }
     
    334334 */
    335335function bp_nouveau_get_message_date( $date ) {
    336     $now = bp_core_current_time( true, 'timestamp' );
     336    $now  = bp_core_current_time( true, 'timestamp' );
    337337    $date = strtotime( $date );
    338338
    339     $now_date  = getdate( $now );
    340     $date_date = getdate( $date );
    341     $compare   = array_diff( $date_date, $now_date );
     339    $now_date    = getdate( $now );
     340    $date_date   = getdate( $date );
     341    $compare     = array_diff( $date_date, $now_date );
    342342    $date_format = 'Y/m/d';
    343343
  • trunk/src/bp-templates/bp-nouveau/includes/messages/loader.php

    r11686 r11855  
    6868        // Notices
    6969        add_action( 'widgets_init', 'bp_nouveau_unregister_notices_widget' );
    70         add_action( 'bp_init',      'bp_nouveau_push_sitewide_notices', 99 );
     70        add_action( 'bp_init', 'bp_nouveau_push_sitewide_notices', 99 );
    7171
    7272        // Messages
     
    9999
    100100        // Notices
    101         add_filter( 'bp_messages_single_new_message_notification', 'bp_nouveau_format_notice_notification_for_user',  10, 1 );
     101        add_filter( 'bp_messages_single_new_message_notification', 'bp_nouveau_format_notice_notification_for_user', 10, 1 );
    102102        add_filter( 'bp_notifications_get_all_notifications_for_user', 'bp_nouveau_add_notice_notification_for_user', 10, 2 );
    103103
     
    105105        add_filter( 'bp_messages_admin_nav', 'bp_nouveau_messages_adjust_admin_nav', 10, 1 );
    106106
    107         remove_filter( 'messages_notice_message_before_save',  'wp_filter_kses', 1 );
     107        remove_filter( 'messages_notice_message_before_save', 'wp_filter_kses', 1 );
    108108        remove_filter( 'messages_message_content_before_save', 'wp_filter_kses', 1 );
    109         remove_filter( 'bp_get_the_thread_message_content',    'wp_filter_kses', 1 );
     109        remove_filter( 'bp_get_the_thread_message_content', 'wp_filter_kses', 1 );
    110110
    111         add_filter( 'messages_notice_message_before_save',  'wp_filter_post_kses', 1 );
     111        add_filter( 'messages_notice_message_before_save', 'wp_filter_post_kses', 1 );
    112112        add_filter( 'messages_message_content_before_save', 'wp_filter_post_kses', 1 );
    113         add_filter( 'bp_get_the_thread_message_content',    'wp_filter_post_kses', 1 );
    114         add_filter( 'bp_get_message_thread_content',        'wp_filter_post_kses', 1 );
    115         add_filter( 'bp_get_message_thread_content',        'wptexturize'            );
    116         add_filter( 'bp_get_message_thread_content',        'stripslashes_deep',  1 );
    117         add_filter( 'bp_get_message_thread_content',        'convert_smilies',    2 );
    118         add_filter( 'bp_get_message_thread_content',        'convert_chars'          );
    119         add_filter( 'bp_get_message_thread_content',        'make_clickable',      9 );
    120         add_filter( 'bp_get_message_thread_content',        'wpautop'                );
     113        add_filter( 'bp_get_the_thread_message_content', 'wp_filter_post_kses', 1 );
     114        add_filter( 'bp_get_message_thread_content', 'wp_filter_post_kses', 1 );
     115        add_filter( 'bp_get_message_thread_content', 'wptexturize' );
     116        add_filter( 'bp_get_message_thread_content', 'stripslashes_deep', 1 );
     117        add_filter( 'bp_get_message_thread_content', 'convert_smilies', 2 );
     118        add_filter( 'bp_get_message_thread_content', 'convert_chars' );
     119        add_filter( 'bp_get_message_thread_content', 'make_clickable', 9 );
     120        add_filter( 'bp_get_message_thread_content', 'wpautop' );
    121121    }
    122122}
  • trunk/src/bp-templates/bp-nouveau/includes/notifications/loader.php

    r11686 r11855  
    8080        add_filter( 'bp_nouveau_register_scripts', 'bp_nouveau_notifications_register_scripts', 10, 1 );
    8181        add_filter( 'bp_get_the_notification_mark_unread_link', 'bp_nouveau_notifications_mark_unread_link', 10, 1 );
    82         add_filter( 'bp_get_the_notification_mark_read_link',   'bp_nouveau_notifications_mark_read_link'  , 10, 1 );
    83         add_filter( 'bp_get_the_notification_delete_link',      'bp_nouveau_notifications_delete_link'     , 10, 1 );
     82        add_filter( 'bp_get_the_notification_mark_read_link', 'bp_nouveau_notifications_mark_read_link', 10, 1 );
     83        add_filter( 'bp_get_the_notification_delete_link', 'bp_nouveau_notifications_delete_link', 10, 1 );
    8484    }
    8585}
  • trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

    r11813 r11855  
    163163function bp_nouveau_dismiss_button_type() {
    164164    $bp_nouveau = bp_nouveau();
    165     $type = 'clear';
     165    $type       = 'clear';
    166166
    167167    if ( ! empty( $bp_nouveau->user_feedback['dismiss'] ) ) {
     
    237237
    238238        // Set dismiss button true for sitewide notices
    239         if( 'bp-sitewide-notice' == $template_message['type'] ) {
     239        if ( 'bp-sitewide-notice' == $template_message['type'] ) {
    240240            $template_message['dismiss'] = true;
    241241        }
     
    304304
    305305    // Reset the feedback message.
    306     $bp_nouveau->user_feedback =array();
     306    $bp_nouveau->user_feedback = array();
    307307}
    308308
     
    738738            $nav = $user_nav->get_primary( $args );
    739739        }
    740 
    741740    } elseif ( ! empty( $bp_nouveau->object_nav ) ) {
    742741
     
    17571756            do_action( 'bp_members_directory_member_sub_types' );
    17581757        }
    1759 
    17601758    } elseif ( 'group' === $objects['primary'] && 'activity' === $objects['secondary'] ) {
    17611759        /**
     
    21552153             * render suitable markup for error string.
    21562154             */
    2157             if( isset( buddypress()->signup->errors[ $name ] ) ) {
     2155            if ( isset( buddypress()->signup->errors[ $name ] ) ) {
    21582156                nouveau_error_template( buddypress()->signup->errors[ $name ] );
    21592157                $invalid = 'invalid';
     
    21772175
    21782176        // Set the input.
    2179         $field_output = sprintf( '<input type="%1$s" name="%2$s" id="%3$s" %4$s value="%5$s" %6$s />',
     2177        $field_output = sprintf(
     2178            '<input type="%1$s" name="%2$s" id="%3$s" %4$s value="%5$s" %6$s />',
    21802179            esc_attr( $type ),
    21812180            esc_attr( $name ),
     
    21942193            } elseif ( is_subdomain_install() ) {
    21952194                // Constructed safely above.
    2196                 printf( '%1$s %2$s . %3$s',
     2195                printf(
     2196                    '%1$s %2$s . %3$s',
    21972197                    is_ssl() ? 'https://' : 'http://',
    21982198                    $field_output,
     
    22022202            // Subfolders!
    22032203            } else {
    2204                 printf( '%1$s %2$s',
     2204                printf(
     2205                    '%1$s %2$s',
    22052206                    home_url( '/' ),
    22062207                    $field_output  // Constructed safely above.
     
    22152216
    22162217        // Password strength is restricted to the signup_password field
    2217         if ( 'signup_password' === $name ) : ?>
     2218        if ( 'signup_password' === $name ) :
     2219        ?>
    22182220            <div id="pass-strength-result"></div>
    2219         <?php endif ;
     2221        <?php
     2222        endif;
    22202223    }
    22212224
  • trunk/src/bp-templates/bp-nouveau/includes/xprofile/loader.php

    r11686 r11855  
    4242     */
    4343    protected function includes() {
    44         require( trailingslashit( $this->dir ) . 'functions.php'     );
     44        require( trailingslashit( $this->dir ) . 'functions.php' );
    4545        require( trailingslashit( $this->dir ) . 'template-tags.php' );
    4646    }
Note: See TracChangeset for help on using the changeset viewer.