Ticket #3340: 3340.patch
File 3340.patch, 17.1 KB (added by , 14 years ago) |
---|
-
bp-themes/bp-default/groups/index.php
30 30 31 31 <div class="item-list-tabs" role="navigation"> 32 32 <ul> 33 <li class="selected" id="groups-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ); ?></a></li>33 <li class="selected" id="groups-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php printf( __( 'All Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count() ); ?></a></li> 34 34 35 35 <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?> 36 36 37 <li id="groups-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups' ); ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>37 <li id="groups-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups' ); ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li> 38 38 39 39 <?php endif; ?> 40 40 -
bp-themes/bp-default/members/index.php
28 28 29 29 <div class="item-list-tabs" role="navigation"> 30 30 <ul> 31 <li class="selected" id="members-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ); ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>31 <li class="selected" id="members-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_member_count() ); ?></a></li> 32 32 33 33 <?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?> 34 34 35 <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>35 <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/' ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li> 36 36 37 37 <?php endif; ?> 38 38 -
bp-themes/bp-default/activity/index.php
34 34 <ul> 35 35 <?php do_action( 'bp_before_activity_type_tab_all' ) ?> 36 36 37 <li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>37 <li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li> 38 38 39 39 <?php if ( is_user_logged_in() ) : ?> 40 40 … … 44 44 45 45 <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?> 46 46 47 <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>47 <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li> 48 48 49 49 <?php endif; ?> 50 50 … … 56 56 57 57 <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?> 58 58 59 <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>59 <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li> 60 60 61 61 <?php endif; ?> 62 62 … … 66 66 67 67 <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?> 68 68 69 <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/' ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites (<span>%s</span>)', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>69 <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/' ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites <span>%s</span>', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li> 70 70 71 71 <?php endif; ?> 72 72 73 73 <?php do_action( 'bp_before_activity_type_tab_mentions' ) ?> 74 74 75 <li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( ' (%s new)', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>75 <li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '<span>%s new</span>', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li> 76 76 77 77 <?php endif; ?> 78 78 -
bp-themes/bp-default/blogs/index.php
28 28 29 29 <div class="item-list-tabs" role="navigation"> 30 30 <ul> 31 <li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Sites (%s)', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li>31 <li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li> 32 32 33 33 <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?> 34 34 35 <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug() . '/my-blogs/' ?>"><?php printf( __( 'My Sites (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>35 <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug() . '/my-blogs/' ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li> 36 36 37 37 <?php endif; ?> 38 38 -
bp-themes/bp-default/_inc/css/default.css
1315 1315 padding: 3px 8px; 1316 1316 text-decoration: none; 1317 1317 } 1318 a.bp-primary-action span, .comment-reply-link span, #reply-title small a span { 1319 background: #FFA200; 1320 -moz-border-radius: 3px; 1321 -webkit-border-radius: 3px; 1322 border-radius: 3px; 1323 color: #FFF; 1324 margin-left: 2px; 1325 padding: 0 5px; 1326 font-size: 90%; 1327 } 1318 1328 a.bp-primary-action:hover, 1319 1329 .comment-reply-link:hover, 1320 1330 #reply-title small a:hover { … … 1322 1332 border-color: #f7740a; 1323 1333 color: #fff; 1324 1334 } 1335 a.bp-primary-action:hover span, 1336 .comment-reply-link:hover span, 1337 #reply-title small a:hover span { 1338 background: #fff; 1339 color: #f7740a; 1340 } 1325 1341 div.activity-comments { 1326 1342 margin: 0 0 0 70px; 1327 1343 overflow: hidden; /* IE fix */ … … 2116 2132 color: #aaa; 2117 2133 } 2118 2134 div.item-list-tabs ul li a span { 2119 color: inherit;2135 color: #fff; 2120 2136 display: inline; 2121 padding: 0; 2137 padding: 0 6px; 2138 background: #1FB3DD; 2139 -moz-border-radius: 3px; 2140 -webkit-border-radius: 3px; 2141 border-radius: 3px; 2142 margin-left: 2px; 2143 font-size: 90%; 2144 line-height: 100%; 2122 2145 } 2123 2146 div.item-list-tabs ul li.selected a, 2124 2147 div.item-list-tabs ul li.current a { … … 2132 2155 color: #555; 2133 2156 font-weight: bold; 2134 2157 } 2158 div.item-list-tabs ul li.selected a span, 2159 div.item-list-tabs ul li.current a span { 2160 background: #999; 2161 } 2135 2162 ul li.loading a { 2136 2163 background-image: url( ../images/ajax-loader.gif ); 2137 2164 background-position: 92% 50%; -
bp-themes/bp-default/forums/index.php
35 35 36 36 <div class="item-list-tabs" role="navigation"> 37 37 <ul> 38 <li class="selected" id="forums-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li>38 <li class="selected" id="forums-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?>"><?php printf( __( 'All Topics <span>%s</span>', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li> 39 39 40 40 <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?> 41 41 42 <li id="forums-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() . '/topics' ); ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>42 <li id="forums-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() . '/topics' ); ?>"><?php printf( __( 'My Topics <span>%s</span>', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?></a></li> 43 43 44 44 <?php endif; ?> 45 45 -
bp-friends/bp-friends-loader.php
94 94 95 95 // Add 'Friends' to the main navigation 96 96 $main_nav = array( 97 'name' => sprintf( __( 'Friends <span> (%d)</span>', 'buddypress' ), friends_get_total_friend_count() ),97 'name' => sprintf( __( 'Friends <span>%d</span>', 'buddypress' ), friends_get_total_friend_count() ), 98 98 'slug' => $this->slug, 99 99 'position' => 60, 100 100 'screen_function' => 'friends_screen_my_friends', … … 148 148 149 149 // Pending friend requests 150 150 if ( $count = count( friends_get_friendship_request_user_ids( $bp->loggedin_user->id ) ) ) { 151 $title = sprintf( __( 'Friends <s trong>(%s)</strong>', 'buddypress' ), $count );152 $pending = sprintf( __( 'Pending Requests <s trong>(%s)</strong>', 'buddypress' ), $count );151 $title = sprintf( __( 'Friends <span>%s</span>', 'buddypress' ), $count ); 152 $pending = sprintf( __( 'Pending Requests <span>%s</span>', 'buddypress' ), $count ); 153 153 } else { 154 154 $title = __( 'Friends', 'buddypress' ); 155 155 $pending = __( 'No Pending Requests', 'buddypress' ); -
bp-activity/bp-activity-template.php
712 712 $content .= $time_since; 713 713 714 714 if ( is_user_logged_in() && bp_activity_can_comment() ) 715 $content .= sprintf( '<a href="%1$s" class="acomment-reply bp-primary-action" id="acomment-comment-%2$d">%3$s</a>', bp_get_activity_comment_link(), bp_get_activity_id(), sprintf( __( 'Reply (<span>%s</span>)', 'buddypress' ), bp_activity_get_comment_count() ) );715 $content .= sprintf( '<a href="%1$s" class="acomment-reply bp-primary-action" id="acomment-comment-%2$d">%3$s</a>', bp_get_activity_comment_link(), bp_get_activity_id(), sprintf( __( 'Reply <span>%s</span>', 'buddypress' ), bp_activity_get_comment_count() ) ); 716 716 717 717 return apply_filters( 'bp_insert_activity_meta', $content ); 718 718 } -
bp-blogs/bp-blogs-loader.php
105 105 106 106 // Add 'Sites' to the main navigation 107 107 $main_nav = array( 108 'name' => sprintf( __( 'Sites <span> (%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),108 'name' => sprintf( __( 'Sites <span>%d</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ), 109 109 'slug' => $this->slug, 110 110 'position' => 30, 111 111 'screen_function' => 'bp_blogs_screen_my_blogs', -
bp-messages/bp-messages-loader.php
93 93 global $bp; 94 94 95 95 if ( $count = messages_get_unread_count() ) 96 $name = sprintf( __( 'Messages <s trong>(%s)</strong>', 'buddypress' ), $count );96 $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), $count ); 97 97 else 98 98 $name = __( 'Messages <strong></strong>', 'buddypress' ); 99 99 … … 178 178 179 179 // Unread message count 180 180 if ( $count = messages_get_unread_count() ) { 181 $title = sprintf( __( 'Messages <s trong>(%s)</strong>', 'buddypress' ), $count );182 $inbox = sprintf( __( 'Inbox <s trong>(%s)</strong>', 'buddypress' ), $count );181 $title = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), $count ); 182 $inbox = sprintf( __( 'Inbox <span>%s</span>', 'buddypress' ), $count ); 183 183 } else { 184 184 $title = __( 'Messages', 'buddypress' ); 185 185 $inbox = __( 'Inbox', 'buddypress' ); -
bp-groups/bp-groups-loader.php
223 223 224 224 // Add 'Groups' to the main navigation 225 225 $main_nav = array( 226 'name' => sprintf( __( 'Groups <span> (%d)</span>', 'buddypress' ), groups_total_groups_for_user() ),226 'name' => sprintf( __( 'Groups <span>%d</span>', 'buddypress' ), groups_total_groups_for_user() ), 227 227 'slug' => $this->slug, 228 228 'position' => 70, 229 229 'screen_function' => 'groups_screen_my_groups', … … 330 330 } 331 331 332 332 $sub_nav[] = array( 333 'name' => sprintf( __( 'Members (%s)', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),333 'name' => sprintf( __( 'Members <span>%s</span>', 'buddypress' ), number_format( $this->current_group->total_member_count ) ), 334 334 'slug' => 'members', 335 335 'parent_url' => $group_link, 336 336 'parent_slug' => $this->current_group->slug, … … 385 385 386 386 if ( !empty( $count->total ) ) { 387 387 $title = sprintf( __( 'Groups <strong>(%s)</strong>', 'buddypress' ), $count->total ); 388 $pending = sprintf( __( 'Pending Invites <s trong>(%s)</strong>', 'buddypress' ), $count->total );388 $pending = sprintf( __( 'Pending Invites <span>%s</span>', 'buddypress' ), $count->total ); 389 389 } else { 390 390 $title = __( 'Groups', 'buddypress' ); 391 391 $pending = __( 'No Pending Invites', 'buddypress' );