parent
6b3c3516cd
commit
c05dd4f900
@ -1,32 +1,7 @@
|
||||
<style>
|
||||
.avatar-3{
|
||||
width: 35px;
|
||||
height: 35px;
|
||||
}
|
||||
.inner-right{
|
||||
float: left;
|
||||
}
|
||||
</style>
|
||||
<ul>
|
||||
|
||||
<% id = "journal_reply_ul_" + journal.id.to_s%>
|
||||
<ul class="messages-for_user-reply" id = <%= id %> >
|
||||
<% fetch_user_leaveWord_reply(journal).each do |reply|%>
|
||||
<li style="display: block; padding-bottom: 4px;">
|
||||
<div class="inner-right" style="float: left; height: 100%; ">
|
||||
<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
|
||||
</div>
|
||||
<div class="inner-right" style="float: left; width:86%; height: 100%; ">
|
||||
<% id = reply.id %>
|
||||
<span style="color: green;"><a href="/users/4245" style="color:green;"><%= reply.user.name %></a>: </span>
|
||||
<%= reply.notes %>
|
||||
<% if @user == User.current %>
|
||||
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
||||
<%= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %>
|
||||
<% end %>
|
||||
<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= reply.created_on %></span></p>
|
||||
</div>
|
||||
<div id=<%= id %> style="display: none;">
|
||||
<%= render :partial => "words/new_respond", :locals => {:journal => journal} %>
|
||||
</div>
|
||||
<div style="clear: both;"></div>
|
||||
</li>
|
||||
<%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply.id} %>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
@ -0,0 +1,20 @@
|
||||
<li style="display: block; padding-bottom: 4px;">
|
||||
<span class="portrait">
|
||||
<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
|
||||
</span>
|
||||
<span class="body">
|
||||
<% id = reply.id %>
|
||||
<span style="color: green;"><%= link_to reply.user.name, user_path(reply.user) %>: </span>
|
||||
<span style="max-width: 80%; word-wrap: break-word;"> <%= reply.notes %></span>
|
||||
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
||||
|
||||
<p style="margin-top: 4px;">
|
||||
<span style="color: rgb(172, 174, 177)"><%= format_time reply.created_on %></span>
|
||||
<span style="float: right;"><%= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %></span>
|
||||
</p>
|
||||
</span>
|
||||
<div id=<%= id %> style="display: none;">
|
||||
<%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id} %>
|
||||
</div>
|
||||
<div style="clear: both;"></div>
|
||||
</li>
|
Loading…
Reference in new issue