From 629c106a461e6781dcbca51ebdffea4094e15709 2009-03-07 11:17:23 From: Jean-Philippe Lang Date: 2009-03-07 11:17:23 Subject: [PATCH] Merged r2515, r2516, r2527, r2534, r2555 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2556 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/common/_file.rhtml b/app/views/common/_file.rhtml index 43f5c6c..599a173 100644 --- a/app/views/common/_file.rhtml +++ b/app/views/common/_file.rhtml @@ -3,7 +3,7 @@ <% line_num = 1 %> <% syntax_highlight(filename, to_utf8(content)).each_line do |line| %> -<%= line_num %>
<%= line %>
+<%= line_num %>
<%= line %>
<% line_num += 1 %> <% end %> diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index b0e5366..1a2add9 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -46,7 +46,9 @@ <% form_tag({}, :method => :get) do %>

<%= l(:label_activity) %>

<% @activity.event_types.each do |t| %> -
+<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> +<%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%> +
<% end %>

<% if @project && @project.active_children.any? %>

diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml index 0871ba2..2b2e5e8 100644 --- a/app/views/projects/list_files.rhtml +++ b/app/views/projects/list_files.rhtml @@ -6,7 +6,7 @@ <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %> - +
<%= sort_header_tag('filename', :caption => l(:field_filename)) %> <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %> @@ -19,15 +19,19 @@ <% @containers.each do |container| %> <% next if container.attachments.empty? -%> <% if container.is_a?(Version) -%> - + + + <% end -%> <% container.attachments.each do |file| %> - "> - - - - - + "> + + + + + - + diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 5eb13d4..e27ab0a 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -11,9 +11,13 @@ http://www.redmine.org/ * Strip keywords from received email body * Footer updated to 2009 * Show RSS-link even when no issues is found +* One click filter action in activity view +* Clickable/linkable line #'s while browsing the repo or viewing a file +* Links to versions on files list * Fixed: exporting an issue with attachments to PDF raises an error * Fixed: "too few arguments" error may occur on activerecord error translation * Fixed: "Default columns Displayed on the Issues list" setting is not easy to read +* Fixed: visited links to closed tickets are not striked through with IE6 == 2009-02-15 v0.8.1 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 824b4cb..38ecd6b 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -76,7 +76,7 @@ a, a:link, a:visited{ color: #2A5685; text-decoration: none; } a:hover, a:active{ color: #c61a1a; text-decoration: underline;} a img{ border: 0; } -a.issue.closed { text-decoration: line-through; } +a.issue.closed, a.issue.closed:link, a.issue.closed:visited { text-decoration: line-through; } /***** Tables *****/ table.list { border: 1px solid #e4e4e4; border-collapse: collapse; width: 100%; margin-bottom: 4px; } @@ -104,6 +104,10 @@ tr.entry.file td.filename a { margin-left: 16px; } tr.changeset td.author { text-align: center; width: 15%; } tr.changeset td.committed_on { text-align: center; width: 15%; } +tr.file td { text-align: center; } +tr.file td.filename { text-align: left; padding-left: 24px; } +tr.file td.digest { font-size: 80%; } + tr.message { height: 2.6em; } tr.message td.last_message { font-size: 80%; } tr.message.locked td.subject a { background-image: url(../images/locked.png); } diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css index ecd3193..29b2398 100644 --- a/public/stylesheets/scm.css +++ b/public/stylesheets/scm.css @@ -40,6 +40,10 @@ table.filecontent th.line-num { padding-right: 3px; color: #999; } +table.filecontent th.line-num a { + text-decoration: none; + color: inherit; +} table.filecontent td.line-code pre { white-space: pre-wrap; /* CSS2.1 compliant */ white-space: -moz-pre-wrap; /* Mozilla-based browsers */
<%=h container %>
+ <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %> +
<%= link_to_attachment file, :download => true, :title => file.description %><%= format_time(file.created_on) %><%= number_to_human_size(file.filesize) %><%= file.downloads %><%= file.digest %>
<%= link_to_attachment file, :download => true, :title => file.description %><%= format_time(file.created_on) %><%= number_to_human_size(file.filesize) %><%= file.downloads %><%= file.digest %> <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file}, :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %> diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml index 44b5a81..d0fb8cb 100644 --- a/app/views/repositories/annotate.rhtml +++ b/app/views/repositories/annotate.rhtml @@ -11,7 +11,7 @@ <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %> <% revision = @annotate.revisions[line_num-1] %>
<%= line_num %><%= line_num %> <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %> <%= h(revision.author.to_s.split('<').first) if revision %>