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

'merge'

This commit is contained in:
yanxd 2013-12-25 15:43:28 +08:00
parent f05d2131bd fbf73de68b
commit 2c5cd7a12a
3 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/words_helper.rb
View File

@ -54,4 +54,3 @@ module WordsHelper
end
end
end

41
app/views/words/_journal_reply.html.erb
View File

@ -1,9 +1,32 @@
<%= form_tag({:controller => 'words',
:action => 'create_reply'}) do %>
<%= text_area_tag 'project_respond', "", :class => 'noline', :style => "resize: none;", :rows => 4, :placeholder => l(:label_projects_feedback_respond_content) %>
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn", :style => "margin-top: 1px;"%>
<% end %>
<style>
.avatar-3{
width: 35px;
height: 35px;
}
.inner-right{
float: left;
}
</style>
<ul>
<% fetch_user_leaveWord_reply.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>:&nbsp;</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>
<% end %>
</ul>

19
app/views/words/_message.html.erb
View File

@ -25,23 +25,20 @@
<tr>
<td align="left"><span class="font_lighter"> <%= l :label_comment_time %>：&nbsp; <%= format_time journal.created_on %></span></td>
<td width="200" align="right" class="a">
<% if @user == User.current %>
<% ids = 'project_respond_form_'+ journal.id.to_s%>
<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>
<td width="200" align="right" class="a"> <% if @user == User.current %>
<%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true,
:method => 'post', :title => l(:button_quote))%>
<%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user},
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %></td>
<% else %>
<%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true,
:method => 'post', :title => l(:button_quote))%>
<% end %>
</td>
</tr>
</table>
</td>
</tr>
</table>
<div id=<%= ids %> style="display: none;width: 80%; margin: auto;">
<%= render :partial => 'words/new_respond', :locals => {:journal => journal} %>
</div>
<div>
<%#= render :partial => "words/journal_reply", :locals => {:journal => journal} %>
</div>
<div class="line_under"></div>
<% end %>
<% end %>