##// END OF EJS Templates
Merged r2515, r2516, r2527, r2534, r2555 from trunk....
Jean-Philippe Lang -
r2488:629c106a461e
parent child
Show More
@@ -3,7 +3,7
3 3 <tbody>
4 4 <% line_num = 1 %>
5 5 <% syntax_highlight(filename, to_utf8(content)).each_line do |line| %>
6 <tr><th class="line-num" id="L<%= line_num %>"><%= line_num %></th><td class="line-code"><pre><%= line %></pre></td></tr>
6 <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>
7 7 <% line_num += 1 %>
8 8 <% end %>
9 9 </tbody>
@@ -46,7 +46,9
46 46 <% form_tag({}, :method => :get) do %>
47 47 <h3><%= l(:label_activity) %></h3>
48 48 <p><% @activity.event_types.each do |t| %>
49 <label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
49 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
50 <%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%>
51 <br />
50 52 <% end %></p>
51 53 <% if @project && @project.active_children.any? %>
52 54 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
@@ -6,7 +6,7
6 6
7 7 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
8 8
9 <table class="list">
9 <table class="list files">
10 10 <thead><tr>
11 11 <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
12 12 <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
@@ -19,15 +19,19
19 19 <% @containers.each do |container| %>
20 20 <% next if container.attachments.empty? -%>
21 21 <% if container.is_a?(Version) -%>
22 <tr><th colspan="6" align="left"><span class="icon icon-package"><b><%=h container %></b></span></th></tr>
22 <tr>
23 <th colspan="6" align="left">
24 <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
25 </th>
26 </tr>
23 27 <% end -%>
24 28 <% container.attachments.each do |file| %>
25 <tr class="<%= cycle("odd", "even") %>">
26 <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
27 <td align="center"><%= format_time(file.created_on) %></td>
28 <td align="center"><%= number_to_human_size(file.filesize) %></td>
29 <td align="center"><%= file.downloads %></td>
30 <td align="center"><small><%= file.digest %></small></td>
29 <tr class="file <%= cycle("odd", "even") %>">
30 <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
31 <td class="created_on"><%= format_time(file.created_on) %></td>
32 <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
33 <td class="downloads"><%= file.downloads %></td>
34 <td class="digest"><%= file.digest %></td>
31 35 <td align="center">
32 36 <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
33 37 :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>
@@ -11,7 +11,7
11 11 <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
12 12 <% revision = @annotate.revisions[line_num-1] %>
13 13 <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
14 <th class="line-num"><%= line_num %></th>
14 <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
15 15 <td class="revision">
16 16 <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
17 17 <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
@@ -11,9 +11,13 http://www.redmine.org/
11 11 * Strip keywords from received email body
12 12 * Footer updated to 2009
13 13 * Show RSS-link even when no issues is found
14 * One click filter action in activity view
15 * Clickable/linkable line #'s while browsing the repo or viewing a file
16 * Links to versions on files list
14 17 * Fixed: exporting an issue with attachments to PDF raises an error
15 18 * Fixed: "too few arguments" error may occur on activerecord error translation
16 19 * Fixed: "Default columns Displayed on the Issues list" setting is not easy to read
20 * Fixed: visited links to closed tickets are not striked through with IE6
17 21
18 22
19 23 == 2009-02-15 v0.8.1
@@ -76,7 +76,7 a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
76 76 a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
77 77 a img{ border: 0; }
78 78
79 a.issue.closed { text-decoration: line-through; }
79 a.issue.closed, a.issue.closed:link, a.issue.closed:visited { text-decoration: line-through; }
80 80
81 81 /***** Tables *****/
82 82 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; }
104 104 tr.changeset td.author { text-align: center; width: 15%; }
105 105 tr.changeset td.committed_on { text-align: center; width: 15%; }
106 106
107 tr.file td { text-align: center; }
108 tr.file td.filename { text-align: left; padding-left: 24px; }
109 tr.file td.digest { font-size: 80%; }
110
107 111 tr.message { height: 2.6em; }
108 112 tr.message td.last_message { font-size: 80%; }
109 113 tr.message.locked td.subject a { background-image: url(../images/locked.png); }
@@ -40,6 +40,10 table.filecontent th.line-num {
40 40 padding-right: 3px;
41 41 color: #999;
42 42 }
43 table.filecontent th.line-num a {
44 text-decoration: none;
45 color: inherit;
46 }
43 47 table.filecontent td.line-code pre {
44 48 white-space: pre-wrap; /* CSS2.1 compliant */
45 49 white-space: -moz-pre-wrap; /* Mozilla-based browsers */
General Comments 0
You need to be logged in to leave comments. Login now