Merge remote branch 'edavis10/master'

lest · May 6, 2010 · a505e8f · a505e8f
2 parents a73fbe7 + 1d4080e
commit a505e8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/models/question_mailer.rb b/app/models/question_mailer.rb
@@ -1,4 +1,6 @@
 class QuestionMailer < Mailer
+  unloadable
+
   def asked_question(journal)
     question = journal.question
     subject "[Question ##{question.issue.id}] #{question.issue.subject}"

diff --git a/lib/question_kanban_hooks.rb b/lib/question_kanban_hooks.rb
@@ -46,7 +46,7 @@ def view_kanbans_user_name(context = {})
 
   protected
 
-  def updated_note_icon(issue)
+  def updated_note_icon(issue, title)
     if issue && issue.journals.present?
       # Get the last Journal with a note and see if that "could" have
       # been an answer.
@@ -55,7 +55,7 @@ def updated_note_icon(issue)
       question_askees = issue.questions.collect(&:assigned_to_id)
 
       if last_journal_with_note && question_askees.include?(last_journal_with_note.user_id)
-        return image_tag('comment.png', :class => 'updated-note')
+        return image_tag('comment.png', :class => 'updated-note', :style=> 'left:0px', :alt => title, :title => title)
       end
     end
 
@@ -70,6 +70,6 @@ def question_icon(color, issue)
     title = l(:question_text_ratio_questions_answered, :ratio => "#{answered_questions}/#{total_questions}")
     link_to(image_tag("question-#{color}.png", :plugin => 'question_plugin', :title => title, :class => "kanban-question #{color}"),
             { :controller => 'issues', :action => 'show', :id => issue }) +
-      updated_note_icon(issue)
+      updated_note_icon(issue, title)
   end
 end