Skip to content

Commit

Permalink
#104 closed: "Change users grid to a simpler list"
Browse files Browse the repository at this point in the history
  • Loading branch information
ignatov committed Aug 8, 2011
1 parent f34e446 commit b645f34
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 5 deletions.
9 changes: 8 additions & 1 deletion src/main/scala/scala/tools/colladoc/model/mapper/User.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import net.liftweb.util.Helpers._
import net.liftweb.http.SHtml.ElemAttr._
import xml.{NodeSeq, Text}
import lib.js.JqUI._
import net.liftweb.widgets.gravatar.Gravatar

/**
* Mapper for user table storing registered users.
Expand Down Expand Up @@ -388,7 +389,13 @@ object User extends User with KeyedMetaMapper[Long, User] {
{
User.findAll(OrderBy(User.userName, Ascending)) map { u =>
<li class={"ui-selectee" + (if (u.deleted_?) " deleted" else if (u.banned.is) " banned" else "")}>
{ u.profileHyperlinkLocal }
<div class="profile_link">
{
Gravatar(u.email, 16) ++
u.profileHyperlinkLocal ++
(if (u.superUser.is) SHtml.span(NodeSeq.Empty, Noop, ("class", "ui-icon ui-icon-lightbulb")) else NodeSeq.Empty)
}
</div>
</li>
}
}
Expand Down
26 changes: 22 additions & 4 deletions src/main/webapp/cosettings.css
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,17 @@
}

#user_list li {
padding: 5px 0;
padding: 5px;
}

#user_list a {
padding-left: 5px;
}

.ui-icon {
display: inline-block;
vertical-align: middle;
padding-top: 2px;
}

.deleted > a {
Expand All @@ -232,11 +242,19 @@
li.ui-selectee {
border: 1px solid #E5E5E5;
margin: 1px;
padding-left: 5px;
padding: 1px 0 1px 5px;
}

.profile_link {
padding: 1px;
}

.ui-selectee div {
display: inline;
}

.ui-selectee > a {
padding: 2px 8px;
.ui-selectee img {
vertical-align: middle;
}

#user_settings input {
Expand Down

0 comments on commit b645f34

Please sign in to comment.