Adds more css classes to the roadmap issues (#3214).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2694 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
8887b6f3d3
commit
32c09fd5cf
@ -54,9 +54,7 @@ module ApplicationHelper
|
|||||||
end
|
end
|
||||||
|
|
||||||
def link_to_issue(issue, options={})
|
def link_to_issue(issue, options={})
|
||||||
options[:class] ||= ''
|
options[:class] ||= issue.css_classes
|
||||||
options[:class] << ' issue'
|
|
||||||
options[:class] << ' closed' if issue.closed?
|
|
||||||
link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
|
link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -33,16 +33,6 @@ module IssuesHelper
|
|||||||
"<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
|
"<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns a string of css classes that apply to the given issue
|
|
||||||
def css_issue_classes(issue)
|
|
||||||
s = "issue status-#{issue.status.position} priority-#{issue.priority.position}"
|
|
||||||
s << ' closed' if issue.closed?
|
|
||||||
s << ' overdue' if issue.overdue?
|
|
||||||
s << ' created-by-me' if User.current.logged? && issue.author_id == User.current.id
|
|
||||||
s << ' assigned-to-me' if User.current.logged? && issue.assigned_to_id == User.current.id
|
|
||||||
s
|
|
||||||
end
|
|
||||||
|
|
||||||
def sidebar_queries
|
def sidebar_queries
|
||||||
unless @sidebar_queries
|
unless @sidebar_queries
|
||||||
# User can see public queries and his own queries
|
# User can see public queries and his own queries
|
||||||
|
@ -269,6 +269,16 @@ class Issue < ActiveRecord::Base
|
|||||||
"#{tracker} ##{id}: #{subject}"
|
"#{tracker} ##{id}: #{subject}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Returns a string of css classes that apply to the issue
|
||||||
|
def css_classes
|
||||||
|
s = "issue status-#{status.position} priority-#{priority.position}"
|
||||||
|
s << ' closed' if closed?
|
||||||
|
s << ' overdue' if overdue?
|
||||||
|
s << ' created-by-me' if User.current.logged? && author_id == User.current.id
|
||||||
|
s << ' assigned-to-me' if User.current.logged? && assigned_to_id == User.current.id
|
||||||
|
s
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# Callback on attachment deletion
|
# Callback on attachment deletion
|
||||||
|
@ -11,7 +11,7 @@ while day <= calendar.enddt %>
|
|||||||
<p class="day-num"><%= day.day %></p>
|
<p class="day-num"><%= day.day %></p>
|
||||||
<% calendar.events_on(day).each do |i| %>
|
<% calendar.events_on(day).each do |i| %>
|
||||||
<% if i.is_a? Issue %>
|
<% if i.is_a? Issue %>
|
||||||
<div class="<%= css_issue_classes(i) %> tooltip">
|
<div class="<%= i.css_classes %> tooltip">
|
||||||
<%= if day == i.start_date && day == i.due_date
|
<%= if day == i.start_date && day == i.due_date
|
||||||
image_tag('arrow_bw.png')
|
image_tag('arrow_bw.png')
|
||||||
elsif day == i.start_date
|
elsif day == i.start_date
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
</tr></thead>
|
</tr></thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<% issues.each do |issue| -%>
|
<% issues.each do |issue| -%>
|
||||||
<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= css_issue_classes(issue) %>">
|
<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
|
||||||
<td class="checkbox"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
|
<td class="checkbox"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
|
||||||
<td><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
|
<td><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
|
||||||
<% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>
|
<% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
</tr></thead>
|
</tr></thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<% for issue in issues %>
|
<% for issue in issues %>
|
||||||
<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= css_issue_classes(issue) %>">
|
<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
|
||||||
<td class="id">
|
<td class="id">
|
||||||
<%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
|
<%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
|
||||||
<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
|
<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
|
<h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
|
||||||
|
|
||||||
<div class="<%= css_issue_classes(@issue) %> details">
|
<div class="<%= @issue.css_classes %> details">
|
||||||
<%= avatar(@issue.author, :size => "64") %>
|
<%= avatar(@issue.author, :size => "64") %>
|
||||||
<h3><%=h @issue.subject %></h3>
|
<h3><%=h @issue.subject %></h3>
|
||||||
<p class="author">
|
<p class="author">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user