jro_apps/redmine Commit - r54:707360169ed1

issue links modified on activity, calendar and gantt views...

Jean-Philippe Lang -

r54:707360169ed1

parent child

Context file:

r54:707360169ed1

Collapse all files

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

             <h2><%=l(:label_activity)%></h2>
             <div>
             <div class="rightbox">
               <%= start_form_tag %>
             <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
                 <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0 %> <%=l(:label_issue_plural)%><br />
                 <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0 %> <%=l(:label_news_plural)%><br />
                 <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0 %> <%=l(:label_attachment_plural)%><br />
                 <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0 %> <%=l(:label_document_plural)%><br />
                 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
               <%= end_form_tag %>
               </div>
             <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
               <h3><%= day_name(day.cwday) %> <%= format_date(day) %></h3>
               <ul>
               <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %>
                 <li><p>
                 <% if e.is_a? Issue %>
-                  <%= e.created_on.strftime("%H:%M") %> <%= e.tracker.name %> <%= link_to e.long_id, :controller => 'issues', :action => 'show', :id => e %> (<%= e.status.name %>): <%= e.subject %><br />
+                  <%= e.created_on.strftime("%H:%M") %> <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %> (<%= e.status.name %>): <%= e.subject %><br />
                       <i><%= e.author.name %></i>
                 <% elsif e.is_a? News %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_news)%>: <%= link_to e.title, :controller => 'news', :action => 'show', :id => e %><br />
                       <% unless e.summary.empty? %><%= e.summary %><br /><% end %>
                       <i><%= e.author.name %></i>
                 <% elsif (e.is_a? Attachment) and (e.container.is_a? Version) %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%> (Version <%= e.container.name %>): <%= link_to e.filename, :controller => 'projects', :action => 'list_files', :id => @project %><br />
                     <i><%= e.author.name %></i>
                 <% elsif (e.is_a? Attachment) and (e.container.is_a? Document) %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_document)%>: <%= link_to e.container.title, :controller => 'documents', :action => 'show', :id => e %><br />
                     <i><%= e.author.name %></i>
                 <% end %>
                 </p></li>
               <% end %>
               </ul>
             <% end %>
             <% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <br />
             </div>

redmine/app/views/projects/calendar.rhtml +1 -1

             <h2><%= l(:label_calendar) %></h2>
             <table width="100%">
             <tr>
             <td align="left">
             <%= start_form_tag :action => 'calendar', :id => @project %>
             <%= select_month(@month, :prefix => "month", :discard_type => true) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %>
             <%= submit_tag l(:button_submit), :class => "button-small" %>
             <%= end_form_tag %>
             </td>
             <td align="right">
             <%= image_tag 'gantt' %>
             <%= link_to l(:label_gantt_chart), :action => 'gantt', :id => @project %>&nbsp;
             </td>
             </tr>
             </table>
             <br />
             <table class="calenderTable">
             <tr class="ListHead">
             <td></td>
             <% 1.upto(7) do |d| %>
                 <td align="center" width="14%"><%= day_name(d) %></td>
             <% end %>
             </tr>
             <tr height="100">
             <% day = @date_from
             while day <= @date_to
             	if day.cwday == 1 %>
             	<td valign="middle"><%= day.cweek %></td>
             	<% end %>
             	<td valign="top" width="14%" class="<%= day.month==@month ? "even" : "odd" %>">
             	<p align="right"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
             	<% day_issues = []
             	@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
             	day_issues.each do |i| %>
             		<%= if day == i.start_date and day == i.due_date
             		    image_tag('arrow_bw')
             		elsif day == i.start_date
             		    image_tag('arrow_from')
             		elsif day == i.due_date
             		    image_tag('arrow_to')
             		end %>
-            		<%= i.tracker.name %> <%= link_to i.id, :controller => 'issues', :action => 'show', :id => i %>: <small><%= i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
+            		<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%= i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
             	<% end %>
                 </td>
             	<%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
             	<%
             	day = day + 1
             end %>
             </tr>
             </table>
             <table width="100%">
             <tr>
             <td align="left">
             <%= link_to_remote ('&#171; ' + l(:label_previous)),
                                 {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
                                 {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
                                 %>
             </td>
             <td align="right">
             <%= link_to_remote (l(:label_next) + ' &#187;'),
                                 {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
                                 {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
                                 %>
             &nbsp;
             </td>
             </tr>
             </table>

redmine/app/views/projects/gantt.rhtml +1 -1

             <h2><%= l(:label_gantt_chart) %></h2>
             <div class="topright">
             <small>
             <%= link_to 'PDF ', :zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf' %>
             </small>
             </div>
             <table width="100%">
             <tr>
             <td align="left">
             <%= start_form_tag %>
             <input type="text" name="months" size="2" value="<%= @months %>">
             <%= l(:label_months_from) %>
             <%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
             <%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
             <%= hidden_field_tag 'zoom', @zoom %>
             <%= submit_tag l(:button_submit), :class => "button-small" %>
             <%= end_form_tag %>
             </td>
             <td align="right">
             <%= if @zoom < 4
                 link_to image_tag('zoom_in'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months}
               else
                 image_tag 'zoom_in_g'
               end %>
             <%= if @zoom > 1
                 link_to image_tag('zoom_out'), :zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months
               else
                 image_tag 'zoom_out_g'
               end %>
             </td>
             </tr>
             </table>
             <br />
             <style>
             .m_bg {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               background:#aaa;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late {
               background:#f66;
             }
             .task_done {
               background:#66f;
             }
             </style>
             <% zoom = 1
             @zoom.times { zoom = zoom * 2 }
             subject_width = 260
             header_heigth = 18
             headers_heigth = header_heigth
             show_weeks = false
             show_days = false
             if @zoom >1
                 show_weeks = true
                 headers_heigth = 2*header_heigth
                 if @zoom > 2
                     show_days = true
                     headers_heigth = 3*header_heigth
                 end
             end
             g_width = (@date_to - @date_from + 1)*zoom
             g_height = [(20 * @issues.length + 6), 206].max
             t_height = g_height + headers_heigth
             %>
             <table width="100%" border=0 cellspacing=0 cellpading=0>
             <tr>
             <td width=260>
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_heigth %>px;" class="m_bg"></div>
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;" class="m_bg"></div>
             <%
             #
             # Tasks subjects
             #
             top = headers_heigth + 8
             @issues.each do |i| %>
             	<div style="position: absolute;line-height:1em;height:16px;top:<%= top %>px;left:4px;width:<%= subject_width - 5 %>px;overflow:hidden;">
-            	<small><%= link_to i.id, :controller => 'issues', :action => 'show', :id => i %>
+            	<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>:
             	<%= i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
             	</div>
             <% top = top + 20
             end %>
             </div>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width %>;overflow:auto;">
             <div style="width:<%= g_width-1 %>px;height:<%= headers_heigth %>px;" class="m_bg">&nbsp;</div>
             <%
             #
             # Months headers
             #
             month_f = @date_from
             left = 0
             height = (show_weeks ? header_heigth : header_heigth + g_height)
             @months.times do
             	width = ((month_f >> 1) - month_f) * zoom - 1
             	%>
             	<div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="m_bg">
             	<%= link_to "#{month_f.year}-#{month_f.month}", :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months %>
             	</div>
             	<%
             	left = left + width + 1
             	month_f = month_f >> 1
             end %>
             <%
             #
             # Weeks headers
             #
             if show_weeks
             	left = 0
             	height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
             	if @date_from.cwday == 1
             	    # @date_from is monday
                     week_f = @date_from
             	else
             	    # find next monday after @date_from
             		week_f = @date_from + (7 - @date_from.cwday + 1)
             		width = (7 - @date_from.cwday + 1) * zoom-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="m_bg">&nbsp;</div>
             		<%
             		left = left + width+1
             	end %>
             	<%
             	while week_f < @date_to
             		width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="m_bg">
             		<small><%= week_f.cweek %></small>
             		</div>
             		<%
             		left = left + width+1
             		week_f = week_f+7
             	end
             end %>
             <%
             #
             # Days headers
             #
             if show_days
             	left = 0
             	height = g_height + header_heigth - 1
             	wday = @date_from.cwday
             	(@date_to - @date_from + 1).to_i.times do
             	width =  zoom - 1
             	%>
             	<div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="m_bg">
             	<%= day_name(wday)[0,1] %>
             	</div>
             	<%
             	left = left + width+1
             	wday = wday + 1
             	wday = 1 if wday > 7
             	end
             end %>
             <%
             #
             # Today red line
             #
             if Date.today >= @date_from and Date.today <= @date_to %>
                 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_heigth + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
             <% end %>
             <%
             #
             # Tasks
             #
             top = headers_heigth + 12
             @issues.each do |i| %>
             	<%
             	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
             	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
             	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
             	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
             	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
             	i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
             	i_left = ((i_start_date - @date_from)*zoom).floor
             	i_width = ((i_end_date - i_start_date + 1)*zoom).floor
             	d_width = ((i_done_date - i_start_date)*zoom).floor
             	l_width = ((i_late_date - i_start_date+1)*zoom).floor if i_late_date
             	l_width ||= 0
             	%>
             	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task">&nbsp;</div>
             	<% if l_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
             	<% end %>
             	<% if d_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
             	<% end %>
             	<div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
             	<%= i.status.name %>
             	<%= (i.done_ratio).to_i %>%
             	</div>
             	<% top = top + 20
             end %>
             </div>
             </td>
             </tr>
             </table>
             <table width="100%">
             <tr>
             <td align="left"><%= link_to ('&#171; ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months %></td>
             <td>
             <td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months %></td>
             </tr>
             </table>

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