叠层中的回复、赞的显隐
This commit is contained in:
parent
97f40e4697
commit
4814c1db3d
|
@ -19,7 +19,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
<div class="ping_disfoot f14">
|
<div class="ping_disfoot f14">
|
||||||
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
||||||
|
|
||||||
<span id="reply_praise_count_<%=journal.id %>">
|
<span class="reply_praise_count_<%=journal.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<% if reply_allow %>
|
<% if reply_allow %>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= comment.id %>">
|
<span class="reply_praise_count_<%= comment.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= reply.id %>">
|
<span class="reply_praise_count_<%= reply.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= reply.id %>">
|
<span class="reply_praise_count_<%= reply.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= reply.id %>">
|
<span class="reply_praise_count_<%= reply.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= reply.id %>">
|
<span class="reply_praise_count_<%= reply.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -356,7 +356,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
<%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
|
<%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= format_time(reply.created_on) %>
|
<%= format_time(reply.created_on) %>
|
||||||
<span id="reply_praise_count_<%=reply.id %>">
|
<span class="reply_praise_count_<%=reply.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -81,7 +81,7 @@
|
||||||
<%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
|
<%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= format_time(comment.created_on) %>
|
<%= format_time(comment.created_on) %>
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -92,7 +92,7 @@
|
||||||
<%= link_to reply.try(:user).try(:realname), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
|
<%= link_to reply.try(:user).try(:realname), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= format_time(reply.created_on) %>
|
<%= format_time(reply.created_on) %>
|
||||||
<span id="reply_praise_count_<%=reply.id %>">
|
<span class="reply_praise_count_<%=reply.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -91,7 +91,7 @@
|
||||||
<%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
|
<%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= format_time(reply.created_on) %>
|
<%= format_time(reply.created_on) %>
|
||||||
<span id="reply_praise_count_<%=reply.id %>">
|
<span class="reply_praise_count_<%=reply.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<% if @type.to_s == 'activity' %>
|
<% if @type.to_s == 'activity' %>
|
||||||
$('#praise_count_<%=@user_activity_id %>').html('<%= j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>');
|
$('#praise_count_<%=@user_activity_id %>').html('<%= j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>');
|
||||||
<% else @type.to_s == 'reply' %>
|
<% else @type.to_s == 'reply' %>
|
||||||
$('#reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
|
$('.reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
<% else %>
|
||||||
$('#praise_tread').html('<%= j(
|
$('#praise_tread').html('<%= j(
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<% if @type.to_s == 'activity' %>
|
<% if @type.to_s == 'activity' %>
|
||||||
$('#praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>');
|
$('#praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>');
|
||||||
<% else @type.to_s == 'reply' %>
|
<% else @type.to_s == 'reply' %>
|
||||||
$('#reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
|
$('.reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
|
||||||
<% end %>
|
<% end %>
|
||||||
<% elsif @obj_type == 'Memo'%>
|
<% elsif @obj_type == 'Memo'%>
|
||||||
$('#praise_tread_<%= @obj.id %>').html('<%= j(
|
$('#praise_tread_<%= @obj.id %>').html('<%= j(
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<div class="orig_user fl">
|
<div class="orig_user fl">
|
||||||
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
|
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
|
||||||
</div>
|
</div>
|
||||||
<div class="orig_right fl">
|
<div class="orig_right fl" style="width: 93%;" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
|
||||||
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
|
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
|
||||||
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
|
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
|
||||||
<div class="orig_content ">
|
<div class="orig_content ">
|
||||||
|
@ -16,10 +16,10 @@
|
||||||
<%= comment.content_detail.html_safe %>
|
<%= comment.content_detail.html_safe %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="orig_reply mt-10">
|
<div class="orig_reply mt-10 pr" style="height: 18px;">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<div class="reply-right none" style="position: absolute; right: 0px;">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
:title => l(:button_reply)) %>
|
:title => l(:button_reply)) %>
|
||||||
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
|
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="ping_disfoot f14">
|
<div class="ping_disfoot f14">
|
||||||
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
||||||
<span id="reply_praise_count_<%=journal.id %>">
|
<span class="reply_praise_count_<%=journal.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<% if journal.user == User.current|| User.current.admin? %>
|
<% if journal.user == User.current|| User.current.admin? %>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<div class="orig_user fl">
|
<div class="orig_user fl">
|
||||||
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
|
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
|
||||||
</div>
|
</div>
|
||||||
<div class="orig_right fl">
|
<div class="orig_right fl" style="width: 93%;" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
|
||||||
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
|
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
|
||||||
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
|
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
|
||||||
<div class="orig_content ">
|
<div class="orig_content ">
|
||||||
|
@ -16,13 +16,13 @@
|
||||||
<%= comment.content_detail.html_safe %>
|
<%= comment.content_detail.html_safe %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="orig_reply mt-10">
|
<div class="orig_reply mt-10 pr" style="height: 18px;">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<div class="reply-right none" style="position: absolute; right: 0px;">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span class="fr mr20">
|
||||||
<%= link_to(
|
<%= link_to(
|
||||||
l(:button_reply),
|
l(:button_reply),
|
||||||
{:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => 'Issue', :user_activity_id => user_activity_id, :parent_id => parent_id, :is_project => true},
|
{:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => 'Issue', :user_activity_id => user_activity_id, :parent_id => parent_id, :is_project => true},
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
:title => l(:button_reply)) %>
|
:title => l(:button_reply)) %>
|
||||||
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
|
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= comment.id %>">
|
<span class="reply_praise_count_<%= comment.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= comment.id %>">
|
<span class="reply_praise_count_<%= comment.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span style="position: relative" class="fr mr20">
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<div class="orig_user fl">
|
<div class="orig_user fl">
|
||||||
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
|
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
|
||||||
</div>
|
</div>
|
||||||
<div class="orig_right fl">
|
<div class="orig_right fl" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
|
||||||
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %>
|
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %>
|
||||||
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
|
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
|
||||||
<div class="orig_content">
|
<div class="orig_content">
|
||||||
|
@ -16,16 +16,16 @@
|
||||||
<%= comment.content_detail.html_safe %>
|
<%= comment.content_detail.html_safe %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="orig_reply mt-10">
|
<div class="orig_reply mt-10 pr" style="height: 18px;">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<div class="reply-right none" style="position: absolute; right: 0px;">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<% if type == 'Message' %>
|
<% if type == 'Message' %>
|
||||||
<% topic = comment.root %>
|
<% topic = comment.root %>
|
||||||
<% if !topic.locked? && authorize_for('messages', 'reply') %>
|
<% if !topic.locked? && authorize_for('messages', 'reply') %>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span class="fr mr20">
|
||||||
<%= link_to(
|
<%= link_to(
|
||||||
l(:button_reply),
|
l(:button_reply),
|
||||||
{:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :parent_id => parent_id},
|
{:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :parent_id => parent_id},
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span style="position: relative" class="fr mr20">
|
<span class="fr mr20">
|
||||||
<%= link_to(
|
<%= link_to(
|
||||||
l(:button_reply),
|
l(:button_reply),
|
||||||
{:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :parent_id => parent_id},
|
{:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :parent_id => parent_id},
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
|
<span id="reply_iconup_<%=comment.id %>" class="reply_iconup03" style="display: none"> ︿</span>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%=comment.id %>">
|
<span class="reply_praise_count_<%=comment.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<% if type == 'Message' %>
|
<% if type == 'Message' %>
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<div class="orig_reply mb10 mt-10">
|
<div class="orig_reply mb10 mt-10">
|
||||||
<div class="reply">
|
<div class="reply">
|
||||||
<span class="reply-right">
|
<span class="reply-right">
|
||||||
<span id="reply_praise_count_<%= comment.id %>">
|
<span class="reply_praise_count_<%= comment.id %>">
|
||||||
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
<%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
|
||||||
</span>
|
</span>
|
||||||
<% if type == 'HomeworkCommon' %>
|
<% if type == 'HomeworkCommon' %>
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
<%= format_time reply.created_on %>
|
<%= format_time reply.created_on %>
|
||||||
</span>
|
</span>
|
||||||
<div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
|
<div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
|
||||||
<span id="reply_praise_count_<%=reply.id %>">
|
<span class="reply_praise_count_<%=reply.id %>">
|
||||||
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
||||||
</span>
|
</span>
|
||||||
<% if reply_allow %>
|
<% if reply_allow %>
|
||||||
|
|
Loading…
Reference in New Issue