Changeset 5563
- Timestamp:
- 11/11/2014 05:25:09 PM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 21 edited
-
includes/common/template.php (modified) (3 diffs)
-
includes/forums/template.php (modified) (1 diff)
-
includes/topics/template.php (modified) (1 diff)
-
includes/users/template.php (modified) (2 diffs)
-
templates/default/bbpress/content-archive-topic.php (modified) (1 diff)
-
templates/default/bbpress/content-topic-tag-edit.php (modified) (1 diff)
-
templates/default/bbpress/feedback-logged-in.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-access.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-forums.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-replies.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-search.php (modified) (1 diff)
-
templates/default/bbpress/feedback-no-topics.php (modified) (1 diff)
-
templates/default/bbpress/form-forum.php (modified) (5 diffs)
-
templates/default/bbpress/form-reply-move.php (modified) (2 diffs)
-
templates/default/bbpress/form-reply.php (modified) (6 diffs)
-
templates/default/bbpress/form-topic-merge.php (modified) (2 diffs)
-
templates/default/bbpress/form-topic-split.php (modified) (2 diffs)
-
templates/default/bbpress/form-topic-tag.php (modified) (4 diffs)
-
templates/default/bbpress/form-topic.php (modified) (5 diffs)
-
templates/default/bbpress/form-user-register.php (modified) (1 diff)
-
templates/default/css/bbpress.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/includes/common/template.php
r5561 r5563 1469 1469 'orderby' => $r['orderby'], 1470 1470 'order' => $r['order'], 1471 ) ); 1471 ) ); 1472 1472 } 1473 1473 … … 2508 2508 if ( !empty( $errors ) ) : ?> 2509 2509 2510 <div class="bbp-template-notice error" >2511 < p>2512 < ?php echo implode( "</p>\n<p>", $errors ); ?>2513 </ p>2510 <div class="bbp-template-notice error" role="alert" tabindex="-1"> 2511 <ul> 2512 <li><?php echo implode( "</li>\n<li>", $errors ); ?></li> 2513 </ul> 2514 2514 </div> 2515 2515 … … 2520 2520 2521 2521 <div class="bbp-template-notice"> 2522 < p>2523 < ?php echo implode( "</p>\n<p>", $messages ); ?>2524 </ p>2522 <ul> 2523 <li><?php echo implode( "</li>\n<li>", $messages ); ?></li> 2524 </ul> 2525 2525 </div> 2526 2526 -
trunk/src/includes/forums/template.php
r5562 r5563 2066 2066 $r = bbp_parse_args( $args, array( 2067 2067 'forum_id' => 0, 2068 'before' => '<div class="bbp-template-notice info">< pclass="bbp-forum-description">',2069 'after' => '</ p></div>',2068 'before' => '<div class="bbp-template-notice info"><ul><li class="bbp-forum-description">', 2069 'after' => '</li></ul></div>', 2070 2070 'size' => 14, 2071 2071 'feed' => true -
trunk/src/includes/topics/template.php
r5561 r5563 3435 3435 $r = bbp_parse_args( $args, array( 3436 3436 'topic_id' => 0, 3437 'before' => '<div class="bbp-template-notice info">< pclass="bbp-topic-description">',3438 'after' => '</ p></div>',3437 'before' => '<div class="bbp-template-notice info"><ul><li class="bbp-topic-description">', 3438 'after' => '</li></ul></div>', 3439 3439 'size' => 14 3440 3440 ), 'get_single_topic_description' ); -
trunk/src/includes/users/template.php
r5475 r5563 1174 1174 1175 1175 <div class="bbp-template-notice updated"> 1176 <p><?php esc_html_e( 'User updated.', 'bbpress' ); ?></p> 1176 <ul> 1177 <li><?php esc_html_e( 'User updated.', 'bbpress' ); ?></li> 1178 </ul> 1177 1179 </div> 1178 1180 … … 1199 1201 1200 1202 <div class="bbp-template-notice important"> 1201 <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> 1203 <ul> 1204 <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> 1205 </ul> 1202 1206 </div> 1203 1207 -
trunk/src/templates/default/bbpress/content-archive-topic.php
r5310 r5563 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; ?> -
trunk/src/templates/default/bbpress/content-topic-tag-edit.php
r5310 r5563 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' ); ?> -
trunk/src/templates/default/bbpress/feedback-logged-in.php
r4836 r5563 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> -
trunk/src/templates/default/bbpress/feedback-no-access.php
r4836 r5563 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> -
trunk/src/templates/default/bbpress/feedback-no-forums.php
r4836 r5563 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> -
trunk/src/templates/default/bbpress/feedback-no-replies.php
r4836 r5563 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> -
trunk/src/templates/default/bbpress/feedback-no-search.php
r4836 r5563 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> -
trunk/src/templates/default/bbpress/feedback-no-topics.php
r4836 r5563 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> -
trunk/src/templates/default/bbpress/form-forum.php
r5561 r5563 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 … … 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 … … 159 163 <div id="no-forum-<?php bbp_forum_id(); ?>" class="bbp-no-forum"> 160 164 <div class="bbp-template-notice"> 161 <p><?php printf( __( 'The forum ‘%s’ is closed to new content.', 'bbpress' ), bbp_get_forum_title() ); ?></p> 165 <ul> 166 <li><?php printf( __( 'The forum ‘%s’ is closed to new content.', 'bbpress' ), bbp_get_forum_title() ); ?></li> 167 </ul> 162 168 </div> 163 169 </div> … … 167 173 <div id="no-forum-<?php bbp_forum_id(); ?>" class="bbp-no-forum"> 168 174 <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> 175 <ul> 176 <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> 177 </ul> 170 178 </div> 171 179 </div> … … 177 185 </div> 178 186 179 <?php endif; ?>187 <?php endif; -
trunk/src/templates/default/bbpress/form-reply-move.php
r5561 r5563 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 … … 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 -
trunk/src/templates/default/bbpress/form-reply.php
r5561 r5563 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 … … 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 … … 182 186 <div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply"> 183 187 <div class="bbp-template-notice"> 184 <p><?php printf( __( 'The topic ‘%s’ is closed to new replies.', 'bbpress' ), bbp_get_topic_title() ); ?></p> 188 <ul> 189 <li><?php printf( __( 'The topic ‘%s’ is closed to new replies.', 'bbpress' ), bbp_get_topic_title() ); ?></li> 190 </ul> 185 191 </div> 186 192 </div> … … 190 196 <div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply"> 191 197 <div class="bbp-template-notice"> 192 <p><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></p> 198 <ul> 199 <li><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></li> 200 </ul> 193 201 </div> 194 202 </div> … … 198 206 <div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply"> 199 207 <div class="bbp-template-notice"> 200 <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> 208 <ul> 209 <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> 210 </ul> 201 211 </div> 202 212 </div> … … 208 218 </div> 209 219 210 <?php endif; ?>220 <?php endif; -
trunk/src/templates/default/bbpress/form-topic-merge.php
r5561 r5563 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( 'Replies to both topics are merged chronologically, ordered by the time and date they were published. Topics may be updated to a 1 second difference to maintain chronological order based on the merge direction.', 'bbpress' ); ?></p> 36 <ul> 37 <li><?php _e( 'Replies to both topics are merged chronologically, ordered by the time and date they were published. Topics may be updated to a 1 second difference to maintain chronological order based on the merge direction.', 'bbpress' ); ?></li> 38 </ul> 35 39 </div> 36 40 … … 88 92 89 93 <div class="bbp-template-notice error"> 90 <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p> 94 <ul> 95 <li><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></li> 96 </ul> 91 97 </div> 92 98 -
trunk/src/templates/default/bbpress/form-topic-split.php
r5561 r5563 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 … … 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 -
trunk/src/templates/default/bbpress/form-topic-tag.php
r5561 r5563 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 … … 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 … … 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 … … 120 130 </div> 121 131 122 <?php endif; ?>132 <?php endif; -
trunk/src/templates/default/bbpress/form-topic.php
r5561 r5563 54 54 55 55 <div class="bbp-template-notice"> 56 <p><?php _e( 'This forum is marked as closed to new topics, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></p> 56 <ul> 57 <li><?php _e( 'This forum is marked as closed to new topics, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></li> 58 </ul> 57 59 </div> 58 60 … … 62 64 63 65 <div class="bbp-template-notice"> 64 <p><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></p> 66 <ul> 67 <li><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></li> 68 </ul> 65 69 </div> 66 70 … … 227 231 <div id="forum-closed-<?php bbp_forum_id(); ?>" class="bbp-forum-closed"> 228 232 <div class="bbp-template-notice"> 229 <p><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title() ); ?></p> 233 <ul> 234 <li><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title() ); ?></li> 235 </ul> 230 236 </div> 231 237 </div> … … 235 241 <div id="no-topic-<?php bbp_forum_id(); ?>" class="bbp-no-topic"> 236 242 <div class="bbp-template-notice"> 237 <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> 243 <ul> 244 <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> 245 </ul> 238 246 </div> 239 247 </div> … … 245 253 </div> 246 254 247 <?php endif; ?>255 <?php endif; -
trunk/src/templates/default/bbpress/form-user-register.php
r5561 r5563 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 -
trunk/src/templates/default/css/bbpress.css
r5508 r5563 890 890 color: #c00; 891 891 } 892 div.bbp-template-notice p { 892 div.bbp-template-notice p, 893 div.bbp-template-notice li { 893 894 margin: 0.5em 0 6px 0 !important; 894 895 padding: 2px;
Note: See TracChangeset
for help on using the changeset viewer.