kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Port issue history changes

Browse Source
This commit is contained in:
Eric Davis 2011-03-05 20:01:00 -08:00
parent ec21b4c075
commit 5949f8de91
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/helpers/journals_helper.rb
View File

@ -27,7 +27,6 @@ module JournalsHelper
def render_journal(model, journal, options = {}) def render_journal(model, journal, options = {})
return "" if journal.initial? return "" if journal.initial?
journal_content = render_journal_details(journal, :label_updated_time_by) journal_content = render_journal_details(journal, :label_updated_time_by)
journal_content += render_notes(model, journal, options) unless journal.notes.blank?
content_tag "div", journal_content, { :id => "change-#{journal.id}", :class => journal.css_classes } content_tag "div", journal_content, { :id => "change-#{journal.id}", :class => journal.css_classes }
end end
@ -35,15 +34,21 @@ module JournalsHelper
def render_journal_details(journal, header_label = :label_updated_time_by) def render_journal_details(journal, header_label = :label_updated_time_by)
header = <<-HTML header = <<-HTML
<h4> <h4>
<div style="float:right;">#{link_to "##{journal.anchor}", :anchor => "note-#{journal.anchor}"}</div> <div class="journal-link" style="float:right;">#{link_to "##{journal.anchor}", :anchor => "note-#{journal.anchor}"}</div>
#{avatar(journal.user, :size => "24")}
#{content_tag('a', '', :name => "note-#{journal.anchor}")}
#{authoring journal.created_at, journal.user, :label => header_label} #{authoring journal.created_at, journal.user, :label => header_label}
#{content_tag('a', '', :name => "note-#{journal.anchor}")}
</h4> </h4>
<div class="profile-wrap">
#{avatar(journal.user, :size => "40")}
</div>
#{render_notes(model, journal, options) unless journal.notes.blank?}
HTML HTML
if journal.details.any? if journal.details.any?
details = content_tag "ul", :class => "details" do details = content_tag "ul", :class => "details journal-attributes" do
journal.details.collect do |detail| journal.details.collect do |detail|
if d = journal.render_detail(detail) if d = journal.render_detail(detail)
content_tag("li", d) content_tag("li", d)