jro_apps/redmine Commit - r158:51ea8b02954d

tooltips added on calendar...

Jean-Philippe Lang -

r158:51ea8b02954d

parent child

Context file:

r158:51ea8b02954d

Collapse all files

app/views/issues/_tooltip.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<%= link_to "#{issue.tracker.name} ##{issue.id}", { :controller => 'issues', :action => 'show', :id => issue } %></strong>: <%=h issue.subject %><br />
	2	<br />
	3	<strong><%= l(:field_start_date) %></strong>: <%= format_date(issue.start_date) %><br />
	4	<strong><%= l(:field_due_date) %></strong>: <%= format_date(issue.due_date) %><br />
	5	<strong><%= l(:field_assigned_to) %></strong>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %><br />
	6	<strong><%= l(:field_priority) %></strong>: <%= issue.priority.name %>

app/controllers/projects_controller.rb +2 -2

                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
-                @issues = @project.issues.find(:all, :include => :tracker, :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to])
+                @issues = @project.issues.find(:all, :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to])
                 render :layout => false if request.xhr?
               end
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
-                @issues = @project.issues.find(:all, :order => "start_date, due_date", :include => [:tracker, :status, :author, :priority], :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to])
+                @issues = @project.issues.find(:all, :order => "start_date, due_date", :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to])
                 if params[:output]=='pdf'
                   @options_for_rfpdf ||= {}

app/helpers/issues_helper.rb +3 -3

                 unless no_html
                   label = content_tag('strong', label)
-                  old_value = content_tag("i", h(old_value)) if old_value
+                  old_value = content_tag("i", h(old_value)) if detail.old_value
-                  old_value = content_tag("strike", h(old_value)) if old_value and !value
+                  old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
                   value = content_tag("i", h(value)) if value
                 end
-                if value
+                if detail.value and !detail.value.empty?
                   if old_value
                     label + " " + l(:text_journal_changed, old_value, value)
                   else

app/views/projects/calendar.rhtml +8 -3

             	if day.cwday == 1 %>
             	<th><%= day.cweek %></th>
             	<% end %>
-            	<td valign="top" style="width:14%" class="<%= day.month==@month ? "even" : "odd" %>">
+            	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %>" style="width:14%; <%= Date.today == day ? 'background:#FDFED0;' : '' %>">
             	<p class="textright"><%= 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| %>
+            	    <div class="tooltip">
             		<%= if day == i.start_date and day == i.due_date
             		    image_tag('arrow_bw.png')
             		elsif day == i.start_date
             		elsif day == i.due_date
             		    image_tag('arrow_to.png')
             		end %>
-            		<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
+            		<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i } %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
+                    <span class="tip">
+                    <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
+                    </span>
+            		</div>
             	<% end %>
                 </td>
             	<%= '</tr><tr style="height:100px">' if day.cwday >= 7 and day!=@date_to %>

app/views/projects/gantt.rhtml +3 -7

             	<%= (i.done_ratio).to_i %>%
             	</div>
             	<% # === tooltip === %>
-            	<div style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;" class="tooltip"><span class="tip">
+            	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
-            	   <strong><%= "#{i.tracker.name} ##{i.id}" %></strong>: <%=h i.subject %><br />
+            	<span class="tip">
-            	   <br />
+                <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
-            	   <strong><%= l(:field_start_date) %></strong>: <%= format_date(i.start_date) %><br />
-            	   <strong><%= l(:field_due_date) %></strong>: <%= format_date(i.due_date) %><br />
-            	   <strong><%= l(:field_assigned_to) %></strong>: <%= i.assigned_to ? i.assigned_to.name : "-" %><br />
-            	   <strong><%=l(:field_priority)%></strong>: <%= i.priority.name %>
             	</span></div>
             	<% top = top + 20
             end %>

public/stylesheets/application.css +2 -2

             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             /***** Tooltips ******/
-            .tooltip{position:absolute;z-index:24;}
+            .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
-            top:12px; left:20px; width:270px;
+            top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;

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