Changeset 3624

Timestamp:

11/20/2011 09:39:16 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Add topic sticky dropdown to wp-admin metabox. Fixes #1625. Props GautamGupta.

Location:

branches/plugin

Files:

• bbp-admin/bbp-metaboxes.php (modified) (1 diff)
• bbp-admin/bbp-topics.php (modified) (3 diffs)
• bbp-includes/bbp-topic-template.php (modified) (2 diffs)

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

@@ -338 +338 @@
     </p>
 
+    <p><strong><?php _e( 'Topic Type', 'bbpress' ); ?></strong></p>
+
+    <p>
+        <label class="screen-reader-text" for="bbp_stick_topic"><?php _e( 'Topic Type', 'bbpress' ); ?></label>
+        <?php bbp_topic_type_select( array( 'topic_id' => $post->ID ) ); ?>
+    </p>
+
     <?php
 

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

@@ -118 +118 @@
         $bbp_contextual_help[] = __( '<strong>Title</strong> - Enter a title for your topic. After you enter a title, you will see the permalink below, which you can edit.', 'bbpress' );
         $bbp_contextual_help[] = __( '<strong>Post editor</strong> - Enter the text for your topic. There are two modes of editing: Visual and HTML. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The screen icon just before that allows you to expand the edit box to full screen. The HTML mode allows you to enter raw HTML along with your forum text. You can insert media files by clicking the icons above the post editor and following the directions.', 'bbpress' );
-        $bbp_contextual_help[] = __( '<strong>Topic Attributes</strong> - Select the attributes that your topic should have. The Forum dropdown determines the parent forum that the topic belongs to. Select the forum or category from the dropdown, or leave the default (No Forum) to post the topic without an assigned forum.', 'bbpress' );
+        $bbp_contextual_help[] = __( '<strong>Topic Attributes</strong> - Select the attributes that your topic should have. The Forum dropdown determines the parent forum that the topic belongs to. Select the forum or category from the dropdown, or leave the default (No Forum) to post the topic without an assigned forum. The topic type drop down indicates the sticky status of the topic. Selecting the super sticky option would stick the topic to the front of your forums, i.e. the topic index, sticky option would stick the topic to its respective forum. Selecting normal would not stick the topic anywhere.', 'bbpress' );
         $bbp_contextual_help[] = __( '<strong>Publish</strong> - The Publish box will allow you to save your topic as Draft or Pending Review. You may Preview your topic before it is published as well. The Visibility will determine whether the topic is Public, Password protected (requiring a password on the site to view) or Private (only the author will have access to it). Topics may be published immediately by clicking the dropdown, or at a specific date and time by clicking the Edit link.', 'bbpress' );
         $bbp_contextual_help[] = __( '<strong>Topic Tags</strong> - You can assign keywords to your topics using Topic Tags. Unlike categories, tags have no hierarchy, meaning there is no relationship from one tag to another. Topics can be added and modified further from the Topic Tags screen.', 'bbpress' );
@@ -142 +142 @@
         /** Post Rows *********************************************************/
 
-        $bbp_contextual_help[] = __( 'This screen displays the topics created on your site.',           'bbpress' );
+        $bbp_contextual_help[] = __( 'This screen displays the topics created on your site.',             'bbpress' );
         $bbp_contextual_help[] = __( 'You can customize the display of this screen in a number of ways:', 'bbpress' );
         $bbp_contextual_help[] =
@@ -263 +263 @@
         // Formally update the topic
         bbp_update_topic( $topic_id, $forum_id );
+
+        // Stickies
+        if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
+
+            // What's the haps?
+            switch ( $_POST['bbp_stick_topic'] ) {
+
+                // Sticky in this forum
+                case 'stick'   :
+                    bbp_stick_topic( $topic_id );
+                    break;
+
+                // Super sticky in all forums
+                case 'super'   :
+                    bbp_stick_topic( $topic_id, true );
+                    break;
+
+                // Normal
+                case 'unstick' :
+                default        :
+                    bbp_unstick_topic( $topic_id );
+                    break;
+            }
+        }
 
         // Allow other fun things to happen

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

@@ -2620 +2620 @@
  *  - topic_id: Topic id
  * @uses bbp_get_topic_id() To get the topic id
+ * @uses bbp_is_single_topic() To check if we're viewing a single topic
  * @uses bbp_is_topic_edit() To check if it is the topic edit page
  * @uses bbp_is_topic_super_sticky() To check if the topic is a super sticky
@@ -2638 +2639 @@
     extract( $r );
 
-    // Get current topic id
-    $topic_id = bbp_get_topic_id( $topic_id );
-
     // Edit topic
-    if ( bbp_is_topic_edit() ) {
+    if ( bbp_is_single_topic() || bbp_is_topic_edit() ) {
+
+        // Get current topic id
+        $topic_id = bbp_get_topic_id( $topic_id );
 
         // Post value is passed