jro_apps/redmine Commit - r2488:629c106a461e

Merged r2515, r2516, r2527, r2534, r2555 from trunk....

Jean-Philippe Lang -

r2488:629c106a461e

parent child

Context file:

r2488:629c106a461e

Collapse all files

app/views/common/_file.rhtml +1 -1

             <tbody>
             <% line_num = 1 %>
             <% syntax_highlight(filename, to_utf8(content)).each_line do |line| %>
-            <tr><th class="line-num" id="L<%= line_num %>"><%= line_num %></th><td class="line-code"><pre><%= line %></pre></td></tr>
+            <tr><th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th><td class="line-code"><pre><%= line %></pre></td></tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>

app/views/projects/activity.rhtml +3 -1

             <% form_tag({}, :method => :get) do %>
             <h3><%= l(:label_activity) %></h3>
             <p><% @activity.event_types.each do |t| %>
-            <label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
+            <%= 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]})%>
+            <br />
             <% end %></p>
             <% if @project && @project.active_children.any? %>
                 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>

app/views/projects/list_files.rhtml +12 -8

             <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
-            <table class="list">
+            <table class="list files">
               <thead><tr>
                 <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
                 <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
             <% @containers.each do |container| %>
               <% next if container.attachments.empty? -%>
             	<% if container.is_a?(Version) -%>
-              <tr><th colspan="6" align="left"><span class="icon icon-package"><b><%=h container %></b></span></th></tr>
+              <tr>
+              	<th colspan="6" align="left">
+              		<%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
+            		</th>
+            	</tr>
             	<% end -%>
               <% container.attachments.each do |file| %>
-              <tr class="<%= cycle("odd", "even") %>">
+              <tr class="file <%= cycle("odd", "even") %>">
-                <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
+                <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
-                <td align="center"><%= format_time(file.created_on) %></td>
+                <td class="created_on"><%= format_time(file.created_on) %></td>
-                <td align="center"><%= number_to_human_size(file.filesize) %></td>
+                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-                <td align="center"><%= file.downloads %></td>
+                <td class="downloads"><%= file.downloads %></td>
-                <td align="center"><small><%= file.digest %></small></td>
+                <td class="digest"><%= file.digest %></td>
                 <td align="center">
                 <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
             																				 :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>

app/views/repositories/annotate.rhtml +1 -1

                 <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
                 <% revision = @annotate.revisions[line_num-1] %>
                 <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
-                  <th class="line-num"><%= line_num %></th>
+                  <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
                   <td class="revision">
                   <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
                   <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>

doc/CHANGELOG +4 0

             * 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

public/stylesheets/application.css +5 -1

             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; }
             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); }

public/stylesheets/scm.css +4 0

             	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 */

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages