Changeset 2612 for trunk/bp-themes/bp-default/header.php

Timestamp:

02/07/2010 12:22:22 AM (15 years ago)

Author:

apeatling

Message:

Removing theme options and moving the option to show the activity stream on the front page to the normal WordPress Settings > Reading menu. This stops problems caused when choosing a static WordPress page as the front page.

File:

• trunk/bp-themes/bp-default/header.php (modified) (2 diffs)

trunk/bp-themes/bp-default/header.php

@@ -45 +45 @@
 
             <ul id="nav">
-                <li<?php if ( bp_is_page( 'home' ) && !is_page() ) : ?> class="selected"<?php endif; ?>>
+                <li<?php if ( is_front_page() || !bp_current_component() ) : ?> class="selected"<?php endif; ?>>
                     <a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
                 </li>
 
-                <?php if ( bp_is_active( 'activity' ) ) : ?>
-                    <?php if ( 'blog' == bp_dtheme_show_on_frontpage() ) : ?>
-                        <li<?php if ( bp_is_page( BP_ACTIVITY_SLUG ) ) : ?> class="selected"<?php endif; ?>>
-                            <a href="<?php echo site_url() ?>/<?php echo BP_ACTIVITY_SLUG ?>/" title="<?php _e( 'Activity', 'buddypress' ) ?>"><?php _e( 'Activity', 'buddypress' ) ?></a>
-                        </li>
-                    <?php else : ?>
-                        <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) || bp_is_blog_page() && !is_front_page() && !is_page() ) : ?> class="selected"<?php endif; ?>>
-                            <a href="<?php echo site_url() ?>/<?php echo BP_HOME_BLOG_SLUG ?>/" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a>
-                        </li>
-                    <?php endif; ?>
+                <?php if ( 'activity' != bp_dtheme_page_on_front() && bp_is_active( 'activity' ) ) : ?>
+                    <li<?php if ( bp_is_page( BP_ACTIVITY_SLUG ) ) : ?> class="selected"<?php endif; ?>>
+                        <a href="<?php echo site_url() ?>/<?php echo BP_ACTIVITY_SLUG ?>/" title="<?php _e( 'Activity', 'buddypress' ) ?>"><?php _e( 'Activity', 'buddypress' ) ?></a>
+                    </li>
                 <?php endif; ?>
 
-                <li<?php if (  bp_is_page( BP_MEMBERS_SLUG ) || bp_is_member() ) : ?> class="selected"<?php endif; ?>>
+                <li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) || bp_is_member() ) : ?> class="selected"<?php endif; ?>>
                     <a href="<?php echo site_url() ?>/<?php echo BP_MEMBERS_SLUG ?>/" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a>
                 </li>
@@ -83 +77 @@
                 <?php endif; ?>
 
-                <?php wp_list_pages( 'title_li=&depth=1' ); ?>
+                <?php wp_list_pages( 'title_li=&depth=1&exclude=' . bp_dtheme_page_on_front() ); ?>
 
                 <?php do_action( 'bp_nav_items' ); ?>