summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2009-05-26 16:11:28 +0200
committerJohan Sørensen <johan@johansorensen.com>2009-05-26 16:11:28 +0200
commit8ca04a30cd724761cdfbc9347f077dbab834f7f6 (patch)
tree4f98552094feba0ca18c26ed33d75c2250326b99
parentbe6043862805d45712256ca6fdb719706d9757e1 (diff)
downloadgitorious-mainline-outdated-8ca04a30cd724761cdfbc9347f077dbab834f7f6.zip
gitorious-mainline-outdated-8ca04a30cd724761cdfbc9347f077dbab834f7f6.tar.gz
gitorious-mainline-outdated-8ca04a30cd724761cdfbc9347f077dbab834f7f6.tar.bz2
Show user and team avatars on the frontpage
-rw-r--r--app/views/site/index.html.erb14
-rw-r--r--public/stylesheets/base.css6
m---------vendor/plugins/gitorious_sites0
3 files changed, 16 insertions, 4 deletions
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 9eff638..61a8f1f 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -113,9 +113,12 @@
<% cache([:site_index, :active_teams], :expires_in => 15.minutes) do -%>
<% pull_box("Active teams") do -%>
- <ul class="with_icons">
+ <ul class="with_icons inline_icons">
<% @active_groups.each do |group| -%>
- <li class="group"><%= link_to h(group.title), group -%></li>
+ <li class="group">
+ <%= image_tag(group.avatar.url(:thumb), :alt => "Avatar", :width => "16") %>
+ <%= link_to h(group.title), group -%>
+ </li>
<% end -%>
</ul>
<% end -%>
@@ -123,9 +126,12 @@
<% cache([:site_index, :active_users], :expires_in => 20.minutes) do -%>
<% pull_box("Active users") do -%>
- <ul class="with_icons">
+ <ul class="with_icons inline_icons">
<% @active_users.each do |user| -%>
- <li class="user"><%= link_to h(user.title), user -%></li>
+ <li class="user">
+ <%= avatar(user, { :size => 16 }) -%>
+ <%= link_to h(user.title), user -%>
+ </li>
<% end -%>
</ul>
<% end -%>
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index b316d83..61568e8 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -621,6 +621,12 @@ li.merge_requests a.selected { color: #09460F;}
background-position: 2px 0px;
}
+.with_icons.inline_icons li a {
+ background-image: none !important;
+ margin: 0 0 0 5px;
+ padding: 0;
+}
+
.with_icons li span a {
background-image: none;
padding: 0;
diff --git a/vendor/plugins/gitorious_sites b/vendor/plugins/gitorious_sites
-Subproject ea9fd2f0ebb68d50d7a27c9bc26da356d0b2763
+Subproject a5ea79e97c650035b070a51f463f3c3e2aa5e0c