Skip to content

Commit 700aac4

Browse files
authored
Merge pull request #60 from topcoder-platform/issues-394
Issues-394: handling colour for nested categories
2 parents ab57323 + dc9f291 commit 700aac4

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Topcoder/class.topcoder.plugin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2096,6 +2096,7 @@ function userAnchor($user, $cssClass = null, $options = null) {
20962096
}
20972097

20982098
$px = val('Px', $options, '');
2099+
$userID = $px ? val($px.'ID', $user) : val('UserID', $user);
20992100
$name = val($px.'Name', $user, t('Unknown'));
21002101
$text = val('Text', $options, htmlspecialchars($name)); // Allow anchor text to be overridden.
21012102

@@ -2110,7 +2111,7 @@ function userAnchor($user, $cssClass = null, $options = null) {
21102111
// Go to Topcoder user profile link instead of Vanilla profile link
21112112
$userUrl = topcoderUserUrl($user, $px);
21122113

2113-
$topcoderProfile = TopcoderPlugin::getTopcoderUser($user);
2114+
$topcoderProfile = TopcoderPlugin::getTopcoderUser($userID);
21142115
$topcoderRating = val('Rating',$topcoderProfile, false);
21152116
if($topcoderRating != false || $topcoderRating == null) {
21162117
$coderStyles = TopcoderPlugin::getRatingCssClass($topcoderRating);

Topcoder/design/topcoder.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,37 +65,44 @@ a.coderRatingRed:hover, a.coderRatingYellow:hover, a.coderRatingBlue:hover, a.co
6565
.topcoderAdmin, .topcoderAdmin:link, .topcoderAdmin:visited, .topcoderAdmin:hover, .topcoderAdmin:active { color: #ff9900 !important; }
6666

6767
/* Red */
68+
.DataList .MItem a.coderRatingRed, .DataList .MItem a.coderRatingRed:link, .DataList .MItem a.coderRatingRed:hover, .DataList .MItem a.coderRatingRed:visited,
6869
.MessageList .ItemDiscussion .Username.coderRatingRed, .MessageList .ItemDiscussion .Username.coderRatingRed:hover,
6970
.Content.MainContent .MessageList.DataList.Comments li.Item .Item-Header.CommentHeader .Username.coderRatingRed,
7071
.Flyout.Flyout a.coderRatingRed, .Flyout.Flyout a.coderRatingRed:link, .Flyout.Flyout a.coderRatingRed:hover, .Flyout.Flyout a.coderRatingRed:active, .Flyout.Flyout a.coderRatingRed:visited,
7172
.userContent p a.coderRatingRed, .userContent p a.coderRatingRed:link, .userContent p a.coderRatingRed:hover, .userContent p a.coderRatingRed:active, .userContent p a.coderRatingRed:visited { color: #EE0000 !important; }
7273
/* Yellow */
74+
.DataList .MItem a.coderRatingYellow, .DataList .MItem a.coderRatingYellow:link, .DataList .MItem a.coderRatingYellow:hover, .DataList .MItem a.coderRatingYellow:visited,
7375
.MessageList .ItemDiscussion .Username.coderRatingYellow, .MessageList .ItemDiscussion .Username.coderRatingYellow:hover,
7476
.Content.MainContent .MessageList.DataList.Comments li.Item .Item-Header.CommentHeader .Username.coderRatingYellow,
7577
.Flyout.Flyout a.coderRatingYellow, .Flyout.Flyout a.coderRatingYellow:link, .Flyout.Flyout a.coderRatingYellow:hover, .Flyout.Flyout a.coderRatingYellow:active, .Flyout.Flyout a.coderRatingYellow:visited,
7678
.userContent p a.coderRatingYellow, .userContent p a.coderRatingYellow:link, .userContent p a.coderRatingYellow:hover, .userContent p a.coderRatingYellow:active, .userContent p a.coderRatingYellow:visited { color: #DDCC00 !important; }
7779
/* Blue */
80+
.DataList .MItem a.coderRatingBlue, .DataList .MItem a.coderRatingBlue:link, .DataList .MItem a.coderRatingBlue:hover, .DataList .MItem a.coderRatingBlue:visited,
7881
.MessageList .ItemDiscussion .Username.coderRatingBlue, .MessageList .ItemDiscussion .Username.coderRatingBlue:hover,
7982
.Content.MainContent .MessageList.DataList.Comments li.Item .Item-Header.CommentHeader .Username.coderRatingBlue,
8083
.Flyout.Flyout a.coderRatingBlue, .Flyout.Flyout a.coderRatingBlue:link, .Flyout.Flyout a.coderRatingBlue:active, .Flyout.Flyout a.coderRatingBlue:hover, .Flyout.Flyout a.coderRatingBlue:visited,
8184
.userContent p a.coderRatingBlue, .userContent p a.coderRatingBlue:link, .userContent p a.coderRatingBlue:active, .userContent p a.coderRatingBlue:hover, .userContent p a.coderRatingBlue:visited{ color: #6666FF !important; }
8285
/* Green */
86+
.DataList .MItem a.coderRatingGreen, .DataList .MItem a.coderRatingGreen:link, .DataList .MItem a.coderRatingGreen:hover, .DataList .MItem a.coderRatingGreen:visited,
8387
.MessageList .ItemDiscussion .Username.coderRatingGreen,.MessageList .ItemDiscussion .Username.coderRatingGreen:hover,
8488
.Content.MainContent .MessageList.DataList.Comments li.Item .Item-Header.CommentHeader .Username.coderRatingGreen,
8589
.Flyout.Flyout a.coderRatingGreen, .Flyout.Flyout a.coderRatingGreen:link, .Flyout.Flyout a.coderRatingGreen:active, .Flyout.Flyout a.coderRatingGreen:hover, .Flyout.Flyout a.coderRatingGreen:visited,
8690
.userContent p a.coderRatingGreen, .userContent p a.coderRatingGreen:link, .userContent p a.coderRatingGreen:active, .userContent p a.coderRatingGreen:hover, .userContent p a.coderRatingGreen:visited { color: #00A900 !important; }
8791
/* Gray */
92+
.DataList .MItem a.coderRatingGrey, .DataList .MItem a.coderRatingGrey:link, .DataList .MItem a.coderRatingGrey:hover, .DataList .MItem a.coderRatingGrey:visited,
8893
.MessageList .ItemDiscussion .Username.coderRatingGrey,.MessageList .ItemDiscussion .Username.coderRatingGrey:hover,
8994
.Content.MainContent .MessageList.DataList.Comments li.Item .Item-Header.CommentHeader .Username.coderRatingGrey,
9095
.Flyout.Flyout a.coderRatingGrey, .Flyout.Flyout a.coderRatingGrey:link, .Flyout.Flyout a.coderRatingGrey:active, .Flyout.Flyout a.coderRatingGrey:hover, .Flyout.Flyout a.coderRatingGrey:visited,
9196
.userContent p a.coderRatingGrey, .userContent p a.coderRatingGrey:link, .userContent p a.coderRatingGrey:active, .userContent p a.coderRatingGrey:hover, .userContent p a.coderRatingGrey:visited{ color: #999999 !important; }
9297

98+
.DataList .MItem a.coderRatingNone, .DataList .MItem a.coderRatingNone:link, .DataList .MItem a.coderRatingNone:hover, .DataList .MItem a.coderRatingNone:visited,
9399
.MessageList .ItemDiscussion .Username.coderRatingNone, .MessageList .ItemDiscussion .Username.coderRatingNone:hover,
94100
.Content.MainContent .MessageList.DataList.Comments li.Item .Item-Header.CommentHeader .Username.coderRatingNone,
95101
.Flyout.Flyout a.coderRatingNone, .Flyout.Flyout a.coderRatingNone:link, .Flyout.Flyout a.coderRatingNone:active, .Flyout.Flyout a.coderRatingNone:hover, .Flyout.Flyout a.coderRatingNone:visited,
96102
.userContent p a.coderRatingNone, .userContent p a.coderRatingNone:link, .userContent p a.coderRatingNone:active, .userContent p a.coderRatingNone:hover, .userContent p a.coderRatingNone:visited { color: #000000; !important;}
97103

98104
/* Topcoder Admin */
105+
.DataList .MItem a.topcoderAdmin, .DataList .MItem a.topcoderAdmin:link, .DataList .MItem a.topcoderAdmin:hover, .DataList .MItem a.topcoderAdmin:visited,
99106
.MessageList .ItemDiscussion .Username.topcoderAdmin, .MessageList .ItemDiscussion .Username.topcoderAdmin:hover,
100107
.Content.MainContent .MessageList.DataList.Comments li.Item .Item-Header.CommentHeader .Username.topcoderAdmin,
101108
.Flyout.Flyout a.topcoderAdmin, .Flyout.Flyout a.topcoderAdmin:link,.Flyout.Flyout a.topcoderAdmin:visited, .Flyout.Flyout a.topcoderAdmin:hover, .Flyout.Flyout a.topcoderAdmin:active,

0 commit comments

Comments
 (0)