Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
STYLE: refs #0445. Userpage Actions links should have mouseover highl…
Browse files Browse the repository at this point in the history
…ighting

Also allow admin user to see all user's pending community invitations
  • Loading branch information
zachmullen committed Jan 16, 2012
1 parent f104e36 commit ce1e73b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
5 changes: 3 additions & 2 deletions core/controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -693,8 +693,9 @@ public function userpageAction()
}
}

// If this is the user's own page, show any pending community invitations
if($this->logged && $this->userSession->Dao->getKey() == $userDao->getKey())
// If this is the user's own page (or admin user), show any pending community invitations
if($this->logged &&
($this->userSession->Dao->getKey() == $userDao->getKey() || $this->userSession->Dao->isAdmin()))
{
$invitations = $userDao->getInvitations();
$communityInvitations = array();
Expand Down
7 changes: 6 additions & 1 deletion core/public/css/user/user.userpage.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#locationUser{
color:grey;
font-size: 10px;
}
}

div.sideElementFirst ul li:hover {
background-color: #e5e5e5;
color:black;
}

0 comments on commit ce1e73b

Please sign in to comment.