Skip to:
Content

bbPress.org

Changeset 2810


Ignore:
Timestamp:
01/17/2011 05:26:05 AM (14 years ago)
Author:
johnjamesjacoby
Message:

Normalize bbp-twentyten theme files. Introduce bbp_tab_index functions for forms. Rename some page- files to action- since they are not page templates. Introduce bbp_login and bbp_register place-holders in bbp-twentyten theme.

Location:
branches/plugin
Files:
2 added
33 edited
3 moved

Legend:

Unmodified
Added
Removed

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

    r2790 r2810  
    669669    // Editing a topic
    670670    } elseif ( bbp_is_topic_edit() ) {
    671         $template = array( 'page-bbp_edit.php', 'single-' . $bbp->topic_id, 'single.php', 'index.php' );
     671        $template = array( 'action-bbp_edit.php', 'single-' . $bbp->topic_id, 'single.php', 'index.php' );
    672672
    673673        if ( !empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'merge', 'split' ) ) )
    674             array_unshift( $template, 'page-bbp_split-merge.php' );
     674            array_unshift( $template, 'action-bbp_split-merge.php' );
    675675
    676676    // Editing a reply
    677677    } elseif ( bbp_is_reply_edit() ) {
    678         $template = array( 'page-bbp_edit.php', 'single-' . $bbp->reply_id, 'single.php', 'index.php' );
     678        $template = array( 'action-bbp_edit.php', 'single-' . $bbp->reply_id, 'single.php', 'index.php' );
    679679    }
    680680

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

    r2804 r2810  
    322322
    323323/** START Form Functions ******************************************************/
     324
     325/**
     326 * Output the current tab index of a given form
     327 *
     328 * Use this function to handle the tab indexing of user facing forms within a
     329 * template file. Calling this function will automatically increment the global
     330 * tab index by default.
     331 *
     332 * @param int $auto_increment Optional Default true. Set to false to prevent ++
     333 */
     334function bbp_tab_index( $auto_increment = true) {
     335    echo bbp_get_tab_index( $auto_increment );
     336}
     337
     338    /**
     339     * Output the current tab index of a given form
     340     *
     341     * Use this function to handle the tab indexing of user facing forms within a
     342     * template file. Calling this function will automatically increment the global
     343     * tab index by default.
     344     *
     345     * @uses apply_filters Allows return value to be filtered
     346     * @param int $auto_increment Optional Default true. Set to false to prevent ++
     347     * @return int $bbp->tab_index The global tab index
     348     */
     349    function bbp_get_tab_index( $auto_increment = true ) {
     350        global $bbp;
     351
     352        if ( true === $auto_increment )
     353            ++$bbp->tab_index;
     354
     355        return apply_filters( 'bbp_get_tab_index', (int) $bbp->tab_index );
     356    }
    324357
    325358/**
    … …  
    393426            // Output-related
    394427            'select_id'          => 'bbp_forum_id',
    395             'tab'                => false,
     428            'tab'                => bbp_get_tab_index(),
    396429            'options_only'       => false,
    397430            'show_none'          => false,

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

    r2809 r2810  
    21852185        'super_text'   => __( 'Super Sticky', 'bbpress' ),
    21862186        'select_id'    => 'bbp_stick_topic',
    2187         'tab'          => 0,
     2187        'tab'          => bbp_get_tab_index(),
    21882188        'topic_id'     => 0
    21892189    );

  • branches/plugin/bbp-themes/bbp-twentyten/action-bbp_edit.php

    r2779 r2810  
    11<?php
     2
    23/**
    3  * Edit topic/reply page
     4 * Edit handler for topics and replies
    45 *
    56 * @package bbPress
    6  * @subpackage Themes
     7 * @subpackage Theme
    78 */
     9
    810?>
     11
    912<?php get_header(); ?>
    1013

  • branches/plugin/bbp-themes/bbp-twentyten/action-bbp_split-merge.php

    r2779 r2810  
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    1010?>
     11
    1112<?php get_header(); ?>
    1213

  • branches/plugin/bbp-themes/bbp-twentyten/css/bbpress.css

    r2785 r2810  
    340340-------------------------------------------------------------- */
    341341
    342 tr.super-sticky td,
     342.bbp-topics-front tr.super-sticky td,
    343343.bbp-forum-info tr.sticky td {
    344344    background-color: #ffffe0 !important;

  • branches/plugin/bbp-themes/bbp-twentyten/form-bbp_anonymous.php

    r2753 r2810  
    11<?php
     2
    23/**
    3  * Anonymous user form
     4 * Anonymous User
    45 *
    56 * @package bbPress
    6  * @subpackage Themes
     7 * @subpackage Theme
    78 */
     9
    810?>
     11
    912                    <?php if ( bbp_is_anonymous() || ( bbp_is_topic_edit() && bbp_is_topic_anonymous() ) || ( bbp_is_reply_edit() && bbp_is_reply_anonymous() ) ) : ?>
    1013
    … …  
    1316                            <p>
    1417                                <label for="bbp_anonymous_author"><?php _e( 'Name (required):', 'bbpress' ); ?></label><br />
    15                                 <input type="text" id="bbp_anonymous_author" value="<?php bbp_is_topic_edit() ? bbp_topic_author() : bbp_is_reply_edit() ? bbp_reply_author() : bbp_current_anonymous_user_data( 'name' ); ?>" tabindex="4" size="40" name="bbp_anonymous_name" />
     18                                <input type="text" id="bbp_anonymous_author" value="<?php bbp_is_topic_edit() ? bbp_topic_author() : bbp_is_reply_edit() ? bbp_reply_author() : bbp_current_anonymous_user_data( 'name' ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_anonymous_name" />
    1619                            </p>
    1720
    1821                            <p>
    1922                                <label for="bbp_anonymous_email"><?php _e( 'Mail (will not be published) (required):', 'bbpress' ); ?></label><br />
    20                                 <input type="text" id="bbp_anonymous_email" value="<?php echo ( bbp_is_topic_edit() || bbp_is_reply_edit() ) ? get_post_meta( $post->ID, '_bbp_anonymous_email', true ) : bbp_get_current_anonymous_user_data( 'email' ); ?>" tabindex="6" size="40" name="bbp_anonymous_email" />
     23                                <input type="text" id="bbp_anonymous_email" value="<?php echo ( bbp_is_topic_edit() || bbp_is_reply_edit() ) ? get_post_meta( $post->ID, '_bbp_anonymous_email', true ) : bbp_get_current_anonymous_user_data( 'email' ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_anonymous_email" />
    2124                            </p>
    2225
    2326                            <p>
    2427                                <label for="bbp_anonymous_website"><?php _e( 'Website:', 'bbpress' ); ?></label><br />
    25                                 <input type="text" id="bbp_anonymous_website" value="<?php bbp_is_topic_edit() ? bbp_topic_author_url() : bbp_is_reply_edit() ? bbp_reply_author_url() : bbp_current_anonymous_user_data( 'website' ); ?>" tabindex="8" size="40" name="bbp_anonymous_website" />
     28                                <input type="text" id="bbp_anonymous_website" value="<?php bbp_is_topic_edit() ? bbp_topic_author_url() : bbp_is_reply_edit() ? bbp_reply_author_url() : bbp_current_anonymous_user_data( 'website' ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_anonymous_website" />
    2629                            </p>
    2730                        </fieldset>

  • branches/plugin/bbp-themes/bbp-twentyten/form-bbp_merge.php

    r2758 r2810  
    22
    33/**
    4  * Merge topic form
     4 * Merge Topic
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    … …  
    4343                            <?php
    4444                                global $bbp;
    45                                 bbp_dropdown( array( 'post_type' => $bbp->topic_id, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'selected' => -1, 'exclude' => bbp_get_topic_id(), 'select_id' => 'bbp_destination_topic', 'tab' => 4, 'none_found' => __( 'No topics were found to which the topic could be merged to!', 'bbpress' ) ) );
     45                                bbp_dropdown( array( 'post_type' => $bbp->topic_id, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'selected' => -1, 'exclude' => bbp_get_topic_id(), 'select_id' => 'bbp_destination_topic', 'none_found' => __( 'No topics were found to which the topic could be merged to!', 'bbpress' ) ) );
    4646                            ?>
    4747                        </div>
    … …  
    5555                            <?php if ( bbp_is_subscriptions_active() ) : ?>
    5656
    57                                 <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="6" />
     57                                <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    5858                                <label for="bbp_topic_subscribers"><?php _e( 'Merge topic subscribers', 'bbpress' ); ?></label><br />
    5959
    6060                            <?php endif; ?>
    6161
    62                             <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="8" />
     62                            <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    6363                            <label for="bbp_topic_favoriters"><?php _e( 'Merge topic favoriters', 'bbpress' ); ?></label><br />
    6464
    65                             <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="10" />
     65                            <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    6666                            <label for="bbp_topic_tags"><?php _e( 'Merge topic tags', 'bbpress' ); ?></label><br />
    6767
    … …  
    7070
    7171                    <p id="bbp_topic_submit_container">
    72                         <button type="submit" tabindex="12" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
     72                        <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
    7373                    </p>
    7474                </div>

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

    r2782 r2810  
    11<?php
     2
    23/**
    3  * New/edit bbPress reply form
     4 * New/Edit Reply
    45 *
    56 * @package bbPress
    6  * @subpackage Themes
     7 * @subpackage Theme
    78 */
     9
    810?>
     11
    912<?php if ( bbp_is_reply_edit() || bbp_is_topic_open() || current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
    1013
    … …  
    3033
    3134                        <?php bbp_is_reply_edit() ? bbp_reply_author_avatar( bbp_get_reply_id(), 80 ) : bbp_current_user_avatar( 80 ); ?>
     35
    3236                    </div>
    3337
    … …  
    3842                        <p>
    3943                            <label for="bbp_reply_content"><?php _e( 'Reply:', 'bbpress' ); ?></label><br />
    40                             <textarea id="bbp_reply_content" tabindex="8" name="bbp_reply_content" cols="52" rows="6"><?php echo ( bbp_is_reply_edit() && !empty( $post->post_content ) ) ? $post->post_content : ''; ?></textarea>
     44                            <textarea id="bbp_reply_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_reply_content" cols="52" rows="6"><?php echo ( bbp_is_reply_edit() && !empty( $post->post_content ) ) ? $post->post_content : ''; ?></textarea>
    4145                        </p>
    4246
    … …  
    5155                            <p>
    5256                                <label for="bbp_topic_tags"><?php _e( 'Tags:', 'bbpress' ); ?></label><br />
    53                                 <input id="bbp_topic_tags" type="text" value="" tabindex="10" size="40" name="bbp_topic_tags" />
     57                                <input id="bbp_topic_tags" type="text" value="" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_tags" />
    5458                            </p>
    5559
    … …  
    6165                            <p>
    6266                                <?php if ( bbp_is_reply_edit() && $post->post_author != bbp_get_current_user_id() ) : ?>
    63                                     <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( $post->post_author, bbp_get_reply_topic_id() ) ); ?> tabindex="12" />
     67                                    <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( $post->post_author, bbp_get_reply_topic_id() ) ); ?> tabindex="<?php bbp_tab_index(); ?>" />
    6468                                    <label for="bbp_topic_subscription"><?php _e( 'Notify the author of follow-up replies via email', 'bbpress' ); ?></label>
    6569
    6670                                <?php else : ?>
    67                                     <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( bbp_get_user_id( 0, false, true ), bbp_get_reply_topic_id() ) ); ?> tabindex="12" />
     71                                    <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( bbp_get_user_id( 0, false, true ), bbp_get_reply_topic_id() ) ); ?> tabindex="<?php bbp_tab_index(); ?>" />
    6872                                    <label for="bbp_topic_subscription"><?php _e( 'Notify me of follow-up replies via email', 'bbpress' ); ?></label>
    6973
    … …  
    7882                                <legend><?php _e( 'Revision', 'bbpress' ); ?></legend>
    7983                                <div>
    80                                     <input name="bbp_log_reply_edit" id="bbp_log_reply_edit" type="checkbox" value="1" checked="checked" tabindex="14" />
     84                                    <input name="bbp_log_reply_edit" id="bbp_log_reply_edit" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    8185                                    <label for="bbp_log_reply_edit"><?php _e( 'Keep a log of this edit:', 'bbpress' ); ?></label><br />                                                                         
    8286                                </div>
    … …  
    8488                                <div>                                   
    8589                                    <label for="bbp_reply_edit_reason"><?php printf( __( 'Optional reason for editing:', 'bbpress' ), bbp_get_current_user_name() ); ?></label><br />
    86                                     <input type="text" value="" tabindex="16" size="40" name="bbp_reply_edit_reason" id="bbp_reply_edit_reason" />
     90                                    <input type="text" value="" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_reply_edit_reason" id="bbp_reply_edit_reason" />
    8791                                </div>
    8892                            </fieldset>
    … …  
    9195
    9296                        <p id="bbp_reply_submit_container">
    93                             <button type="submit" tabindex="18" id="bbp_reply_submit" name="bbp_reply_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
     97                            <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_reply_submit" name="bbp_reply_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
    9498                        </p>
    9599                    </div>

  • branches/plugin/bbp-themes/bbp-twentyten/form-bbp_split.php

    r2758 r2810  
    22
    33/**
    4  * Split topic form
     4 * Split Topic
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    1010?>
     11
    1112<?php if ( is_user_logged_in() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
    1213
    … …  
    3132                    </div>
    3233
    33                     <?php // @todo Make a codex and add the merge topic docs. ?>
    34                     <?php // printf( __( 'For more information, check <a href="%s">this documentation.', 'bbpress' ), 'http://codex.bbpress.org/Merge_Topics' ); ?>
     34                    <?php
     35                    /**
     36                     * @todo Make a codex and add the merge topic docs.
     37                     * printf( __( 'For more information, check <a href="%s">this documentation.', 'bbpress' ), 'http://codex.bbpress.org/Merge_Topics' );
     38                     */
     39                    ?>
    3540
    3641                    <fieldset>
    … …  
    3843
    3944                        <div>
    40                             <input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" tabindex="10" />
     45                            <input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" tabindex="<?php bbp_tab_index(); ?>" />
    4146                            <label for="bbp_topic_split_option_reply"><?php _e( 'Creating a new topic in this forum:', 'bbpress' ); ?></label>
    42                             <input type="text" id="bbp_topic_split_destination_title" value="<?php bbp_topic_title(); ?>" tabindex="12" size="40" name="bbp_topic_split_destination_title" /><br />
     47                            <input type="text" id="bbp_topic_split_destination_title" value="<?php bbp_topic_title(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_split_destination_title" /><br />
    4348
    44                             <input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" tabindex="14" />
     49                            <input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" tabindex="<?php bbp_tab_index(); ?>" />
    4550                            <label for="bbp_topic_split_option_existing"><?php _e( 'Use an existing topic in this forum:', 'bbpress' ); ?></label>
    4651
    4752                            <?php
    4853                                global $bbp;
    49                                 bbp_dropdown( array( 'post_type' => $bbp->topic_id, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'selected' => -1, 'exclude' => bbp_get_topic_id(), 'select_id' => 'bbp_destination_topic', 'tab' => 16, 'none_found' => __( 'No topics were found to which the topic could be split to!', 'bbpress' ) ) );
     54                                bbp_dropdown( array( 'post_type' => $bbp->topic_id, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'selected' => -1, 'exclude' => bbp_get_topic_id(), 'select_id' => 'bbp_destination_topic', 'none_found' => __( 'No topics were found to which the topic could be split to!', 'bbpress' ) ) );
    5055                            ?>
    5156
    … …  
    6065                            <?php if ( bbp_is_subscriptions_active() ) : ?>
    6166
    62                                 <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="4" />
     67                                <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    6368                                <label for="bbp_topic_subscribers"><?php _e( 'Copy subscribers to the new topic', 'bbpress' ); ?></label><br />
    6469
    6570                            <?php endif; ?>
    6671
    67                             <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="6" />
     72                            <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    6873                            <label for="bbp_topic_favoriters"><?php _e( 'Copy favoriters to the new topic', 'bbpress' ); ?></label><br />
    6974
    70                             <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="8" />
     75                            <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    7176                            <label for="bbp_topic_tags"><?php _e( 'Copy topic tags to the new topic', 'bbpress' ); ?></label><br />
    7277
    … …  
    7580
    7681                    <p id="bbp_topic_submit_container">
    77                         <button type="submit" tabindex="18" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
     82                        <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
    7883                    </p>
    7984                </div>

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

    r2784 r2810  
    11<?php
     2
    23/**
    3  * New/edit bbPress topic forum
     4 * New/Edit Topic
    45 *
    56 * @package bbPress
    6  * @subpackage Themes
     7 * @subpackage Theme
    78 */
     9
    810?>
     11
    912<?php if ( ( bbp_is_topic_edit() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) || current_user_can( 'publish_topics' ) || bbp_allow_anonymous() ) : ?>
    1013
    … …  
    4851                        <p>
    4952                            <label for="bbp_topic_title"><?php _e( 'Title:', 'bbpress' ); ?></label><br />
    50                             <input type="text" id="bbp_topic_title" value="<?php echo ( bbp_is_topic_edit() && !empty( $post->post_title ) ) ? $post->post_title : ''; ?>" tabindex="8" size="40" name="bbp_topic_title" />
     53                            <input type="text" id="bbp_topic_title" value="<?php echo ( bbp_is_topic_edit() && !empty( $post->post_title ) ) ? $post->post_title : ''; ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_title" />
    5154                        </p>
    5255
    5356                        <p>
    5457                            <label for="bbp_topic_content"><?php _e( 'Topic:', 'bbpress' ); ?></label><br />
    55                             <textarea id="bbp_topic_content" tabindex="10" name="bbp_topic_content" cols="52" rows="6"><?php echo ( bbp_is_topic_edit() && !empty( $post->post_content ) ) ? $post->post_content : ''; ?></textarea>
     58                            <textarea id="bbp_topic_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_topic_content" cols="52" rows="6"><?php echo ( bbp_is_topic_edit() && !empty( $post->post_content ) ) ? $post->post_content : ''; ?></textarea>
    5659                        </p>
    5760
    … …  
    6568                            <p>
    6669                                <label for="bbp_topic_tags"><?php _e( 'Tags:', 'bbpress' ); ?></label><br />
    67                                 <input type="text" value="" tabindex="12" size="40" name="bbp_topic_tags" id="bbp_topic_tags" />
     70                                <input type="text" value="" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_tags" id="bbp_topic_tags" />
    6871                            </p>
    6972
    … …  
    7477                            <p>
    7578                                <label for="bbp_forum_id"><?php _e( 'Forum:', 'bbpress' ); ?></label><br />
    76                                 <?php bbp_dropdown( array( 'tab' => 14, 'selected' => bbp_is_topic_edit() ? bbp_get_topic_forum_id() : 0 ) ); ?>
     79                                <?php bbp_dropdown( array( 'selected' => bbp_is_topic_edit() ? bbp_get_topic_forum_id() : 0 ) ); ?>
    7780                            </p>
    7881
    … …  
    8588                                <label for="bbp_stick_topic"><?php _e( 'Topic Type:', 'bbpress' ); ?></label><br />
    8689
    87                                 <?php bbp_topic_type_select( array( 'tab' => 16 ) ); ?>
     90                                <?php bbp_topic_type_select(); ?>
    8891
    8992                            </p>
    … …  
    9699                                <?php if ( bbp_is_topic_edit() && $post->post_author != bbp_get_current_user_id() ) : ?>
    97100
    98                                     <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( $post->post_author ) ); ?> tabindex="18" />
     101                                    <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( $post->post_author ) ); ?> tabindex="<?php bbp_tab_index(); ?>" />
    99102                                    <label for="bbp_topic_subscription"><?php _e( 'Notify the author of follow-up replies via email', 'bbpress' ); ?></label>
    100103
    101104                                <?php else : ?>
    102105
    103                                     <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( bbp_get_user_id( 0, false, true ) ) ); ?> tabindex="18" />
     106                                    <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php checked( true, bbp_is_user_subscribed( bbp_get_user_id( 0, false, true ) ) ); ?> tabindex="<?php bbp_tab_index(); ?>" />
    104107                                    <label for="bbp_topic_subscription"><?php _e( 'Notify me of follow-up replies via email', 'bbpress' ); ?></label>
    105108
    … …  
    114117                                <legend><?php _e( 'Revision', 'bbpress' ); ?></legend>
    115118                                <div>
    116                                     <input name="bbp_log_topic_edit" id="bbp_log_topic_edit" type="checkbox" value="1" checked="checked" tabindex="20" />
     119                                    <input name="bbp_log_topic_edit" id="bbp_log_topic_edit" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
    117120                                    <label for="bbp_log_topic_edit"><?php _e( 'Keep a log of this edit:', 'bbpress' ); ?></label><br />
    118121                                </div>
    … …  
    120123                                <div>
    121124                                    <label for="bbp_topic_edit_reason"><?php printf( __( 'Optional reason for editing:', 'bbpress' ), bbp_get_current_user_name() ); ?></label><br />
    122                                     <input type="text" value="" tabindex="22" size="40" name="bbp_topic_edit_reason" id="bbp_topic_edit_reason" />
     125                                    <input type="text" value="" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_edit_reason" id="bbp_topic_edit_reason" />
    123126                                </div>
    124127                            </fieldset>
    … …  
    127130
    128131                        <p id="bbp_topic_submit_container">
    129                             <button type="submit" tabindex="24" id="bbp_topic_submit" name="bbp_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
     132                            <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_topic_submit" name="bbp_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
    130133                        </p>
    131134                    </div>

  • branches/plugin/bbp-themes/bbp-twentyten/form-bbp_topic_tag.php

    r2768 r2810  
    22
    33/**
    4  * Edit bbPress Topic Tag Form
     4 * Edit Topic Tag
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
     10//@todo - remove $term variable references
    1011$term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
    1112
    1213?>
    13 
    1414<?php if ( current_user_can( 'edit_topic_tags' ) ) : ?>
    1515
    … …  
    3636                    <div class="alignleft">
    3737                        <label for="tag-name"><?php _e( 'Name:', 'bbpress' ); ?></label>
    38                         <input type="text" name="tag-name" size="20" maxlength="40" tabindex="2" value="<?php echo esc_attr( $term->name ); ?>" />
     38                        <input type="text" name="tag-name" size="20" maxlength="40" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( $term->name ); ?>" />
    3939                    </div>
    4040
    4141                    <div class="alignleft">
    4242                        <label for="tag-name"><?php _e( 'Slug:', 'bbpress' ); ?></label>
    43                         <input type="text" name="tag-slug" size="20" maxlength="40" tabindex="4" value="<?php echo esc_attr( apply_filters( 'editable_slug', $term->slug ) ); ?>" />
     43                        <input type="text" name="tag-slug" size="20" maxlength="40" tabindex="<?php bbp_tab_index(); ?>" value="<?php echo esc_attr( apply_filters( 'editable_slug', $term->slug ) ); ?>" />
    4444                    </div>
    4545
    4646                    <div class="alignright">
    47                         <input type="submit" name="submit" tabindex="6" value="<?php esc_attr_e( 'Update', 'bbpress' ); ?>" /><br />
     47                        <input type="submit" name="submit" tabindex="<?php bbp_tab_index(); ?>" value="<?php esc_attr_e( 'Update', 'bbpress' ); ?>" /><br />
    4848
    4949                        <input type="hidden" name="tag-id" value="<?php echo esc_attr( $term->term_id ); ?>" />
    … …  
    6969                    <div class="alignleft">
    7070                        <label for="tag-name"><?php _e( 'Existing tag:', 'bbpress' ); ?></label>
    71                         <input type="text" name="tag-name" size="22" tabindex="8" maxlength="40" />
     71                        <input type="text" name="tag-name" size="22" tabindex="<?php bbp_tab_index(); ?>" maxlength="40" />
    7272                    </div>
    7373
    7474                    <div class="alignright">
    75                         <input type="submit" name="submit" tabindex="10" value="<?php esc_attr_e( 'Merge', 'bbpress' ); ?>"
     75                        <input type="submit" name="submit" tabindex="<?php bbp_tab_index(); ?>" value="<?php esc_attr_e( 'Merge', 'bbpress' ); ?>"
    7676                            onclick="return confirm('<?php echo esc_js( sprintf( __( 'Are you sure you want to merge the "%s" tag into the tag you specified?', 'bbpress' ), $term->name ) ); ?>');" />
    7777
    … …  
    102102
    103103                        <div class="alignright">
    104                             <input type="submit" name="submit" tabindex="12" value="<?php _e( 'Delete', 'bbpress' ); ?>"
     104                            <input type="submit" name="submit" tabindex="<?php bbp_tab_index(); ?>" value="<?php _e( 'Delete', 'bbpress' ); ?>"
    105105                                onclick="return confirm('<?php echo esc_js( sprintf( __( 'Are you sure you want to delete the "%s" tag? This is permanent and cannot be undone.', 'bbpress' ), $term->name ) ); ?>');" />
    106106

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

    r2787 r2810  
    200200}
    201201
    202 /* Actions */
     202// Actions
    203203add_action( 'init',                     'bbp_twentyten_enqueue_styles'               );
    204204add_action( 'wp_ajax_dim-favorite',     'bbp_twentyten_dim_favorite'                 );

  • branches/plugin/bbp-themes/bbp-twentyten/loop-bbp_forums.php

    r2758 r2810  
    22
    33/**
    4  * The loop that displays bbPress forums.
     4 * Forums Loop
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

  • branches/plugin/bbp-themes/bbp-twentyten/loop-bbp_replies.php

    r2780 r2810  
    22
    33/**
    4  * The loop that displays bbPress replies.
     4 * Replies Loop
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
    8  *
    9  * @todo - Not use table rows
     7 * @subpackage Theme
    108 */
    119

  • branches/plugin/bbp-themes/bbp-twentyten/loop-bbp_topics.php

    r2758 r2810  
    22
    33/**
    4  * The loop that displays bbPress topics.
     4 * Topics Loop
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    10 if ( bbp_get_query_name() || bbp_has_topics() ) : ?>
     10?>
     11
     12<?php if ( bbp_get_query_name() || bbp_has_topics() ) : ?>
    1113
    1214    <?php get_template_part( 'pagination', 'bbp_topics' ); ?>

  • branches/plugin/bbp-themes/bbp-twentyten/page-bbp_front.php

    r2758 r2810  
    22
    33/**
    4  * Template Name: bbPress - Forum Index
     4 * Template Name: bbPress - Forums (Index)
    55 *
    66 * @package bbPress

  • branches/plugin/bbp-themes/bbp-twentyten/page-bbp_statistics.php

    r2769 r2810  
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    10 /** Get the statistics and extract them for later use in this template */
     10// Get the statistics and extract them for later use in this template
     11// @todo - remove variable references
    1112extract( bbp_get_statistics(), EXTR_SKIP );
    1213

  • branches/plugin/bbp-themes/bbp-twentyten/page-bbp_topics.php

    r2758 r2810  
    22
    33/**
    4  * Template Name: bbPress - Topic Index
     4 * Template Name: bbPress - Topics (Newest)
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

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

    r2758 r2810  
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

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

    r2758 r2810  
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

  • branches/plugin/bbp-themes/bbp-twentyten/single-bbp_forum.php

    r2758 r2810  
    22
    33/**
    4  * bbPress Single Forum
     4 * Single Forum
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

  • branches/plugin/bbp-themes/bbp-twentyten/single-bbp_reply.php

    r2780 r2810  
    22
    33/**
    4  * bbPress Single Reply
     4 * Single Reply
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

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

    r2780 r2810  
    22
    33/**
    4  * bbPress Single Topic
     4 * Single Topic
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

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

    r2679 r2810  
    1010 **
    1111 *
    12  * This file intentionally left blank. Styles are enqueued in functions.php
     12 * This file intentionally left blank. Styles are enqueued in functions.php in
     13 * the order you see listed below:
    1314 *
    14  * Please see:
    1515 *
    16  * - /css/twentyten.css
     16 * 1 - ./css/twentyten.css
    1717 *
    18  * - /css/bbpress.css
     18 * 2 - ./css/bbpress.css
    1919 *
    2020 **/

  • branches/plugin/bbp-themes/bbp-twentyten/taxonomy-bbp_topic_tag.php

    r2768 r2810  
    22
    33/**
    4  * bbPress Topic Tag
     4 * Topic Tag
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    10 
     10//@todo - remove $term variable references
    1111$term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
    1212

  • branches/plugin/bbp-themes/bbp-twentyten/user-bbp_details.php

    r2758 r2810  
    22
    33/**
    4  * User details
     4 * User Details
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    1010?>
     11
    1112                <span class="page-title author">
     13
    1214                    <?php printf( __( 'Profile: %s', 'bbpress' ), "<span class='vcard'><a class='url fn n' href='" . bbp_get_user_profile_url() . "' title='" . esc_attr( bbp_get_displayed_user_field( 'display_name' ) ) . "' rel='me'>" . bbp_get_displayed_user_field( 'display_name' ) . "</a></span>" ); ?>
    1315

  • branches/plugin/bbp-themes/bbp-twentyten/user-bbp_favorites.php

    r2758 r2810  
    22
    33/**
    4  * User favorites loop
     4 * User Favorites
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    1010?>
     11
    1112                <?php bbp_set_query_name( 'bbp_user_profile_favorites' ); ?>
    1213

  • branches/plugin/bbp-themes/bbp-twentyten/user-bbp_subscriptions.php

    r2758 r2810  
    22
    33/**
    4  * User subscriptions loop
     4 * User Sbscriptions
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    1010?>
     11
    1112            <?php if ( bbp_is_subscriptions_active() ) : ?>
    1213

  • branches/plugin/bbp-themes/bbp-twentyten/user-bbp_topics_created.php

    r2758 r2810  
    22
    33/**
    4  * User topics created loop
     4 * User Topics Created
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    1010?>
     11
    1112                <?php bbp_set_query_name( 'bbp_user_profile_topics_created' ); ?>
    1213

  • branches/plugin/bbp-themes/bbp-twentyten/user-edit.php

    r2758 r2810  
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    … …  
    104104                                <?php
    105105
     106                                // Handle address change requests
    106107                                $new_email = get_option( bbp_get_displayed_user_id() . '_new_email' );
    107108                                if ( $new_email && $new_email != bbp_get_displayed_user_field( 'user_email' ) ) : ?>
    … …  
    109110                                    <span class="updated inline">
    110111
    111                                         <?php printf( __( 'There is a pending change of your e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>', 'bbpress' ), $new_email['newemail'], esc_url( self_admin_url( 'user.php?dismiss=' . bbp_get_current_user_id()  . '_new_email' ) ) ); ?>
     112                                        <?php printf( __( 'There is a pending email address change to <code>%1$s</code>. <a href="%2$s">Cancel</a>', 'bbpress' ), $new_email['newemail'], esc_url( self_admin_url( 'user.php?dismiss=' . bbp_get_current_user_id()  . '_new_email' ) ) ); ?>
    112113
    113114                                    </span>

  • branches/plugin/bbp-themes/bbp-twentyten/user-posts.php

    r2758 r2810  
    22
    33/**
    4  * User blog posts loop
     4 * User blog posts
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99
    1010?>
     11
    1112                <div id="bbp-author-blog-posts" class="bbp-author-blog-posts">
    1213                    <hr />

  • branches/plugin/bbp-themes/bbp-twentyten/user.php

    r2758 r2810  
    22
    33/**
    4  * bbPress user profile
     4 * User Profile
    55 *
    66 * @package bbPress
    7  * @subpackage Themes
     7 * @subpackage Theme
    88 */
    99

  • branches/plugin/bbp-themes/bbp-twentyten/view.php

    r2789 r2810  
    22
    33/**
    4  * View Page
     4 * View Handler
    55 *
    66 * @package bbPress

  • branches/plugin/bbpress.php

    r2790 r2810  
    11<?php
     2
    23/**
    34 * The bbPress Plugin
    … …  
    1516 * Author: The bbPress Community
    1617 * Author URI: http://bbpress.org
    17  * Version: plugin-bleeding
     18 * Version: plugin-alpha
    1819 */
    1920
    2021/**
    21  * bbPress vesion
     22 * bbPress version
    2223 *
    2324 * Set the version early so other plugins have an inexpensive way to check if
    2425 * bbPress is already loaded.
    2526 *
    26  * Note: Loaded does NOT mean initialized.
     27 * Note: Checking for defined( 'BBP_VERSION' ) in your code does NOT
     28 *       guarantee bbPress is initialized and listening.
    2729 */
    28 define( 'BBP_VERSION', 'plugin-bleeding' );
     30define( 'BBP_VERSION', 'plugin-alpha' );
    2931
    3032if ( !class_exists( 'bbPress' ) ) :
    … …  
    3537 *
    3638 * @since bbPress (r2464)
     39 * @todo Use BP_Component class
    3740 */
    3841class bbPress {
    3942
    40     // Post type
     43    /** Post type *************************************************************/
    4144
    4245    /**
    … …  
    5558    var $reply_id;
    5659
    57     // Post status identifiers
     60    /** Post status ***********************************************************/
    5861
    5962    /**
    … …  
    7780    var $trash_status_id;
    7881
    79     // Slugs
     82    /** Slugs *****************************************************************/
    8083
    8184    /**
    … …  
    109112    var $view_slug;
    110113
    111     // Absolute Paths
     114    /** Paths *****************************************************************/
    112115
    113116    /**
    … …  
    121124    var $themes_dir;
    122125
    123     // URLs
     126    /** URLs ******************************************************************/
    124127
    125128    /**
    … …  
    138141    var $themes_url;
    139142
    140     // Current identifiers
     143    /** Current ID's **********************************************************/
    141144
    142145    /**
    … …  
    155158    var $current_reply_id;
    156159
    157     // User objects
     160    /** User ******************************************************************/
    158161
    159162    /**
    … …  
    167170    var $displayed_user;
    168171
    169     // Query objects
     172    /** Query *****************************************************************/
    170173
    171174    /**
    … …  
    184187    var $reply_query;
    185188
    186     // Arrays
     189    /** Arrays ****************************************************************/
    187190
    188191    /**
    … …  
    191194    var $sub_forums;
    192195
    193     // Errors
     196    /** Errors ****************************************************************/
    194197
    195198    /**
    … …  
    198201    var $errors;
    199202
    200     // Views
     203    /** Views *****************************************************************/
    201204
    202205    /**
    … …  
    204207     */
    205208    var $views;
     209   
     210    /** Forms *****************************************************************/
     211   
     212    /**
     213     * @var int The current tab index for form building
     214     */
     215    var $tab_index;
     216   
    206217
    207218    /**
Note: See TracChangeset for help on using the changeset viewer.