Skip to:
Content

bbPress.org


Ignore:
Timestamp:
03/21/2012 10:26:34 PM (12 years ago)
Author:
johnjamesjacoby
Message:

Revert bbp-twentyten back to table based layout:

  • bbp-theme-compat retains tableless layout, and is canonical backup for missing template files
  • Avoid back-compat issues with installs that have modified bbPress 2.0 CSS
  • Fixes #1796
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/plugin/bbp-themes/bbp-twentyten/bbpress/loop-single-topic.php

    r3654 r3820  
    1010?>
    1111
    12 <ul id="topic-<?php bbp_topic_id(); ?>" <?php bbp_topic_class(); ?>>
     12    <tr id="topic-<?php bbp_topic_id(); ?>" <?php bbp_topic_class(); ?>>
    1313
    14     <li class="bbp-topic-title">
     14        <td class="bbp-topic-title">
    1515
    16         <?php do_action( 'bbp_theme_before_topic_title' ); ?>
     16            <?php do_action( 'bbp_theme_before_topic_title' ); ?>
    1717
    18         <a href="<?php bbp_topic_permalink(); ?>" title="<?php bbp_topic_title(); ?>"><?php bbp_topic_title(); ?></a>
     18            <a href="<?php bbp_topic_permalink(); ?>" title="<?php bbp_topic_title(); ?>"><?php bbp_topic_title(); ?></a>
    1919
    20         <?php do_action( 'bbp_theme_after_topic_title' ); ?>
     20            <?php do_action( 'bbp_theme_after_topic_title' ); ?>
    2121
    22         <?php bbp_topic_pagination(); ?>
     22            <?php bbp_topic_pagination(); ?>
    2323
    24         <?php do_action( 'bbp_theme_before_topic_meta' ); ?>
     24            <?php do_action( 'bbp_theme_before_topic_meta' ); ?>
    2525
    26         <p class="bbp-topic-meta">
     26            <p class="bbp-topic-meta">
    2727
    28             <?php do_action( 'bbp_theme_before_topic_started_by' ); ?>
     28                <?php do_action( 'bbp_theme_before_topic_started_by' ); ?>
    2929
    30             <span class="bbp-topic-started-by"><?php printf( __( 'Started by: %1$s', 'bbpress' ), bbp_get_topic_author_link( array( 'size' => '14' ) ) ); ?></span>
     30                <span class="bbp-topic-started-by"><?php printf( __( 'Started by: %1$s', 'bbpress' ), bbp_get_topic_author_link( array( 'size' => '14' ) ) ); ?></span>
    3131
    32             <?php do_action( 'bbp_theme_after_topic_started_by' ); ?>
     32                <?php do_action( 'bbp_theme_after_topic_started_by' ); ?>
    3333
    34             <?php if ( !bbp_is_single_forum() || ( bbp_get_topic_forum_id() != bbp_get_forum_id() ) ) : ?>
     34                <?php if ( !bbp_is_single_forum() || ( bbp_get_topic_forum_id() != bbp_get_forum_id() ) ) : ?>
    3535
    36                 <?php do_action( 'bbp_theme_before_topic_started_in' ); ?>
     36                    <?php do_action( 'bbp_theme_before_topic_started_in' ); ?>
    3737
    38                 <span class="bbp-topic-started-in"><?php printf( __( 'in: <a href="%1$s">%2$s</a>', 'bbpress' ), bbp_get_forum_permalink( bbp_get_topic_forum_id() ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></span>
     38                    <span class="bbp-topic-started-in"><?php printf( __( 'in: <a href="%1$s">%2$s</a>', 'bbpress' ), bbp_get_forum_permalink( bbp_get_topic_forum_id() ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></span>
    3939
    40                 <?php do_action( 'bbp_theme_after_topic_started_in' ); ?>
     40                    <?php do_action( 'bbp_theme_after_topic_started_in' ); ?>
     41
     42                <?php endif; ?>
     43
     44            </p>
     45
     46            <?php do_action( 'bbp_theme_after_topic_meta' ); ?>
     47
     48        </td>
     49
     50        <td class="bbp-topic-voice-count"><?php bbp_topic_voice_count(); ?></td>
     51
     52        <td class="bbp-topic-reply-count"><?php bbp_show_lead_topic() ? bbp_topic_reply_count() : bbp_topic_post_count(); ?></td>
     53
     54        <td class="bbp-topic-freshness">
     55
     56            <?php do_action( 'bbp_theme_before_topic_freshness_link' ); ?>
     57
     58            <?php bbp_topic_freshness_link(); ?>
     59
     60            <?php do_action( 'bbp_theme_after_topic_freshness_link' ); ?>
     61
     62            <p class="bbp-topic-meta">
     63
     64                <?php do_action( 'bbp_theme_before_topic_freshness_author' ); ?>
     65
     66                <span class="bbp-topic-freshness-author"><?php bbp_author_link( array( 'post_id' => bbp_get_topic_last_active_id(), 'size' => 14 ) ); ?></span>
     67
     68                <?php do_action( 'bbp_theme_after_topic_freshness_author' ); ?>
     69
     70            </p>
     71        </td>
     72
     73        <?php if ( bbp_is_user_home() ) : ?>
     74
     75            <?php if ( bbp_is_favorites() ) : ?>
     76
     77                <td class="bbp-topic-action">
     78
     79                    <?php do_action( 'bbp_theme_before_topic_favorites_action' ); ?>
     80
     81                    <?php bbp_user_favorites_link( array( 'mid' => '+', 'post' => '' ), array( 'pre' => '', 'mid' => '&times;', 'post' => '' ) ); ?>
     82
     83                    <?php do_action( 'bbp_theme_after_topic_favorites_action' ); ?>
     84
     85                </td>
     86
     87            <?php elseif ( bbp_is_subscriptions() ) : ?>
     88
     89                <td class="bbp-topic-action">
     90
     91                    <?php do_action( 'bbp_theme_before_topic_subscription_action' ); ?>
     92
     93                    <?php bbp_user_subscribe_link( array( 'before' => '', 'subscribe' => '+', 'unsubscribe' => '&times;' ) ); ?>
     94
     95                    <?php do_action( 'bbp_theme_after_topic_subscription_action' ); ?>
     96
     97                </td>
    4198
    4299            <?php endif; ?>
    43100
    44         </p>
    45 
    46         <?php do_action( 'bbp_theme_after_topic_meta' ); ?>
    47 
    48         <?php bbp_topic_row_actions(); ?>
    49 
    50     </li>
    51 
    52     <li class="bbp-topic-voice-count"><?php bbp_topic_voice_count(); ?></li>
    53 
    54     <li class="bbp-topic-reply-count"><?php bbp_show_lead_topic() ? bbp_topic_reply_count() : bbp_topic_post_count(); ?></li>
    55 
    56     <li class="bbp-topic-freshness">
    57 
    58         <?php do_action( 'bbp_theme_before_topic_freshness_link' ); ?>
    59 
    60         <?php bbp_topic_freshness_link(); ?>
    61 
    62         <?php do_action( 'bbp_theme_after_topic_freshness_link' ); ?>
    63 
    64         <p class="bbp-topic-meta">
    65 
    66             <?php do_action( 'bbp_theme_before_topic_freshness_author' ); ?>
    67 
    68             <span class="bbp-topic-freshness-author"><?php bbp_author_link( array( 'post_id' => bbp_get_topic_last_active_id(), 'size' => 14 ) ); ?></span>
    69 
    70             <?php do_action( 'bbp_theme_after_topic_freshness_author' ); ?>
    71 
    72         </p>
    73     </li>
    74 
    75     <?php if ( bbp_is_user_home() ) : ?>
    76 
    77         <?php if ( bbp_is_favorites() ) : ?>
    78 
    79             <li class="bbp-topic-action">
    80 
    81                 <?php do_action( 'bbp_theme_before_topic_favorites_action' ); ?>
    82 
    83                 <?php bbp_user_favorites_link( array( 'mid' => '+', 'post' => '' ), array( 'pre' => '', 'mid' => '&times;', 'post' => '' ) ); ?>
    84 
    85                 <?php do_action( 'bbp_theme_after_topic_favorites_action' ); ?>
    86 
    87             </li>
    88 
    89         <?php elseif ( bbp_is_subscriptions() ) : ?>
    90 
    91             <li class="bbp-topic-action">
    92 
    93                 <?php do_action( 'bbp_theme_before_topic_subscription_action' ); ?>
    94 
    95                 <?php bbp_user_subscribe_link( array( 'before' => '', 'subscribe' => '+', 'unsubscribe' => '&times;' ) ); ?>
    96 
    97                 <?php do_action( 'bbp_theme_after_topic_subscription_action' ); ?>
    98 
    99             </li>
    100 
    101101        <?php endif; ?>
    102102
    103     <?php endif; ?>
    104 
    105 </ul><!-- #topic-<?php bbp_topic_id(); ?> -->
     103    </tr><!-- #topic-<?php bbp_topic_id(); ?> -->
Note: See TracChangeset for help on using the changeset viewer.