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

[#807] Move gravatar into the journal div

Browse Source
This commit is contained in:
Holger Just 2012-01-17 19:25:53 +01:00
parent 31620d0c0a
commit 91c04f335d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/helpers/journals_helper.rb
View File

@ -27,8 +27,18 @@ module JournalsHelper
def render_journal(model, journal, options = {}) def render_journal(model, journal, options = {})
return "" if journal.initial? return "" if journal.initial?
journal_classes = journal.css_classes
journal_content = render_journal_details(journal, :label_updated_time_by, model, options) journal_content = render_journal_details(journal, :label_updated_time_by, model, options)
content_tag "div", journal_content, { :id => "change-#{journal.id}", :class => journal.css_classes }
avatar = avatar(journal.user, :size => "40")
unless avatar.blank?
profile_wrap = content_tag("div", avatar, {:class => "profile-wrap"}, false)
journal_content = profile_wrap + journal_content
journal_classes << " has-avatar"
end
content_tag("div", journal_content, :id => "change-#{journal.id}", :class => journal_classes)
end end
# This renders a journal entry with a header and details # This renders a journal entry with a header and details
@ -39,17 +49,12 @@ module JournalsHelper
#{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}")} #{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
header << render_notes(model, journal, options) unless journal.notes.blank?
if journal.details.any? if journal.details.any?
details = content_tag "ul", :class => "details journal-attributes" do details = content_tag "ul", :class => "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)
@ -58,7 +63,7 @@ module JournalsHelper
end end
end end
return "#{header}#{details}" content_tag "div", "#{header}#{details}", :class => "journal-details"
end end
def render_notes(model, journal, options={}) def render_notes(model, journal, options={})