Changeset 1531

Timestamp:

05/14/08 17:18:17 (7 months ago)

Author:

sambauers

Message:

Enable categories using forum meta data. See #520

Files:

• trunk/bb-admin/admin-functions.php (modified) (7 diffs)
• trunk/bb-includes/template-functions.php (modified) (4 diffs)
• trunk/bb-templates/kakumei/forum.php (modified) (1 diff)
• trunk/bb-templates/kakumei/front-page.php (modified) (1 diff)
• trunk/bb-templates/kakumei/style.css (modified) (1 diff)

trunk/bb-admin/admin-functions.php

@@ -506 +506 @@
-                return false;
-
-
+, 'forum_is_category' => 0
-        $args = wp_parse_args( $args, $defaults );
-        if ( 1 < func_num_args() ) : // For back compat
@@ -521 +521 @@
-        $forum_order = (int) $forum_order;
-        $forum_parent = (int) $forum_parent;
+        $forum_is_category = (int) $forum_is_category;
-
-        $forum_name = apply_filters( 'bb_pre_forum_name', stripslashes($forum_name) );
@@ -540 +541 @@
-        $bbdb->insert( $bbdb->forums, compact( 'forum_name', 'forum_slug', 'forum_desc', 'forum_parent', 'forum_order' ) );
-        $forum_id = $bbdb->insert_id;
-
+
+
-        wp_cache_flush( 'bb_forums' );
-
@@ -552 +554 @@
-                return false;
-
-
+, 'forum_is_category' => 0
-        $args = wp_parse_args( $args, $defaults );
-        if ( 1 < func_num_args() ) : // For back compat
@@ -567 +569 @@
-        $forum_order = (int) $forum_order;
-        $forum_parent = (int) $forum_parent;
+        $forum_is_category = (int) $forum_is_category;
-
-        $forum_name = apply_filters( 'bb_pre_forum_name', stripslashes($forum_name) );
@@ -578 +581 @@
-        wp_cache_flush( 'bb_forums' );
-
-
+
+
+
+
+
+
+
-}
-
@@ -662 +671 @@
-                </tr>
-                <tr id="forum-parent-row"><th scope="row"><label for="forum_parent"><?php _e('Forum Parent:'); ?></label></th>
-
+, 'disable_categories' => 0
-                </tr>
-                <tr id="forum-position-row"><th scope="row"><label for="forum-order"><?php _e('Position:'); ?></label></th>
-                        <td><input type="text" name="forum_order" id="forum-order" value="<?php if ( $forum_id ) echo get_forum_position( $forum_id ); ?>" tabindex="12" maxlength="10" class="widefat" /></td>
+                </tr>
+                <tr id="forum-is-category-row"><th scope="row"><label for="forum-is-category"><?php _e('Forum is Category:'); ?></label></th>
+                        <td><input type="checkbox" name="forum_is_category" id="forum-is-category" value="1" <?php if ( $forum_id && bb_get_forum_is_category($forum_id) ) : ?>checked="checked" <?php endif; ?>tabindex="13" /></td>
-                </tr>
-        </table>

trunk/bb-includes/template-functions.php

@@ -130 +130 @@
-function post_form( $h2 = '' ) {
-        global $page, $topic, $forum;
+        
+        if ($forum->forum_is_category)
+                return;
+        
-        $add = topic_pages_add();
-        if ( empty($h2) && false !== $h2 ) {
@@ -547 +551 @@
-}
-
+function bb_get_forum_is_category( $forum_id = 0 ) {
+        $forum = get_forum( get_forum_id( $forum_id ) );
+        return apply_filters( 'bb_get_forum_is_category', $forum->forum_is_category, $forum->forum_id );
+}
+
-function forum_topics( $forum_id = 0 ) {
-        echo apply_filters( 'forum_topics', get_forum_topics( $forum_id ), $forum_id );
@@ -2208 +2217 @@
-
-function bb_get_forum_dropdown( $args = '' ) {
-
+, 'disable_categories' => 1
-        if ( $args && is_string($args) && false === strpos($args, '=') )
-                $args = array( 'callback' => $args );
@@ -2231 +2240 @@
-                $none = __('- None -');
-
-"<select name='$name' id='$id' tabindex='$tab'>
+'<select name="' . $name . '" id="' . $id . '" tabindex="' . $tab . '">' . "
-        if ( $none )
-
-
+
+
+
+
-        while ( $depth = bb_forum() ) :
-                global $forum; // Globals + References = Pain
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        endwhile;
+        
+        foreach ($options as $option_index => $option_value) {
+                if (!$none && !$selected && $no_option_selected && !$option_value['disabled']) {
+                        $option_value['selected'] = true;
+                        $no_option_selected = false;
+                }
+                $option_disabled = $option_value['disabled'] ? ' disabled="disabled"' : '';
+                $option_selected = $option_value['selected'] ? ' selected="selected"' : '';
+                $r .= "\n" . '<option value="' . $option_value['value'] . '"' . $option_disabled . $option_selected . '>' . $option_value['display'] . '</option>' . "\n";
+        }
+        
-        $forum = $old_global;
-"</select>
+'</select>' . "
-        return $r;
-}

trunk/bb-templates/kakumei/forum.php

@@ -48 +48 @@
-
-<?php while ( bb_forum() ) : ?>
+<?php if (bb_get_forum_is_category()) : ?>
+<tr<?php bb_forum_class('bb-category'); ?>>
+        <td colspan="3"><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><small><?php forum_description(); ?></small><?php bb_forum_pad( '</div>' ); ?></td>
+</tr>
+<?php continue; endif; ?>
-<tr<?php bb_forum_class(); ?>>
-        <td><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><small><?php forum_description(); ?></small><?php bb_forum_pad( '</div>' ); ?></td>

trunk/bb-templates/kakumei/front-page.php

@@ -51 +51 @@
-</tr>
-<?php while ( bb_forum() ) : ?>
+<?php if (bb_get_forum_is_category()) : ?>
+<tr<?php bb_forum_class('bb-category'); ?>>
+        <td colspan="3"><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><small><?php forum_description(); ?></small><?php bb_forum_pad( '</div>' ); ?></td>
+</tr>
+<?php continue; endif; ?>
-<tr<?php bb_forum_class(); ?>>
-        <td><?php bb_forum_pad( '<div class="nest">' ); ?><a href="<?php forum_link(); ?>"><?php forum_name(); ?></a><small><?php forum_description(); ?></small><?php bb_forum_pad( '</div>' ); ?></td>

trunk/bb-templates/kakumei/style.css

@@ -478 +478 @@
-        padding: 5px 10px;
-        text-transform: uppercase;
+}
+
+tr.bb-category td {
+        background-color: #ddd;
-}
-