Commit 07ef4bae38c35145e550b0bcf67e308ac3e4e771
- Date: Wed Apr 16 21:40:51 +0000 2008
- Committer: Johan Sørensen (johan@johansorensen.com)
- Author: Johan Sørensen (johan@johansorensen.com)
- Commit SHA1: 07ef4bae38c35145e550b0bcf67e308ac3e4e771
- Tree SHA1: 2c24deaa263dc15baf21b1ca49a338a74f3c62af
Merge commit 'teknofire/master'
Commit diff
| |   |
| 1 | 1 | <ul> |
| 2 | | <% @users.each do |user| -%> |
| 3 | | <li><span class="login"><%=h user.login -%></span> |
| 4 | | <span class="email"><small>(<%=h user.email -%>)</small></span> |
| 5 | | </li> |
| 6 | | <% end -%> |
| 2 | <% @users.each do |user| -%> |
| 3 | <li class="committer"> |
| 4 | <div class="image"><%= gravatar user.email, :size => 32 -%></div> |
| 5 | <div class="login"><%=h user.login -%></div> |
| 6 | <div class="email"><span class="informal"><%=h user.email -%></span></div> |
| 7 | </li> |
| 8 | <% end -%> |
| 7 | 9 | </ul> |
| toggle raw diff |
--- a/app/views/committers/auto_complete_for_user_login.js.erb
+++ b/app/views/committers/auto_complete_for_user_login.js.erb
@@ -1,7 +1,9 @@
<ul>
- <% @users.each do |user| -%>
- <li><span class="login"><%=h user.login -%></span>
- <span class="email"><small>(<%=h user.email -%>)</small></span>
- </li>
- <% end -%>
+<% @users.each do |user| -%>
+<li class="committer">
+<div class="image"><%= gravatar user.email, :size => 32 -%></div>
+<div class="login"><%=h user.login -%></div>
+<div class="email"><span class="informal"><%=h user.email -%></span></div>
+</li>
+<% end -%>
</ul>
\ No newline at end of file |
| |   |
| 1 | 1 | <h1> |
| 2 | 2 | Give a user commit rights to <%= h(@repository.name) -%> |
| 3 | 3 | </h1> |
| 4 | | |
| 4 | <style> |
| 5 | li.committer { |
| 6 | height: 32px; |
| 7 | } |
| 8 | |
| 9 | li.committer div.image { |
| 10 | float: left; |
| 11 | width: 32px; |
| 12 | height: 32px; |
| 13 | margin-right: 8px; |
| 14 | } |
| 15 | |
| 16 | li.committer div.name { |
| 17 | font-weight: bold |
| 18 | font-size: 12px; |
| 19 | line-height: 1.2em; |
| 20 | } |
| 21 | |
| 22 | li.committer div.email { |
| 23 | font-size: 10px; |
| 24 | color:#888; |
| 25 | } |
| 26 | </style> |
| 5 | 27 | <% form_for @committer, |
| 6 | 28 | :url => {:controller => "committers", :action => "create"}, :method => :post do |f| -%> |
| 7 | 29 | <p> |
| toggle raw diff |
--- a/app/views/committers/new.html.erb
+++ b/app/views/committers/new.html.erb
@@ -1,7 +1,29 @@
<h1>
Give a user commit rights to <%= h(@repository.name) -%>
</h1>
-
+<style>
+ li.committer {
+ height: 32px;
+ }
+
+ li.committer div.image {
+ float: left;
+ width: 32px;
+ height: 32px;
+ margin-right: 8px;
+ }
+
+ li.committer div.name {
+ font-weight: bold
+ font-size: 12px;
+ line-height: 1.2em;
+ }
+
+ li.committer div.email {
+ font-size: 10px;
+ color:#888;
+ }
+</style>
<% form_for @committer,
:url => {:controller => "committers", :action => "create"}, :method => :post do |f| -%>
<p> |