课程和项目留言的点赞
This commit is contained in:
parent
c8467a50a0
commit
8257770ec9
|
@ -23,6 +23,9 @@
|
||||||
<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 %>">
|
||||||
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
|
||||||
|
</span>
|
||||||
<% if journal.user == User.current|| User.current.admin? || (@course && User.current.allowed_to?(:as_teacher,@course)) %>
|
<% if journal.user == User.current|| User.current.admin? || (@course && User.current.allowed_to?(:as_teacher,@course)) %>
|
||||||
<%= link_to(l(:label_bid_respond_delete),
|
<%= link_to(l(:label_bid_respond_delete),
|
||||||
{:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
|
{:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
|
||||||
|
|
|
@ -14,6 +14,9 @@
|
||||||
</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 %>">
|
||||||
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
|
||||||
|
</span>
|
||||||
<% if journal.user == User.current|| User.current.admin? %>
|
<% if journal.user == User.current|| User.current.admin? %>
|
||||||
<%= link_to(l(:label_bid_respond_delete),
|
<%= link_to(l(:label_bid_respond_delete),
|
||||||
{:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
|
{:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
|
||||||
|
@ -26,7 +29,6 @@
|
||||||
<%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>
|
<%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
<%= 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 %>">
|
||||||
|
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
|
||||||
|
</span>
|
||||||
<% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
|
<% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
|
||||||
<%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
|
<%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
|
||||||
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %>
|
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %>
|
||||||
|
|
|
@ -439,6 +439,7 @@ a:hover.ping_sub{ background:#14a8b9;}
|
||||||
/*.ping_distop span{ float:left;}*/
|
/*.ping_distop span{ float:left;}*/
|
||||||
.ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
|
.ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
|
||||||
.ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
|
.ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
|
||||||
|
.ping_disfoot span a span{ color: #6883b6;}
|
||||||
/*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
|
/*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
|
||||||
.list_style ol li{list-style-type: decimal;margin-left: 40px;}
|
.list_style ol li{list-style-type: decimal;margin-left: 40px;}
|
||||||
.list_style ul li{list-style-type: disc;margin-left: 40px;}
|
.list_style ul li{list-style-type: disc;margin-left: 40px;}
|
||||||
|
|
|
@ -332,6 +332,7 @@ a:hover.ping_sub{ background:#14a8b9;}
|
||||||
/*.ping_distop span{ float:left;}*/
|
/*.ping_distop span{ float:left;}*/
|
||||||
.ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
|
.ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
|
||||||
.ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
|
.ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
|
||||||
|
.ping_disfoot span a span{ color: #6883b6;}
|
||||||
/*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
|
/*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
|
||||||
.list_style ol li{list-style-type: decimal;margin-left: 40px;}
|
.list_style ol li{list-style-type: decimal;margin-left: 40px;}
|
||||||
.list_style ul li{list-style-type: disc;margin-left: 40px;}
|
.list_style ul li{list-style-type: disc;margin-left: 40px;}
|
||||||
|
|
Loading…
Reference in New Issue