Changeset 2668

Timestamp:

12/03/2010 08:03:43 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Add topic subscription ability. Fixes #1366 props GautamGupta va Google Code-in

Location:

branches/plugin

Files:

• bbp-admin/bbp-functions.php (modified) (3 diffs)
• bbp-admin/bbp-settings.php (modified) (3 diffs)
• bbp-includes/bbp-functions.php (modified) (11 diffs)
• bbp-includes/bbp-template.php (modified) (6 diffs)
• bbp-includes/bbp-users.php (modified) (6 diffs)
• bbp-themes/bbp-twentyten/author.php (modified) (2 diffs)
• bbp-themes/bbp-twentyten/css (added)
• bbp-themes/bbp-twentyten/css/bbpress.css (added)
• bbp-themes/bbp-twentyten/css/twentyten.css (added)
• bbp-themes/bbp-twentyten/form-bbp_reply.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/form-bbp_topic.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/functions.php (modified) (9 diffs)
• bbp-themes/bbp-twentyten/js/topic.js (modified) (3 diffs)
• bbp-themes/bbp-twentyten/page-bbp_profile.php (added)
• bbp-themes/bbp-twentyten/pagination-bbp_replies.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/pagination-bbp_topics.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/profile-bbp_details.php (added)
• bbp-themes/bbp-twentyten/profile-bbp_favorites.php (added)
• bbp-themes/bbp-twentyten/profile-bbp_subscriptions.php (added)
• bbp-themes/bbp-twentyten/profile-bbp_topics_created.php (added)
• bbp-themes/bbp-twentyten/profile-posts.php (added)
• bbp-themes/bbp-twentyten/single-bbp_topic.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/style.css (modified) (1 diff)

branches/plugin/bbp-admin/bbp-functions.php

@@ -38 +38 @@
 function bbp_recount_list () {
     $recount_list = array(
-        5  => array( 'bbp-forum-topics',          __( 'Count topics in each forum',                'bbpress' ), 'bbp_recount_forum_topics'          ),
-        10 => array( 'bbp-forum-replies',         __( 'Count replies in each forum',               'bbpress' ), 'bbp_recount_forum_replies'         ),
-        15 => array( 'bbp-topic-replies',         __( 'Count replies in each topic',               'bbpress' ), 'bbp_recount_topic_replies'         ),
-        20 => array( 'bbp-topic-voices',          __( 'Count voices in each topic',                'bbpress' ), 'bbp_recount_topic_voices'          ),
-        25 => array( 'bbp-topic-trashed-replies', __( 'Count trashed replies in each topic',       'bbpress' ), 'bbp_recount_topic_trashed_replies' ),
-        30 => array( 'bbp-topics-replied',        __( 'Count replies for each user',               'bbpress' ), 'bbp_recount_user_topics_replied'   ),
-        35 => array( 'bbp-clean-favorites',       __( 'Remove deleted topics from user favorites', 'bbpress' ), 'bbp_recount_clean_favorites'       )
-        //40 => array( 'bbp-topic-tag-count',       __( 'Count tags for every topic',                'bbpress' ), 'bbp_recount_topic_tags'            ),
-        //45 => array( 'bbp-tags-tag-count',        __( 'Count topics for every tag',                'bbpress' ), 'bbp_recount_tag_topics'            ),
-        //50 => array( 'bbp-tags-delete-empty',     __( 'Delete tags with no topics',                'bbpress' ), 'bbp_recount_tag_delete_empty'      )
+        5  => array( 'bbp-forum-topics',          __( 'Count topics in each forum',                    'bbpress' ), 'bbp_recount_forum_topics'          ),
+        10 => array( 'bbp-forum-replies',         __( 'Count replies in each forum',                   'bbpress' ), 'bbp_recount_forum_replies'         ),
+        15 => array( 'bbp-topic-replies',         __( 'Count replies in each topic',                   'bbpress' ), 'bbp_recount_topic_replies'         ),
+        20 => array( 'bbp-topic-voices',          __( 'Count voices in each topic',                    'bbpress' ), 'bbp_recount_topic_voices'          ),
+        25 => array( 'bbp-topic-trashed-replies', __( 'Count trashed replies in each topic',           'bbpress' ), 'bbp_recount_topic_trashed_replies' ),
+        30 => array( 'bbp-topics-replied',        __( 'Count replies for each user',                   'bbpress' ), 'bbp_recount_user_topics_replied'   ),
+        35 => array( 'bbp-clean-favorites',       __( 'Remove trashed topics from user favorites',     'bbpress' ), 'bbp_recount_clean_favorites'       ),
+        40 => array( 'bbp-clean-subscriptions',   __( 'Remove trashed topics from user subscriptions', 'bbpress' ), 'bbp_recount_clean_subscriptions'   )
+        //45 => array( 'bbp-topic-tag-count',       __( 'Count tags for every topic',                'bbpress' ), 'bbp_recount_topic_tags'            ),
+        //50 => array( 'bbp-tags-tag-count',        __( 'Count topics for every tag',                'bbpress' ), 'bbp_recount_tag_topics'            ),
+        //55 => array( 'bbp-tags-delete-empty',     __( 'Delete tags with no topics',                'bbpress' ), 'bbp_recount_tag_delete_empty'      )
     );
 
@@ -449 +450 @@
     global $wpdb, $bbp;
 
-    $statement = __( 'Removing deleted topics from user favorites… %s', 'bbpress' );
+    $statement = __( 'Removing trashed topics from user favorites… %s', 'bbpress' );
     $result    = __( 'Failed!', 'bbpress' );
 
@@ -495 +496 @@
 }
 
+function bbp_recount_clean_subscriptions () {
+    global $wpdb, $bbp;
+
+    $statement = __( 'Removing trashed topics from user subscriptions… %s', 'bbpress' );
+    $result    = __( 'Failed!', 'bbpress' );
+
+    $users = $wpdb->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `$wpdb->usermeta` WHERE `meta_key` = '_bbp_subscriptions';" );
+    if ( is_wp_error( $users ) )
+        return array( 1, sprintf( $statement, $result ) );
+
+    $topics = $wpdb->get_col( "SELECT `ID` FROM `$wpdb->posts` WHERE `post_type` = '$bbp->topic_id' AND `post_status` = 'publish';" );
+    if ( is_wp_error( $topics ) )
+        return array( 2, sprintf( $statement, $result ) );
+
+    $values = array();
+    foreach ( $users as $user ) {
+        if ( empty( $user->subscriptions ) || !is_string( $user->subscriptions ) )
+            continue;
+
+        $subscriptions = array_intersect( $topics, (array) explode( ',', $user->subscriptions ) );
+        if ( empty( $subscriptions ) || !is_array( $subscriptions ) )
+            continue;
+
+        $subscriptions = join( ',', $subscriptions );
+        $values[] = "('$user->user_id', '_bbp_subscriptions', '$subscriptions')";
+    }
+
+    if ( !count( $values ) ) {
+        $result = __( 'Nothing to remove!', 'bbpress' );
+        return array( 0, sprintf( $statement, $result ) );
+    }
+
+    $sql_delete = "DELETE FROM `$wpdb->usermeta` WHERE `meta_key` = '_bbp_subscriptions';";
+    if ( is_wp_error( $wpdb->query( $sql_delete ) ) )
+        return array( 4, sprintf( $statement, $result ) );
+
+    $values = array_chunk( $values, 10000 );
+    foreach ( $values as $chunk ) {
+        $chunk = "\n" . join( ",\n", $chunk );
+        $sql_insert = "INSERT INTO `$wpdb->usermeta` (`user_id`, `meta_key`, `meta_value`) VALUES $chunk;";
+        if ( is_wp_error( $wpdb->query( $sql_insert ) ) )
+            return array( 5, sprintf( $statement, $result ) );
+    }
+
+    $result = __( 'Complete!', 'bbpress' );
+    return array( 0, sprintf( $statement, $result ) );
+}
+
 ?>

branches/plugin/bbp-admin/bbp-settings.php

@@ -3 +3 @@
 function bbp_admin_settings () {
 
-    if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) ) {
-        check_admin_referer( 'bbpress' );
+    if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) && !empty( $_POST['action'] ) && $_POST['action'] == '_bbp_update_settings' ) {
+        check_admin_referer( '_bbp_settings' );
+
+        $options = array( '_bbp_edit_lock' => 'int', '_bbp_throttle_time' => 'int', '_bbp_enable_subscriptions' => 'bool' );
+        foreach ( array_keys( $options ) as $option ) {
+            $$option = trim( @$_POST[$option] );
+            switch ( $options[$option] ) {
+                case 'int':
+                    $$option = intval( $$option );
+                    break;
+                case 'bool':
+                    $$option = intval( $$option ) == 0 ? false : true;
+                    break;
+                case 'text':
+                case 'default':
+                    $$option = esc_attr( $$option );
+                    break;
+            }
+            update_option( $option, $$option );
+        }
+
+        bbp_admin_notices( __( 'Options successfully saved!' ) );
     } ?>
 
@@ -14 +34 @@
         <h2><?php _e( 'bbPress Settings', 'bbpress' ) ?></h2>
 
-        <form name="form1" method="post" action="options.php">
+        <form name="form1" method="post">
 
             <table class="form-table">
                 <tr valign="top">
                     <th scope="row"><label for="_bbp_edit_lock"><?php _e( 'Lock post editing after', 'bbpress' ); ?></label></th>
-                    <td>
-                        <input name="_bbp_edit_lock" type="text" id="posts_per_page" value="<?php form_option( '_bbp_edit_lock' ); ?>" class="small-text" /> <?php _e( 'minutes', 'bbpress' ); ?>
-                    </td>
+                    <td><input name="_bbp_edit_lock" type="text" id="posts_per_page" value="<?php form_option( '_bbp_edit_lock' ); ?>" class="small-text" /> <?php _e( 'minutes', 'bbpress' ); ?></td>
                 </tr>
 
                 <tr valign="top">
-                    <th scope="row"><label for="_bbp_throttle_time"><?php _e( 'Throttle time' ); ?></label></th>
+                    <th scope="row"><label for="_bbp_throttle_time"><?php _e( 'Throttle time', 'bbpress' ); ?></label></th>
                     <td><input name="_bbp_throttle_time" type="text" id="posts_per_rss" value="<?php form_option( '_bbp_throttle_time' ); ?>" class="small-text" /> <?php _e( 'seconds', 'bbpress' ); ?></td>
+                </tr>
+
+                <tr valign="top">
+                    <th scope="row"><label for="_bbp_enable_subscriptions"><?php _e( 'Enable subscriptions', 'bbpress' ); ?></label></th>
+                    <td><input id="_bbp_enable_subscriptions" name="_bbp_enable_subscriptions" type="checkbox" id="posts_per_rss" value="1" <?php checked( true, bbp_is_subscriptions_active() ); ?> class="small-text" /><label for="_bbp_enable_subscriptions"><?php _e( 'Allow users to subscribe to topics', 'bbpress' ); ?></label></td>
                 </tr>
 
@@ -32 +55 @@
 
             <p class="submit">
-                <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e( 'Save Changes' ); ?>" />
+                <?php wp_nonce_field( '_bbp_settings' ); ?>
+                <input type="hidden" name="action" value="_bbp_update_settings" />
+                <input type="submit" name="submit" class="button-primary" value="<?php esc_attr_e( 'Save Changes', 'bbpress' ); ?>" />
             </p>
         </form>

branches/plugin/bbp-includes/bbp-functions.php

@@ -115 +115 @@
         // Handle Tags
         if ( isset( $_POST['bbp_topic_tags'] ) && !empty( $_POST['bbp_topic_tags'] ) ) {
-            // Escape tag input
-            $terms = esc_html( $_POST['bbp_topic_tags'] );
-
-            // Explode by comma
-            if ( strstr( $terms, ',' ) )
-                $terms = explode( ',', $terms );
-
-            // Add topic tag ID as main key
-            $terms = array( $bbp->topic_tag_id => $terms );
-
-            // @todo - Handle adding of tags from reply
+            $terms = $_POST['bbp_topic_tags'];
+            wp_set_post_terms( $topic_id, $terms, $bbp->topic_tag_id, true );
         }
 
@@ -149 +140 @@
             // Check for missing reply_id or error
             if ( !empty( $reply_id ) && !is_wp_error( $reply_id ) ) {
+
+                // Handle Subscription Checkbox
+                if ( bbp_is_subscriptions_active() ) {
+                    $subscribed = bbp_is_user_subscribed( $reply_data['post_author'], $topic_id ) ? true : false;
+                    $subscheck  = ( !empty( $_POST['bbp_topic_subscription'] ) && 'bbp_subscribe' == $_POST['bbp_topic_subscription'] ) ? true : false;
+
+                    if ( true == $subscribed && false == $subscheck )
+                        bbp_remove_user_subscription( $reply_data['post_author'], $topic_id );
+                    elseif ( false == $subscribed && true == $subscheck )
+                        bbp_add_user_subscription( $reply_data['post_author'], $topic_id );
+                }
 
                 // Redirect back to new reply
@@ -233 +235 @@
             if ( !empty( $topic_id ) && !is_wp_error( $topic_id ) ) {
 
+                if ( bbp_is_subscriptions_active() ) {
+                    if ( !empty( $_POST['bbp_topic_subscription'] ) && 'bbp_subscribe' == $_POST['bbp_topic_subscription'] )
+                        bbp_add_user_subscription( $topic_data['post_author'], $topic_id );
+                }
+
                 // Redirect back to new reply
                 wp_redirect( bbp_get_topic_permalink( $topic_id ) . '#topic-' . $topic_id );
@@ -253 +260 @@
 
     // Only proceed if GET is a favorite action
-    if ( 'GET' == $_SERVER['REQUEST_METHOD'] && !empty( $_GET['action'] ) && !empty( $_GET['topic_id'] ) ) {
+    if ( 'GET' == $_SERVER['REQUEST_METHOD'] && !empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'bbp_favorite_add', 'bbp_favorite_remove' ) ) && !empty( $_GET['topic_id'] ) ) {
+        // What action is taking place?
+        $action       = $_GET['action'];
 
         // Load user info
@@ -259 +268 @@
         $user_id      = $current_user->ID;
 
-        // Check users ability to create new reply
+        // Check current user's ability to edit the user
         if ( !current_user_can( 'edit_user', $user_id ) )
             return false;
-
-        // What action is taking place?
-        $action       = $_GET['action'];
 
         // Load favorite info
@@ -296 +302 @@
 }
 add_action( 'template_redirect', 'bbp_favorites_handler' );
+
+/**
+ * bbp_subscriptions_handler ()
+ *
+ * Handles the front end subscribing and unsubscribing topics
+ */
+function bbp_subscriptions_handler () {
+    global $bbp, $current_user;
+
+    if ( !bbp_is_subscriptions_active() )
+        return false;
+
+    // Only proceed if GET is a favorite action
+    if ( 'GET' == $_SERVER['REQUEST_METHOD'] && !empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'bbp_subscribe', 'bbp_unsubscribe' ) ) && !empty( $_GET['topic_id'] ) ) {
+        // What action is taking place?
+        $action = $_GET['action'];
+
+        // Load user info
+        $current_user = wp_get_current_user();
+        $user_id      = $current_user->ID;
+
+        // Check current user's ability to edit the user
+        if ( !current_user_can( 'edit_user', $user_id ) )
+            return false;
+
+        // Load subscription info
+        $topic_id         = intval( $_GET['topic_id'] );
+        $is_subscription  = bbp_is_user_subscribed( $user_id, $topic_id );
+        $success          = false;
+
+        if ( !empty( $topic_id ) && !empty( $user_id ) ) {
+
+            if ( $is_subscription && 'bbp_unsubscribe' == $action )
+                $success = bbp_remove_user_subscription( $user_id, $topic_id );
+            elseif ( !$is_subscription && 'bbp_subscribe' == $action )
+                $success = bbp_add_user_subscription( $user_id, $topic_id );
+
+            // Do additional subscriptions actions
+            do_action( 'bbp_subscriptions_handler', $success, $user_id, $topic_id, $action );
+
+            // Check for missing reply_id or error
+            if ( true == $success ) {
+
+                // Redirect back to new reply
+                $redirect = bbp_get_topic_permalink( $topic_id );
+                wp_redirect( $redirect );
+
+                // For good measure
+                exit();
+            }
+        }
+    }
+}
+add_action( 'template_redirect', 'bbp_subscriptions_handler' );
 
 /**
@@ -364 +424 @@
  *
  * @package bbPress
- * @subpackage Template Tags
+ * @subpackage Functions
  * @since bbPress (r2628)
  *
@@ -390 +450 @@
  *
  * @package bbPress
- * @subpackage Template Tags
+ * @subpackage Functions
  * @since bbPress (r2628)
  *
@@ -402 +462 @@
 }
 
+/** Favorites *****************************************************************/
+
 /**
  * bbp_remove_topic_from_all_favorites ()
@@ -408 +470 @@
  *
  * @package bbPress
- * @subpackage Template Tags
+ * @subpackage Functions
  * @since bbPress (r2652)
  *
+ * @uses bbp_get_topic_favoriters ()
  * @param int $topic_id Topic ID to remove
  * @return void
  */
 function bbp_remove_topic_from_all_favorites ( $topic_id = 0 ) {
-    global $wpdb;
-
-    if ( $users = $wpdb->get_col( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = '_bbp_favorites' and FIND_IN_SET('{$topic_id}', meta_value) > 0" ) )
+    if ( empty( $topic_id ) )
+        return;
+
+    if ( $users = bbp_get_topic_favoriters( $topic_id ) )
         foreach ( $users as $user )
             bbp_remove_user_favorite( $user, $topic_id );
@@ -424 +488 @@
 add_action( 'delete_post', 'bbp_remove_topic_from_all_favorites' );
 
+/** Subscriptions *************************************************************/
+
+/**
+ * bbp_remove_topic_from_all_subscriptions ()
+ *
+ * Remove a deleted topic from all users' subscriptions
+ *
+ * @package bbPress
+ * @subpackage Functions
+ * @since bbPress (r2652)
+ *
+ * @uses bbp_get_topic_subscribers ()
+ * @param int $topic_id Topic ID to remove
+ * @return void
+ */
+function bbp_remove_topic_from_all_subscriptions ( $topic_id = 0 ) {
+    if ( empty( $topic_id ) )
+        return;
+
+    if ( !bbp_is_subscriptions_active() )
+        return;
+
+    if ( $users = bbp_get_topic_subscribers( $topic_id ) ) {
+        foreach ( $users as $user ) {
+            bbp_remove_user_subscription( $user, $topic_id );
+        }
+    }
+}
+add_action( 'trash_post',  'bbp_remove_topic_from_all_subscriptions' );
+add_action( 'delete_post', 'bbp_remove_topic_from_all_subscriptions' );
+
+/**
+ * bbp_is_subscriptions_active ()
+ *
+ * Checks if subscription feature is enabled.
+ *
+ * @package bbPress
+ * @subpackage Functions
+ * @since bbPress (r2658)
+ *
+ * @return bool Is subscription enabled or not
+ */
+function bbp_is_subscriptions_active () {
+    return (bool) get_option( '_bbp_enable_subscriptions' );
+}
+
+/**
+ * bbp_notify_subscribers ()
+ *
+ * Sends notification emails for new posts.
+ *
+ * Gets new post's ID and check if there are subscribed
+ * user to that topic, and if there are, send notifications
+ *
+ * @package bbPress
+ * @subpackage Functions
+ * @since bbPress (r2668)
+ *
+ * @todo When Akismet is made to work with bbPress posts, add a check if the post is spam or not, to avoid sending out spam mails
+ *
+ * @param int $reply_id ID of the newly made reply
+ * @return bool True on success, false on failure
+ */
+function bbp_notify_subscribers ( $reply_id = 0 ) {
+    global $bbp, $wpdb;
+
+    if ( !bbp_is_subscriptions_active() )
+        return false;
+
+    if ( !$reply = get_post( $reply_id ) )
+        return false;
+
+    if ( $reply->post_type != $bbp->reply_id || empty( $reply->post_parent ) )
+        return false;
+
+    if ( !$topic = get_post( $post->post_parent ) )
+        return false;
+
+    $reply_id = $reply->ID;
+    $topic_id = $topic->ID;
+
+    if ( !$poster_name = get_the_author_meta( 'display_name', $reply->post_author ) )
+        return false;
+
+    do_action( 'bbp_pre_notify_subscribers', $reply_id, $topic_id );
+
+    // Get the users who have favorited the topic and have subscriptions on
+    if ( !$user_ids = bbp_get_topic_subscribers( $topic_id, true ) )
+        return false;
+
+    foreach ( (array) $user_ids as $user_id ) {
+
+        // Don't send notifications to the person who made the post
+        if ( $user_id == $reply->post_author )
+            continue;
+
+        // For plugins
+        if ( !$message = apply_filters( 'bbp_subscription_mail_message', __( "%1\$s wrote:\n\n%2\$s\n\nPost Link: %3\$s\n\nYou're getting this mail because you subscribed to the topic, visit the topic and login to unsubscribe." ), $reply_id, $topic_id ) )
+            continue;
+
+        $user = get_userdata( $user_id );
+
+        wp_mail(
+            $user->user_email,
+            apply_filters( 'bbp_subscription_mail_title', '[' . get_option( 'blogname' ) . '] ' . $topic->post_title, $reply_id, $topic_id ),
+            sprintf( $message, $poster_name, strip_tags( $reply->post_content ), bbp_get_reply_permalink( $reply_id ) )
+        );
+    }
+
+    do_action( 'bbp_post_notify_subscribers', $reply_id, $topic_id );
+
+    return true;
+}
+add_action( 'bbp_new_reply', 'bbp_notify_subscribers' );
+
 ?>

branches/plugin/bbp-includes/bbp-template.php

@@ -2827 +2827 @@
 
 /**
+ * bbp_is_subscriptions ()
+ *
+ * Check if current page is a bbPress user's subscriptions page (author page)
+ *
+ * @since bbPress (r2652)
+ *
+ * @return bool
+ */
+function bbp_is_subscriptions () {
+    return (bool) is_author();
+}
+
+/**
  * bbp_is_user_home ()
  *
@@ -2887 +2900 @@
  * bbp_user_favorites_link ()
  *
- * Output the link to the user's favorites page (author page)
+ * Output the link to make a topic favorite/remove a topic from favorites
  *
  * @package bbPress
@@ -2897 +2910 @@
  * @param int $user_id optional
  *
- * @uses bbp_get_favorites_link()
+ * @uses bbp_get_user_favorites_link()
  */
 function bbp_user_favorites_link ( $add = array(), $rem = array(), $user_id = 0 ) {
@@ -2905 +2918 @@
      * bbp_get_user_favorites_link ()
      *
-     * Return the link to the user's favorites page (author page)
+     * Return the link to make a topic favorite/remove a topic from favorites
      *
      * @package bbPress
@@ -2916 +2929 @@
      *
      * @uses apply_filters
-     * @uses get_author_posts_url
      * @return string Permanent link to topic
      */
@@ -2964 +2976 @@
         }
 
+        // Create the link based where the user is and if the topic is already the user's favorite
         $permalink = bbp_is_favorites() ? bbp_get_favorites_permalink( $user_id ) : bbp_get_topic_permalink( $topic_id );
         $url       = esc_url( wp_nonce_url( add_query_arg( $favs, $permalink ), 'toggle-favorite_' . $topic_id ) );
         $is_fav    = $is_fav ? 'is-favorite' : '';
-
-        return apply_filters( 'bbp_get_user_favorites_link', "<span id='favorite-toggle'><span id='favorite-$topic_id' class='$is_fav'>$pre<a href='$url' class='dim:favorite-toggle:favorite-$topic_id:is-favorite'>$mid</a>$post</span></span>" );
+        $html      = '<span id="favorite-toggle"><span id="favorite-' . $topic_id . '" class="' . $is_fav . '">' . $pre . '<a href="' . $url . '" class="dim:favorite-toggle:favorite-' . $topic_id . ':is-favorite">' . $mid . '</a>' . $post . '</span></span>';
+
+        // Return the link
+        return apply_filters( 'bbp_get_user_favorites_link', $html, $add, $rem, $user_id, $topic_id );
     }
 
 /** END Favorites Functions ***************************************************/
+
+/** START Subscriptions Functions *********************************************/
+
+/**
+ * bbp_user_subscribe_link ()
+ *
+ * Output the link to subscribe/unsubscribe from a topic
+ *
+ * @package bbPress
+ * @subpackage Template Tags
+ * @since bbPress (r2668)
+ *
+ * @param mixed $args
+ *
+ * @uses bbp_get_user_subscribe_link()
+ */
+function bbp_user_subscribe_link ( $args = '' ) {
+    echo bbp_get_user_subscribe_link( $args );
+}
+    /**
+     * bbp_get_user_subscribe_link ()
+     *
+     * Return the link to subscribe/unsubscribe from a topic
+     *
+     * @package bbPress
+     * @subpackage Template Tags
+     * @since bbPress (r2668)
+     *
+     * @param mixed $args
+     *
+     * @uses apply_filters
+     * @return string Permanent link to topic
+     */
+    function bbp_get_user_subscribe_link ( $args = '' ) {
+        if ( !bbp_is_subscriptions_active() )
+            return;
+
+        $defaults = array (
+            'subscribe'     => __( 'Subscribe',   'bbpress' ),
+            'unsubscribe'   => __( 'Unsubscribe', 'bbpress' ),
+            'user_id'       => 0,
+            'topic_id'      => 0,
+            'before'        => '&nbsp;|&nbsp;',
+            'after'         => ''
+        );
+
+        $args = wp_parse_args( $args, $defaults );
+        extract( $args );
+
+        // Try to get a user_id from $current_user
+        if ( empty( $user_id ) ) {
+            global $current_user;
+            $current_user = wp_get_current_user();
+
+            // Return if not logged in
+            if ( !$user_id = $current_user->ID ) {
+                return false;
+            }
+        }
+
+        if ( !current_user_can( 'edit_user', (int) $user_id ) )
+            return false;
+
+        if ( !$topic_id = bbp_get_topic_id( $topic_id ) )
+            return false;
+
+        if ( $is_subscribed = bbp_is_user_subscribed( $user_id, $topic_id ) ) {
+            $text = $unsubscribe;
+            $query_args  = array( 'action' => 'bbp_unsubscribe', 'topic_id' => $topic_id );
+        } else {
+            $text = $subscribe;
+            $query_args = array( 'action' => 'bbp_subscribe', 'topic_id' => $topic_id );
+        }
+
+        // Create the link based where the user is and if the user is subscribed already
+        $permalink     = bbp_is_subscriptions() ? bbp_get_favorites_permalink( $user_id ) : bbp_get_topic_permalink( $topic_id );
+        $url           = esc_url( wp_nonce_url( add_query_arg( $query_args, $permalink ), 'toggle-subscription_' . $topic_id ) );
+        $is_subscribed = $is_subscribed ? 'is-subscribed' : '';
+        $html          = '<span id="subscription-toggle">' . $before . '<span id="subscribe-' . $topic_id . '" class="' . $is_subscribed . '"><a href="' . $url . '" class="dim:subscription-toggle:subscribe-' . $topic_id . ':is-subscribed">' . $text . '</a></span>' . $after . '</span>';
+
+        // Return the link
+        return apply_filters( 'bbp_get_user_subscribe_link', $html, $subscribe, $unsubscribe, $user_id, $topic_id );
+    }
+
+/** END Subscriptions Functions ***********************************************/
 
 /** START User Functions ******************************************************/

branches/plugin/bbp-includes/bbp-users.php

@@ -41 +41 @@
 
 /**
- * bbp_get_user_favorites_topic_ids ()
- *
- * Get a user's favorite topics' IDs
+ * bbp_get_topic_favoriters ()
+ *
+ * Get the users who have made the topic favorite
+ *
+ * @package bbPress
+ * @subpackage Users
+ * @since bbPress (r2658)
+ *
+ * @param int $topic_id Topic ID
+ * @return array|bool Results if the topic has any favoriters, otherwise false
+ */
+function bbp_get_topic_favoriters ( $topic_id = 0 ) {
+    if ( empty( $topic_id ) )
+        return;
+
+    global $wpdb;
+
+    // Get the users who have favorited the topic
+    $users = $wpdb->get_col( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = '_bbp_favorites' and FIND_IN_SET('{$topic_id}', meta_value) > 0" );
+    $users = apply_filters( 'bbp_get_topic_favoriters', $users, $topic_id );
+
+    if ( !empty( $users ) )
+        return $users;
+
+    return false;
+}
+
+/**
+ * bbp_get_user_favorites ()
+ *
+ * Get a user's favorite topics
  *
  * @package bbPress
@@ -49 +77 @@
  * @since bbPress (r2652)
  *
- * @param int $user_id User ID
- * @return array|bool Results if user has favorites, otherwise false
- */
-function bbp_get_user_favorites_topic_ids ( $user_id = 0 ) {
-    if ( empty( $user_id ) )
-        return;
-
-    $favorites = (string) get_user_meta( $user_id, '_bbp_favorites', true );
-    $favorites = (array) explode( ',', $favorites );
-    $favorites = array_filter( $favorites );
-
-    if ( !empty( $favorites ) )
-        return $favorites;
-
-    return false;
-}
-
-/**
- * bbp_get_user_favorites ()
- *
- * Get a user's favorite topics
- *
- * @package bbPress
- * @subpackage Users
- * @since bbPress (r2652)
- *
- * @todo Pagination
+ * @uses bbp_get_user_favorites_topic_ids ()
  *
  * @param int $user_id User ID
@@ -95 +97 @@
     if ( !empty( $favorites ) ) {
         $query = bbp_has_topics( array( 'post__in' => $favorites, 'posts_per_page' => -1 ) );
-        return $query;
-    }
-
-    return false;
-}
+        return apply_filters( 'bbp_get_user_favorites', $query, $user_id );
+    }
+
+    return false;
+}
+
+    /**
+     * bbp_get_user_favorites_topic_ids ()
+     *
+     * Get a user's favorite topics' IDs
+     *
+     * @package bbPress
+     * @subpackage Users
+     * @since bbPress (r2652)
+     *
+     * @param int $user_id User ID
+     * @return array|bool Results if user has favorites, otherwise false
+     */
+    function bbp_get_user_favorites_topic_ids ( $user_id = 0 ) {
+        if ( empty( $user_id ) )
+            return;
+
+        $favorites = (string) get_user_meta( $user_id, '_bbp_favorites', true );
+        $favorites = (array) explode( ',', $favorites );
+        $favorites = array_filter( $favorites );
+        $favorites = apply_filters( 'bbp_get_user_favorites_topic_ids', $favorites, $user_id );
+
+        if ( !empty( $favorites ) )
+            return $favorites;
+
+        return false;
+    }
 
 /**
@@ -141 +170 @@
 
     if ( isset( $favorites ) )
-        return in_array( $topic_id, $favorites );
+        return apply_filters( 'bbp_is_user_favorite', (bool) in_array( $topic_id, $favorites ), $user_id, $topic_id, $favorites );
 
     return false;
@@ -220 +249 @@
 /** END - Favorites ***********************************************************/
 
+/** START - Subscriptions *****************************************************/
+
+/**
+ * bbp_get_topic_subscribers ()
+ *
+ * Get the users who have subscribed to the topic
+ *
+ * @package bbPress
+ * @subpackage Users
+ * @since bbPress (r2668)
+ *
+ * @param int $topic_id Topic ID
+ * @return array|bool Results if the topic has any subscribers, otherwise false
+ */
+function bbp_get_topic_subscribers ( $topic_id = 0 ) {
+    if ( empty( $topic_id ) )
+        return;
+
+    global $wpdb;
+
+    // Get the users who have favorited the topic
+    $users = $wpdb->get_col( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = '_bbp_subscriptions' and FIND_IN_SET('{$topic_id}', meta_value) > 0" );
+    $users = apply_filters( 'bbp_get_topic_subscribers', $users );
+
+    if ( !empty( $users ) )
+        return $users;
+
+    return false;
+}
+
+/**
+ * bbp_get_user_subscriptions ()
+ *
+ * Get a user's subscribed topics
+ *
+ * @package bbPress
+ * @subpackage Users
+ * @since bbPress (r2668)
+ *
+ * @uses bbp_get_user_subscribed_topic_ids ()
+ *
+ * @param int $user_id User ID
+ * @return array|bool Results if user has subscriptions, otherwise false
+ */
+function bbp_get_user_subscriptions ( $user_id = 0 ) {
+    // Default to author
+    if ( empty( $user_id ) )
+        $user_id = get_the_author_meta( 'ID' );
+
+    // If nothing passed and not an author page, return nothing
+    if ( empty( $user_id ) )
+        return false;
+
+    // Get users' subscriptions
+    $subscriptions = bbp_get_user_subscribed_topic_ids( $user_id );
+
+    // If user has subscriptions, load them
+    if ( !empty( $subscriptions ) ) {
+        $query = bbp_has_topics( array( 'post__in' => $subscriptions, 'posts_per_page' => -1 ) );
+        return apply_filters( 'bbp_get_user_subscriptions', $query );
+    }
+
+    return false;
+}
+
+    /**
+     * bbp_get_user_subscribed_topic_ids ()
+     *
+     * Get a user's subscribed topics' IDs
+     *
+     * @package bbPress
+     * @subpackage Users
+     * @since bbPress (r2668)
+     *
+     * @param int $user_id User ID
+     * @return array|bool Results if user has subscriptions, otherwise false
+     */
+    function bbp_get_user_subscribed_topic_ids ( $user_id = 0 ) {
+        if ( empty( $user_id ) )
+            return;
+
+        $subscriptions = (string) get_user_meta( $user_id, '_bbp_subscriptions', true );
+        $subscriptions = (array) explode( ',', $subscriptions );
+        $subscriptions = array_filter( $subscriptions );
+        $subscriptions = apply_filters( 'bbp_get_user_subscribed_topic_ids', $subscriptions );
+
+        if ( !empty( $subscriptions ) )
+            return $subscriptions;
+
+        return false;
+    }
+
+/**
+ * bbp_is_user_subscribed ()
+ *
+ * Check if a topic is in user's subscription list or not
+ *
+ * @package bbPress
+ * @subpackage Users
+ * @since bbPress (r2668)
+ *
+ * @param int $user_id User ID
+ * @param int $topic_id Topic ID
+ * @return bool True if the topic is in user's subscriptions, otherwise false
+ */
+function bbp_is_user_subscribed ( $user_id = 0, $topic_id = 0 ) {
+    global $post, $current_user;
+
+    if ( empty( $user_id ) ) {
+        $current_user = wp_get_current_user();
+        $user_id      = $current_user->ID;
+    }
+
+    if ( empty( $user_id ) )
+        return false;
+
+    $subscriptions = bbp_get_user_subscribed_topic_ids( $user_id );
+
+    if ( !empty( $topic_id ) ) {
+        $post = get_post( $topic_id );
+        $topic_id = $post->ID;
+    } elseif ( !$topic_id = bbp_get_topic_id() ) {
+        if ( empty( $post ) )
+            return false;
+
+        $topic_id = $post->ID;
+    }
+
+    if ( empty( $subscriptions ) || empty( $topic_id ) )
+        return false;
+
+    if ( isset( $subscriptions ) )
+        return apply_filters( 'bbp_is_user_subscribed', (bool) in_array( $topic_id, $subscriptions ), $user_id, $topic_id, $subscriptions );
+
+    return false;
+}
+
+/**
+ * bbp_add_user_subscription ()
+ *
+ * Add a topic to user's subscriptions
+ *
+ * @package bbPress
+ * @subpackage Users
+ * @since bbPress (r2668)
+ *
+ * @param int $user_id User ID
+ * @param int $topic_id Topic ID
+ * @return bool True
+ */
+function bbp_add_user_subscription ( $user_id = 0, $topic_id = 0 ) {
+    if ( empty( $user_id ) || empty( $topic_id ) )
+        return false;
+
+    $subscriptions = (array) bbp_get_user_subscribed_topic_ids( $user_id );
+    $topic         = get_post( $topic_id );
+
+    if ( empty( $subscriptions ) || empty( $topic ) )
+        return false;
+
+    if ( !in_array( $topic_id, $subscriptions ) ) {
+        $subscriptions[] = $topic_id;
+        $subscriptions   = array_filter( $subscriptions );
+        $subscriptions   = (string) implode( ',', $subscriptions );
+        update_user_meta( $user_id, '_bbp_subscriptions', $subscriptions );
+    }
+
+    do_action( 'bbp_add_user_subscription', $user_id, $topic_id );
+
+    return true;
+}
+
+/**
+ * bbp_remove_user_subscription ()
+ *
+ * Remove a topic from user's subscriptions
+ *
+ * @package bbPress
+ * @subpackage Users
+ * @since bbPress (r2668)
+ *
+ * @param int $user_id User ID
+ * @param int $topic_id Topic ID
+ * @return bool True if the topic was removed from user's subscriptions, otherwise false
+ */
+function bbp_remove_user_subscription ( $user_id, $topic_id ) {
+    if ( empty( $user_id ) || empty( $topic_id ) )
+        return false;
+
+    $subscriptions = (array) bbp_get_user_subscribed_topic_ids( $user_id );
+
+    if ( empty( $subscriptions ) )
+        return false;
+
+    if ( is_int( $pos = array_search( $topic_id, $subscriptions ) ) ) {
+        array_splice( $subscriptions, $pos, 1 );
+        $subscriptions = array_filter( $subscriptions );
+
+        if ( !empty( $subscriptions ) ) {
+            $subscriptions = implode( ',', $subscriptions );
+            update_user_meta( $user_id, '_bbp_subscriptions', $subscriptions );
+        } else {
+            delete_user_meta( $user_id, '_bbp_subscriptions' );
+        }
+    }
+
+    do_action( 'bbp_remove_user_subscription', $user_id, $topic_id );
+
+    return true;
+}
+
+/** END - Subscriptions *******************************************************/
+
 /**
  * bbp_get_user_topics_started ()
@@ -227 +469 @@
  * @package bbPress
  * @subpackage Users
- * @since bbPress (r2652)
+ * @since bbPress (r2660)
  *
  * @param int $user_id User ID

branches/plugin/bbp-themes/bbp-twentyten/author.php

@@ -1 +1 @@
 <?php
 /**
- * Template Name: bbPress - User Profile
+ * Template Name: bbPress - Author
  *
  * @package bbPress
@@ -13 +13 @@
             <div id="content" role="main">
 
-                <?php if ( have_posts() ) the_post(); ?>
+                <?php
+                    // Profile details
+                    get_template_part( 'profile', 'bbp_details' );
 
-                <span class="page-title author"><?php printf( __( 'Profile: %s', 'twentyten' ), "<span class='vcard'><a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a></span>" ); ?></span>
+                    // Subsciptions
+                    get_template_part( 'profile', 'bbp_subscriptions' );
 
-                <div id="entry-author-info">
-                    <div id="author-avatar">
+                    // Favorite topics
+                    get_template_part( 'profile', 'bbp_favorites' );
 
-                        <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
+                    // Topics created
+                    get_template_part( 'profile', 'bbp_topics_created' );
 
-                    </div><!-- #author-avatar -->
-                    <div id="author-description">
-                        <h1><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h1>
-
-                        <?php the_author_meta( 'description' ); ?>
-
-                    </div><!-- #author-description  -->
-                </div><!-- #entry-author-info -->
-
-                <div id="bbp-author-favorites" class="bbp-author-favorites">
-                    <hr />
-                    <h2 class="entry-title"><?php _e( 'Favorite Forum Topics', 'bbpress' ); ?></h2>
-                    <div class="entry-content">
-
-                        <?php if ( bbp_get_user_favorites() ) :
-
-                            get_template_part( 'loop', 'bbp_topics' );
-
-                        else : ?>
-
-                            <p><?php bbp_is_user_home() ? _e( 'You currently have no favorite topics.', 'bbpress' ) : _e( 'This user has no favorite topics.', 'bbpress' ); ?></p>
-
-                        <?php endif; ?>
-
-                    </div>
-                </div><!-- #bbp-author-favorites -->
-
-                <div id="bbp-author-topics-started" class="bbp-author-topics-started">
-                    <hr />
-                    <h2 class="entry-title"><?php _e( 'Forum Topics Created', 'bbpress' ); ?></h2>
-                    <div class="entry-content">
-
-                        <?php if ( bbp_get_user_topics_started() ) :
-
-                            get_template_part( 'loop', 'bbp_topics' );
-
-                        else : ?>
-
-                            <p><?php bbp_is_user_home() ? _e( 'You have not created any topics.', 'bbpress' ) : _e( 'This user has not created any topics.', 'bbpress' ); ?></p>
-
-                        <?php endif; ?>
-
-                    </div>
-                </div><!-- #bbp-author-topics-started -->
-
-
-                <div id="bbp-author-blog-posts" class="bbp-author-blog-posts">
-                    <hr />
-                    <h2 class="entry-title"><?php _e( 'Blog Posts', 'bbpress' ); ?></h2>
-
-                    <div class="entry-content">
-
-                    <?php rewind_posts(); ?>
-
-                    <?php get_template_part( 'loop', 'author' ); ?>
-                    </div>
-                </div><!-- #bbp-author-blog-posts -->
+                    // Blog posts
+                    get_template_part( 'profile', 'posts' );
+                ?>
 
             </div><!-- #content -->

branches/plugin/bbp-themes/bbp-twentyten/form-bbp_reply.php

@@ -24 +24 @@
                     </p>
 
+                    <?php if ( bbp_is_subscriptions_active() ) : ?>
+
+                        <p>
+                            <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed() ); ?> tabindex="7" />
+                            <label for="bbp_topic_subscription"><?php _e( 'Notify me of follow-up replies via email', 'bbpress' ); ?></label>
+                        </p>
+
+                    <?php endif; ?>
+
                     <p align="right">
-                        <button type="submit" tabindex="6" id="bbp_reply_submit" name="bbp_reply_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+                        <button type="submit" tabindex="9" id="bbp_reply_submit" name="bbp_reply_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
                     </p>
                 </div>

branches/plugin/bbp-themes/bbp-twentyten/form-bbp_topic.php

@@ -38 +38 @@
                     <?php endif; ?>
 
+                    <?php if ( bbp_is_subscriptions_active() ) : ?>
+
+                        <p>
+                            <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe" tabindex="9" />
+                            <label for="bbp_topic_subscription"><?php _e( 'Notify me of follow-up replies via email', 'bbpress' ); ?></label>
+                        </p>
+
+                    <?php endif; ?>
+
                     <p align="right">
-                        <button type="submit" tabindex="7" id="bbp_topic_submit" name="bbp_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+                        <button type="submit" tabindex="11" id="bbp_topic_submit" name="bbp_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
                     </p>
                 </div>

branches/plugin/bbp-themes/bbp-twentyten/functions.php

@@ -1 +1 @@
 <?php
+
+/**
+ * bbp_twentyten_enqueue_styles ()
+ *
+ * Load the theme CSS
+ */
+function bbp_twentyten_enqueue_styles () {
+    // Default styling, taken from twentyten theme
+    wp_enqueue_style( 'bbp-twentyten-default', get_stylesheet_directory_uri() . '/css/twentyten.css', false, 20100312, 'screen' );
+
+    // bbPress specific
+    wp_enqueue_style( 'bbp-twentyten-bbpress', get_stylesheet_directory_uri() . '/css/bbpress.css', 'bbp-twentyten-default', 20100312, 'screen' );
+}
+add_action( 'init', 'bbp_twentyten_enqueue_styles' );
 
 /**
@@ -7 +21 @@
  *
  * @package bbPress
- * @subpackage Template Tags
+ * @subpackage bbPress TwentyTen
  * @since bbPress (r2652)
  *
@@ -40 +54 @@
 
 /**
+ * bbp_twentyten_dim_subscription ()
+ *
+ * Subscribe/Unsubscribe a user from a topic
+ *
+ * @package bbPress
+ * @subpackage bbPress TwentyTen
+ * @since bbPress (r2668)
+ *
+ * @return void
+ */
+function bbp_twentyten_dim_subscription () {
+    global $current_user;
+
+    if ( !bbp_is_subscriptions_active() )
+        return;
+
+    $current_user = wp_get_current_user();
+    $user_id      = $current_user->ID;
+    $id           = intval( $_POST['id'] );
+
+    if ( !current_user_can( 'edit_user', $user_id ) )
+        die( '-1' );
+
+    if ( !$topic = get_post( $id ) )
+        die( '0' );
+
+    check_ajax_referer( "toggle-subscription_$topic->ID" );
+
+    if ( bbp_is_user_subscribed( $user_id, $topic->ID ) ) {
+        if ( bbp_remove_user_subscription( $user_id, $topic->ID ) )
+            die( '1' );
+    } else {
+        if ( bbp_add_user_subscription( $user_id, $topic->ID ) )
+            die( '1' );
+    }
+
+    die( '0' );
+}
+add_action( 'wp_ajax_dim-subscription', 'bbp_twentyten_dim_subscription' );
+
+/**
  * bbp_twentyten_enqueue_topic_script ()
  *
@@ -45 +100 @@
  *
  * @package bbPress
- * @subpackage Template Tags
+ * @subpackage bbPress TwentyTen
  * @since bbPress (r2652)
  *
@@ -54 +109 @@
         return;
 
-    wp_enqueue_script( 'bbp_topic', get_stylesheet_directory_uri() . '/js/topic.js', array( 'wp-lists' ), '20101124' );
+    wp_enqueue_script( 'bbp_topic', get_stylesheet_directory_uri() . '/js/topic.js', array( 'wp-lists' ), '20101202' );
 }
 add_filter( 'wp_enqueue_scripts', 'bbp_twentyten_enqueue_topic_script' );
@@ -64 +119 @@
  *
  * @package bbPress
- * @subpackage Template Tags
+ * @subpackage bbPress TwentyTen
  * @since bbPress (r2652)
  *
@@ -91 +146 @@
  *
  * @package bbPress
- * @subpackage Template Tags
+ * @subpackage bbPress TwentyTen
  * @since bbPress (r2652)
  *
@@ -102 +157 @@
     global $current_user;
 
-    wp_get_current_user();
-    $user_id = $current_user->ID;
+    $current_user = wp_get_current_user();
+    $user_id      = $current_user->ID;
 
-    wp_localize_script( 'bbp_topic', 'bbpTopicJS', array(
+    $localizations = array(
         'currentUserId' => $user_id,
         'topicId'       => bbp_get_topic_id(),
@@ -116 +171 @@
         'favDel'        => __( '&times;', 'bbpress' ),
         'favAdd'        => __( 'Add this topic to your favorites', 'bbpress' )
-    ) );
+    );
+
+    if ( bbp_is_subscriptions_active() ) {
+        $localizations['subsActive']   = 1;
+        $localizations['isSubscribed'] = (int) bbp_is_user_subscribed( $user_id );
+        $localizations['subsSub']      = __( 'Subscribe', 'bbpress' );
+        $localizations['subsUns']      = __( 'Unsubscribe', 'bbpress' );
+        $localizations['subsLink']     = bbp_get_topic_permalink();
+    } else {
+        $localizations['subsActive'] = 0;
+    }
+
+    wp_localize_script( 'bbp_topic', 'bbpTopicJS', $localizations );
 }
 add_filter( 'wp_enqueue_scripts', 'bbp_twentyten_topic_script_localization' );

branches/plugin/bbp-themes/bbp-twentyten/js/topic.js

@@ -1 +1 @@
 bbpTopicJS = jQuery.extend( {
+    // User and Topic
     currentUserId: '0',
     topicId: '0',
+
+    // Favorites
     favoritesLink: '',
     isFav: 0,
@@ -9 +12 @@
     favNo: '%favAdd% (%favLinkNo%)',
     favDel: 'x',
-    favAdd: 'Add this topic to your favorites'
+    favAdd: 'Add this topic to your favorites',
+
+    // Subscriptions
+    subsLink: '',
+    subsActive: 0,
+    isSubscribed: 0,
+    subsSub: 'Subscribe',
+    subsUns: 'Unsubscribe'
 }, bbpTopicJS );
 
-bbpTopicJS.isFav = parseInt( bbpTopicJS.isFav );
+// Topic Global
+bbpTopicJS.isFav        = parseInt( bbpTopicJS.isFav );
+bbpTopicJS.subsActive   = parseInt( bbpTopicJS.subsActive );
+bbpTopicJS.isSubscribed = parseInt( bbpTopicJS.isSubscribed );
 
+// Run it
 jQuery( function($) {
-    // Favorites
-    var favoritesToggle = $('#favorite-toggle')
+    /** Favorites *************************************************************/
+    var favoritesToggle = $( '#favorite-toggle' )
         .addClass( 'list:favorite' )
         .wpList( { alt: '', dimAfter: favLinkSetup } );
@@ -39 +53 @@
         favoritesToggle.get(0).wpList.process( favoritesToggle );
     }
+
+    /** Subscriptions *********************************************************/
+    if ( bbpTopicJS.subsActive == 1 ) {
+        var subscriptionToggle = $( '#subscription-toggle' )
+            .addClass( 'list:subscription' )
+            .wpList( { alt: '', dimAfter: subsLinkSetup } );
+
+        var subscriptionToggleSpan = subscriptionToggle.children( 'span' )
+            [bbpTopicJS.isSubscribed ? 'addClass' : 'removeClass' ]( 'is-subscribed' );
+
+        function subsLinkSetup() {
+            bbpTopicJS.isSubscribed = subscriptionToggleSpan.is( '.is-subscribed' );
+            var aLink = "<a href='" + bbpTopicJS.subsLink + "'>";
+            var aDim  = "<a href='" + subscriptionToggleSpan.find( 'a[class^="dim:"]' ).attr( 'href' ) + "' class='dim:subscription-toggle:" + subscriptionToggleSpan.attr( 'id' ) + ":is-subscribed'>";
+
+            if ( bbpTopicJS.isSubscribed ) {
+                html = aDim + bbpTopicJS.subsUns + '</a>';
+            } else {
+                html = aDim + bbpTopicJS.subsSub + '</a>';
+            }
+
+            subscriptionToggleSpan.html( html );
+            subscriptionToggle.get(0).wpList.process( subscriptionToggle );
+        }
+    }
+
 } );

branches/plugin/bbp-themes/bbp-twentyten/pagination-bbp_replies.php

@@ +1 @@
+<?php
+/**
+ * Pagination for pages of replies (when viewing a topic)
+ *
+ * @package bbPress
+ * @subpackage Twenty Ten
+ */
+?>
 
     <div class="bbp-pagination">

branches/plugin/bbp-themes/bbp-twentyten/pagination-bbp_topics.php

@@ +1 @@
+<?php
+/**
+ * Pagination for pages of topics (when viewing a forum)
+ *
+ * @package bbPress
+ * @subpackage Twenty Ten
+ */
+?>
 
     <div class="bbp-pagination">

branches/plugin/bbp-themes/bbp-twentyten/single-bbp_topic.php

@@ -29 +29 @@
                                         <th class="bbp-topic-content">
                                             <?php _e( 'Topic', 'bbpress' ); ?>
+                                            <?php bbp_user_subscribe_link(); ?>
                                             <?php bbp_user_favorites_link(); ?>
                                         </th>

branches/plugin/bbp-themes/bbp-twentyten/style.css

@@ -7 +7 @@
  * Template: twentyten
  * Tags: bbpress, black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style
- */
-
-/* =Reset default browser CSS. Based on work by Eric Meyer: http://meyerweb.com/eric/tools/css/reset/index.html
--------------------------------------------------------------- */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-    background: transparent;
-    border: 0;
-    margin: 0;
-    padding: 0;
-    vertical-align: baseline;
-}
-body {
-    line-height: 1;
-}
-h1, h2, h3, h4, h5, h6 {
-    clear: both;
-    font-weight: normal;
-}
-ol, ul {
-    list-style: none;
-}
-blockquote {
-    quotes: none;
-}
-blockquote:before, blockquote:after {
-    content: '';
-    content: none;
-}
-del {
-    text-decoration: line-through;
-}
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
-a img {
-    border: none;
-}
-
-/* =Layout
--------------------------------------------------------------- */
-
-/*
-LAYOUT: Two columns
-DESCRIPTION: Two-column fixed layout with one sidebar right of content
-*/
-
-#container {
-    float: left;
-    margin: 0 -240px 0 0;
-    width: 100%;
-}
-#content {
-    margin: 0 280px 0 20px;
-}
-#primary,
-#secondary {
-    float: right;
-    overflow: hidden;
-    width: 220px;
-}
-#secondary {
-    clear: right;
-}
-#footer {
-    clear: both;
-    width: 100%;
-}
-
-/*
-LAYOUT: One column, no sidebar
-DESCRIPTION: One centered column with no sidebar
-*/
-
-.one-column #content {
-    margin: 0 auto;
-    width: 640px;
-}
-
-/*
-LAYOUT: Full width, no sidebar
-DESCRIPTION: Full width content with no sidebar; used for attachment pages
-*/
-
-.single-attachment #content {
-    margin: 0 auto;
-    width: 900px;
-}
-
-
-/* =Fonts
--------------------------------------------------------------- */
-body,
-input,
-textarea,
-.page-title span,
-.pingback a.url {
-    font-family: Georgia, "Bitstream Charter", serif;
-}
-h3#comments-title,
-h3#reply-title,
-#access .menu,
-#access div.menu ul,
-#cancel-comment-reply-link,
-.form-allowed-tags,
-#site-info,
-#site-title,
-#wp-calendar,
-.comment-meta,
-.comment-body tr th,
-.comment-body thead th,
-.entry-content label,
-.entry-content tr th,
-.entry-content thead th,
-.entry-meta,
-.entry-title,
-.entry-utility,
-#respond label,
-.navigation,
-.page-title,
-.pingback p,
-.reply,
-.widget-title,
-.wp-caption-text,
-input[type=submit] {
-    font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
-}
-pre {
-    font-family: "Courier 10 Pitch", Courier, monospace;
-}
-code {
-    font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
-}
-
-
-/* =Structure
--------------------------------------------------------------- */
-
-/* The main theme structure */
-#access .menu-header,
-div.menu,
-#colophon,
-#branding,
-#main,
-#wrapper {
-    margin: 0 auto;
-    width: 940px;
-}
-#wrapper {
-    background: #fff;
-    margin-top: 20px;
-    padding: 0 20px;
-}
-
-/* Structure the footer area */
-#footer-widget-area {
-    overflow: hidden;
-}
-#footer-widget-area .widget-area {
-    float: left;
-    margin-right: 20px;
-    width: 220px;
-}
-#footer-widget-area #fourth {
-    margin-right: 0;
-}
-#site-info {
-    float: left;
-    font-size: 14px;
-    font-weight: bold;
-    width: 700px;
-}
-#site-generator {
-    float: right;
-    width: 220px;
-}
-
-
-/* =Global Elements
--------------------------------------------------------------- */
-
-/* Main global 'theme' and typographic styles */
-body {
-    background: #f1f1f1;
-}
-body,
-input,
-textarea {
-    color: #666;
-    font-size: 12px;
-    line-height: 18px;
-}
-hr {
-    background-color: #e7e7e7;
-    border: 0;
-    clear: both;
-    height: 1px;
-    margin-bottom: 18px;
-}
-
-/* Text elements */
-p {
-    margin-bottom: 18px;
-}
-ul {
-    list-style: square;
-    margin: 0 0 18px 1.5em;
-}
-ol {
-    list-style: decimal;
-    margin: 0 0 18px 1.5em;
-}
-ol ol {
-    list-style: upper-alpha;
-}
-ol ol ol {
-    list-style: lower-roman;
-}
-ol ol ol ol {
-    list-style: lower-alpha;
-}
-ul ul,
-ol ol,
-ul ol,
-ol ul {
-    margin-bottom: 0;
-}
-dl {
-    margin: 0 0 24px 0;
-}
-dt {
-    font-weight: bold;
-}
-dd {
-    margin-bottom: 18px;
-}
-strong {
-    font-weight: bold;
-}
-cite,
-em,
-i {
-    font-style: italic;
-}
-big {
-    font-size: 131.25%;
-}
-ins {
-    background: #ffc;
-    text-decoration: none;
-}
-blockquote {
-    font-style: italic;
-    padding: 0 3em;
-}
-blockquote cite,
-blockquote em,
-blockquote i {
-    font-style: normal;
-}
-pre {
-    background: #f7f7f7;
-    color: #222;
-    line-height: 18px;
-    margin-bottom: 18px;
-    padding: 1.5em;
-}
-abbr,
-acronym {
-    border-bottom: 1px dotted #666;
-    cursor: help;
-}
-sup,
-sub {
-    height: 0;
-    line-height: 1;
-    position: relative;
-    vertical-align: baseline;
-}
-sup {
-    bottom: 1ex;
-}
-sub {
-    top: .5ex;
-}
-input[type="text"],
-textarea {
-    background: #f9f9f9;
-    border: 1px solid #ccc;
-    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.1);
-    -moz-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.1);
-    -webkit-box-shadow: inset 1px 1px 1px rgba(0,0,0,0.1);
-    padding: 2px;
-}
-a:link {
-    color: #0066cc;
-}
-a:visited {
-    color: #743399;
-}
-a:active,
-a:hover {
-    color: #ff4b33;
-}
-
-/* Text meant only for screen readers */
-.screen-reader-text {
-    position: absolute;
-    left: -9000px;
-}
-
-
-/* =Header
--------------------------------------------------------------- */
-
-#header {
-    padding: 30px 0 0 0;
-}
-#site-title {
-    float: left;
-    font-size: 30px;
-    line-height: 36px;
-    margin: 0 0 18px 0;
-    width: 700px;
-}
-#site-title a {
-    color: #000;
-    font-weight: bold;
-    text-decoration: none;
-}
-#site-description {
-    clear: right;
-    float: right;
-    font-style: italic;
-    margin: 14px 0 18px 0;
-    width: 220px;
-}
-
-/* This is the custom header image */
-#branding img {
-    border-top: 4px solid #000;
-    border-bottom: 1px solid #000;
-    clear: both;
-    display: block;
-}
-
-
-/* =Menu
--------------------------------------------------------------- */
-
-#access {
-    background: #000;
-    display: block;
-    float: left;
-    margin: 0 auto;
-    width: 940px;
-}
-#access .menu-header,
-div.menu {
-    font-size: 13px;
-    margin-left: 12px;
-    width: 928px;
-}
-#access .menu-header ul,
-div.menu ul {
-    list-style: none;
-    margin: 0;
-}
-#access .menu-header li,
-div.menu li {
-    float: left;
-    position: relative;
-}
-#access a {
-    color: #aaa;
-    display: block;
-    line-height: 38px;
-    padding: 0 10px;
-    text-decoration: none;
-}
-#access ul ul {
-    box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-    -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-    -webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-    display: none;
-    position: absolute;
-    top: 38px;
-    left: 0;
-    float: left;
-    width: 180px;
-    z-index: 99999;
-}
-#access ul ul li {
-    min-width: 180px;
-}
-#access ul ul ul {
-    left: 100%;
-    top: 0;
-}
-#access ul ul a {
-    background: #333;
-    line-height: 1em;
-    padding: 10px;
-    width: 160px;
-    height: auto;
-}
-#access li:hover > a,
-#access ul ul :hover > a {
-    background: #333;
-    color: #fff;
-}
-#access ul li:hover > ul {
-    display: block;
-}
-#access ul li.current_page_item > a,
-#access ul li.current-menu-ancestor > a,
-#access ul li.current-menu-item > a,
-#access ul li.current-menu-parent > a {
-    color: #fff;
-}
-* html #access ul li.current_page_item a,
-* html #access ul li.current-menu-ancestor a,
-* html #access ul li.current-menu-item a,
-* html #access ul li.current-menu-parent a,
-* html #access ul li a:hover {
-    color: #fff;
-}
-
-
-/* =Content
--------------------------------------------------------------- */
-
-#main {
-    clear: both;
-    overflow: hidden;
-    padding: 40px 0 0 0;
-}
-#content {
-    margin-bottom: 36px;
-}
-#content,
-#content input,
-#content textarea {
-    color: #333;
-    font-size: 16px;
-    line-height: 24px;
-}
-#content p,
-#content ul,
-#content ol,
-#content dd,
-#content pre,
-#content hr {
-    margin-bottom: 24px;
-}
-#content ul ul,
-#content ol ol,
-#content ul ol,
-#content ol ul {
-    margin-bottom: 0;
-}
-#content pre,
-#content kbd,
-#content tt,
-#content var {
-    font-size: 15px;
-    line-height: 21px;
-}
-#content code {
-    font-size: 13px;
-}
-#content dt,
-#content th {
-    color: #000;
-}
-#content h1,
-#content h2,
-#content h3,
-#content h4,
-#content h5,
-#content h6 {
-    color: #000;
-    line-height: 1.5em;
-    margin: 0 0 20px 0;
-}
-#content table {
-    border: 1px solid #e7e7e7;
-    margin: 0 -1px 24px 0;
-    text-align: left;
-    width: 100%;
-}
-#content tr th,
-#content thead th {
-    color: #888;
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 18px;
-    padding: 9px 24px;
-}
-#content tr td {
-    border-top: 1px solid #e7e7e7;
-    padding: 6px 24px;
-}
-#content tr.odd td {
-    background: #f2f7fc;
-}
-.hentry {
-    margin: 0 0 48px 0;
-}
-.home .sticky {
-    background: #f2f7fc;
-    border-top: 4px solid #000;
-    margin-left: -20px;
-    margin-right: -20px;
-    padding: 18px 20px;
-}
-.single .hentry {
-    margin: 0 0 36px 0;
-}
-.page-title {
-    color: #000;
-    font-size: 14px;
-    font-weight: bold;
-    margin: 0 0 36px 0;
-}
-.page-title span {
-    color: #333;
-    font-size: 16px;
-    font-style: italic;
-    font-weight: normal;
-}
-.page-title a:link,
-.page-title a:visited {
-    color: #888;
-    text-decoration: none;
-}
-.page-title a:active,
-.page-title a:hover {
-    color: #ff4b33;
-}
-#content .entry-title {
-    color: #000;
-    font-size: 21px;
-    font-weight: bold;
-    line-height: 1.3em;
-    margin-bottom: 0;
-}
-.entry-title a:link,
-.entry-title a:visited {
-    color: #000;
-    text-decoration: none;
-}
-.entry-title a:active,
-.entry-title a:hover {
-    color: #ff4b33;
-}
-.entry-meta {
-    color: #888;
-    font-size: 12px;
-}
-.entry-meta abbr,
-.entry-utility abbr {
-    border: none;
-}
-.entry-meta abbr:hover,
-.entry-utility abbr:hover {
-    border-bottom: 1px dotted #666;
-}
-.entry-content,
-.entry-summary {
-    clear: both;
-    padding: 12px 0 0 0;
-}
-#content .entry-summary p:last-child {
-    margin-bottom: 12px;
-}
-.entry-content fieldset {
-    border: 1px solid #e7e7e7;
-    margin: 0 0 24px 0;
-    padding: 24px;
-}
-.entry-content fieldset legend {
-    background: #fff;
-    color: #000;
-    font-weight: bold;
-    padding: 0 4px;
-}
-.entry-content input {
-    margin: 0 0 24px 0;
-}
-.entry-content input.file,
-.entry-content input.button {
-    margin-right: 24px;
-}
-.entry-content label {
-    color: #888;
-    font-size: 12px;
-}
-.entry-content select {
-    margin: 0 0 24px 0;
-}
-.entry-content sup,
-.entry-content sub {
-    font-size: 10px;
-}
-.entry-content blockquote.left {
-    float: left;
-    margin-left: 0;
-    margin-right: 24px;
-    text-align: right;
-    width: 33%;
-}
-.entry-content blockquote.right {
-    float: right;
-    margin-left: 24px;
-    margin-right: 0;
-    text-align: left;
-    width: 33%;
-}
-.page-link {
-    color: #000;
-    font-weight: bold;
-    margin: 0 0 22px 0;
-    word-spacing: 0.5em;
-}
-.page-link a:link,
-.page-link a:visited {
-    background: #f1f1f1;
-    color: #333;
-    font-weight: normal;
-    padding: 0.5em 0.75em;
-    text-decoration: none;
-}
-.home .sticky .page-link a {
-    background: #d9e8f7;
-}
-.page-link a:active,
-.page-link a:hover {
-    color: #ff4b33;
-}
-body.page .edit-link {
-    clear: both;
-    display: block;
-}
-#entry-author-info {
-    background: #f2f7fc;
-    border-top: 4px solid #000;
-    clear: both;
-    font-size: 14px;
-    line-height: 20px;
-    margin: 24px 0;
-    overflow: hidden;
-    padding: 18px 20px;
-}
-#entry-author-info #author-avatar {
-    background: #fff;
-    border: 1px solid #e7e7e7;
-    float: left;
-    height: 60px;
-    margin: 0 -104px 0 0;
-    padding: 11px;
-}
-#entry-author-info #author-description {
-    float: left;
-    margin: 0 0 0 104px;
-}
-#entry-author-info h2 {
-    color: #000;
-    font-size: 100%;
-    font-weight: bold;
-    margin-bottom: 0;
-}
-.entry-utility {
-    clear: both;
-    color: #888;
-    font-size: 12px;
-    line-height: 18px;
-}
-.entry-meta a,
-.entry-utility a {
-    color: #888;
-}
-.entry-meta a:hover,
-.entry-utility a:hover {
-    color: #ff4b33;
-}
-#content .video-player {
-    padding: 0;
-}
-
-
-/* =Asides
--------------------------------------------------------------- */
-
-.home #content .category-asides p {
-    font-size: 14px;
-    line-height: 20px;
-    margin-bottom: 10px;
-    margin-top: 0;
-}
-.home .hentry.category-asides {
-    padding: 0;
-}
-.home #content .category-asides .entry-content {
-    padding-top: 0;
-}
-
-
-/* =Gallery listing
--------------------------------------------------------------- */
-
-.category-gallery .size-thumbnail img {
-    border: 10px solid #f1f1f1;
-    margin-bottom: 0;
-}
-.category-gallery .gallery-thumb {
-    float: left;
-    margin-right: 20px;
-    margin-top: -4px;
-}
-.home #content .category-gallery .entry-utility {
-    padding-top: 4px;
-}
-
-
-/* =Attachment pages
--------------------------------------------------------------- */
-
-.attachment .entry-content .entry-caption {
-    font-size: 140%;
-    margin-top: 24px;
-}
-.attachment .entry-content .nav-previous a:before {
-    content: '\2190\00a0';
-}
-.attachment .entry-content .nav-next a:after {
-    content: '\00a0\2192';
-}
-
-
-/* =Images
--------------------------------------------------------------- */
-
-#content img {
-    margin: 0;
-    height: auto;
-    max-width: 640px;
-    width: auto;
-}
-#content .attachment img {
-    max-width: 900px;
-}
-#content .alignleft,
-#content img.alignleft {
-    display: inline;
-    float: left;
-    margin-right: 24px;
-    margin-top: 4px;
-}
-#content .alignright,
-#content img.alignright {
-    display: inline;
-    float: right;
-    margin-left: 24px;
-    margin-top: 4px;
-}
-#content .aligncenter,
-#content img.aligncenter {
-    clear: both;
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-}
-#content img.alignleft,
-#content img.alignright,
-#content img.aligncenter {
-    margin-bottom: 12px;
-}
-#content .wp-caption {
-    background: #f1f1f1;
-    line-height: 18px;
-    margin-bottom: 20px;
-    padding: 4px;
-    text-align: center;
-}
-#content .wp-caption img {
-    margin: 5px 5px 0;
-}
-#content .wp-caption p.wp-caption-text {
-    color: #888;
-    font-size: 12px;
-    margin: 5px;
-}
-#content .wp-smiley {
-    margin: 0;
-}
-#content .gallery {
-    margin: 0 auto 18px;
-}
-#content .gallery .gallery-item {
-    float: left;
-    margin-top: 0;
-    text-align: center;
-    width: 33%;
-}
-#content .gallery img {
-    border: 2px solid #cfcfcf;
-}
-#content .gallery .gallery-caption {
-    color: #888;
-    font-size: 12px;
-    margin: 0 0 12px;
-}
-#content .gallery dl {
-    margin: 0;
-}
-#content .gallery img {
-    border: 10px solid #f1f1f1;
-}
-#content .gallery br+br {
-    display: none;
-}
-#content .attachment img { /* single attachment images should be centered */
-    display: block;
-    margin: 0 auto;
-}
-
-
-/* =Navigation
--------------------------------------------------------------- */
-
-.navigation {
-    color: #888;
-    font-size: 12px;
-    line-height: 18px;
-    overflow: hidden;
-}
-.navigation a:link,
-.navigation a:visited {
-    color: #888;
-    text-decoration: none;
-}
-.navigation a:active,
-.navigation a:hover {
-    color: #ff4b33;
-}
-.nav-previous {
-    float: left;
-    width: 50%;
-}
-.nav-next {
-    float: right;
-    text-align: right;
-    width: 50%;
-}
-#nav-above {
-    margin: 0 0 18px 0;
-}
-#nav-above {
-    display: none;
-}
-.paged #nav-above,
-.single #nav-above {
-    display: block;
-}
-#nav-below {
-    margin: -18px 0 0 0;
-}
-
-
-/* =Comments
--------------------------------------------------------------- */
-#comments {
-    clear: both;
-}
-#comments .navigation {
-    padding: 0 0 18px 0;
-}
-h3#comments-title,
-h3#reply-title {
-    color: #000;
-    font-size: 20px;
-    font-weight: bold;
-    margin-bottom: 0;
-}
-h3#comments-title {
-    padding: 24px 0;
-}
-.commentlist {
-    list-style: none;
-    margin: 0;
-}
-.commentlist li.comment {
-    border-bottom: 1px solid #e7e7e7;
-    line-height: 24px;
-    margin: 0 0 24px 0;
-    padding: 0 0 0 56px;
-    position: relative;
-}
-.commentlist li:last-child {
-    border-bottom: none;
-    margin-bottom: 0;
-}
-#comments .comment-body ul,
-#comments .comment-body ol {
-    margin-bottom: 18px;
-}
-#comments .comment-body p:last-child {
-    margin-bottom: 6px;
-}
-#comments .comment-body blockquote p:last-child {
-    margin-bottom: 24px;
-}
-.commentlist ol {
-    list-style: decimal;
-}
-.commentlist .avatar {
-    position: absolute;
-    top: 4px;
-    left: 0;
-}
-.comment-author {
-}
-.comment-author cite {
-    color: #000;
-    font-style: normal;
-    font-weight: bold;
-}
-.comment-author .says {
-    font-style: italic;
-}
-.comment-meta {
-    font-size: 12px;
-    margin: 0 0 18px 0;
-}
-.comment-meta a:link,
-.comment-meta a:visited {
-    color: #888;
-    text-decoration: none;
-}
-.comment-meta a:active,
-.comment-meta a:hover {
-    color: #ff4b33;
-}
-.commentlist .even {
-}
-.commentlist .bypostauthor {
-}
-.reply {
-    font-size: 12px;
-    padding: 0 0 24px 0;
-}
-.reply a,
-a.comment-edit-link {
-    color: #888;
-}
-.reply a:hover,
-a.comment-edit-link:hover {
-    color: #ff4b33;
-}
-.commentlist .children {
-    list-style: none;
-    margin: 0;
-}
-.commentlist .children li {
-    border: none;
-    margin: 0;
-}
-.nopassword,
-.nocomments {
-    display: none;
-}
-#comments .pingback {
-    border-bottom: 1px solid #e7e7e7;
-    margin-bottom: 18px;
-    padding-bottom: 18px;
-}
-.commentlist li.comment+li.pingback {
-    margin-top: -6px;
-}
-#comments .pingback p {
-    color: #888;
-    display: block;
-    font-size: 12px;
-    line-height: 18px;
-    margin: 0;
-}
-#comments .pingback .url {
-    font-size: 13px;
-    font-style: italic;
-}
-
-/* Comments form */
-input[type=submit] {
-    color: #333;
-}
-#respond {
-    border-top: 1px solid #e7e7e7;
-    margin: 24px 0;
-    overflow: hidden;
-    position: relative;
-}
-#respond p {
-    margin: 0;
-}
-#respond .comment-notes {
-    margin-bottom: 1em;
-}
-.form-allowed-tags {
-    line-height: 1em;
-}
-.children #respond {
-    margin: 0 48px 0 0;
-}
-h3#reply-title {
-    margin: 18px 0;
-}
-#comments-list #respond {
-    margin: 0 0 18px 0;
-}
-#comments-list ul #respond {
-    margin: 0;
-}
-#cancel-comment-reply-link {
-    font-size: 12px;
-    font-weight: normal;
-    line-height: 18px;
-}
-#respond .required {
-    color: #ff4b33;
-    font-weight: bold;
-}
-#respond label {
-    color: #888;
-    font-size: 12px;
-}
-#respond input {
-    margin: 0 0 9px;
-    width: 98%;
-}
-#respond textarea {
-    width: 98%;
-}
-#respond .form-allowed-tags {
-    color: #888;
-    font-size: 12px;
-    line-height: 18px;
-}
-#respond .form-allowed-tags code {
-    font-size: 11px;
-}
-#respond .form-submit {
-    margin: 12px 0;
-}
-#respond .form-submit input {
-    font-size: 14px;
-    width: auto;
-}
-
-
-/* =Widget Areas
--------------------------------------------------------------- */
-
-.widget-area ul {
-    list-style: none;
-    margin-left: 0;
-}
-.widget-area ul ul {
-    list-style: square;
-    margin-left: 1.3em;
-}
-.widget_search #s {/* This keeps the search inputs in line */
-    width: 60%;
-}
-.widget_search label {
-    display: none;
-}
-.widget-container {
-    margin: 0 0 18px 0;
-}
-.widget-title {
-    color: #222;
-    font-weight: bold;
-}
-.widget-area a:link,
-.widget-area a:visited {
-    text-decoration: none;
-}
-.widget-area a:active,
-.widget-area a:hover {
-    text-decoration: underline;
-}
-.widget-area .entry-meta {
-    font-size: 11px;
-}
-#wp_tag_cloud div {
-    line-height: 1.6em;
-}
-#wp-calendar {
-    width: 100%;
-}
-#wp-calendar caption {
-    color: #222;
-    font-size: 14px;
-    font-weight: bold;
-    padding-bottom: 4px;
-    text-align: left;
-}
-#wp-calendar thead {
-    font-size: 11px;
-}
-#wp-calendar thead th {
-}
-#wp-calendar tbody {
-    color: #aaa;
-}
-#wp-calendar tbody td {
-    background: #f5f5f5;
-    border: 1px solid #fff;
-    padding: 3px 0 2px;
-    text-align: center;
-}
-#wp-calendar tbody .pad {
-    background: none;
-}
-#wp-calendar tfoot #next {
-    text-align: right;
-}
-.widget_rss a.rsswidget {
-    color: #000;
-}
-.widget_rss a.rsswidget:hover {
-    color: #ff4b33;
-}
-.widget_rss .widget-title img {
-    width: 11px;
-    height: 11px;
-}
-
-/* Main sidebars */
-#main .widget-area ul {
-    margin-left: 0;
-    padding: 0 20px 0 0;
-}
-#main .widget-area ul ul {
-    border: none;
-    margin-left: 1.3em;
-    padding: 0;
-}
-#primary {
-}
-#secondary {
-}
-
-/* Footer widget areas */
-#footer-widget-area {
-}
-
-
-/* =Footer
--------------------------------------------------------------- */
-
-#footer {
-    margin-bottom: 20px;
-}
-#colophon {
-    border-top: 4px solid #000;
-    margin-top: -4px;
-    overflow: hidden;
-    padding: 18px 0;
-}
-#site-info {
-    font-weight: bold;
-}
-#site-info a {
-    color: #000;
-    text-decoration: none;
-}
-#site-generator {
-    font-style: italic;
-    position: relative;
-}
-#site-generator a {
-    background: url(images/wordpress.png) center left no-repeat;
-    color: #666;
-    display: inline-block;
-    line-height: 16px;
-    padding-left: 20px;
-    text-decoration: none;
-}
-#site-generator a:hover {
-    text-decoration: underline;
-}
-img#wpstats {
-    display: block;
-    margin: 0 auto 10px;
-}
-
-
-/* =Mobile Safari ( iPad, iPhone and iPod Touch )
--------------------------------------------------------------- */
-
-pre {
-    -webkit-text-size-adjust: 140%;
-}
-code {
-    -webkit-text-size-adjust: 160%;
-}
-#access,
-.entry-meta,
-.entry-utility,
-.navigation,
-.widget-area {
-    -webkit-text-size-adjust: 120%;
-}
-#site-description {
-    -webkit-text-size-adjust: none;
-}
-
-
-/* =Print Style
--------------------------------------------------------------- */
-
-@media print {
-    body {
-        background: none !important;
-    }
-    #wrapper {
-        clear: both !important;
-        display: block !important;
-        float: none !important;
-        position: relative !important;
-    }
-    #header {
-        border-bottom: 2pt solid #000;
-        padding-bottom: 18pt;
-    }
-    #colophon {
-        border-top: 2pt solid #000;
-    }
-    #site-title,
-    #site-description {
-        float: none;
-        line-height: 1.4em;
-        margin: 0;
-        padding: 0;
-    }
-    #site-title {
-        font-size: 13pt;
-    }
-    .entry-content {
-        font-size: 14pt;
-        line-height: 1.6em;
-    }
-    .entry-title {
-        font-size: 21pt;
-    }
-    #access,
-    #branding img,
-    #respond,
-    .comment-edit-link,
-    .edit-link,
-    .navigation,
-    .page-link,
-    .widget-area {
-        display: none !important;
-    }
-    #container,
-    #header,
-    #footer {
-        margin: 0;
-        width: 100%;
-    }
-    #content,
-    .one-column #content {
-        margin: 24pt 0 0;
-        width: 100%;
-    }
-    .wp-caption p {
-        font-size: 11pt;
-    }
-    #site-info,
-    #site-generator {
-        float: none;
-        width: auto;
-    }
-    #colophon {
-        width: auto;
-    }
-    img#wpstats {
-        display: none;
-    }
-    #site-generator a {
-        margin: 0;
-        padding: 0;
-    }
-    #entry-author-info {
-        border: 1px solid #e7e7e7;
-    }
-    #main {
-        display: inline;
-    }
-    .home .sticky {
-        border: none;
-    }
-}
-
-/* bbPress Style
--------------------------------------------------------------- */
-
-hr { margin: 0 0 24px 0 !important; }
-#entry-author-info {
-    margin: 10px 0 0 0;
-    border-bottom: 1px solid #fff;
-}
-
-/* tables */
-table.bbp-forums th, table.bbp-topics th,
-table.bbp-topic th, table.bbp-replies th {
-    background-color: #f5f5f5;
-}
-table.bbp-forums th span, table.bbp-topics th span,
-table.bbp-topic th span, table.bbp-replies th span {
-    float: right;
-}
-table.bbp-forums tfoot td, table.bbp-topics tfoot td,
-table.bbp-topic tfoot td, table.bbp-replies tfoot td,
-tr.bbp-reply-header td, tr.bbp-topic-header td {
-    background-color: #fafafa;
-    color: #888;
-    font-size: 12px;
-    font-weight: bold;
-    font-family: 'Helvetica Neue', Arial, Helvetica, 'Nimbus Sans L', sans-serif;
-}
-
-.bbp-forum-topic-count, .bbp-forum-topic-replies,
-.bbp-topic-reply-count, .bbp-topic-voice-count, .bbp-topic-action {
-    width: 10%;
-    text-align: center;
-}
-.bbp-topic-freshness, .bbp-forum-freshness {
-    text-align: center;
-    width: 20%;
-}
-.bbp-topic-author, .bbp-reply-author {
-    width: 90px;
-    text-align: center;
-    padding: 0 10px;
-}
-
-.bbp-topic-content, .bbp-reply-content {
-    vertical-align: top;
-}
-span.bbp-admin-links {
-    float: right;
-    color: #d0d0d0;
-}
-
-.bbp-topic-action #favorite-toggle a {
-    text-decoration: none;
-    padding: 0px 3px 1px;
-    color: #7c7;
-    border: 1px solid #aca;
-    background-color: #dfd;
-    font-weight: bold;
-    font-size: 13px;
-    -moz-border-radius: 8px;
-    -webkit-border-radius: 8px;
-    }
-    .bbp-topic-action #favorite-toggle a:hover {
-        color: #5a5;
-        border-color: #7c7;
-        background-color: #beb;
-    }
-    .bbp-topic-action #favorite-toggle span.is-favorite a {
-        color: #faa;
-        border: 1px solid #faa;
-        background-color: #fee;
-        -moz-border-radius: 5px;
-        -webkit-border-radius: 5px;
-        }
-        .bbp-topic-action #favorite-toggle span.is-favorite a:hover {
-            color: #c88;
-            border-color: #c88;
-            background-color: #fdd;
-        }
-
-.bbp-reply-header td {
-    background-color: #fafafa;
-}
-#content p.bbp-topic-meta {
-    margin-bottom: 0;
-    font-size: 0.7em;
-}
-
-/* pagination */
-.bbp-pagination-count {
-    float: left;
-}
-.bbp-pagination-links {
-    float: right;
-}
-.bbp-pagination {
-    float: left;
-    width: 100%;
-    margin-bottom: 20px;
-}
-
-/* forms */
-.bbp-topic-form, .bbp-reply-form {
-    clear: left;
-}
+ *
+ **
+ *
+ * This file intentionally left blank. Styles are enqueued in functions.php
+ *
+ * Please see:
+ *
+ * - /css/twentyten.css
+ *
+ * - /css/bbpress.css
+ *
+ **/