<% for attachment in attachments %>
@@ -20,43 +20,13 @@
- <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 32 -%>
+ <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%>
<% if options[:deletable] %>
- <%#= link_to image_tag('delete.png'), attachment_path(attachment),
- :data => {:confirm => l(:text_are_you_sure)},
- :method => :delete,
- :class => 'delete',
- #:remote => true,
- #:id => "attachments_" + attachment.id.to_s,
- :title => l(:button_delete) %>
<% end %>
-
- <%# if attachment.is_text? %>
- <%#= link_to image_tag('magnifier.png'),
- :controller => 'attachments',
- :action => 'show',
- :id => attachment,
- :filename => attachment.filename%>
- <%# end %>
-
-
-
-
-
-
-
-
-
-
- <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>
-
-
-
-
<% end %>
<% if defined?(thumbnails) && thumbnails %>
<% images = attachments.select(&:thumbnailable?) %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 133a90547..550c7a4fe 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -30,6 +30,14 @@
$(function() {
init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
});
+
+ function del_confirm(){
+ if(confirm('确认删除么?')){
+ $("#del_link").click();
+ }else{
+
+ }
+ }
<%end%>
-
+
<%= format_date( @memo.created_at)%>
<%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-
+
<%= @memo.content.html_safe%>
-
+
<% if @memo.attachments.any?%>
<% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
<%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index afd2f142b..8798002c9 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -1,3 +1,4 @@
+<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
@@ -45,18 +46,29 @@
<%= activity.description.html_safe %>
-
-
- -
-
- - 编辑
- - 复制
- - 删除
+ <% if is_teacher%>
+
+
+ -
+
+ -
+ <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
+
+ -
+ <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink") %>
+
+ -
+ <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+
+ -
+ <%= homework_anonymous_comment activity %>
+
+
+
-
-
+
+ <% end%>
-
\ No newline at end of file
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 363e2dfdd..a2c4e4504 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -13,11 +13,11 @@
<% course=Course.find(activity.jour_id) %>
<%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
-
+
<% if activity.m_parent_id.nil? %>
- <%= link_to activity.notes.to_s, course_feedback_path(course), :class => "postGrey" %>
+ <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
<% else %>
- <%= link_to activity.parent.notes.to_s, course_feedback_path(course), :class => "postGrey" %>
+ <%= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
<% end %>
@@ -62,7 +62,7 @@
<% end %>
<%= format_time(comment.created_on) %>
-
<%= comment.notes.html_safe %>
+
<%= comment.notes.html_safe %>
<% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
@@ -83,7 +83,7 @@
<% end %>
<%= format_time reply.created_on %>
-
<%= reply.notes.html_safe %>
+
<%= reply.notes.html_safe %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index fd9ae05e8..65bf644bc 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -87,7 +87,7 @@
<% end %>
<%= format_time(reply.created_on) %>
-
+
<%= reply.content.html_safe %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 99e85fc73..f5d570fe0 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -60,7 +60,7 @@
<% end %>
<%= format_time(comment.created_on) %>
-
<%= comment.comments.html_safe %>
+
<%= comment.comments.html_safe %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 0b86dc3eb..bb3c4cb54 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -97,7 +97,7 @@
<% end %>
<%= format_time(reply.created_on) %>
+
<% if reply.details.any? %>
<% details_to_strings(reply.details).each do |string| %>
<%= string %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 2856d6ed1..9be1145ff 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -74,7 +74,7 @@
<% end %>
<%= format_time(reply.created_on) %>
-
<%= reply.content.html_safe %>
+
<%= reply.content.html_safe %>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 149cd8857..63876084d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -51,7 +51,7 @@
- <% if User.current.allowed_to?(:as_teacher,ma.course_message) %>
+ <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
<%= User.current.lastname + User.current.firstname %>老师您好!
<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业:
@@ -175,47 +175,22 @@
<%= User.current.lastname + User.current.firstname %>同学您好!
<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了:
-
课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
-
作业标题:<%= ma.course_message.name %>
-
提交截止:<%= ma.course_message.end_time %>@nbsp; 24点
-
-
匿评关闭:<%= ma.course_message.homework_detail_manual.evaluation_end %>
- @nbsp;@nbsp;24点
-
+
匿评关闭:<%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点
迟交扣分:<%= ma.course_message.late_penalty %>分
-
-
- 请同学们抓紧时间提交自己的作品,谢谢!
-
+
请同学们抓紧时间提交自己的作品,谢谢!
<% else %>
-
<%= User.current.lastname + User.current.firstname %>您好!
- <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>
- 老师发布的作业截止日期快到了:
-
-
课程名称:<%= ma.course_message.course.name %>
- (<%= ma.course_message.course.term %>)
-
-
作业标题:<%= ma.course_message.name %>
-
-
提交截止:<%= ma.course_message.end_time %>@nbsp;@nbsp;24点
-
-
匿评开始:<%= ma.course_message.homework_detail_manual.evaluation_start %>
- @nbsp;@nbsp;24点
-
-
匿评关闭:<%= ma.course_message.homework_detail_manual.evaluation_end %>
- @nbsp;@nbsp;24点
-
-
迟交扣分:<%= ma.course_message.late_penalty %>分
-
-
缺评扣分:<%= ma.course_message.homework_detail_manual.absence_penalty %>分
-
-
-
- 您可以修改作业内容、评分规则、匿评过程等,谢谢!
-
+
<%= User.current.lastname + User.current.firstname %>老师您好!<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了:
+
课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
+
作业标题:<%= ma.course_message.name %>
+
提交截止:<%= ma.course_message.end_time %>@nbsp;@nbsp;24点
+
匿评开始:<%= ma.course_message.homework_detail_manual.evaluation_start %>@nbsp;@nbsp;24点
+
匿评关闭:<%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点
+
迟交扣分:<%= ma.course_message.late_penalty %>分
+
缺评扣分:<%= ma.course_message.homework_detail_manual.absence_penalty %>分
+
您可以修改作业内容、评分规则、匿评过程等,谢谢!
<% end %>
@@ -239,14 +214,14 @@
:onmouseout => "message_titile_hide($(this))" %>
-
您好!<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评,作业详情如下:
-
课程:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
-
作业标题:<%= ma.course_message.name %>
- <% unless ma.course_message.description.blank? %>
-
作业内容:
-
<%= ma.course_message.description.html_safe %>
- <% end %>
-
匿评自动关闭日期:<%= ma.course_message.homework_detail_manual.evaluation_end %>
+
+ <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学' : '老师' %>您好!
+ <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评,作业详情如下:
+
+
课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
+
作业标题:<%= ma.course_message.name %>
+
+ 截止日期:<%= ma.course_message.homework_detail_manual.evaluation_end %> 24点
@@ -265,13 +240,12 @@
:onmouseout => "message_titile_hide($(this))"%>
-
您好!<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评,作业详情如下:
-
课程:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
-
作业标题:<%= ma.course_message.name %>
- <% unless ma.course_message.description.blank? %>
-
作业内容:
-
<%= ma.course_message.description.html_safe %>
- <% end %>
+
+ <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学':'老师'%>您好!
+ <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评,作业详情如下:
+
+
课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
+
作业标题:<%= ma.course_message.name %>
@@ -293,13 +267,12 @@
:onmouseout => "message_titile_hide($(this))" %>
-
您好!<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师启动作业匿评失败,作业详情如下:
-
课程:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
-
作业标题:<%= ma.course_message.name %>
- <% unless ma.course_message.description.blank? %>
-
作业内容:
-
<%= ma.course_message.description.html_safe %>
- <% end %>
+
+ <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好!
+ <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师启动作业匿评失败,作业详情如下:
+
+
课程名称:<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)
+
作业标题:<%= ma.course_message.name %>
@@ -383,13 +356,8 @@
:onmouseout => "message_titile_hide($(this))" %>
<%= ma.content.html_safe %>
-
课程:<%= ma.course.name %>
- (<%= ma.course.term %>)
-
作业标题:<%=ma.course_message.student_work.homework_common.name %>
- <% unless ma.course_message.student_work.homework_common.description.blank? %>
-
作业内容:
-
<%= ma.course_message.student_work.homework_common.description.html_safe %>
- <% end %>
+
课程名称:<%= ma.course.name %>(<%= ma.course.term %>)
+
作业标题:<%=ma.course_message.student_work.homework_common.name %>
@@ -434,16 +402,12 @@
:onmouseout => "message_titile_hide($(this))" %>
-
回复内容:
+
回复内容:
<%= ma.course_message.notes %>
-
您的作品评论:
-
<%= ma.course_message.jour.comment %>
-
课程:<%= ma.course.name %>(<%= ma.course.term %>)
-
作业标题:<%=ma.course_message.jour.student_work.homework_common.name %>
- <% unless ma.course_message.jour.student_work.homework_common.description.blank? %>
-
作业内容:
-
<%= ma.course_message.jour.student_work.homework_common.description.html_safe %>
- <% end %>
+
您的评论:
+
<%= ma.course_message.jour.comment %>
+
课程名称:<%= ma.course.name %>(<%= ma.course.term %>)
+
作业标题:<%=ma.course_message.jour.student_work.homework_common.name %>
@@ -515,7 +479,7 @@