Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
01/22/2011 08:58:56 AM (14 years ago)
Author:
johnjamesjacoby
Message:

Clean up single member root template files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-themes/bp-default/members/single/activity.php

    r3771 r3808  
    11<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
    22    <ul>
     3
    34        <?php bp_get_options_nav() ?>
    45
     
    89                <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
    910
    10                 <?php if ( 'groups' != bp_current_action() ) : ?>
    11                     <?php if ( bp_is_active( 'blogs' ) ) : ?>
     11                <?php
     12                if ( 'groups' != bp_current_action() ) :
     13                    if ( bp_is_active( 'blogs' ) ) : ?>
     14
    1215                        <option value="new_blog_post"><?php _e( 'Show Blog Posts', 'buddypress' ) ?></option>
    1316                        <option value="new_blog_comment"><?php _e( 'Show Blog Comments', 'buddypress' ) ?></option>
    14                     <?php endif; ?>
    1517
    16                     <?php if ( bp_is_active( 'friends' ) ) : ?>
     18                    <?php
     19                    endif;
     20
     21                    if ( bp_is_active( 'friends' ) ) : ?>
     22
    1723                        <option value="friendship_accepted,friendship_created"><?php _e( 'Show Friendship Connections', 'buddypress' ) ?></option>
    18                     <?php endif; ?>
    19                 <?php endif; ?>
    2024
    21                 <?php if ( bp_is_active( 'forums' ) ) : ?>
     25                    <?php endif;
     26
     27                endif;
     28
     29                if ( bp_is_active( 'forums' ) ) : ?>
     30
    2231                    <option value="new_forum_topic"><?php _e( 'Show New Forum Topics', 'buddypress' ) ?></option>
    2332                    <option value="new_forum_post"><?php _e( 'Show Forum Replies', 'buddypress' ) ?></option>
    24                 <?php endif; ?>
    2533
    26                 <?php if ( bp_is_active( 'groups' ) ) : ?>
     34                <?php endif;
     35
     36                if ( bp_is_active( 'groups' ) ) : ?>
     37
    2738                    <option value="created_group"><?php _e( 'Show New Groups', 'buddypress' ) ?></option>
    2839                    <option value="joined_group"><?php _e( 'Show New Group Memberships', 'buddypress' ) ?></option>
    29                 <?php endif; ?>
    3040
    31                 <?php do_action( 'bp_member_activity_filter_options' ) ?>
     41                <?php endif;
     42
     43                do_action( 'bp_member_activity_filter_options' ); ?>
     44
    3245            </select>
    3346        </li>
     
    3548</div><!-- .item-list-tabs -->
    3649
    37 <?php do_action( 'bp_before_member_activity_post_form' ) ?>
     50<?php do_action( 'bp_before_member_activity_post_form' ); ?>
    3851
    39 <?php if ( is_user_logged_in() && bp_is_my_profile() && ( '' == bp_current_action() || 'just-me' == bp_current_action() ) ) : ?>
    40     <?php locate_template( array( 'activity/post-form.php'), true ) ?>
    41 <?php endif; ?>
     52<?php
     53if ( is_user_logged_in() && bp_is_my_profile() && ( !bp_is_current_action() || bp_is_current_action( 'just-me' ) ) )
     54    locate_template( array( 'activity/post-form.php'), true );
    4255
    43 <?php do_action( 'bp_after_member_activity_post_form' ) ?>
    44 <?php do_action( 'bp_before_member_activity_content' ) ?>
     56do_action( 'bp_after_member_activity_post_form' );
     57do_action( 'bp_before_member_activity_content' ); ?>
    4558
    4659<div class="activity" role="main">
    47     <?php locate_template( array( 'activity/activity-loop.php' ), true ) ?>
     60
     61    <?php locate_template( array( 'activity/activity-loop.php' ), true ); ?>
     62
    4863</div><!-- .activity -->
    4964
    50 <?php do_action( 'bp_after_member_activity_content' ) ?>
     65<?php do_action( 'bp_after_member_activity_content' ); ?>
Note: See TracChangeset for help on using the changeset viewer.