diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb index 286219356..7934a80fe 100644 --- a/app/views/forums/_forum_list.html.erb +++ b/app/views/forums/_forum_list.html.erb @@ -2,15 +2,15 @@ <% if forums.any? %> <% forums.each do |forum| %>
-
+
<%= link_to image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %>
- - <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %> + <%=forum.name.gsub(/(\r\n)/,'
').html_safe %> + <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'
'), forum_path(forum),:class=>"f16 linkBlue" %>
-
<%= textAreailizable forum.description%>
+
<%= textAreailizable forum.description%>
创建者：<%= forum.creator.name %>
创建时间：<%= format_date(forum.created_at) %>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 366291691..52309912e 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -21,7 +21,7 @@ function edit_desc(){ if(<%=@forum.creator.id == User.current.id%>) { desc = $("#forum_desc_span").html(); - $("#forum_desc_span").html(""); + $("#forum_desc_span").html(""); $("#forum_desc_input").focus(); } } @@ -149,15 +149,14 @@
-
<%= @forum.name%>
+
<%= @forum.name%>
吧主：<%= @forum.creator.name%>
回答：<%= @forum.memo_count %> 帖子：<%=@forum.topic_count%>
-
<%= @forum.description%> +
<%= @forum.description.html_safe%> <%if @forum.creator.id == User.current.id%> - <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%> <%end%> diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 807fb2caa..9f77b248d 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -14,7 +14,7 @@ <%= csrf_meta_tag %> <%= favicon %> -<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new',prettify,'users', :media => 'all' %> +<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','prettify','users', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= javascript_include_tag "avatars",'prettify'%> diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb index 15473e6e7..967bc0883 100644 --- a/app/views/memos/_attachments_links.html.erb +++ b/app/views/memos/_attachments_links.html.erb @@ -20,7 +20,7 @@
<% else %> - <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 32 -%> + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 80 -%> (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> <%#= link_to image_tag('delete.png'), attachment_path(attachment), diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 133a90547..1e2f0f25b 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{ + + } + }
@@ -43,24 +51,25 @@
    • <%end%> -
    主题: <%= @memo.subject%>
    +
    主题: <%= @memo.subject%>
    <%= @memo.author.name%>
    <%= 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 %>
    - + <% 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..93969f71b 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -51,7 +51,7 @@
  • Trustie平台发布新消息：
    • - 【系统消息】
  • + 【系统消息】
  • <%= link_to usm.subject.blank? ? (usm.content.nil? ? usm.description.html_safe : usm.content.html_safe) : usm.subject, user_system_messages_path(User.current), @@ -191,26 +191,26 @@ 请同学们抓紧时间提交自己的作品，谢谢！

    <% else %> -

    <%= User.current.lastname + User.current.firstname %>您好！ +

    <%= 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.name %> (<%= ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    +

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>@nbsp;@nbsp;24点

    +

    提交截止：<%= 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_start %> + @nbsp;@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 %>分

    +

    迟交扣分：<%= ma.course_message.late_penalty %>分

    -

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分 +

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    @@ -239,14 +239,15 @@ :onmouseout => "message_titile_hide($(this))" %>

  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -265,8 +266,10 @@ :onmouseout => "message_titile_hide($(this))"%>