Ticket #2637: 2637.diff
| File 2637.diff, 24.9 KB (added by , 11 years ago) |
|---|
-
src/includes/common/template.php
1416 1416 'numberposts' => $r['numberposts'], 1417 1417 'orderby' => $r['orderby'], 1418 1418 'order' => $r['order'], 1419 ) ); 1419 ) ); 1420 1420 } 1421 1421 1422 1422 /** Drop Down *********************************************************/ … … 2454 2454 // Display errors first... 2455 2455 if ( !empty( $errors ) ) : ?> 2456 2456 2457 <div class="bbp-template-notice error" >2458 < p>2459 < ?php echo implode( "</p>\n<p>", $errors ); ?>2460 </ p>2457 <div class="bbp-template-notice error" role="alert" tabindex="-1"> 2458 <ul> 2459 <li><?php echo implode( "</li>\n<li>", $errors ); ?></li> 2460 </ul> 2461 2461 </div> 2462 2462 2463 2463 <?php endif; … … 2466 2466 if ( !empty( $messages ) ) : ?> 2467 2467 2468 2468 <div class="bbp-template-notice"> 2469 < p>2470 < ?php echo implode( "</p>\n<p>", $messages ); ?>2471 </ p>2469 <ul> 2470 <li><?php echo implode( "</li>\n<li>", $messages ); ?></li> 2471 </ul> 2472 2472 </div> 2473 2473 2474 2474 <?php endif; -
src/includes/forums/template.php
1942 1942 // Parse arguments against default values 1943 1943 $r = bbp_parse_args( $args, array( 1944 1944 'forum_id' => 0, 1945 'before' => '<div class="bbp-template-notice info">< pclass="bbp-forum-description">',1946 'after' => '</ p></div>',1945 'before' => '<div class="bbp-template-notice info"><ul><li class="bbp-forum-description">', 1946 'after' => '</li></ul></div>', 1947 1947 'size' => 14, 1948 1948 'feed' => true 1949 1949 ), 'get_single_forum_description' ); … … 2226 2226 2227 2227 return apply_filters( 'bbp_get_form_forum_visibility', esc_attr( $forum_visibility ) ); 2228 2228 } 2229 2229 2230 2230 /** 2231 2231 * Output checked value of forum subscription 2232 2232 * -
src/includes/topics/template.php
3289 3289 // Parse arguments against default values 3290 3290 $r = bbp_parse_args( $args, array( 3291 3291 'topic_id' => 0, 3292 'before' => '<div class="bbp-template-notice info">< pclass="bbp-topic-description">',3293 'after' => '</ p></div>',3292 'before' => '<div class="bbp-template-notice info"><ul><li class="bbp-topic-description">', 3293 'after' => '</li></ul></div>', 3294 3294 'size' => 14 3295 3295 ), 'get_single_topic_description' ); 3296 3296 -
src/includes/users/template.php
1160 1160 if ( isset( $_GET['updated'] ) && ( bbp_is_single_user() || bbp_is_single_user_edit() ) ) : ?> 1161 1161 1162 1162 <div class="bbp-template-notice updated"> 1163 <p><?php esc_html_e( 'User updated.', 'bbpress' ); ?></p> 1163 <ul> 1164 <li><?php esc_html_e( 'User updated.', 'bbpress' ); ?></li> 1165 </ul> 1164 1166 </div> 1165 1167 1166 1168 <?php endif; … … 1185 1187 if ( is_multisite() && ( bbp_is_single_user() || bbp_is_single_user_edit() ) && current_user_can( 'manage_network_options' ) && is_super_admin( bbp_get_displayed_user_id() ) ) : ?> 1186 1188 1187 1189 <div class="bbp-template-notice important"> 1188 <p><?php bbp_is_user_home() || bbp_is_user_home_edit() ? esc_html_e( 'You have super admin privileges.', 'bbpress' ) : esc_html_e( 'This user has super admin privileges.', 'bbpress' ); ?></p> 1190 <ul> 1191 <li><?php bbp_is_user_home() || bbp_is_user_home_edit() ? esc_html_e( 'You have super admin privileges.', 'bbpress' ) : esc_html_e( 'This user has super admin privileges.', 'bbpress' ); ?></li> 1192 </ul> 1189 1193 </div> 1190 1194 1191 1195 <?php endif; -
src/templates/default/bbpress/content-archive-topic.php
27 27 28 28 <?php if ( bbp_is_topic_tag() ) : ?> 29 29 30 <?php bbp_topic_tag_description( array( 'before' => '<div class="bbp-template-notice info">< p>', 'after' => '</p></div>' ) ); ?>30 <?php bbp_topic_tag_description( array( 'before' => '<div class="bbp-template-notice info"><ul><li>', 'after' => '</li></ul></div>' ) ); ?> 31 31 32 32 <?php endif; ?> 33 33 -
src/templates/default/bbpress/content-topic-tag-edit.php
15 15 16 16 <?php do_action( 'bbp_template_before_topic_tag_description' ); ?> 17 17 18 <?php bbp_topic_tag_description( array( 'before' => '<div class="bbp-template-notice info">< p>', 'after' => '</p></div>' ) ); ?>18 <?php bbp_topic_tag_description( array( 'before' => '<div class="bbp-template-notice info"><ul><li>', 'after' => '</li></ul></div>' ) ); ?> 19 19 20 20 <?php do_action( 'bbp_template_after_topic_tag_description' ); ?> 21 21 -
src/templates/default/bbpress/feedback-logged-in.php
10 10 ?> 11 11 12 12 <div class="bbp-template-notice info"> 13 <p><?php _e( 'You are already logged in.', 'bbpress' ); ?></p> 13 <ul> 14 <li><?php _e( 'You are already logged in.', 'bbpress' ); ?></li> 15 </ul> 14 16 </div> -
src/templates/default/bbpress/feedback-no-access.php
13 13 <h1 class="entry-title"><?php _e( 'Private', 'bbpress' ); ?></h1> 14 14 <div class="entry-content"> 15 15 <div class="bbp-template-notice info"> 16 <p><?php _e( 'You do not have permission to view this forum.', 'bbpress' ); ?></p> 16 <ul> 17 <li><?php _e( 'You do not have permission to view this forum.', 'bbpress' ); ?></li> 18 </ul> 17 19 </div> 18 20 </div> 19 21 </div><!-- #forum-private --> -
src/templates/default/bbpress/feedback-no-forums.php
10 10 ?> 11 11 12 12 <div class="bbp-template-notice"> 13 <p><?php _e( 'Oh bother! No forums were found here!', 'bbpress' ); ?></p> 13 <ul> 14 <li><?php _e( 'Oh bother! No forums were found here!', 'bbpress' ); ?></li> 15 </ul> 14 16 </div> -
src/templates/default/bbpress/feedback-no-replies.php
10 10 ?> 11 11 12 12 <div class="bbp-template-notice"> 13 <p><?php _e( 'Oh bother! No replies were found here!', 'bbpress' ); ?></p> 13 <ul> 14 <li><?php _e( 'Oh bother! No replies were found here!', 'bbpress' ); ?></li> 15 </ul> 14 16 </div> -
src/templates/default/bbpress/feedback-no-search.php
10 10 ?> 11 11 12 12 <div class="bbp-template-notice"> 13 <p><?php _e( 'Oh bother! No search results were found here!', 'bbpress' ); ?></p> 13 <ul> 14 <li><?php _e( 'Oh bother! No search results were found here!', 'bbpress' ); ?></li> 15 </ul> 14 16 </div> -
src/templates/default/bbpress/feedback-no-topics.php
10 10 ?> 11 11 12 12 <div class="bbp-template-notice"> 13 <p><?php _e( 'Oh bother! No topics were found here!', 'bbpress' ); ?></p> 13 <ul> 14 <li><?php _e( 'Oh bother! No topics were found here!', 'bbpress' ); ?></li> 15 </ul> 14 16 </div> -
src/templates/default/bbpress/form-forum.php
44 44 <?php if ( !bbp_is_forum_edit() && bbp_is_forum_closed() ) : ?> 45 45 46 46 <div class="bbp-template-notice"> 47 <p><?php _e( 'This forum is closed to new content, however your account still allows you to do so.', 'bbpress' ); ?></p> 47 <ul> 48 <li><?php _e( 'This forum is closed to new content, however your account still allows you to do so.', 'bbpress' ); ?></li> 49 </ul> 48 50 </div> 49 51 50 52 <?php endif; ?> … … 52 54 <?php if ( current_user_can( 'unfiltered_html' ) ) : ?> 53 55 54 56 <div class="bbp-template-notice"> 55 <p><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></p> 57 <ul> 58 <li><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></li> 59 </ul> 56 60 </div> 57 61 58 62 <?php endif; ?> … … 63 67 64 68 <?php do_action( 'bbp_theme_before_forum_form_title' ); ?> 65 69 66 <p> 67 <label for="bbp_forum_title"><?php printf( __( 'Forum Name (Maximum Length: %d):', 'bbpress' ), bbp_get_title_max_length() ); ?></label><br /> 68 <input type="text" id="bbp_forum_title" value="<?php bbp_form_forum_title(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_forum_title" maxlength="<?php bbp_title_max_length(); ?>" /> 69 </p> 70 <ul> 71 <li> 72 <label for="bbp_forum_title"><?php printf( __( 'Forum Name (Maximum Length: %d):', 'bbpress' ), bbp_get_title_max_length() ); ?></label><br /> 73 <input type="text" id="bbp_forum_title" value="<?php bbp_form_forum_title(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_forum_title" maxlength="<?php bbp_title_max_length(); ?>" /> 74 </li> 75 </ul> 70 76 71 77 <?php do_action( 'bbp_theme_after_forum_form_title' ); ?> 72 78 … … 158 164 159 165 <div id="no-forum-<?php bbp_forum_id(); ?>" class="bbp-no-forum"> 160 166 <div class="bbp-template-notice"> 161 <p><?php printf( __( 'The forum ‘%s’ is closed to new content.', 'bbpress' ), bbp_get_forum_title() ); ?></p> 167 <ul> 168 <li><?php printf( __( 'The forum ‘%s’ is closed to new content.', 'bbpress' ), bbp_get_forum_title() ); ?></li> 169 </ul> 162 170 </div> 163 171 </div> 164 172 … … 166 174 167 175 <div id="no-forum-<?php bbp_forum_id(); ?>" class="bbp-no-forum"> 168 176 <div class="bbp-template-notice"> 169 <p><?php is_user_logged_in() ? _e( 'You cannot create new forums.', 'bbpress' ) : _e( 'You must be logged in to create new forums.', 'bbpress' ); ?></p> 177 <ul> 178 <li><?php is_user_logged_in() ? _e( 'You cannot create new forums.', 'bbpress' ) : _e( 'You must be logged in to create new forums.', 'bbpress' ); ?></li> 179 </ul> 170 180 </div> 171 181 </div> 172 182 -
src/templates/default/bbpress/form-reply-move.php
26 26 <div> 27 27 28 28 <div class="bbp-template-notice info"> 29 <p><?php _e( 'You can either make this reply a new topic with a new title, or merge it into an existing topic.', 'bbpress' ); ?></p> 29 <ul> 30 <li><?php _e( 'You can either make this reply a new topic with a new title, or merge it into an existing topic.', 'bbpress' ); ?></li> 31 </ul> 30 32 </div> 31 33 32 34 <div class="bbp-template-notice"> 33 <p><?php _e( 'If you choose an existing topic, replies will be ordered by the time and date they were created.', 'bbpress' ); ?></p> 35 <ul> 36 <li><?php _e( 'If you choose an existing topic, replies will be ordered by the time and date they were created.', 'bbpress' ); ?></li> 37 </ul> 34 38 </div> 35 39 36 40 <fieldset class="bbp-form"> … … 64 68 65 69 </fieldset> 66 70 67 <div class="bbp-template-notice error"> 68 <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p> 71 <div class="bbp-template-notice error" role="alert" tabindex="-1"> 72 <ul> 73 <li><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></li> 74 </ul> 69 75 </div> 70 76 71 77 <div class="bbp-submit-wrapper"> -
src/templates/default/bbpress/form-reply.php
33 33 <?php if ( !bbp_is_topic_open() && !bbp_is_reply_edit() ) : ?> 34 34 35 35 <div class="bbp-template-notice"> 36 <p><?php _e( 'This topic is marked as closed to new replies, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></p> 36 <ul> 37 <li><?php _e( 'This topic is marked as closed to new replies, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></li> 38 </ul> 37 39 </div> 38 40 39 41 <?php endif; ?> … … 41 43 <?php if ( current_user_can( 'unfiltered_html' ) ) : ?> 42 44 43 45 <div class="bbp-template-notice"> 44 <p><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></p> 46 <ul> 47 <li><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></li> 48 </ul> 45 49 </div> 46 50 47 51 <?php endif; ?> … … 172 176 173 177 <div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply"> 174 178 <div class="bbp-template-notice"> 175 <p><?php printf( __( 'The topic ‘%s’ is closed to new replies.', 'bbpress' ), bbp_get_topic_title() ); ?></p> 179 <ul> 180 <li><?php printf( __( 'The topic ‘%s’ is closed to new replies.', 'bbpress' ), bbp_get_topic_title() ); ?></li> 181 </ul> 176 182 </div> 177 183 </div> 178 184 … … 180 186 181 187 <div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply"> 182 188 <div class="bbp-template-notice"> 183 <p><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></p> 189 <ul> 190 <li><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></li> 191 </ul> 184 192 </div> 185 193 </div> 186 194 … … 188 196 189 197 <div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply"> 190 198 <div class="bbp-template-notice"> 191 <p><?php is_user_logged_in() ? _e( 'You cannot reply to this topic.', 'bbpress' ) : _e( 'You must be logged in to reply to this topic.', 'bbpress' ); ?></p> 199 <ul> 200 <li><?php is_user_logged_in() ? _e( 'You cannot reply to this topic.', 'bbpress' ) : _e( 'You must be logged in to reply to this topic.', 'bbpress' ); ?></li> 201 </ul> 192 202 </div> 193 203 </div> 194 204 -
src/templates/default/bbpress/form-topic-merge.php
26 26 <div> 27 27 28 28 <div class="bbp-template-notice info"> 29 <p><?php _e( 'Select the topic to merge this one into. The destination topic will remain the lead topic, and this one will change into a reply.', 'bbpress' ); ?></p> 30 <p><?php _e( 'To keep this topic as the lead, go to the other topic and use the merge tool from there instead.', 'bbpress' ); ?></p> 29 <ul> 30 <li><?php _e( 'Select the topic to merge this one into. The destination topic will remain the lead topic, and this one will change into a reply.', 'bbpress' ); ?></li> 31 <li><?php _e( 'To keep this topic as the lead, go to the other topic and use the merge tool from there instead.', 'bbpress' ); ?></li> 32 </ul> 31 33 </div> 32 34 33 35 <div class="bbp-template-notice"> 34 <p><?php _e( 'All replies within both the topics will be merged chronologically. The order of the merged replies is based on the time they were posted. If the destination topic was created after this one, its post date will be updated to a second earlier than this one.', 'bbpress' ); ?></p> 36 <ul> 37 <li><?php _e( 'All replies within both the topics will be merged chronologically. The order of the merged replies is based on the time they were posted. If the destination topic was created after this one, its post date will be updated to a second earlier than this one.', 'bbpress' ); ?></li> 38 </ul> 35 39 </div> 36 40 37 41 <fieldset class="bbp-form"> … … 86 90 </div> 87 91 </fieldset> 88 92 89 <div class="bbp-template-notice error"> 90 <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p> 93 <div class="bbp-template-notice error" role="alert" tabindex="-1"> 94 <ul> 95 <li><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></li> 96 </ul> 91 97 </div> 92 98 93 99 <div class="bbp-submit-wrapper"> -
src/templates/default/bbpress/form-topic-split.php
26 26 <div> 27 27 28 28 <div class="bbp-template-notice info"> 29 <p><?php _e( 'When you split a topic, you are slicing it in half starting with the reply you just selected. Choose to use that reply as a new topic with a new title, or merge those replies into an existing topic.', 'bbpress' ); ?></p> 29 <ul> 30 <li><?php _e( 'When you split a topic, you are slicing it in half starting with the reply you just selected. Choose to use that reply as a new topic with a new title, or merge those replies into an existing topic.', 'bbpress' ); ?></li> 31 </ul> 30 32 </div> 31 33 32 34 <div class="bbp-template-notice"> 33 <p><?php _e( 'If you use the existing topic option, replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'bbpress' ); ?></p> 35 <ul> 36 <li><?php _e( 'If you use the existing topic option, replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'bbpress' ); ?></li> 37 </ul> 34 38 </div> 35 39 36 40 <fieldset class="bbp-form"> … … 90 94 </div> 91 95 </fieldset> 92 96 93 <div class="bbp-template-notice error"> 94 <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p> 97 <div class="bbp-template-notice error" role="alert" tabindex="-1"> 98 <ul> 99 <li><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></li> 100 </ul> 95 101 </div> 96 102 97 103 <div class="bbp-submit-wrapper"> -
src/templates/default/bbpress/form-topic-tag.php
22 22 <legend><?php _e( 'Rename', 'bbpress' ); ?></legend> 23 23 24 24 <div class="bbp-template-notice info"> 25 <p><?php _e( 'Leave the slug empty to have one automatically generated.', 'bbpress' ); ?></p> 25 <ul> 26 <li><?php _e( 'Leave the slug empty to have one automatically generated.', 'bbpress' ); ?></li> 27 </ul> 26 28 </div> 27 29 28 30 <div class="bbp-template-notice"> 29 <p><?php _e( 'Changing the slug affects its permalink. Any links to the old slug will stop working.', 'bbpress' ); ?></p> 31 <ul> 32 <li><?php _e( 'Changing the slug affects its permalink. Any links to the old slug will stop working.', 'bbpress' ); ?></li> 33 </ul> 30 34 </div> 31 35 32 36 <form id="rename_tag" name="rename_tag" method="post" action="<?php the_permalink(); ?>"> … … 64 68 <legend><?php _e( 'Merge', 'bbpress' ); ?></legend> 65 69 66 70 <div class="bbp-template-notice"> 67 <p><?php _e( 'Merging tags together cannot be undone.', 'bbpress' ); ?></p> 71 <ul> 72 <li><?php _e( 'Merging tags together cannot be undone.', 'bbpress' ); ?></li> 73 </ul> 68 74 </div> 69 75 70 76 <form id="merge_tag" name="merge_tag" method="post" action="<?php the_permalink(); ?>"> … … 93 99 <legend><?php _e( 'Delete', 'bbpress' ); ?></legend> 94 100 95 101 <div class="bbp-template-notice info"> 96 <p><?php _e( 'This does not delete your topics. Only the tag itself is deleted.', 'bbpress' ); ?></p> 102 <ul> 103 <li><?php _e( 'This does not delete your topics. Only the tag itself is deleted.', 'bbpress' ); ?></li> 104 </ul> 97 105 </div> 98 106 <div class="bbp-template-notice"> 99 <p><?php _e( 'Deleting a tag cannot be undone.', 'bbpress' ); ?></p> 100 <p><?php _e( 'Any links to this tag will no longer function.', 'bbpress' ); ?></p> 107 <ul> 108 <li><?php _e( 'Deleting a tag cannot be undone.', 'bbpress' ); ?></li> 109 <li><?php _e( 'Any links to this tag will no longer function.', 'bbpress' ); ?></li> 110 </ul> 101 111 </div> 102 112 103 113 <form id="delete_tag" name="delete_tag" method="post" action="<?php the_permalink(); ?>"> -
src/templates/default/bbpress/form-topic.php
50 50 <?php if ( !bbp_is_topic_edit() && bbp_is_forum_closed() ) : ?> 51 51 52 52 <div class="bbp-template-notice"> 53 <p><?php _e( 'This forum is marked as closed to new topics, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></p> 53 <ul> 54 <li><?php _e( 'This forum is marked as closed to new topics, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></li> 55 </ul> 54 56 </div> 55 57 56 58 <?php endif; ?> … … 58 60 <?php if ( current_user_can( 'unfiltered_html' ) ) : ?> 59 61 60 62 <div class="bbp-template-notice"> 61 <p><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></p> 63 <ul> 64 <li><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></li> 65 </ul> 62 66 </div> 63 67 64 68 <?php endif; ?> … … 223 227 224 228 <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic"> 225 229 <div class="bbp-template-notice"> 226 <p><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title() ); ?></p> 230 <ul> 231 <li><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title() ); ?></li> 232 </ul> 227 233 </div> 228 234 </div> 229 235 … … 231 237 232 238 <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic"> 233 239 <div class="bbp-template-notice"> 234 <p><?php is_user_logged_in() ? _e( 'You cannot create new topics.', 'bbpress' ) : _e( 'You must be logged in to create new topics.', 'bbpress' ); ?></p> 240 <ul> 241 <li><?php is_user_logged_in() ? _e( 'You cannot create new topics.', 'bbpress' ) : _e( 'You must be logged in to create new topics.', 'bbpress' ); ?></li> 242 </ul> 235 243 </div> 236 244 </div> 237 245 -
src/templates/default/bbpress/form-user-register.php
16 16 <?php do_action( 'bbp_template_before_register_fields' ); ?> 17 17 18 18 <div class="bbp-template-notice"> 19 <p><?php _e( 'Your username must be unique, and cannot be changed later.', 'bbpress' ) ?></p> 20 <p><?php _e( 'We use your email address to email you a secure password and verify your account.', 'bbpress' ) ?></p> 19 <ul> 20 <li><?php _e( 'Your username must be unique, and cannot be changed later.', 'bbpress' ) ?></li> 21 <li><?php _e( 'We use your email address to email you a secure password and verify your account.', 'bbpress' ) ?></li> 22 </ul> 21 23 </div> 22 24 23 25 <div class="bbp-username"> -
src/templates/default/css/bbpress.css
883 883 div.bbp-template-notice.warning a { 884 884 color: #c00; 885 885 } 886 div.bbp-template-notice p{886 div.bbp-template-notice li { 887 887 margin: 0.5em 0 6px 0 !important; 888 888 padding: 2px; 889 889 font-size: 12px;