##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r3282 to r3284 from trunk....
Jean-Philippe Lang -
r3173:9d82bff1a84f
parent child
Show More
Side by Side Unified
Context file:
r3173:9d82bff1a84f Loading diff...:
Show file before | Show file after | Hide comments
@@ -32,7 +32,6 module JournalsHelper
32 32 content << textilizable(journal, :notes)
33 33 css_classes = "wiki"
34 34 css_classes << " editable" if editable
35 css_classes << " gravatar-margin" if Setting.gravatar_enabled?
36 35 content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
37 36 end
38 37
Show file before | Show file after | Hide comments
@@ -232,7 +232,7 class Query < ActiveRecord::Base
232 232
233 233 def add_short_filter(field, expression)
234 234 return unless expression
235 parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
235 parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
236 236 add_filter field, (parms[0] || "="), [parms[1] || ""]
237 237 end
238 238
Show file before | Show file after | Hide comments
@@ -22,6 +22,7
22 22 <td class="buttons">
23 23 <%= link_to l(:button_test), :action => 'test_connection', :id => source %>
24 24 <%= link_to l(:button_delete), { :action => 'destroy', :id => source },
25 :method => :post,
25 26 :confirm => l(:text_are_you_sure),
26 27 :class => 'icon icon-del',
27 28 :disabled => source.users.any? %>
Show file before | Show file after | Hide comments
@@ -2,9 +2,10
2 2 <% for journal in journals %>
3 3 <div id="change-<%= journal.id %>" class="journal">
4 4 <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
5 <%= avatar(journal.user, :size => "24") %>
5 6 <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
6 7 <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
7 <%= avatar(journal.user, :size => "32") %>
8
8 9 <ul>
9 10 <% for detail in journal.details %>
10 11 <li><%= show_detail(detail) %></li>
Show file before | Show file after | Hide comments
@@ -3,7 +3,7
3 3 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
4 4
5 5 <div class="<%= @issue.css_classes %> details">
6 <%= avatar(@issue.author, :size => "64") %>
6 <%= avatar(@issue.author, :size => "50") %>
7 7 <h3><%=h @issue.subject %></h3>
8 8 <p class="author">
9 9 <%= authoring @issue.created_on, @issue.author %>.
Show file before | Show file after | Hide comments
@@ -8,7 +8,7
8 8 <%= 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) %>
9 9 </div>
10 10
11 <h2><%=h @topic.subject %></h2>
11 <h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
12 12
13 13 <div class="message">
14 14 <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
@@ -29,6 +29,7
29 29 <%= 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) %>
30 30 </div>
31 31 <h4>
32 <%= avatar(message.author, :size => "24") %>
32 33 <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %>
33 34 -
34 35 <%= authoring message.created_on, message.author %>
Show file before | Show file after | Hide comments
@@ -7,7 +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' %>
8 8 </div>
9 9
10 <h2><%=h @news.title %></h2>
10 <h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
11 11
12 12 <% if authorize_for('news', 'edit') %>
13 13 <div id="edit-news" style="display:none;">
@@ -42,7 +42,7
42 42 <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment},
43 43 :confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %>
44 44 </div>
45 <h4><%= authoring comment.created_on, comment.author %></h4>
45 <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
46 46 <%= textilizable(comment.comments) %>
47 47 <% end if @comments.any? %>
48 48 </div>
Show file before | Show file after | Hide comments
@@ -17,27 +17,32
17 17 <tr class="<%= cycle("odd", "even") %>">
18 18 <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
19 19 :set_filter => 1,
20 :subproject_id => '!*',
20 21 "#{field_name}" => row.id %></td>
21 22 <% for status in @statuses %>
22 23 <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id },
23 24 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
24 25 :set_filter => 1,
26 :subproject_id => '!*',
25 27 "status_id" => status.id,
26 28 "#{field_name}" => row.id %></td>
27 29 <% end %>
28 30 <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
29 31 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
30 32 :set_filter => 1,
33 :subproject_id => '!*',
31 34 "#{field_name}" => row.id,
32 35 "status_id" => "o" %></td>
33 36 <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
34 37 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
35 38 :set_filter => 1,
39 :subproject_id => '!*',
36 40 "#{field_name}" => row.id,
37 41 "status_id" => "c" %></td>
38 42 <td align="center"><%= aggregate_link data, { field_name => row.id },
39 43 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
40 44 :set_filter => 1,
45 :subproject_id => '!*',
41 46 "#{field_name}" => row.id,
42 47 "status_id" => "*" %></td>
43 48 </tr>
Show file before | Show file after | Hide comments
@@ -13,20 +13,24
13 13 <tr class="<%= cycle("odd", "even") %>">
14 14 <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
15 15 :set_filter => 1,
16 :subproject_id => '!*',
16 17 "#{field_name}" => row.id %></td>
17 18 <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
18 19 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
19 20 :set_filter => 1,
21 :subproject_id => '!*',
20 22 "#{field_name}" => row.id,
21 23 "status_id" => "o" %></td>
22 24 <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
23 25 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
24 26 :set_filter => 1,
27 :subproject_id => '!*',
25 28 "#{field_name}" => row.id,
26 29 "status_id" => "c" %></td>
27 30 <td align="center"><%= aggregate_link data, { field_name => row.id },
28 31 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
29 32 :set_filter => 1,
33 :subproject_id => '!*',
30 34 "#{field_name}" => row.id,
31 35 "status_id" => "*" %></td>
32 36 </tr>
Show file before | Show file after | Hide comments
@@ -2,7 +2,7
2 2 <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
3 3 </div>
4 4
5 <h2><%= avatar @user %> <%=h @user.name %></h2>
5 <h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
6 6
7 7 <div class="splitcontentleft">
8 8 <ul>
Show file before | Show file after | Hide comments
@@ -810,9 +810,15 div.issue table img.gravatar {
810 810 margin: 0 0.5em 0 0;
811 811 }
812 812
813 #history img.gravatar {
813 h2 img.gravatar {
814 814 padding: 3px;
815 margin: 0 1.5em 1em 0;
815 margin: -2px 4px 0 0;
816 float: left;
817 }
818
819 h4 img.gravatar {
820 padding: 3px;
821 margin: -6px 4px 0 0;
816 822 float: left;
817 823 }
818 824
@@ -831,10 +837,6 td.username img.gravatar {
831 837 clear: left;
832 838 }
833 839
834 .gravatar-margin {
835 margin-left: 40px;
836 }
837
838 840 h2 img { vertical-align:middle; }
839 841
840 842 .hascontextmenu { cursor: context-menu; }
General Comments 0
You need to be logged in to leave comments. Login now