Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
91c04f33
Commit
91c04f33
authored
Jan 17, 2012
by
Holger Just
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#807] Move gravatar into the journal div
parent
31620d0c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
10 deletions
+15
-10
journals_helper.rb
app/helpers/journals_helper.rb
+15
-10
No files found.
app/helpers/journals_helper.rb
View file @
91c04f33
...
...
@@ -27,8 +27,18 @@ module JournalsHelper
def
render_journal
(
model
,
journal
,
options
=
{})
return
""
if
journal
.
initial?
journal_classes
=
journal
.
css_classes
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
# 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
}
#{
content_tag
(
'a'
,
''
,
:name
=>
"note-
#{
journal
.
anchor
}
"
)
}
</h4>
<div class="profile-wrap">
#{
avatar
(
journal
.
user
,
:size
=>
"40"
)
}
</div>
#{
render_notes
(
model
,
journal
,
options
)
unless
journal
.
notes
.
blank?
}
HTML
header
<<
render_notes
(
model
,
journal
,
options
)
unless
journal
.
notes
.
blank?
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
|
if
d
=
journal
.
render_detail
(
detail
)
content_tag
(
"li"
,
d
)
...
...
@@ -58,7 +63,7 @@ module JournalsHelper
end
end
return
"
#{
header
}#{
details
}
"
content_tag
"div"
,
"
#{
header
}#{
details
}
"
,
:class
=>
"journal-details
"
end
def
render_notes
(
model
,
journal
,
options
=
{})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment