Changeset 1939

Timestamp:

09/23/2009 03:50:34 AM (17 years ago)

Author:

apeatling

Message:

Fixes #1061, #987

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (2 diffs)
• bp-forums/installation-readme.txt (deleted)
• bp-themes/bp-default/_inc/css/screen.css (modified) (3 diffs)
• bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-center.css (modified) (1 diff)
• bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-left.css (modified) (1 diff)
• bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-right.css (modified) (1 diff)

trunk/bp-core/bp-core-templatetags.php

@@ -1586 +1586 @@
         echo bp_get_the_body_class();
 }
-        function bp_get_the_body_class( $wp_classes ) {
-                if ( bp_is_blog_page() || bp_is_activation_page() || bp_is_register_page() )
+        function bp_get_the_body_class( $wp_classes, $custom_classes ) {
+                global $bp;
+
+                if ( $bp->current_component != BP_HOME_BLOG_SLUG && !bp_is_register_page() && !bp_is_activation_page() && !bp_is_directory() && bp_is_blog_page() )
+                        $bp_classes[] = 'home-page';
+                
+                if ( ( $bp->current_component == BP_HOME_BLOG_SLUG || bp_is_activation_page() || bp_is_register_page() ) )
                         $bp_classes[] = 'blog-page';
                         
-                if ( !bp_is_blog_page() && !is_home() && !bp_is_register_page() && !bp_is_activation_page() )
+                if ( !bp_is_blog_page() && !bp_is_register_page() && !bp_is_activation_page() )
                         $bp_classes[] = 'internal-page';
-                
-                if ( bp_is_blog_page() && is_home() )
-                        $bp_classes[] = 'home-page';
                 
                 if ( bp_is_directory() )
@@ -1697 +1699 @@
                 if ( bp_is_activation_page() )
                         $bp_classes[] = 'activation';
-                        
-                if ( is_single() )
-                        $bp_classes[] = 'blog-single';
-
-                if ( is_category() )
-                        $bp_classes[] = 'blog-category';
-
-                if ( is_tag() )
-                        $bp_classes[] = 'blog-tag';
-                        
-                if ( is_search() )
-                        $bp_classes[] = 'blog-search';
-
-                if ( is_day() )
-                        $bp_classes[] = 'blog-day';
-
-                if ( is_month() )
-                        $bp_classes[] = 'blog-month';
-
-                if ( is_year() )                
-                        $bp_classes[] = 'blog-year';
+
+                /* Add the current_component, current_action into the bp classes */
+                if ( !bp_is_blog_page() ) {
+                        if ( !empty( $bp->current_component ) )
+                                $bp_classes[] = $bp->current_component;
+                
+                        if ( !empty( $bp->current_action ) )
+                                $bp_classes[] = $bp->current_action;
+                }
                 
                 /* We don't want WordPress blog classes to appear on non-blog pages. */
-                if ( !bp_is_blog_page() ) 
-                        $wp_classes = array();
-                
-                return apply_filters( 'bp_get_the_body_class', array_merge( (array) $bp_classes, (array) $wp_classes ), $bp_classes, $wp_classes );
-        }
-        add_filter( 'body_class', 'bp_get_the_body_class' )
+                if ( !bp_is_blog_page() || is_home() ) {
+                        /* Preserve any custom classes already set */
+                        if ( !empty( $custom_classes ) )
+                                $wp_classes = (array) $custom_classes;
+                        else
+                                $wp_classes = array();
+                }
+ 
+                /* Merge WP classes with BP classes */
+                $classes = array_merge( (array) $bp_classes, (array) $wp_classes );
+                
+                /* Remove any duplicates */
+                $classes = array_unique( $classes );
+                
+                return apply_filters( 'bp_get_the_body_class', $classes, $bp_classes, $wp_classes, $custom_classes );
+        }
+        add_filter( 'body_class', 'bp_get_the_body_class', 10, 2 )
 
 

trunk/bp-themes/bp-default/_inc/css/screen.css

@@ -139 +139 @@
         }
 
-.blog-page #container, .directory #container {
-        padding-top: 5px;
+.blog-page #container, .directory #container, .home-page #container {
+        padding: 5px 20px 20px 20px;
 }
 
@@ -885 +885 @@
 }
 
-        #third-section .widget h2, .page h2.pagetitle {
+        #third-section .widget h2{
                 background: url(../images/rightcol_header_back.gif) top left no-repeat;
                 color: #fff;
@@ -895 +895 @@
         }
 
-        #first-section .widget h2, #sidebar h2.widgettitle {
+        #first-section .widget h2, #sidebar h2.widgettitle, .page h2.pagetitle  {
                 background: url(../images/leftcol_header_back.gif) top left no-repeat;
 

trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-center.css

@@ -1 @@
-.blog-page #container, .directory #container {
-        padding: 20px;
-        position: relative;
-}
-
 .blog-page #content, .directory #content {
         float: left;

trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-left.css

@@ -1 @@
-.blog-page #container, .directory #container {
-        padding: 20px;
-}
-
 .blog-page #content, .directory #content {
         float: right;

trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-right.css

@@ -1 @@
-.blog-page #container, .directory #container {
-        padding: 20px;
-}
-
 .blog-page #content, .directory #content {
         float: left;