jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

...

This commit is contained in:
yutao 2015-06-12 16:52:49 +08:00
parent e138292f2a
commit 482df88d70
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/projects/_history.html.erb
View File

@ -9,7 +9,8 @@
<span><%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10', :target => "_blank" %>
</span><span class="c_grey fr"><%= format_time(journal.created_on) %></span>
<div class="cl"></div>
<p><%= textilizable journal.notes%></p>
<!--<p><%#= textilizable journal.notes%></p>-->
<p><%=journal.notes.html_safe%>
</div>
<div class="ping_disfoot">
<% ids = 'project_respond_form_'+ journal.id.to_s%>

3
app/views/users/_history.html.erb
View File

@ -11,7 +11,8 @@
<!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
<span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= format_time(journal.created_on) %></span>
<div class="cl"></div>
<p><%= textilizable journal.notes%></p>
<!--<p><%#= textilizable journal.notes%></p>-->
<p><%=journal.notes.html_safe%></p>
</div>
<div class="ping_disfoot">
<% ids = 'project_respond_form_'+ journal.id.to_s%>

2
app/views/words/_journal_reply_items.html.erb
View File

@ -22,7 +22,7 @@
<% end %>
<p>
<%= reply.notes %>
<%= reply.notes.html_safe %>
</p>
<span class="c_grey fl">
<%= format_time reply.created_on %>