Changeset 4618

Timestamp:

12/21/2012 09:23:05 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Search Tweaks:

• Add support for search root page.
• Add search root page to breadcrumb.
• Tweak search form CSS.
• See #1575.

Location:

trunk

Files:

• bbpress.php (modified) (2 diffs)
• includes/common/template-tags.php (modified) (1 diff)
• includes/core/template-functions.php (modified) (1 diff)
• templates/default/bbpress/content-search.php (modified) (1 diff)
• templates/default/css/bbpress.css (modified) (1 diff)

trunk/bbpress.php

@@ -181 +181 @@
         /** Versions **********************************************************/
 
-        $this->version    = '2.3-bleeding-4612';
+        $this->version    = '2.3-bleeding-4618';
         $this->db_version = '220';
 
@@ -924 +924 @@
 
             // Search All
-            $search_slug . $search_page_rule => 'index.php?&paged=' . $wp_rewrite->preg_index( 1 ),
-            $search_slug . $search_root_rule => 'index.php?',
+            $search_slug . $search_page_rule => 'index.php?paged=' . $wp_rewrite->preg_index( 1 ),
+            $search_slug . $search_root_rule => 'index.php?' . $search_id,
         );
 

trunk/includes/common/template-tags.php

@@ -2243 +2243 @@
         } elseif ( bbp_is_topic_tag_edit() ) {
             $crumbs[] = '<a href="' . get_term_link( bbp_get_topic_tag_id(), bbp_get_topic_tag_tax_id() ) . '" class="bbp-breadcrumb-topic-tag">' . sprintf( __( 'Topic Tag: %s', 'bbpress' ), bbp_get_topic_tag_name() ) . '</a>';
+
+        // Search
+        } elseif ( bbp_is_search() && bbp_get_search_terms() ) {
+            $crumbs[] = '<a href="' . home_url( bbp_get_search_slug() ) . '" class="bbp-breadcrumb-search">' . __( 'Search', 'bbpress' ) . '</a>';
         }
 

trunk/includes/core/template-functions.php

@@ -425 +425 @@
 
     // Search Page
-    } elseif ( !empty( $bbp_search ) ) {
+    } elseif ( isset( $bbp_search ) ) {
 
         // Check if there are search query args set

trunk/templates/default/bbpress/content-search.php

@@ -26 +26 @@
          <?php bbp_get_template_part( 'pagination', 'search' ); ?>
 
-    <?php else : ?>
+    <?php elseif ( bbp_get_search_terms() ) : ?>
 
          <?php bbp_get_template_part( 'feedback',   'no-search' ); ?>
 
+    <?php else : ?>
+
+        <?php bbp_get_template_part( 'form', 'search' ); ?>
+
     <?php endif; ?>
-
-    <?php bbp_get_template_part( 'form', 'search' ); ?>
 
     <?php do_action( 'bbp_template_after_search_results' ); ?>

trunk/templates/default/css/bbpress.css

@@ -363 +363 @@
 -------------------------------------------------------------- */
 
-div.bbp-search-form {
+#bbpress-forums #bbp-search {
+    clear: left;
+}
+
+#bbpress-forums div.bbp-search-form {
     float: right;
 }