Changeset 2612

Timestamp:

02/07/2010 12:22:22 AM (16 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.

Location:

trunk/bp-themes/bp-default

Files:

• functions.php (modified) (4 diffs)
• header.php (modified) (2 diffs)
• home.php (deleted)

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

@@ -21 +21 @@
 /* Load the javascript for the theme */
 wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ) );
-
-/* Make sure the blog index page shows under /[HOME_BLOG_SLUG] if enabled */
-function bp_dtheme_show_home_blog() {
-    global $bp, $query_string, $paged;
-
-    if ( $bp->current_component == BP_HOME_BLOG_SLUG && ( !$bp->current_action || 'page' == $bp->current_action ) ) {
-        unset( $query_string );
-
-        if ( ( 'page' == $bp->current_action && $bp->action_variables[0] ) && false === strpos( $query_string, 'paged' ) ) {
-            $query_string .= '&paged=' . $bp->action_variables[0];
-            $paged = $bp->action_variables[0];
-        }
-
-        query_posts($query_string);
-
-        bp_core_load_template( 'index', true );
-    }
-}
-add_action( 'wp', 'bp_dtheme_show_home_blog', 2 );
 
 function bp_dtheme_firstname( $name = false, $echo = false ) {
@@ -101 +82 @@
 }
 
-function bp_dtheme_show_on_frontpage() {
-    $settings = get_option( 'bp_dtheme_options' );
-
-    if ( empty( $settings['show_on_frontpage'] ) || 'blog' == $settings['show_on_frontpage'] )
-        return apply_filters( 'bp_dtheme_show_on_frontpage', 'blog' );
-
-    return apply_filters( 'bp_dtheme_show_on_frontpage', 'activity' );
+function bp_dtheme_wp_pages_filter( $page_html ) {
+    if ( 'page_on_front' != substr( $page_html, 14, 13 ) )
+        return $page_html;
+
+    $selected = false;
+    $page_html = str_replace( '</select>', '', $page_html );
+
+    if ( bp_dtheme_page_on_front() == 'activity' )
+        $selected = ' selected="selected"';
+
+    $page_html .= '<option class="level-0" value="activity"' . $selected . '>' . __( 'Activity Stream', 'buddypress' ) . '</option></select>';
+    return $page_html;
+}
+add_filter( 'wp_dropdown_pages', 'bp_dtheme_wp_pages_filter' );
+
+function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
+    if ( !is_admin() || !is_site_admin() )
+        return false;
+
+    if ( 'activity' == $_POST['page_on_front'] )
+        return 'activity';
+    else
+        return $oldvalue;
+}
+add_action( 'pre_update_option_page_on_front', 'bp_dtheme_page_on_front_update', 10, 2 );
+
+function bp_dtheme_page_on_front_template( $template ) {
+    global $wp_query;
+
+    if ( empty( $wp_query->post->ID ) )
+        return locate_template( array( 'activity/index.php' ), false );
+    else
+        return $template;
+}
+add_filter( 'page_template', 'bp_dtheme_page_on_front_template' );
+
+/* Return the ID of a page set as the home page. */
+function bp_dtheme_page_on_front() {
+    return apply_filters( 'bp_dtheme_page_on_front', get_option( 'page_on_front' ) );
 }
 
@@ -220 +233 @@
 }
 
-/* Load the options page */
-if ( is_admin() )
-    require( TEMPLATEPATH . '/_inc/options.php' );
-
 /* Adjust home page body class if activity stream is home */
 function bp_dtheme_body_class_home( $classes, $bp_classes, $wp_classes, $custom_classes ) {
@@ -230 +239 @@
 
     if ( bp_is_active( 'activity' ) ) {
-        if ( 'activity' == bp_dtheme_show_on_frontpage() ) {
+        if ( 'activity' == bp_dtheme_page_on_front() ) {
             $blog = array_keys( $classes, 'blog-page' );
             $classes[$blog[0]] = 'activity';

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' ); ?>