Ticket #3240: 3240-3.patch

bp-themes/bp-default/_inc/css/default-rtl.css

@@ -22 +22 @@
         4.3 - Gallery
         4.4 - Images
         4.5 - Posts
+        4.6 - Search
 5.0 - BuddyPress
         5.1 - Activity
                 5.1.1 - Activity Listing
@@ -395 +396 @@
         float: right;
 }
 
+/*--------------------------------------------------------------
+4.6 - Search
+--------------------------------------------------------------*/
+
 
 /*--------------------------------------------------------------
 5.0 - BuddyPress

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

@@ -22 +22 @@
         5.3 - Gallery
         5.4 - Images
         5.5 - Posts
+        5.6 - Search
 6.0 - BuddyPress
         6.1 - Activity
                 6.1.1 - Activity Listing
@@ -1037 +1038 @@
 
 
 /*--------------------------------------------------------------
+5.6 - Search
+--------------------------------------------------------------*/
+#search-content {
+        background: #f7f7f7;
+        border: 1px solid #ececec;
+        -moz-border-radius: 7px;
+        -webkit-border-radius: 7px;
+        border-radius: 7px;
+        margin: 20px 0 20px;
+        padding: 0 10px;
+        position: relative;
+}
+#search-tab {
+        background: url(../images/search.png) no-repeat 20px top;
+        height: 16px;
+        margin-top: -16px;
+}
+#search-loop {
+        min-height: 75px;
+}
+.search-column-component h3 {
+        color: #707070;
+        font-size: 16px;
+}
+.search-column-component {
+        float: left;
+        padding: 10px 10px 0 0;
+        text-align: right;
+        width: 20%;
+}
+.search-column-results {
+        border-left: 1px solid #e1e3e3;
+        float: left;
+        padding: 10px 0 42px 10px;
+        width: 76%;
+}
+.search-section {
+        display: inline-block;
+        width: 100%;
+}
+.search-section:last-child .search-column-results {
+        margin-bottom: 0;
+}
+input#s {
+        border: 1px inset #c3c5c5;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+        color: #696a6a;
+        font-size: 20px;
+        height: 30px;
+        width: 300px;
+}
+input#searchsubmit {
+        background-position: 0 bottom;
+        height: 35px;
+}
+div.search-post-content h4.posttitle {
+        font-size: 14px;
+        margin: 10px 0 10px 35px;
+}
+div.search-entry {
+        margin: 0 0 10px 35px;
+}
+div.search-post-content {
+        border-bottom: 1px solid #eaeaea;
+}
+.search-section ul.item-list li {
+        padding-bottom: 0;
+}
+
+
+/*--------------------------------------------------------------
 6.0 - BuddyPress
 --------------------------------------------------------------*/
 /*--------------------------------------------------------------

bp-themes/bp-default/_inc/global.js

@@ -1067 +1067 @@
                         jq.cookie('bp-' + objects[i] + '-extras', null, {path: '/'} );
                 });
         });
+
+        /* search template */
+        jq("#searchsubmit").click(function(e) {
+                e.preventDefault();
+                jq('form#search span.ajax-loader').show();
+
+                jq("#search-loop-results").load(BP_DTheme.root_domain + "/?s=" + escape(jq("#s").val()) + " #search-loop-results", function(response, status, xhr) {
+                        if (status == "success") {
+                                jq('span.ajax-loader').hide();
+                        }
+                });
+        });
 });
 
 /* Setup activity scope and filter based on the current cookie settings. */

bp-themes/bp-default/functions.php

@@ -147 +147 @@
                 'show_all_comments' => __( 'Show all comments for this thread', 'buddypress' ),
                 'show_all'          => __( 'Show all', 'buddypress' ),
                 'comments'          => __( 'comments', 'buddypress' ),
-                'close'             => __( 'Close', 'buddypress' )
+                'close'             => __( 'Close', 'buddypress' ),
+                'root_domain'       => bp_get_root_domain()
         );
 
         if ( !empty( $bp->displayed_user->id ) )

bp-themes/bp-default/search.php

@@ -1 @@
-<?php get_header() ?>
+<?php get_header(); ?>
 
         <div id="content">
                 <div class="padder">
 
-                <?php do_action( 'bp_before_blog_search' ) ?>
+                        <h2 class="pagetitle"><?php _e( 'Search', 'buddypress' ); ?></h2>
+                        <?php locate_template( array( 'searchform.php'), true ); ?>
 
-                <div class="page" id="blog-search" role="main">
-
-                        <h2 class="pagetitle"><?php _e( 'Site', 'buddypress' ) ?></h2>
-
-                        <?php if (have_posts()) : ?>
-
-                                <h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ) ?></h3>
-
-                                <?php bp_dtheme_content_nav( 'nav-above' ); ?>
-
-                                <?php while (have_posts()) : the_post(); ?>
-
-                                        <?php do_action( 'bp_before_blog_post' ) ?>
-
-                                        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-                                                <div class="author-box">
-                                                        <?php echo get_avatar( get_the_author_meta( 'email' ), '50' ); ?>
-                                                        <p><?php printf( _x( 'by %s', 'Post written by...', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>
-                                                </div>
-
-                                                <div class="post-content">
-                                                        <h2 class="posttitle"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
-
-                                                        <p class="date"><?php printf( __( '%1$s <span>in %2$s</span>', 'buddypress' ), get_the_date(), get_the_category_list( ', ' ) ); ?></p>
-
-                                                        <div class="entry">
-                                                                <?php the_content( __( 'Read the rest of this entry &rarr;', 'buddypress' ) ); ?>
-                                                        </div>
-
-                                                        <p class="postmetadata"><?php the_tags( '<span class="tags">' . __( 'Tags: ', 'buddypress' ), ', ', '</span>' ); ?> <span class="comments"><?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></span></p>
-                                                </div>
-
-                                        </div>
-
-                                        <?php do_action( 'bp_after_blog_post' ) ?>
-
-                                <?php endwhile; ?>
-
-                                <?php bp_dtheme_content_nav( 'nav-below' ); ?>
-
-                        <?php else : ?>
-
-                                <h2 class="center"><?php _e( 'No posts found. Try a different search?', 'buddypress' ) ?></h2>
-                                <?php get_search_form() ?>
-
-                        <?php endif; ?>
-
-                </div>
-
-                <?php do_action( 'bp_after_blog_search' ) ?>
+                        <div id="search-content">
+                                <div id="search-loop">
+                                        <div id="search-tab"></div>
+                                        <?php locate_template( array( 'search-loop.php' ), true ); ?>
+                                </div>
+                        </div>
 
                 </div><!-- .padder -->
         </div><!-- #content -->
 
-        <?php get_sidebar() ?>
-
-<?php get_footer() ?>
+        <?php get_sidebar(); ?>
+<?php get_footer(); ?>
+ No newline at end of file

bp-themes/bp-default/searchform.php

@@ -1 +1 @@
 <?php do_action( 'bp_before_blog_search_form' ) ?>
 
-<form role="search" method="get" id="searchform" action="<?php echo home_url() ?>/">
-        <input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
-        <input type="submit" id="searchsubmit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+<div id="searchform">
+        <form role="search" id="search">
+                <input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
+                <input type="submit" id="searchsubmit" value="<?php _e( 'Search', 'buddypress' ); ?>" />
+                <span class="ajax-loader"></span>
 
-        <?php do_action( 'bp_blog_search_form' ) ?>
-</form>
+                <?php do_action( 'bp_blog_search_form' ) ?>
+        </form>
+</div>
 
-<?php do_action( 'bp_after_blog_search_form' ) ?>
+<?php do_action( 'bp_after_blog_search_form' ) ?>
+ No newline at end of file