Changeset 4676

Timestamp:

07/17/2011 11:57:04 PM (13 years ago)

Author:

djpaul

Message:

Replace parentheses around nav item numbers with spans. Fixes #3340, big props davidtcarson

Location:

trunk

Files:

• bp-blogs/bp-blogs-loader.php (modified) (1 diff)
• bp-friends/bp-friends-loader.php (modified) (2 diffs)
• bp-groups/bp-groups-loader.php (modified) (3 diffs)
• bp-messages/bp-messages-loader.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/css/default.css (modified) (3 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-themes/bp-default/activity/entry.php (modified) (1 diff)
• bp-themes/bp-default/activity/index.php (modified) (5 diffs)
• bp-themes/bp-default/blogs/index.php (modified) (1 diff)
• bp-themes/bp-default/forums/index.php (modified) (1 diff)
• bp-themes/bp-default/groups/index.php (modified) (1 diff)
• bp-themes/bp-default/members/index.php (modified) (1 diff)

trunk/bp-blogs/bp-blogs-loader.php

@@ -106 +106 @@
         // Add 'Sites' to the main navigation
         $main_nav =  array(
-            'name'                => sprintf( __( 'Sites <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
+            'name'                => sprintf( __( 'Sites <span>%d</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
             'slug'                => $this->slug,
             'position'            => 30,

trunk/bp-friends/bp-friends-loader.php

@@ -95 +95 @@
         // Add 'Friends' to the main navigation
         $main_nav = array(
-            'name'                => sprintf( __( 'Friends <span>(%d)</span>', 'buddypress' ), friends_get_total_friend_count() ),
+            'name'                => sprintf( __( 'Friends <span>%d</span>', 'buddypress' ), friends_get_total_friend_count() ),
             'slug'                => $this->slug,
             'position'            => 60,
@@ -149 +149 @@
             // Pending friend requests
             if ( $count = count( friends_get_friendship_request_user_ids( $bp->loggedin_user->id ) ) ) {
-                $title   = sprintf( __( 'Friends <strong>(%s)</strong>',          'buddypress' ), $count );
-                $pending = sprintf( __( 'Pending Requests <strong>(%s)</strong>', 'buddypress' ), $count );
+                $title   = sprintf( __( 'Friends <span>%s</span>',          'buddypress' ), $count );
+                $pending = sprintf( __( 'Pending Requests <span>%s</span>', 'buddypress' ), $count );
             } else {
                 $title   = __( 'Friends',             'buddypress' );

trunk/bp-groups/bp-groups-loader.php

@@ -224 +224 @@
         // Add 'Groups' to the main navigation
         $main_nav = array(
-            'name'                => sprintf( __( 'Groups <span>(%d)</span>', 'buddypress' ), groups_total_groups_for_user() ),
+            'name'                => sprintf( __( 'Groups <span>%d</span>', 'buddypress' ), groups_total_groups_for_user() ),
             'slug'                => $this->slug,
             'position'            => 70,
@@ -331 +331 @@
 
             $sub_nav[] = array(
-                'name'            => sprintf( __( 'Members (%s)', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),
+                'name'            => sprintf( __( 'Members <span>%s</span>', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),
                 'slug'            => 'members',
                 'parent_url'      => $group_link,
@@ -386 +386 @@
             if ( !empty( $count->total ) ) {
                 $title   = sprintf( __( 'Groups <strong>(%s)</strong>',          'buddypress' ), $count->total );
-                $pending = sprintf( __( 'Pending Invites <strong>(%s)</strong>', 'buddypress' ), $count->total );
+                $pending = sprintf( __( 'Pending Invites <span>%s</span>', 'buddypress' ), $count->total );
             } else {
                 $title   = __( 'Groups',             'buddypress' );

trunk/bp-messages/bp-messages-loader.php

@@ -94 +94 @@
 
         if ( $count = messages_get_unread_count() )
-            $name = sprintf( __( 'Messages <strong>(%s)</strong>', 'buddypress' ), $count );
+            $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), $count );
         else
             $name = __( 'Messages <strong></strong>', 'buddypress' );
@@ -179 +179 @@
             // Unread message count
             if ( $count = messages_get_unread_count() ) {
-                $title = sprintf( __( 'Messages <strong>(%s)</strong>', 'buddypress' ), $count );
-                $inbox = sprintf( __( 'Inbox <strong>(%s)</strong>',    'buddypress' ), $count );
+                $title = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), $count );
+                $inbox = sprintf( __( 'Inbox <span>%s</span>',    'buddypress' ), $count );
             } else {
                 $title = __( 'Messages', 'buddypress' );

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -1289 +1289 @@
     text-decoration: none;
 }
-a.bp-primary-action:hover,
-.comment-reply-link:hover,
-#reply-title small a:hover {
+a.bp-primary-action span,
+.comment-reply-link span,
+#reply-title small a span {
+    background: #999;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    color: #fff;
+    font-size: 90%; 
+    margin-left: 2px;
+    padding: 0 5px;
+}
+a.bp-primary-action:hover span,
+.comment-reply-link:hover span,
+#reply-title small a:hover span {
+    background: #555;
+    color: #fff;
 }
 div.activity-comments {
@@ -2119 +2133 @@
 }
 div.item-list-tabs ul li a span {
-    color: inherit;
+    background: #1fb3dd; 
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    color: #fff;
     display: inline;
-    padding: 0;
+    font-size: 90%; 
+    margin-left: 2px;
+    padding: 1px 6px;
 }
 div.item-list-tabs ul li.selected a,
@@ -2135 +2155 @@
     font-weight: bold;
 }
+div.item-list-tabs ul li.selected a span,
+div.item-list-tabs ul li.current a span,
+div.item-list-tabs ul li a:hover span {
+    background-color: #999;
+}
 ul li.loading a {
     background-image: url( ../images/ajax-loader.gif );

trunk/bp-themes/bp-default/_inc/global.js

@@ -178 +178 @@
                 if ( 'fav' == type ) {
                     if ( !jq('div.item-list-tabs li#activity-favorites').length )
-                        jq('div.item-list-tabs ul li#activity-mentions').before( '<li id="activity-favorites"><a href="#">' + BP_DTheme.my_favs + ' (<span>0</span>)</a></li>');
+                        jq('div.item-list-tabs ul li#activity-mentions').before( '<li id="activity-favorites"><a href="#">' + BP_DTheme.my_favs + ' <span>0</span></a></li>');
 
                     target.removeClass('fav');

trunk/bp-themes/bp-default/activity/entry.php

@@ -59 +59 @@
                 <?php if ( bp_activity_can_comment() ) : ?>
 
-                    <a href="<?php bp_get_activity_comment_link(); ?>" class="acomment-reply bp-primary-action" id="acomment-comment-<?php bp_activity_id(); ?>"><?php printf( __( 'Comment (<span>%s</span>)', 'buddypress' ), bp_activity_get_comment_count() ); ?></a>
+                    <a href="<?php bp_get_activity_comment_link(); ?>" class="acomment-reply bp-primary-action" id="acomment-comment-<?php bp_activity_id(); ?>"><?php printf( __( 'Comment <span>%s</span>', 'buddypress' ), bp_activity_get_comment_count() ); ?></a>
 
                 <?php endif; ?>

trunk/bp-themes/bp-default/activity/index.php

@@ -35 +35 @@
                     <?php do_action( 'bp_before_activity_type_tab_all' ) ?>
 
-                    <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>
+                    <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>
 
                     <?php if ( is_user_logged_in() ) : ?>
@@ -45 +45 @@
                             <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
-                                <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>
+                                <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>
 
                             <?php endif; ?>
@@ -57 +57 @@
                             <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                                <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>
+                                <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>
 
                             <?php endif; ?>
@@ -67 +67 @@
                         <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                            <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>
+                            <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>
 
                         <?php endif; ?>
@@ -73 +73 @@
                         <?php do_action( 'bp_before_activity_type_tab_mentions' ) ?>
 
-                        <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>
+                        <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>
 
                     <?php endif; ?>

trunk/bp-themes/bp-default/blogs/index.php

@@ -29 +29 @@
             <div class="item-list-tabs" role="navigation">
                 <ul>
-                    <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>
+                    <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>
 
                     <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                        <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>
+                        <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>
 
                     <?php endif; ?>

trunk/bp-themes/bp-default/forums/index.php

@@ -36 +36 @@
                 <div class="item-list-tabs" role="navigation">
                     <ul>
-                        <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>
+                        <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>
 
                         <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                            <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>
+                            <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>
 
                         <?php endif; ?>

trunk/bp-themes/bp-default/groups/index.php

@@ -31 +31 @@
             <div class="item-list-tabs" role="navigation">
                 <ul>
-                    <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>
+                    <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>
 
                     <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                        <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>
+                        <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>
 
                     <?php endif; ?>

trunk/bp-themes/bp-default/members/index.php

@@ -29 +29 @@
             <div class="item-list-tabs" role="navigation">
                 <ul>
-                    <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>
+                    <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>
 
                     <?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
-                        <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>
+                        <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>
 
                     <?php endif; ?>