meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Merged r3282 to r3284 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3287 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-01-09 10:04:21 +00:00
parent 4c75864948
commit 9d82bff1a8
11 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/journals_helper.rb
View File

@ -32,7 +32,6 @@ module JournalsHelper
content << textilizable(journal, :notes)
css_classes = "wiki"
css_classes << " editable" if editable
css_classes << " gravatar-margin" if Setting.gravatar_enabled?
content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
end

2
app/models/query.rb
View File

@ -232,7 +232,7 @@ class Query < ActiveRecord::Base
def add_short_filter(field, expression)
return unless expression
parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
add_filter field, (parms[0] || "="), [parms[1] || ""]
end

1
app/views/auth_sources/list.rhtml
View File

@ -22,6 +22,7 @@
<td class="buttons">
<%= link_to l(:button_test), :action => 'test_connection', :id => source %>
<%= link_to l(:button_delete), { :action => 'destroy', :id => source },
:method => :post,
:confirm => l(:text_are_you_sure),
:class => 'icon icon-del',
:disabled => source.users.any? %>

3
app/views/issues/_history.rhtml
View File

@ -2,9 +2,10 @@
<% for journal in journals %>
<div id="change-<%= journal.id %>" class="journal">
<h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
<%= avatar(journal.user, :size => "24") %>
<%= content_tag('a', '', :name => "note-#{journal.indice}")%>
<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
<%= avatar(journal.user, :size => "32") %>
<ul>
<% for detail in journal.details %>
<li><%= show_detail(detail) %></li>

2
app/views/issues/show.rhtml
View File

@ -3,7 +3,7 @@
<h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
<div class="<%= @issue.css_classes %> details">
<%= avatar(@issue.author, :size => "64") %>
<%= avatar(@issue.author, :size => "50") %>
<h3><%=h @issue.subject %></h3>
<p class="author">
<%= authoring @issue.created_on, @issue.author %>.

3
app/views/messages/show.rhtml
View File

@ -8,7 +8,7 @@
<%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
</div>
<h2><%=h @topic.subject %></h2>
<h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
<div class="message">
<p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
@ -29,6 +29,7 @@
<%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %>
</div>
<h4>
<%= avatar(message.author, :size => "24") %>
<%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %>
-
<%= authoring message.created_on, message.author %>

4
app/views/news/show.rhtml
View File

@ -7,7 +7,7 @@
<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
</div>
<h2><%=h @news.title %></h2>
<h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
<% if authorize_for('news', 'edit') %>
<div id="edit-news" style="display:none;">
@ -42,7 +42,7 @@
<%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment},
:confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %>
</div>
<h4><%= authoring comment.created_on, comment.author %></h4>
<h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
<%= textilizable(comment.comments) %>
<% end if @comments.any? %>
</div>

5
app/views/reports/_details.rhtml
View File

@ -17,27 +17,32 @@
<tr class="<%= cycle("odd", "even") %>">
<td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id %></td>
<% for status in @statuses %>
<td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"status_id" => status.id,
"#{field_name}" => row.id %></td>
<% end %>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id,
"status_id" => "o" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id,
"status_id" => "c" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id,
"status_id" => "*" %></td>
</tr>

4
app/views/reports/_simple.rhtml
View File

@ -13,20 +13,24 @@
<tr class="<%= cycle("odd", "even") %>">
<td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id,
"status_id" => "o" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id,
"status_id" => "c" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id,
"status_id" => "*" %></td>
</tr>

2
app/views/users/show.rhtml
View File

@ -2,7 +2,7 @@
<%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
</div>
<h2><%= avatar @user %> <%=h @user.name %></h2>
<h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
<div class="splitcontentleft">
<ul>

14
public/stylesheets/application.css
View File

@ -810,9 +810,15 @@ div.issue table img.gravatar {
margin: 0 0.5em 0 0;
}
#history img.gravatar {
h2 img.gravatar {
padding: 3px;
margin: 0 1.5em 1em 0;
margin: -2px 4px 0 0;
float: left;
}
h4 img.gravatar {
padding: 3px;
margin: -6px 4px 0 0;
float: left;
}
@ -831,10 +837,6 @@ td.username img.gravatar {
clear: left;
}
.gravatar-margin {
margin-left: 40px;
}
h2 img { vertical-align:middle; }
.hascontextmenu { cursor: context-menu; }