Changeset 3417
- Timestamp:
- 08/11/2011 08:56:49 PM (15 years ago)
- Location:
- branches/plugin/bbp-themes/bbp-twentyten/bbpress
- Files:
-
- 6 edited
-
form-anonymous.php (modified) (2 diffs)
-
form-reply.php (modified) (8 diffs)
-
form-topic.php (modified) (12 diffs)
-
loop-forums.php (modified) (2 diffs)
-
loop-replies.php (modified) (3 diffs)
-
loop-topics.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-anonymous.php
r3375 r3417 12 12 <?php if ( bbp_is_anonymous() || ( bbp_is_topic_edit() && bbp_is_topic_anonymous() ) || ( bbp_is_reply_edit() && bbp_is_reply_anonymous() ) ) : ?> 13 13 14 <?php do_action( 'bbp_theme_before_anonymous_form' ); ?> 15 14 16 <fieldset class="bbp-form"> 15 17 <legend><?php ( bbp_is_topic_edit() || bbp_is_reply_edit() ) ? _e( 'Author Information', 'bbpress' ) : _e( 'Your information:', 'bbpress' ); ?></legend> 18 19 <?php do_action( 'bbp_theme_anonymous_form_extras_top' ); ?> 20 16 21 <p> 17 22 <label for="bbp_anonymous_author"><?php _e( 'Name (required):', 'bbpress' ); ?></label><br /> … … 28 33 <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" /> 29 34 </p> 35 36 <?php do_action( 'bbp_theme_anonymous_form_extras_bottom' ); ?> 37 30 38 </fieldset> 31 39 40 <?php do_action( 'bbp_theme_after_anonymous_form' ); ?> 41 32 42 <?php endif; ?> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-reply.php
r3388 r3417 21 21 22 22 <form id="new-post" name="new-post" method="post" action=""> 23 24 <?php do_action( 'bbp_theme_before_reply_form' ); ?> 25 23 26 <fieldset class="bbp-form"> 24 27 <legend><?php printf( __( 'Reply To: %s', 'bbpress' ), bbp_get_topic_title() ); ?></legend> 28 29 <?php do_action( 'bbp_theme_before_reply_form_notices' ); ?> 25 30 26 31 <?php if ( !bbp_is_topic_open() && !bbp_is_reply_edit() ) : ?> … … 52 57 <?php bbp_get_template_part( 'bbpress/form', 'anonymous' ); ?> 53 58 59 <?php do_action( 'bbp_theme_before_reply_form_content' ); ?> 60 54 61 <p> 55 62 <label for="bbp_reply_content"><?php _e( 'Reply:', 'bbpress' ); ?></label><br /> 56 63 <textarea id="bbp_reply_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_reply_content" cols="51" rows="6"><?php bbp_form_reply_content(); ?></textarea> 57 64 </p> 65 66 <?php do_action( 'bbp_theme_after_reply_form_content' ); ?> 58 67 59 68 <?php if ( !current_user_can( 'unfiltered_html' ) ) : ?> … … 66 75 <?php endif; ?> 67 76 77 <?php do_action( 'bbp_theme_before_reply_form_tags' ); ?> 78 68 79 <p> 69 80 <label for="bbp_topic_tags"><?php _e( 'Tags:', 'bbpress' ); ?></label><br /> … … 71 82 </p> 72 83 84 <?php do_action( 'bbp_theme_after_reply_form_tags' ); ?> 85 73 86 <?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_reply_edit() || ( bbp_is_reply_edit() && !bbp_is_reply_anonymous() ) ) ) : ?> 87 88 <?php do_action( 'bbp_theme_before_reply_form_subscription' ); ?> 74 89 75 90 <p> … … 89 104 </p> 90 105 106 <?php do_action( 'bbp_theme_after_reply_form_subscription' ); ?> 107 91 108 <?php endif; ?> 92 109 93 <?php if ( bbp_is_reply_edit() ) : ?> 110 <?php if ( bbp_allow_revisions() && bbp_is_reply_edit() ) : ?> 111 112 <?php do_action( 'bbp_theme_before_reply_form_revisions' ); ?> 94 113 95 114 <fieldset class="bbp-form"> … … 106 125 </fieldset> 107 126 127 <?php do_action( 'bbp_theme_after_reply_form_revisions' ); ?> 128 108 129 <?php else : ?> 109 130 … … 112 133 <?php endif; ?> 113 134 135 <?php do_action( 'bbp_theme_before_reply_form_submit_wrapper' ); ?> 136 114 137 <div class="bbp-submit-wrapper"> 138 139 <?php do_action( 'bbp_theme_before_reply_form_submit_button' ); ?> 140 115 141 <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_reply_submit" name="bbp_reply_submit"><?php _e( 'Submit', 'bbpress' ); ?></button> 142 143 <?php do_action( 'bbp_theme_after_reply_form_submit_button' ); ?> 144 116 145 </div> 146 147 <?php do_action( 'bbp_theme_after_reply_form_submit_wrapper' ); ?> 148 117 149 </div> 118 150 … … 120 152 121 153 </fieldset> 154 155 <?php do_action( 'bbp_theme_after_reply_form' ); ?> 156 122 157 </form> 123 158 </div> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-topic.php
r3386 r3417 29 29 30 30 <form id="new-post" name="new-post" method="post" action=""> 31 32 <?php do_action( 'bbp_theme_before_topic_form' ); ?> 33 31 34 <fieldset class="bbp-form"> 32 35 <legend> … … 41 44 </legend> 42 45 46 <?php do_action( 'bbp_theme_before_topic_form_notices' ); ?> 47 43 48 <?php if ( !bbp_is_topic_edit() && bbp_is_forum_closed() ) : ?> 44 49 … … 67 72 68 73 <?php bbp_get_template_part( 'bbpress/form', 'anonymous' ); ?> 74 75 <?php do_action( 'bbp_theme_before_topic_form_title' ); ?> 69 76 70 77 <p> … … 73 80 </p> 74 81 82 <?php do_action( 'bbp_theme_after_topic_form_title' ); ?> 83 84 <?php do_action( 'bbp_theme_before_topic_form_content' ); ?> 85 75 86 <p> 76 87 <label for="bbp_topic_content"><?php _e( 'Topic Description:', 'bbpress' ); ?></label><br /> … … 78 89 </p> 79 90 91 <?php do_action( 'bbp_theme_after_topic_form_content' ); ?> 92 80 93 <?php if ( !current_user_can( 'unfiltered_html' ) ) : ?> 81 94 … … 86 99 87 100 <?php endif; ?> 101 102 <?php do_action( 'bbp_theme_before_topic_form_tags' ); ?> 88 103 89 104 <p> … … 92 107 </p> 93 108 109 <?php do_action( 'bbp_theme_after_topic_form_tags' ); ?> 110 94 111 <?php if ( !bbp_is_single_forum() ) : ?> 112 113 <?php do_action( 'bbp_theme_before_topic_form_forum' ); ?> 95 114 96 115 <p> … … 99 118 </p> 100 119 120 <?php do_action( 'bbp_theme_after_topic_form_forum' ); ?> 121 101 122 <?php endif; ?> 102 123 103 124 <?php if ( current_user_can( 'moderate' ) ) : ?> 104 125 126 <?php do_action( 'bbp_theme_before_topic_form_type' ); ?> 127 105 128 <p> 106 129 … … 111 134 </p> 112 135 136 <?php do_action( 'bbp_theme_after_topic_form_type' ); ?> 137 113 138 <?php endif; ?> 114 139 115 140 <?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_topic_edit() || ( bbp_is_topic_edit() && !bbp_is_topic_anonymous() ) ) ) : ?> 141 142 <?php do_action( 'bbp_theme_before_topic_form_subscriptions' ); ?> 116 143 117 144 <p> … … 129 156 </p> 130 157 131 <?php endif; ?> 132 133 <?php if ( bbp_is_topic_edit() ) : ?> 158 <?php do_action( 'bbp_theme_after_topic_form_subscriptions' ); ?> 159 160 <?php endif; ?> 161 162 <?php if ( bbp_allow_revisions() && bbp_is_topic_edit() ) : ?> 163 164 <?php do_action( 'bbp_theme_before_topic_form_revisions' ); ?> 134 165 135 166 <fieldset class="bbp-form"> … … 146 177 </fieldset> 147 178 148 <?php endif; ?> 179 <?php do_action( 'bbp_theme_after_topic_form_revisions' ); ?> 180 181 <?php endif; ?> 182 183 <?php do_action( 'bbp_theme_before_topic_form_submit_wrapper' ); ?> 149 184 150 185 <div class="bbp-submit-wrapper"> 186 187 <?php do_action( 'bbp_theme_before_topic_form_submit_button' ); ?> 188 151 189 <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_topic_submit" name="bbp_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button> 152 </div> 190 191 <?php do_action( 'bbp_theme_after_topic_form_submit_button' ); ?> 192 193 </div> 194 195 <?php do_action( 'bbp_theme_before_topic_form_submit_wrapper' ); ?> 196 153 197 </div> 154 198 … … 156 200 157 201 </fieldset> 202 203 <?php do_action( 'bbp_theme_after_topic_form' ); ?> 204 158 205 </form> 159 206 </div> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/loop-forums.php
r3311 r3417 34 34 35 35 <td class="bbp-forum-info"> 36 37 <?php do_action( 'bbp_theme_before_forum_title' ); ?> 38 36 39 <a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>"><?php bbp_forum_title(); ?></a> 40 41 <?php do_action( 'bbp_theme_after_forum_title' ); ?> 42 43 <?php do_action( 'bbp_theme_before_forum_sub_forums' ); ?> 37 44 38 45 <?php bbp_list_forums(); ?> 39 46 47 <?php do_action( 'bbp_theme_after_forum_sub_forums' ); ?> 48 49 <?php do_action( 'bbp_theme_before_forum_description' ); ?> 50 40 51 <div class="bbp-forum-description"><?php the_content(); ?></div> 52 53 <?php do_action( 'bbp_theme_after_forum_description' ); ?> 54 41 55 </td> 42 56 … … 47 61 <td class="bbp-forum-freshness"> 48 62 63 <?php do_action( 'bbp_theme_before_forum_freshness_link' ); ?> 64 49 65 <?php bbp_forum_freshness_link(); ?> 66 67 <?php do_action( 'bbp_theme_after_forum_freshness_link' ); ?> 50 68 51 69 <p class="bbp-topic-meta"> 52 70 71 <?php do_action( 'bbp_theme_before_topic_author' ); ?> 72 53 73 <span class="bbp-topic-freshness-author"><?php bbp_author_link( array( 'post_id' => bbp_get_forum_last_active_id(), 'size' => 14 ) ); ?></span> 74 75 <?php do_action( 'bbp_theme_after_topic_author' ); ?> 54 76 55 77 </p> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/loop-replies.php
r3311 r3417 66 66 <a href="<?php bbp_reply_url(); ?>" title="<?php bbp_reply_title(); ?>" class="bbp-reply-permalink">#<?php bbp_reply_id(); ?></a> 67 67 68 <?php do_action( 'bbp_theme_before_reply_admin_links' ); ?> 69 68 70 <?php bbp_reply_admin_links(); ?> 71 72 <?php do_action( 'bbp_theme_after_reply_admin_links' ); ?> 69 73 70 74 </td> … … 75 79 <td class="bbp-reply-author"> 76 80 81 <?php do_action( 'bbp_theme_before_reply_author_details' ); ?> 82 77 83 <?php bbp_reply_author_link(); ?> 78 84 79 85 <?php if ( is_super_admin() ) : ?> 80 86 87 <?php do_action( 'bbp_theme_before_reply_author_admin_details' ); ?> 88 81 89 <div class="bbp-reply-ip"><?php bbp_author_ip( bbp_get_reply_id() ); ?></div> 82 90 91 <?php do_action( 'bbp_theme_after_reply_author_admin_details' ); ?> 92 83 93 <?php endif; ?> 94 95 <?php do_action( 'bbp_theme_after_reply_author_details' ); ?> 84 96 85 97 </td> … … 87 99 <td class="bbp-reply-content"> 88 100 101 <?php do_action( 'bbp_theme_after_reply_content' ); ?> 102 89 103 <?php bbp_reply_content(); ?> 104 105 <?php do_action( 'bbp_theme_before_reply_content' ); ?> 90 106 91 107 </td> -
branches/plugin/bbp-themes/bbp-twentyten/bbpress/loop-topics.php
r3344 r3417 34 34 35 35 <td class="bbp-topic-title"> 36 37 <?php do_action( 'bbp_theme_before_topic_title' ); ?> 38 36 39 <a href="<?php bbp_topic_permalink(); ?>" title="<?php bbp_topic_title(); ?>"><?php bbp_topic_title(); ?></a> 40 41 <?php do_action( 'bbp_theme_after_topic_title' ); ?> 37 42 38 43 <?php bbp_topic_pagination(); ?> 39 44 45 <?php do_action( 'bbp_theme_before_topic_meta' ); ?> 46 40 47 <p class="bbp-topic-meta"> 48 49 <?php do_action( 'bbp_theme_before_topic_started_by' ); ?> 41 50 42 51 <span class="bbp-topic-started-by"><?php printf( __( 'Started by: %1$s', 'bbpress' ), bbp_get_topic_author_link( array( 'size' => '14' ) ) ); ?></span> 43 52 53 <?php do_action( 'bbp_theme_after_topic_started_by' ); ?> 54 44 55 <?php if ( !bbp_is_single_forum() || ( bbp_get_topic_forum_id() != bbp_get_forum_id() ) ) : ?> 45 56 57 <?php do_action( 'bbp_theme_before_topic_started_in' ); ?> 58 46 59 <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> 60 61 <?php do_action( 'bbp_theme_after_topic_started_in' ); ?> 47 62 48 63 <?php endif; ?> 49 64 50 65 </p> 66 67 <?php do_action( 'bbp_theme_after_topic_meta' ); ?> 68 51 69 </td> 52 70 … … 57 75 <td class="bbp-topic-freshness"> 58 76 77 <?php do_action( 'bbp_theme_before_topic_freshness_link' ); ?> 78 59 79 <?php bbp_topic_freshness_link(); ?> 80 81 <?php do_action( 'bbp_theme_after_topic_freshness_link' ); ?> 60 82 61 83 <p class="bbp-topic-meta"> 62 84 85 <?php do_action( 'bbp_theme_before_topic_freshness_author' ); ?> 86 63 87 <span class="bbp-topic-freshness-author"><?php bbp_author_link( array( 'post_id' => bbp_get_topic_last_active_id(), 'size' => 14 ) ); ?></span> 88 89 <?php do_action( 'bbp_theme_after_topic_freshness_author' ); ?> 64 90 65 91 </p> … … 72 98 <td class="bbp-topic-action"> 73 99 100 <?php do_action( 'bbp_theme_before_topic_favorites_action' ); ?> 101 74 102 <?php bbp_user_favorites_link( array( 'mid' => '+', 'post' => '' ), array( 'pre' => '', 'mid' => '×', 'post' => '' ) ); ?> 103 104 <?php do_action( 'bbp_theme_after_topic_favorites_action' ); ?> 75 105 76 106 </td> … … 80 110 <td class="bbp-topic-action"> 81 111 112 <?php do_action( 'bbp_theme_before_topic_subscription_action' ); ?> 113 82 114 <?php bbp_user_subscribe_link( array( 'before' => '', 'subscribe' => '+', 'unsubscribe' => '×' ) ); ?> 115 116 <?php do_action( 'bbp_theme_after_topic_subscription_action' ); ?> 83 117 84 118 </td>
Note: See TracChangeset
for help on using the changeset viewer.