-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
-
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
+
\ No newline at end of file
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 05f69055f..a5aa8b780 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -1,226 +1,226 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-
-
- <% if activity.author.id == User.current.id%>
-
-
-
-
-
- <%= link_to(
- l(:button_edit),
- {:controller => 'blog_comments',:action => 'edit',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
- :class => 'postOptionLink'
- ) if User.current && User.current.id == activity.author.id %>
-
-
- <%= link_to(
- l(:button_delete),
- {:controller => 'blog_comments',:action => 'destroy',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
- :method => :delete,
- :data => {:confirm => l(:text_are_you_sure)},
- :class => 'postOptionLink'
- ) if User.current && User.current.id == activity.author.id %>
-
-
- <% if activity.id == activity.blog.homepage_id %>
- <%= link_to(
- l(:button_cancel_homepage),
- {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
- :method => :post,
- :class => 'postOptionLink'
- ) if User.current && User.current.id == activity.blog.author_id %>
- <% else %>
- <%= link_to(
- l(:button_set_homepage),
- {:controller => 'blogs',:action => 'set_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
- :method => :post,
- :class => 'postOptionLink'
- ) if User.current && User.current.id == activity.blog.author_id %>
- <% end %>
-
-
-
-
-
- <%end%>
-
- <% if activity.try(:author).try(:realname) == ' ' %>
- <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
- <% end %>
- TO
- <%= link_to activity.blog.name+" | 博客", user_blogs_path(:user_id=>activity.author_id,:host=>Setting.host_user), :class => "newsBlue ml15 mr5"%>
- <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %>
- 已设为首页
- <% end %>
-
-
-
- <% if activity.parent_id.nil? %>
- <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey" %>
- <% else %>
- <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey"%>
- <% end %>
-
- <% if activity.sticky == 1%>
-
置顶
- <% end%>
- <% if activity.locked%>
-
- <% end%>
-
-
- 发帖时间：<%= format_time(activity.created_on) %>
-
-
- 更新时间：<%= format_time(activity.updated_on) %>
-
-
- <% if activity.parent_id.nil? %>
- <% content= activity.content%>
- <% else %>
- <% content= activity.parent.content%>
- <% end %>
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
-
-
-
-
-
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
-
-
-
-
- <% count=0 %>
- <% if activity.parent %>
- <% count=activity.parent.children.count%>
- <% else %>
- <% count=activity.children.count%>
- <% end %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
-
<%#=format_date(activity.updated_on)%>
- <%if count > 3 %>
-
- <% end %>
-
-
- <% activity= activity.parent ? activity.parent : activity%>
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% activity.children.reorder("created_on desc").each do |reply|%>
-
- <% replies_all_i=replies_all_i+1 %>
-
-
- <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-
-
-
- <% if reply.try(:author).try(:realname) == ' ' %>
- <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(reply.created_on) %>
-
- <% if reply.author == User.current %>
- 赞 <%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
-
-
-
- <%= reply.content.html_safe %>
-
-
-
- <% end %>
-
-
- <% end %>
-
- <% if !activity.locked? %>
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller=>'blog_comments',:action => 'reply', :id => activity.id, :blog_id => activity.blog.id, :user_id => activity.author_id},:method => "post",:remote=>true) do |f|%>
-
-
-
-
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
- <% end %>
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+
+
+ <% if activity.author.id == User.current.id%>
+
+
+
+
+
+ <%= link_to(
+ l(:button_edit),
+ {:controller => 'blog_comments',:action => 'edit',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
+ :class => 'postOptionLink'
+ ) if User.current && User.current.id == activity.author.id %>
+
+
+ <%= link_to(
+ l(:button_delete),
+ {:controller => 'blog_comments',:action => 'destroy',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
+ :method => :delete,
+ :data => {:confirm => l(:text_are_you_sure)},
+ :class => 'postOptionLink'
+ ) if User.current && User.current.id == activity.author.id %>
+
+
+ <% if activity.id == activity.blog.homepage_id %>
+ <%= link_to(
+ l(:button_cancel_homepage),
+ {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
+ :method => :post,
+ :class => 'postOptionLink'
+ ) if User.current && User.current.id == activity.blog.author_id %>
+ <% else %>
+ <%= link_to(
+ l(:button_set_homepage),
+ {:controller => 'blogs',:action => 'set_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
+ :method => :post,
+ :class => 'postOptionLink'
+ ) if User.current && User.current.id == activity.blog.author_id %>
+ <% end %>
+
+
+
+
+
+ <%end%>
+
+ <% if activity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+ <% end %>
+ TO
+ <%= link_to activity.blog.name+" | 博客", user_blogs_path(:user_id=>activity.author_id,:host=>Setting.host_user), :class => "newsBlue ml15 mr5"%>
+ <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %>
+ 已设为首页
+ <% end %>
+
+
+
+ <% if activity.parent_id.nil? %>
+ <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey" %>
+ <% else %>
+ <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey"%>
+ <% end %>
+
+ <% if activity.sticky == 1%>
+
置顶
+ <% end%>
+ <% if activity.locked%>
+
+ <% end%>
+
+
+ 发帖时间：<%= format_time(activity.created_on) %>
+
+
+ 更新时间：<%= format_time(activity.updated_on) %>
+
+
+ <% if activity.parent_id.nil? %>
+ <% content= activity.content%>
+ <% else %>
+ <% content= activity.parent.content%>
+ <% end %>
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+
+
+
+
+
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+
+
+
+
+
+ <% count=0 %>
+ <% if activity.parent %>
+ <% count=activity.parent.children.count%>
+ <% else %>
+ <% count=activity.children.count%>
+ <% end %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.author == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+
<%#=format_date(activity.updated_on)%>
+ <%if count > 3 %>
+
+ <% end %>
+
+
+ <% activity= activity.parent ? activity.parent : activity%>
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% activity.children.reorder("created_on desc").each do |reply|%>
+
+ <% replies_all_i=replies_all_i+1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %>
+ <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(reply.created_on) %>
+
+ <% if reply.author == User.current %>
+ 赞 <%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+ <% end %>
+
+
+
+ <%= reply.content.html_safe %>
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+ <% if !activity.locked? %>
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller=>'blog_comments',:action => 'reply', :id => activity.id, :blog_id => activity.blog.id, :user_id => activity.author_id},:method => "post",:remote=>true) do |f|%>
+
+
+
+
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
+ <% end %>
+
+
+
diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index 35d9fe399..bf69c3a61 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -1,81 +1,139 @@
-
-
- <% if User.current.logged? && User.current.member_of_course?(@course) && @group %>
- <%= join_in_course_group(@course.course_groups,@group, User.current) unless @canShowCode %>
-
- <%= l(:label_current_group)%>:
- <%= @group.name %>
-
- <% end %>
-
-
-
-<% if members.any? %>
- <% if @result_count %>
-
- <%= l(:label_search_member_count) %>
- <%= @result_count %>
- <%= l(:label_member_people) %>
-
-
- <% end %>
-
-
-
- 姓名 学号
- <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
- <% if @score_sort_by == 'desc' %>
-
- 加入时间
-
-
- <% members.each do |member| %>
-
-
- <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %>
-
-
- <% if @canShowCode %>
-
- <% if member.user.show_name == ''%>
- <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.name} ".html_safe,user_path(member.user)) %>
- <% else%>
- <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.show_name} ".html_safe,user_path(member.user)) %>
- <%end%>
-
- <% else %>
- <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.name} ".html_safe, user_path(member.user)) %>
- <% end %>
- <%= link_to("#{l(:label_bidding_user_studentcode)}：#{member.user.user_extensions.student_id} ".html_safe,user_path(member.user)) %>
- <% end%>
-
- <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
- :action => 'show_member_score',
- :member_id => member.id,
- :remote => true},
- :class => 'ml258 c_red' %>
-
<%= format_date(member.created_on)%>
- <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
-
-
- <% end; reset_cycle %>
-
-
-
-<% else%>
-
- <%= l(:label_no_data) %>
-
-<% end%>
-
+
+
+ <% if User.current.logged? && User.current.member_of_course?(@course) && @group %>
+ <%= join_in_course_group(@course.course_groups,@group, User.current) unless @canShowCode %>
+
+ <%= l(:label_current_group)%>:
+ <%= @group.name %>
+
+ <% end %>
+
+
+
+<% if members.any? %>
+ <% if @result_count %>
+
+ <%= l(:label_search_member_count) %>
+ <%= @result_count %>
+ <%= l(:label_member_people) %>
+
+
+ <% end %>
+
+
+
+ 姓名 学号 分班
+ <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
+ <% if @score_sort_by == 'desc' %>
+
+ 加入时间
+
+
+ <% members.each do |member| %>
+
+
+ <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %>
+
+
+ <% if @canShowCode %>
+
+ <% if member.user.show_name == ''%>
+ <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.name} ".html_safe,user_path(member.user)) %>
+ <% else%>
+ <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.show_name} ".html_safe,user_path(member.user)) %>
+ <%end%>
+
+ <% else %>
+ <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.name} ".html_safe, user_path(member.user)) %>
+ <% end %>
+ <%= link_to("#{l(:label_bidding_user_studentcode)}：#{member.user.user_extensions.student_id} ".html_safe,user_path(member.user)) %>
+ <% end%>
+
+ <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
+ <% if @course.course_groups.nil? || @group %>
+
+ <%=member.course_group_id == 0 ? "暂无" : member.course_group.name %>
+
+ <% else %>
+ <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
+
<%=member.course_group_id == 0 ? "暂无" : member.course_group.name %>
+
+
+ <%= select( :name,:group_id, course_group_option(@course),
+ { :include_blank => false,:selected => member.course_group_id},
+ {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w125 undis class-edit fl", :style => "margin-left: 105px;"}) %>
+ <% end %>
+ <% end %>
+ <% else %>
+
+ <%=member.course_group_id == 0 ? "暂无" : member.course_group.name %>
+
+ <% end %>
+ <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
+ :action => 'show_member_score',
+ :member_id => member.id,
+ :remote => true},
+ :class => 'ml25 c_red' %>
+
<%= format_date(member.created_on)%>
+ <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
+
+
+ <% end; reset_cycle %>
+
+
+
+<% else%>
+
+ <%= l(:label_no_data) %>
+
+<% end%>
+
+
+
diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index f26c5fd41..f697383ca 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -6,7 +6,7 @@
<%= image_tag(url_to_avatar(e_course), :width => "40", :height => "40", :class => "fl mr10 rankPortrait", :alt => "logo") %>
-
<%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %>
+
<%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %>
<% if e_course.attachments.count > 0 %>
<%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)
@@ -14,6 +14,7 @@
<% if e_course.homework_commons.count > 0 %>
<%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)
<% end %>
+
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index e12876ce9..8be245958 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -1,218 +1,218 @@
-
-<%= content_for(:header_tags) do %>
- <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
- <%= javascript_include_tag 'blog' %>
-<% end %>
-
-
-
-
-
-
- <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %>
-
-
- <% if User.current && @article.author.id == User.current.id%>
-
-
-
-
-
- 重设大纲
-
-
- <%= link_to(
- '取消大纲',
- {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id},
- :method => :delete,
- :data => {:confirm => '您确定要取消么？'},
- :class => 'postOptionLink'
- ) if User.current && User.current.id == @article.author.id %>
-
-
-
-
-
-
-
-
-
-
-
-
-
- <%end%>
-
-
-
-
- <% if @article.try(:author).try(:realname) == ' ' %>
- <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% else %>
- <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% end %>
-
-
<%= format_time( @article.created_on)%>
-
-
- <%= @article.content.html_safe%>
-
-
-
- <%#= link_to_attachments_course @topic, :author => false %>
- <% if @article.attachments.any?%>
- <% options = {:author => true, :deletable => false} %>
- <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %>
- <% end %>
-
-
-
-
-
- <% count=0 %>
- <% if @article.parent %>
- <% count=@article.parent.children.count%>
- <% else %>
- <% count=@article.children.count%>
- <% end %>
-
- <% unless count == 0 %>
-
-
- <%@article.children.reorder('created_on desc').each_with_index do |reply,i| %>
-
-
-
- <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-
-
-
- <% if reply.try(:author).try(:realname) == ' ' %>
- <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
- <% end %>
-
-
- <%= reply.content.html_safe%>
-
-
- <%= format_time(reply.created_on) %>
-
-
-
-
-
-
- <% end %>
-
-
- <% end %>
-
- <% if !@article.locked? && User.current.logged?%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@article.author_id), :alt => "用户头像" %>
-
-
- <%= form_for 'blog_comment',:url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
-
-
-
-
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
- <% end %>
-
-
+
+
+ <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %>
+
+
+ <% if User.current && @article.author.id == User.current.id%>
+
+
+
+
+
+ 重设大纲
+
+
+ <%= link_to(
+ '取消大纲',
+ {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id},
+ :method => :delete,
+ :data => {:confirm => '您确定要取消么？'},
+ :class => 'postOptionLink'
+ ) if User.current && User.current.id == @article.author.id %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%end%>
+
+
+
+
+ <% if @article.try(:author).try(:realname) == ' ' %>
+ <%= link_to @article.try(:author), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+ <% else %>
+ <%= link_to @article.try(:author).try(:realname), user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+ <% end %>
+
+
<%= format_time( @article.created_on)%>
+
+
+ <%= @article.content.html_safe%>
+
+
+
+ <%#= link_to_attachments_course @topic, :author => false %>
+ <% if @article.attachments.any?%>
+ <% options = {:author => true, :deletable => false} %>
+ <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => @article.attachments, :options => options, :is_float => true} %>
+ <% end %>
+
+
+
+
+
+ <% count=0 %>
+ <% if @article.parent %>
+ <% count=@article.parent.children.count%>
+ <% else %>
+ <% count=@article.children.count%>
+ <% end %>
+
+ <% unless count == 0 %>
+
+
+ <%@article.children.reorder('created_on desc').each_with_index do |reply,i| %>
+
+
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %>
+ <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+ <% end %>
+
+
+ <%= reply.content.html_safe%>
+
+
+ <%= format_time(reply.created_on) %>
+
+
+
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+ <% if !@article.locked? && User.current.logged?%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@article.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for 'blog_comment',:url => {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
+
+
+
+
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+ <% end %>
+
+
- <% issue.journals.reorder("created_on desc").each do |reply| %>
-
- <% replies_all_i=replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
-
-
-
- <% if reply.try(:user).try(:realname) == ' ' %>
- <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%#= format_time(reply.created_on) %>
-
-
- <% if reply.details.any? %>
- <% details_to_strings(reply.details).each do |string| %>
-
<%= string %>
- <% end %>
- <% end %>
-
<%= reply.notes.html_safe %>
-
-
- <%= format_time(reply.created_on) %>
-
-
-
-
-
- <% end %>
-
-
-
-
- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
-
-
-
-
- <%= form_for('new_form',:url => add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
- <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-
-
-
-
-
-
-
- <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
-
-
-
发送
-
- <% end %>
-
-
-
-
-
-
+
+ <% issue.journals.reorder("created_on desc").each do |reply| %>
+
+ <% replies_all_i=replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+
+
+
+ <% if reply.try(:user).try(:realname) == ' ' %>
+ <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%#= format_time(reply.created_on) %>
+
+
+ <% if reply.details.any? %>
+ <% details_to_strings(reply.details).each do |string| %>
+
<%= string %>
+ <% end %>
+ <% end %>
+
<%= reply.notes.html_safe %>
+
+
+ <%= format_time(reply.created_on) %>
+
+
+
+
+
+ <% end %>
+
+
+
+
+ <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
+
+
+
+
+ <%= form_for('new_form',:url => add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
+ <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+
+
+
+
+
+
+
+ <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
+
+
+
发送
+
+ <% end %>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb
index e84d5905c..a2975237b 100644
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@@ -1,27 +1,27 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
+
+
+
\ No newline at end of file
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 2f0d2732b..0675c8a4a 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -77,10 +77,10 @@
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
-
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
+
\ No newline at end of file
diff --git a/app/views/org_document_comments/_simple_ke_reply_form.html.erb b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
index 44eb71500..1813f5b5f 100644
--- a/app/views/org_document_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
@@ -1,18 +1,18 @@
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
-
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
+
\ No newline at end of file
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index e86159dab..9a9943e9b 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -144,7 +144,7 @@
-
发送
+
发送
<% end%>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index aa2493c5f..bf0cc8734 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -1,161 +1,161 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
- <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
-
-
- <% if activity.try(:author).try(:realname) == ' ' %>
- <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
- <% end %>
- TO
- <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
-
-
- <% if activity.parent_id.nil? %>
- <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
- %>
- <% else %>
- <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
- %>
- <% end %>
-
-
- 发布时间：<%= format_time(activity.created_on) %>
-
-
- 更新时间：<%= format_time(OrgActivity.where("org_act_type='#{activity.class}' and org_act_id =#{activity.id}").first.updated_at) %>
-
-
- <% if activity.parent_id.nil? %>
- <% content = activity.content%>
- <% else %>
- <% content = activity.parent.content%>
- <% end %>
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
-
-
-
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
-
-
-
- <% if User.current.logged? %>
-
- <%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'message')") %>
-
- <%= link_to(
- l(:button_edit),
- {:controller => 'messages', :action => 'edit', :id => activity, :board_id => activity.board_id},
- :class => 'postOptionLink'
- ) if activity.org_subfield_editable_by?(User.current) %>
-
-
- <%= link_to(
- l(:button_delete),
- {:controller => 'messages', :action => 'destroy', :id => activity, :board_id => activity.board_id},
- :method => 'post',
- :data => {:confirm => l(:text_are_you_sure)},
- :class => 'postOptionLink'
- ) if activity.org_subfield_editable_by?(User.current) %>
-
-
- <% end %>
-
-
-
-
-
-
- <% count = 0 %>
- <% if activity.parent %>
- <% count=activity.parent.children.count%>
- <% else %>
- <% count=activity.children.count%>
- <% end %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
- <%if count>3 %>
-
- <% end %>
-
-
- <% activity= activity.parent_id.nil? ? activity : activity.parent %>
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% activity.children.reorder("created_on desc").each do |reply| %>
-
- <% replies_all_i=replies_all_i+1 %>
-
-
- <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
-
-
-
- <% if reply.try(:author).try(:realname) == ' ' %>
- <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(reply.created_on) %>
-
- <% if reply.author == User.current %>
- 赞 <%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
-
-
-
- <%= reply.content.html_safe %>
-
-
- <% end %>
-
-
- <% end %>
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
+ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %>
+ TO
+ <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
+
+
+ <% if activity.parent_id.nil? %>
+ <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
+ %>
+ <% else %>
+ <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey"
+ %>
+ <% end %>
+
+
+ 发布时间：<%= format_time(activity.created_on) %>
+
+
+ 更新时间：<%= format_time(OrgActivity.where("org_act_type='#{activity.class}' and org_act_id =#{activity.id}").first.updated_at) %>
+
+
+ <% if activity.parent_id.nil? %>
+ <% content = activity.content%>
+ <% else %>
+ <% content = activity.parent.content%>
+ <% end %>
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+
+
+
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+
+
+
+
+ <% if User.current.logged? %>
+
+ <%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'message')") %>
+
+ <%= link_to(
+ l(:button_edit),
+ {:controller => 'messages', :action => 'edit', :id => activity, :board_id => activity.board_id},
+ :class => 'postOptionLink'
+ ) if activity.org_subfield_editable_by?(User.current) %>
+
+
+ <%= link_to(
+ l(:button_delete),
+ {:controller => 'messages', :action => 'destroy', :id => activity, :board_id => activity.board_id},
+ :method => 'post',
+ :data => {:confirm => l(:text_are_you_sure)},
+ :class => 'postOptionLink'
+ ) if activity.org_subfield_editable_by?(User.current) %>
+
+
+ <% end %>
+
+
+
+
+
+
+ <% count = 0 %>
+ <% if activity.parent %>
+ <% count=activity.parent.children.count%>
+ <% else %>
+ <% count=activity.children.count%>
+ <% end %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.author == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+ <%if count>3 %>
+
+ <% end %>
+
+
+ <% activity= activity.parent_id.nil? ? activity : activity.parent %>
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% activity.children.reorder("created_on desc").each do |reply| %>
+
+ <% replies_all_i=replies_all_i+1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
+
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %>
+ <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(reply.created_on) %>
+
+ <% if reply.author == User.current %>
+ 赞 <%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+ <% end %>
+
+
+
+ <%= reply.content.html_safe %>
+
+
+ <% end %>
+
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
+
+
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index edbdfa16b..3d2a316cf 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -1,146 +1,146 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
- <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
-
-
- <% if activity.try(:author).try(:realname) == ' ' %>
- <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
- <% end %> TO
- <%= link_to activity.org_subfield.name.to_s+" | 帖子栏目通知", organization_path(activity.org_subfield.organization, :org_subfield_id => activity.org_subfield.id), :class => "newsBlue ml15" %>
-
-
- <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
-
-
-
-
- 发布时间：<%= format_time(activity.created_on) %>
-
-
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
-
-
-
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
-
-
-
- <% if User.current.logged? %>
-
- <%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')") %>
-
- <%= link_to(
- l(:button_edit),
- {:controller => 'news', :action => 'edit', :id => activity},
- :class => 'postOptionLink'
- ) if activity.author == User.current %>
-
-
- <%= delete_link(
- news_path(activity),
- :data => {:confirm => l(:text_are_you_sure)},
- :class => 'postOptionLink'
- ) if activity.author == User.current %>
-
-
- <% end %>
-
-
-
-
-
-
- <% count=activity.comments.count %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
-
<%#= format_date(activity.updated_on) %>
- <%if count>3 %>
-
- <% end %>
-
-
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% activity.comments.reorder("created_on desc").each do |comment| %>
-
- <% replies_all_i = replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
-
-
-
- <% if comment.try(:author).try(:realname) == ' ' %>
- <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(comment.created_on) %>
-
-
-
-
-
- <% end %>
-
-
- <% end %>
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
+ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <%= link_to activity.org_subfield.name.to_s+" | 帖子栏目通知", organization_path(activity.org_subfield.organization, :org_subfield_id => activity.org_subfield.id), :class => "newsBlue ml15" %>
+
+
+ <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+
+
+
+
+ 发布时间：<%= format_time(activity.created_on) %>
+
+
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
+
+
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+
+
+
+
+ <% if User.current.logged? %>
+
+ <%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')") %>
+
+ <%= link_to(
+ l(:button_edit),
+ {:controller => 'news', :action => 'edit', :id => activity},
+ :class => 'postOptionLink'
+ ) if activity.author == User.current %>
+
+
+ <%= delete_link(
+ news_path(activity),
+ :data => {:confirm => l(:text_are_you_sure)},
+ :class => 'postOptionLink'
+ ) if activity.author == User.current %>
+
+
+ <% end %>
+
+
+
+
+
+
+ <% count=activity.comments.count %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.author == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+
<%#= format_date(activity.updated_on) %>
+ <%if count>3 %>
+
+ <% end %>
+
+
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% activity.comments.reorder("created_on desc").each do |comment| %>
+
+ <% replies_all_i = replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
+
+
+
+ <% if comment.try(:author).try(:realname) == ' ' %>
+ <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(comment.created_on) %>
+
+
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
+
+
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 518ee3a2b..4ea0e9f17 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -1,123 +1,123 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
- <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
-
-
- <% if activity.try(:author).try(:realname) == ' ' %>
- <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
- <% end %> TO
- <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
-
-
- <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
-
- <% if activity.sticky == 1%>
-
置顶
- <% end%>
-
-
- 发布时间：<%= format_time(activity.created_on) %>
-
-
- 更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
-
-
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
-
-
-
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
-
-
-
- <% count=activity.comments.count %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
-
<%#= format_date(activity.updated_on) %>
- <%if count>3 %>
-
- <% end %>
-
-
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% activity.comments.reorder("created_on desc").each do |comment| %>
-
- <% replies_all_i = replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
-
-
-
- <% if comment.try(:author).try(:realname) == ' ' %>
- <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(comment.created_on) %>
-
-
-
-
-
- <% end %>
-
-
- <% end %>
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
+
+
+ <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+
+ <% if activity.sticky == 1%>
+
置顶
+ <% end%>
+
+
+ 发布时间：<%= format_time(activity.created_on) %>
+
+
+ 更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+
+
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
+
+
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+
+
+
+
+ <% count=activity.comments.count %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.author == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+
<%#= format_date(activity.updated_on) %>
+ <%if count>3 %>
+
+ <% end %>
+
+
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% activity.comments.reorder("created_on desc").each do |comment| %>
+
+ <% replies_all_i = replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+
+
+
+ <% if comment.try(:author).try(:realname) == ' ' %>
+ <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(comment.created_on) %>
+
+
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 76d5745df..750a3c6ec 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,81 +1,81 @@
-<%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
-
-
<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
-
-
- <% if @entries.nil? %>
- <%# 未提交代码提示 %>
-
- <% if @entries.nil? && authorize_for('repositories', 'browse') %>
-
- 该版本库还没有上传代码!
-
- <% end %>
- <% if @repository.type.to_s=="Repository::Gitlab" %>
- 版本库地址：<%= @repos_url %>
- <% else %>
- 版本库地址：<%= h @repository.url %>
- <% end %>
-
-
-
- <% else %>
- <%= render :partial => 'navigation' %>
-
克隆网址:
-
-
-
- <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
- <% if User.current.id != @project.user_id %>
-
<%= link_to "<%= @project.forked_count.to_i %>
-
- <% end %>
-
-
- <% if @changesets && !@changesets.empty? %>
- <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
- <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)), :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
-
<%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %>
- 提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
- <%= @changesets_latest_coimmit.message %>
-
- <% else %>
-
<%=@changesets_latest_coimmit.author_email %>
- 提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
- <%= @changesets_latest_coimmit.message %>
-
- <%end%>
- <% end %>
-
- <%= @repository.branches.count %> 个分支
-
-
-
- <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %> 提交
-
-
-
- <% end %>
-
-
-
-<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
- <%# 数据统计 %>
- <%#= render :partial => 'summary' %>
- <%# end %>
- <%= render :partial => 'dir_list' %>
-<% end %>
-<%#= render_properties(@properties) %>
-
-
-<%#= render_properties(@properties) %>
-
-
-
如何提交代码
-
-<% content_for :header_tags do %>
- <%= stylesheet_link_tag "scm" %>
-<% end %>
-
-<% html_title(l(:label_repository)) -%>
+<%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
+
+
<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
+
+
+ <% if @entries.nil? %>
+ <%# 未提交代码提示 %>
+
+ <% if @entries.nil? && authorize_for('repositories', 'browse') %>
+
+ 该版本库还没有上传代码!
+
+ <% end %>
+ <% if @repository.type.to_s=="Repository::Gitlab" %>
+ 版本库地址：<%= @repos_url %>
+ <% else %>
+ 版本库地址：<%= h @repository.url %>
+ <% end %>
+
+
+
+ <% else %>
+ <%= render :partial => 'navigation' %>
+
克隆网址:
+
+
+
+ <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
+ <% if User.current.id != @project.user_id %>
+
<%= link_to "<%= @project.forked_count.to_i %>
+
+ <% end %>
+
+
+ <% if @changesets && !@changesets.empty? %>
+ <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
+ <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)), :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
+
<%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %>
+ 提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
+ <%= @changesets_latest_coimmit.message %>
+
+ <% else %>
+
<%=@changesets_latest_coimmit.author_email %>
+ 提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
+ <%= @changesets_latest_coimmit.message %>
+
+ <%end%>
+ <% end %>
+
+ <%= @repository.branches.count %> 个分支
+
+
+
+ <%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %> 提交
+
+
+
+ <% end %>
+
+
+
+<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
+ <%# 数据统计 %>
+ <%#= render :partial => 'summary' %>
+ <%# end %>
+ <%= render :partial => 'dir_list' %>
+<% end %>
+<%#= render_properties(@properties) %>
+
+
+<%#= render_properties(@properties) %>
+
+
+
如何提交代码
+
+<% content_for :header_tags do %>
+ <%= stylesheet_link_tag "scm" %>
+<% end %>
+
+<% html_title(l(:label_repository)) -%>
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 66b96431e..aee833b70 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -2,8 +2,16 @@
作品名称
<% if @homework.homework_type != 3 %>
- 姓名
- 学号
+
+ <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl" ,:remote => true%>
+ <% if @show_all && @order == "lastname"%>
+ <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+ <% end%>
+
+ <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+ <% if @show_all && @order == "student_id"%>
+ <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+ <% end%>
<% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
关联项目
<% end %>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index bf022f64c..884bb8eb1 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -1,102 +1,102 @@
-
-
-
-
-
- <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
-
-
-
- <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
-
- <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-
-
-
- <% if @homework.homework_type != 3 %>
-
-
- <%= student_work.user.show_name%>
-
-
- <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-
-
- <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-
-
- <%= student_work.project.name %>
-
-
- <% end %>
-
-
-
-
- <% if student_work.created_at && @homework.end_time%>
- <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>
- <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
- [迟交]
- <% end %>
- <% end %>
-
-
- <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
-
-
- <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
-
-
- <% if @homework.homework_type == 2%>
-
-
- <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
-
- <% end%>
-
- <% if @homework.anonymous_comment == 0%>
-
- <%= student_work.student_score.nil? ? "未参与" : format("%.1f",student_work.student_score)%>
- <% unless student_work.student_score.nil?%>
-
- (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
-
-
- 现共有
- <%= student_work.student_works_scores.where(:reviewer_role => 3).count%>
- 名学生进行了匿评，平均分为
- <%= format("%.1f",student_work.student_score)%> 分。
-
- <% end%>
-
- <% end %>
-
- <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
-
- <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
- <% unless score.nil?%>
-
- 作品最终评分为
- <%= student_work.final_score%> 分。
- 迟交扣分
- <%= student_work.late_penalty%> 分，
- 缺评扣分
- <%= student_work.absence_penalty%> 分，
- 最终成绩为
- <%= format("%.1f",score<0 ? 0 : score)%> 分。
-
- <% end%>
-
- 点击查看详情
-
-
+
+
+
+
+
+ <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
+
+
+
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+
+
+
+ <% if @homework.homework_type != 3 %>
+
+
+ <%= student_work.user.show_name%>
+
+ ">
+ <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+
+
+ <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+
+
+ <%= student_work.project.name %>
+
+
+ <% end %>
+
+
+
+
+ <% if student_work.created_at && @homework.end_time%>
+ <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>
+ <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
+ [迟交]
+ <% end %>
+ <% end %>
+
+
+ <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
+
+
+ <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
+
+
+ <% if @homework.homework_type == 2%>
+
+
+ <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+
+ <% end%>
+
+ <% if @homework.anonymous_comment == 0%>
+
+ <%= student_work.student_score.nil? ? "未参与" : format("%.1f",student_work.student_score)%>
+ <% unless student_work.student_score.nil?%>
+
+ (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
+
+
+ 现共有
+ <%= student_work.student_works_scores.where(:reviewer_role => 3).count%>
+ 名学生进行了匿评，平均分为
+ <%= format("%.1f",student_work.student_score)%> 分。
+
+ <% end%>
+
+ <% end %>
+
+ <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
+
+ <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
+ <% unless score.nil?%>
+
+ 作品最终评分为
+ <%= student_work.final_score%> 分。
+ 迟交扣分
+ <%= student_work.late_penalty%> 分，
+ 缺评扣分
+ <%= student_work.absence_penalty%> 分，
+ 最终成绩为
+ <%= format("%.1f",score<0 ? 0 : score)%> 分。
+
+ <% end%>
+
+ 点击查看详情
+
+
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index cc346361e..f97a8dd2d 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -21,10 +21,10 @@
<% if @homework.homework_type != 3 %>
-
+
<%= student_work.user.show_name%>
-
+ ">
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index d6977325c..8e7c58dc3 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -25,7 +25,7 @@
编程代码：
- <%= work.description if work.description%>
+
<%= work.description if work.description%>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 1eea8f1c2..53e57fd9c 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -63,7 +63,7 @@
} else if(language==4){
program_name = 'text/x-java';
}
- var editor = CodeMirror(document.getElementById("work-code"), {
+ var editor = CodeMirror(document.getElementById("work-code_<%= work.id%>"), {
mode: {name: program_name,
version: 2,
singleLineStringErrors: false},
diff --git a/app/views/student_work/show.js.erb b/app/views/student_work/show.js.erb
index 477f06e0f..c89180b16 100644
--- a/app/views/student_work/show.js.erb
+++ b/app/views/student_work/show.js.erb
@@ -1,36 +1,36 @@
-if($("#about_hwork_<%= @work.id%>").children().length > 0){
- $("#about_hwork_<%= @work.id%>").html("");
-}
-else{
- <% if @homework.homework_type == 2%>
- $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
-
- var program_name = "text/x-csrc";
- var language = <%= @homework.language %>;
- if (language == 1) {
- program_name = 'text/x-csrc';
- } else if(language==2){
- program_name = 'text/x-c++src';
- }else if(language==3){
- program_name = 'text/x-cython';
- } else if(language==4){
- program_name = 'text/x-java';
- }
-
- var editor = CodeMirror(document.getElementById("work-code"), {
- mode: {name: program_name,
- version: 2,
- singleLineStringErrors: false},
- lineNumbers: true,
- indentUnit: 2,
- matchBrackets: true,
- readOnly: true,
- value: $("#work-src").text()
- }
- );
-
- <% else%>
- $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
- <% end%>
- $('#score_<%= @work.id%>').peSlider({range: 'min'});
+if($("#about_hwork_<%= @work.id%>").children().length > 0){
+ $("#about_hwork_<%= @work.id%>").html("");
+}
+else{
+ <% if @homework.homework_type == 2%>
+ $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
+
+ var program_name = "text/x-csrc";
+ var language = <%= @homework.language %>;
+ if (language == 1) {
+ program_name = 'text/x-csrc';
+ } else if(language==2){
+ program_name = 'text/x-c++src';
+ }else if(language==3){
+ program_name = 'text/x-cython';
+ } else if(language==4){
+ program_name = 'text/x-java';
+ }
+
+ var editor = CodeMirror(document.getElementById("work-code_<%= @work.id%>"), {
+ mode: {name: program_name,
+ version: 2,
+ singleLineStringErrors: false},
+ lineNumbers: true,
+ indentUnit: 2,
+ matchBrackets: true,
+ readOnly: true,
+ value: $("#work-src").text()
+ }
+ );
+
+ <% else%>
+ $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
+ <% end%>
+ $('#score_<%= @work.id%>').peSlider({range: 'min'});
}
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index d42dc152d..ee49e3cfc 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -47,7 +47,7 @@
<% end%>
<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
-
系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！
+
系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！
<% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！
<% end %>
@@ -153,8 +153,18 @@
<% end %>
<% student_works.each_with_index do |sw, i| %>
-
<%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
- <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
+
+ <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
+ <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+
+ <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
+
+ <% else %>
+ <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+
+ <%=sw.user.show_name %>
+
+ <% end %>
<% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
分数：<%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分
@@ -346,7 +356,7 @@
<%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-
发送
+
发送
<% end%>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 6b28fb568..f9a59f024 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -1,110 +1,110 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
- <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
-
-
-
- <% if activity.try(:user).try(:realname) == ' ' %>
- <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
- <% end %> TO
- <% course=Course.find(activity.jour_id) %>
- <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
-
-
- <% if activity.parent %>
- <%= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
- <% else %>
- <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
- <% end %>
-
-
- 留言时间：<%= format_time(activity.created_on) %>
-
-
- 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
-
-
-
-
-
- <% count = fetch_user_leaveWord_reply(activity).count %>
-
-
-
-
- 回复（<%= count %>）
-
-
- <%if count>3 %>
-
- <% end %>
-
-
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% fetch_user_leaveWord_reply(activity).each do |comment| unless fetch_user_leaveWord_reply(activity).nil? %>
-
- <% replies_all_i = replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
-
-
-
- <% if comment.try(:user).try(:realname) == ' ' %>
- <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(comment.created_on) %>
-
-
-
-
- <% end %>
- <% end %>
-
-
- <% end %>
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%>
- <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
- <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
- <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
- <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
- <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
+ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
+
+
+
+ <% if activity.try(:user).try(:realname) == ' ' %>
+ <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <% course=Course.find(activity.jour_id) %>
+ <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
+
+
+ <% if activity.parent %>
+ <%= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+ <% else %>
+ <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+ <% end %>
+
+
+ 留言时间：<%= format_time(activity.created_on) %>
+
+
+ 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
+
+
+
+
+
+ <% count = fetch_user_leaveWord_reply(activity).count %>
+
+
+
+
+ 回复（<%= count %>）
+
+
+ <%if count>3 %>
+
+ <% end %>
+
+
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% fetch_user_leaveWord_reply(activity).each do |comment| unless fetch_user_leaveWord_reply(activity).nil? %>
+
+ <% replies_all_i = replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+
+
+
+ <% if comment.try(:user).try(:realname) == ' ' %>
+ <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(comment.created_on) %>
+
+
+
+
+ <% end %>
+ <% end %>
+
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id}, :method => "post", :remote => true) do |f|%>
+ <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
+ <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
+ <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
+ <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
+ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
+
+
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index bb2a31dcc..df084357a 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -178,7 +178,7 @@
-
发送
+
发送
<% end%>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 15dd486ec..efaa72beb 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -1,148 +1,148 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
- <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
-
-
- <% if @ctivity.try(:author).try(:realname) == ' ' %>
- <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
- <% end %> TO
- <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
-
-
- <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
-
- <% if activity.sticky == 1%>
-
置顶
- <% end%>
-
-
- 发布时间：<%= format_time(activity.created_on) %>
-
-
- 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
-
-
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
-
-
-
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
-
-
-
- <% if User.current.logged? %>
-
- <%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')") %>
-
- <%= link_to(
- l(:button_edit),
- {controller:'news', :action => 'edit', :id => activity.id},
- :class => 'postOptionLink'
- ) if User.current.allowed_to?(:manage_news, activity.course) %>
-
-
- <%= delete_link(
- news_path(activity),
- :data => {:confirm => l(:text_are_you_sure)},
- :class => 'postOptionLink'
- ) if User.current.allowed_to?(:manage_news, activity.course) %>
-
-
- <% end %>
-
-
-
-
-
-
- <% count=activity.comments.count %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
-
<%#= format_date(activity.updated_on) %>
- <%if count>3 %>
-
- <% end %>
-
-
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% activity.comments.reorder("created_on desc").each do |comment| %>
-
- <% replies_all_i = replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
-
-
-
- <% if comment.try(:author).try(:realname) == ' ' %>
- <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(comment.created_on) %>
-
-
-
-
-
- <% end %>
-
-
- <% end %>
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+
+
+
+ <% if @ctivity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
+
+
+ <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
+
+ <% if activity.sticky == 1%>
+
置顶
+ <% end%>
+
+
+ 发布时间：<%= format_time(activity.created_on) %>
+
+
+ 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
+
+
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
+
+
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+
+
+
+
+ <% if User.current.logged? %>
+
+ <%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')") %>
+
+ <%= link_to(
+ l(:button_edit),
+ {controller:'news', :action => 'edit', :id => activity.id},
+ :class => 'postOptionLink'
+ ) if User.current.allowed_to?(:manage_news, activity.course) %>
+
+
+ <%= delete_link(
+ news_path(activity),
+ :data => {:confirm => l(:text_are_you_sure)},
+ :class => 'postOptionLink'
+ ) if User.current.allowed_to?(:manage_news, activity.course) %>
+
+
+ <% end %>
+
+
+
+
+
+
+ <% count=activity.comments.count %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.author == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+
<%#= format_date(activity.updated_on) %>
+ <%if count>3 %>
+
+ <% end %>
+
+
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% activity.comments.reorder("created_on desc").each do |comment| %>
+
+ <% replies_all_i = replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+
+
+
+ <% if comment.try(:author).try(:realname) == ' ' %>
+ <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(comment.created_on) %>
+
+
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
+
diff --git a/app/views/users/_homework_repository_list.html.erb b/app/views/users/_homework_repository_list.html.erb
new file mode 100644
index 000000000..67a8f47b4
--- /dev/null
+++ b/app/views/users/_homework_repository_list.html.erb
@@ -0,0 +1,21 @@
+
+ 作业名称 来源
+ 类别
+ 贡献者
+
+ <%= link_to "引用数",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "fl",:remote => true%>
+ <% if @order == "quotes"%>
+ <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12" ,:remote => true%>
+ <% end%>
+
+
+ <%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "fl",:remote => true%>
+ <% if @order == "created_at"%>
+ <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12" ,:remote => true%>
+ <% end%>
+
+
+
+ <%=render :partial => 'homework_repository', :locals => {:homeworks => homeworks} %>
+
\ No newline at end of file
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index adebd74ad..16d681dc9 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -1,89 +1,89 @@
-<% count = activity.journals.count %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
-
<%#= format_date(activity.updated_on) %>
- <% if count > 3 %>
-
- <% end %>
-
-
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% activity.journals.reorder("created_on desc").each do |reply| %>
-
- <% replies_all_i=replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
-
-
-
- <% if reply.try(:user).try(:realname) == ' ' %>
- <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(reply.created_on) %>
-
- <% if reply.user == User.current %>
- 赞 <%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
- <% end %>
-
-
-
- <% if reply.details.any? %>
- <% details_to_strings(reply.details).each do |string| %>
-
<%= string %>
- <% end %>
- <% end %>
-
<%= reply.notes.html_safe %>
-
-
-
- <% end %>
-
-
- <% end %>
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
+<% count = activity.journals.count %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.author == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+
<%#= format_date(activity.updated_on) %>
+ <% if count > 3 %>
+
+ <% end %>
+
+
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% activity.journals.reorder("created_on desc").each do |reply| %>
+
+ <% replies_all_i=replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+
+
+
+ <% if reply.try(:user).try(:realname) == ' ' %>
+ <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(reply.created_on) %>
+
+ <% if reply.user == User.current %>
+ 赞 <%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+ <% end %>
+
+
+
+ <% if reply.details.any? %>
+ <% details_to_strings(reply.details).each do |string| %>
+
<%= string %>
+ <% end %>
+ <% end %>
+
<%= reply.notes.html_safe %>
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 30183c4d1..dd2c832cf 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -154,7 +154,7 @@
-
发送
+
发送
<% end%>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 9e02c4cf4..7f5d185e5 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -132,7 +132,7 @@
-
发送
+
发送
<% end%>
diff --git a/app/views/users/_upload_resource.html.erb b/app/views/users/_upload_resource.html.erb
index b72ec880b..1e691c3b7 100644
--- a/app/views/users/_upload_resource.html.erb
+++ b/app/views/users/_upload_resource.html.erb
@@ -37,8 +37,8 @@
-
(未选择文件)
-
+
(未选择文件)
+
您可以上传小于50MB 的文件
diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index f174e8513..d8649cabe 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -1,21 +1,33 @@
-<% if AtMessage === ma && ma.at_valid? %>
-
- <%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %>
- <%= ma.author.login %> 提到了你：
-
-
- <%= link_to ma.subject.html_safe, ma.url,
- :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
- :onmouseover =>"message_titile_show($(this),event)",
- :onmouseout => "message_titile_hide($(this))" %>
-
-
标题： <%= ma.subject %>
- <% unless ma.description.nil? %>
-
内容：
-
<%= ma.description.html_safe %>
- <% end %>
-
<%= time_tag(ma.created_at).html_safe %>
-
+<% if AtMessage === ma && ma.at_valid? %>
+
+ <%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %>
+ <%= ma.author.login %> 提到了你：
+
+
+ <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+ <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
+ :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+ :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+ :onmouseover =>"message_titile_show($(this),event)",
+ :onmouseout => "message_titile_hide($(this))" %>
+ <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+ <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
+ :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+ :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+ :onmouseover =>"message_titile_show($(this),event)",
+ :onmouseout => "message_titile_hide($(this))" %>
+ <% else %>
+ <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
+ <% end %>
+
+
+
标题： <%= ma.subject %>
+ <% unless ma.description.nil? %>
+
内容：
+
<%= ma.description.html_safe %>
+ <% end %>
+
<%= time_tag(ma.created_at).html_safe %>
+
<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 244951dfa..841fd9377 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -1,147 +1,147 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
- <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
-
-
- <% if @ctivity.try(:author).try(:realname) == ' ' %>
- <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
- <% end %> TO
- <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
-
-
-
- <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %>
-
- <% if activity.sticky == 1%>
-
置顶
- <% end%>
- <% if activity.locked%>
-
- <% end%>
-
-
-
-
- 发布时间：<%= format_time(activity.created_on) %>
-
-
- 更新时间：<%= format_time(UserActivity.where("act_type='#{activity.class}' and act_id =#{activity.id}").first.updated_at) %>
-
-
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %>
-
-
-
-
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
-
-
-
- <% count=activity.children.count %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
-
<%#= format_date(activity.updated_on) %>
- <%if count>3 %>
-
- <% end %>
-
-
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% activity.children.reorder("created_on desc").each do |comment| %>
-
- <% replies_all_i = replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
-
-
-
- <% if comment.try(:author).try(:realname) == ' ' %>
- <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(comment.created_on) %>
-
-
-
-
-
- <% end %>
-
-
- <% end %>
-
- <% if activity.locked == false && User.current.logged?%>
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id},:method => "post", :remote => true) do |f|%>
-
-
-
-
-
-
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
- <% end %>
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+
+
+
+ <% if @ctivity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
+
+
+
+ <%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %>
+
+ <% if activity.sticky == 1%>
+
置顶
+ <% end%>
+ <% if activity.locked%>
+
+ <% end%>
+
+
+
+
+ 发布时间：<%= format_time(activity.created_on) %>
+
+
+ 更新时间：<%= format_time(UserActivity.where("act_type='#{activity.class}' and act_id =#{activity.id}").first.updated_at) %>
+
+
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %>
+
+
+
+
+
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+
+
+
+
+ <% count=activity.children.count %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.author == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+
<%#= format_date(activity.updated_on) %>
+ <%if count>3 %>
+
+ <% end %>
+
+
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% activity.children.reorder("created_on desc").each do |comment| %>
+
+ <% replies_all_i = replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+
+
+
+ <% if comment.try(:author).try(:realname) == ' ' %>
+ <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(comment.created_on) %>
+
+
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+ <% if activity.locked == false && User.current.logged?%>
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id},:method => "post", :remote => true) do |f|%>
+
+
+
+
+
+
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+ <% end %>
+
+
+
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 0c2856c89..a196ee6c0 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -48,7 +48,7 @@
<% end%>
<% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%>
-
系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！
+
系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！
<% elsif homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 0%>
系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！
<% end %>
@@ -157,8 +157,18 @@
<% end %>
<% student_works.each_with_index do |sw, i| %>
-
<%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
- <%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%>
+
+ <% if User.current.member_of_course?(homework_common.course) || User.current.admin? || homework_common.is_open == 1 %>
+ <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
+
+ <%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%>
+
+ <% else %>
+ <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+
+ <%=sw.user.show_name %>
+
+ <% end %>
<% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
分数：<%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分
@@ -350,7 +360,7 @@
<%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
-
发送
+
发送
<% end%>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index f49a65262..dde4f34ce 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -1,152 +1,152 @@
-
-
-
- <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
- <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
-
-
-
- <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
- TO
- <% if activity.jour %>
- <%= link_to activity.jour.show_name+"（"+(activity.jour.login ? activity.jour.login : activity.jour.show_name ).to_s+"）的"+ (activity.private == 1? "私信":"留言"),
- feedback_path(activity.jour, :host=> Setting.host_user), :class => "newsBlue ml15" %>
- <% if activity.private == 1 %>
- 私信
- <% end %>
- <% end %>
-
- <% if is_activity.to_i == 1 %>
-
- <% if activity.parent %>
- <%= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
- <% else %>
- <%= link_to activity.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
- <% end %>
-
- <% else %>
- <% if activity.parent %>
- <% content = activity.parent.notes %>
- <% else %>
- <% content = activity.notes %>
- <% end %>
- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
- <% end %>
-
- 留言时间：<%= format_time(activity.created_on) %>
-
-
- 更新时间：<%= format_time(PrincipalActivity.where("principal_act_type='#{activity.class}' and principal_act_id =#{activity.id}").first.updated_at) %>
-
-
- <% if activity.user == User.current || User.current.admin?%>
-
-
-
-
-
- <%= link_to(l(:label_bid_respond_delete),
- {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
- :confirm => l(:text_are_you_sure), :method => 'delete',
- :class => "postOptionLink", :title => l(:button_delete)) %>
-
-
-
-
-
- <% end%>
-
-
-
- <% count=fetch_user_leaveWord_reply(activity).count %>
-
-
-
回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.user == User.current %>
- 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% else %>
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
- <% end %>
-
-
-
- <%if count>3 %>
-
- <% end %>
-
-
- <% replies_all_i = 0 %>
- <% if count > 0 %>
-
-
- <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
- <% replies_all_i = replies_all_i + 1 %>
-
-
- <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
-
-
-
- <% if comment.try(:user).try(:realname) == ' ' %>
- <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
- <% else %>
- <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
- <% end %>
- <%= format_time(comment.created_on) %>
-
-
-
-
- <%= comment.notes.html_safe %>
-
-
-
- <% end %>
-
-
- <% end %>
-
-
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
- <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
- <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
- <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
- <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
- <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
- <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
-
-
-
发送
-
-
- <% end%>
-
-
-
-
-
-
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
+ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
+
+
+
+ <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
+ TO
+ <% if activity.jour %>
+ <%= link_to activity.jour.show_name+"（"+(activity.jour.login ? activity.jour.login : activity.jour.show_name ).to_s+"）的"+ (activity.private == 1? "私信":"留言"),
+ feedback_path(activity.jour, :host=> Setting.host_user), :class => "newsBlue ml15" %>
+ <% if activity.private == 1 %>
+ 私信
+ <% end %>
+ <% end %>
+
+ <% if is_activity.to_i == 1 %>
+
+ <% if activity.parent %>
+ <%= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
+ <% else %>
+ <%= link_to activity.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>
+ <% end %>
+
+ <% else %>
+ <% if activity.parent %>
+ <% content = activity.parent.notes %>
+ <% else %>
+ <% content = activity.notes %>
+ <% end %>
+ <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+ <% end %>
+
+ 留言时间：<%= format_time(activity.created_on) %>
+
+
+ 更新时间：<%= format_time(PrincipalActivity.where("principal_act_type='#{activity.class}' and principal_act_id =#{activity.id}").first.updated_at) %>
+
+
+ <% if activity.user == User.current || User.current.admin?%>
+
+
+
+
+
+ <%= link_to(l(:label_bid_respond_delete),
+ {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
+ :confirm => l(:text_are_you_sure), :method => 'delete',
+ :class => "postOptionLink", :title => l(:button_delete)) %>
+
+
+
+
+
+ <% end%>
+
+
+
+ <% count=fetch_user_leaveWord_reply(activity).count %>
+
+
+
回复
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <% if activity.user == User.current %>
+ 赞 <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
+ <% else %>
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+ <% end %>
+
+
+
+ <%if count>3 %>
+
+ <% end %>
+
+
+ <% replies_all_i = 0 %>
+ <% if count > 0 %>
+
+
+ <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
+ <% replies_all_i = replies_all_i + 1 %>
+
+
+ <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+
+
+
+ <% if comment.try(:user).try(:realname) == ' ' %>
+ <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%= format_time(comment.created_on) %>
+
+
+
+
+ <%= comment.notes.html_safe %>
+
+
+
+ <% end %>
+
+
+ <% end %>
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
+
+
+ <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => activity.id},:method => "post", :remote => true) do |f|%>
+ <%= hidden_field_tag 'reference_id', params[:reference_id], :value => activity.id %>
+ <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => activity.user.id %>
+ <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
+ <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
+ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+ <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
+
+
+
发送
+
+
+ <% end%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index bd449de7d..bb9fc1174 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -246,7 +246,9 @@
<% if ma.course_message_type == "Message" %>
<%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %> <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
+
+ <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">
+ <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
<% if ma.course_message.parent_id.nil? %>
<%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
@@ -382,7 +384,7 @@
<% end %>
<% end %>
- <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && ma.course_message.homework_common.user_id != User.current.id %>
+ <% if ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? %>
<%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user) %>
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 23a0774c3..6bc169f21 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -1,30 +1,30 @@
-<% if ma.class == UserFeedbackMessage %>
- <% if ma.journals_for_message_type == "JournalsForMessage" %>
-
-
- <%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %>
-
-
- <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
- "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
-
-
- <%= link_to ma.journals_for_message.notes.gsub("","").gsub("
","").gsub("
-
- <% if ma.journals_for_message.reply_id == 0 %>
- <%= ma.journals_for_message.notes.html_safe %>
- <% else %>
-
您的留言：
-
<%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %>
-
回复内容：
-
<%= ma.journals_for_message.notes.html_safe %>
- <% end %>
-
<%= time_tag(ma.journals_for_message.created_on).html_safe %>
-
-
- <% end %>
+<% if ma.class == UserFeedbackMessage %>
+ <% if ma.journals_for_message_type == "JournalsForMessage" %>
+
+
+ <%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %>
+
+
+ <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
+ "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
+
+
+ <%= link_to ma.journals_for_message.notes.gsub("","").gsub("
","").gsub("
+
+ <% if ma.journals_for_message.reply_id == 0 %>
+ <%= ma.journals_for_message.notes.html_safe %>
+ <% else %>
+
您的留言：
+
<%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %>
+
回复内容：
+
<%= ma.journals_for_message.notes.html_safe %>
+ <% end %>
+
<%= time_tag(ma.journals_for_message.created_on).html_safe %>
+
+
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index cafbf457f..6eddf1e05 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -3,7 +3,6 @@
<%= render :partial => 'users/resource_search_form',:locals => {:user => @user, :type => @type} %>
- 为您找到<%= @atta_count %> 个资源
diff --git a/app/views/users/user_homework_type.js.erb b/app/views/users/user_homework_type.js.erb
index 701cf45fa..8cfb4dc04 100644
--- a/app/views/users/user_homework_type.js.erb
+++ b/app/views/users/user_homework_type.js.erb
@@ -4,7 +4,7 @@ $("#homewrok_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :
$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>nil}) %>");
$("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_search_input', :locals=>{:type=>@type,:is_import=>@is_import}) %>");
<% else %>
-$("#homework_repository").html('<%= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');
+$("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>''})%>');
$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
$("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_repository_search', :locals=>{:type=>@type,:is_import=>@is_import,:property=>@property}) %>");
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 4e928ca78..279f36b5c 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -58,40 +58,26 @@
- <%=render :partial=>'homework_repository_search', :locals=>{:type => @type,:is_import => 0,:property => @property} %>
+ <%=render :partial=>'homework_repository_search', :locals=>{:type => @type,:is_import => 0,:property => @property} %>
-
-
-
- 作业名称 来源
- 类别
- 贡献者
- 引用数
- 发布时间
-
-
- <%=render :partial => 'homework_repository', :locals => {:homeworks => @homeworks} %>
+
+ <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>@type,:is_import => 0,:property => @property,:search=>''} %>
+
+
+ <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil} %>
+
+
+
+
+ <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+
+
+
+
+
-
-
- <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil} %>
-
-
-
-
- <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb
index a24b3d018..ce1bb65e2 100644
--- a/app/views/users/user_homeworks.js.erb
+++ b/app/views/users/user_homeworks.js.erb
@@ -1,3 +1,4 @@
-$("#homework_repository").html('<%= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');
+/*$("#homework_repository").html('<%#= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');*/
+$("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => 0,:property => @property,:search=>''})%>');
$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
diff --git a/app/views/users/user_search_homeworks.js.erb b/app/views/users/user_search_homeworks.js.erb
index 34d73b823..29d490960 100644
--- a/app/views/users/user_search_homeworks.js.erb
+++ b/app/views/users/user_search_homeworks.js.erb
@@ -3,7 +3,7 @@ $("#homework_list_form_show").html('<%= escape_javascript(render :partial => 'us
$("#homewrok_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>nil}) %>");
<% else %>
-$("#homework_repository").html('<%= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');
+$("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>@search})%>');
$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
<% end %>
\ No newline at end of file
diff --git a/app/views/welcome/_search_attachment_results.html.erb b/app/views/welcome/_search_attachment_results.html.erb
index 21ba68336..e51706085 100644
--- a/app/views/welcome/_search_attachment_results.html.erb
+++ b/app/views/welcome/_search_attachment_results.html.erb
@@ -21,6 +21,6 @@
<% end %>
<% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2bed45103..3da533eb7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1520,6 +1520,9 @@ en:
label_submit_comments: Submit_comments
label_course_empty_select: You have not selected course！
label_enterprise_page_made: enterprise_page
+ label_excellent_courses_list: excellent_courses
+ label_course_resource_list: course_resource_list
+ label_project_resource_list: project_resource_list
#api
label_recently_updated_notification: Recently updated notification
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 114e67370..37d26dbd8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -483,6 +483,9 @@ zh:
label_requirement: 需求
label_new_course: 课程列表
label_course_all: 课程列表
+ label_excellent_courses_list: 精品课程列表
+ label_course_resource_list: 课程资源列表
+ label_project_resource_list: 項目资源列表
label_teacher_all: 所有教师
label_requirement_enterprise_list: 众包列表
label_new_homework: 作业
diff --git a/config/routes.rb b/config/routes.rb
index 29afad2d6..97c1881ed 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -940,6 +940,9 @@ RedmineApp::Application.routes.draw do
match 'admin', :to => 'admin#index', :via => :get
match 'admin/projects', :via => :get
get 'admin/courses'
+ get 'admin/excellent_courses'
+ get 'admin/course_resource_list'
+ get 'admin/project_resource_list'
match 'admin/users', :via => :get
match 'admin/messages', :via => :get
match 'admin/first_page_made', as: :first_page_made
@@ -1006,6 +1009,7 @@ RedmineApp::Application.routes.draw do
get 'course_outline'
post 'search_course_outline'
post 'set_course_outline'
+ post 'teacher_assign_group'
get 'syllabus'
get 'search_public_orgs_not_in_course'
get "homework_search"
diff --git a/db/migrate/20160309024051_update_homework_common_updated_at.rb b/db/migrate/20160309024051_update_homework_common_updated_at.rb
new file mode 100644
index 000000000..37accdc6e
--- /dev/null
+++ b/db/migrate/20160309024051_update_homework_common_updated_at.rb
@@ -0,0 +1,18 @@
+class UpdateHomeworkCommonUpdatedAt < ActiveRecord::Migration
+ def up
+ count = HomeworkCommon.all.count / 30 + 2
+ transaction do
+ for i in 1 ... count do i
+ HomeworkCommon.page(i).per(30).each do |hw|
+ ca = CourseActivity.where("course_act_type = 'HomeworkCommon' and course_act_id = #{hw.id}").first
+ unless ca.nil?
+ hw.update_attributes(:updated_at => ca.updated_at)
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160309072649_update_contributor_after_delete.rb b/db/migrate/20160309072649_update_contributor_after_delete.rb
new file mode 100644
index 000000000..01f91105a
--- /dev/null
+++ b/db/migrate/20160309072649_update_contributor_after_delete.rb
@@ -0,0 +1,50 @@
+class UpdateContributorAfterDelete < ActiveRecord::Migration
+ def up
+ Course.all.each do |course|
+ if course.course_activities.count > 1
+ course.members.each do |s|
+ puts course.id
+ puts course.name
+ puts s.user_id
+ # board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2
+ # 发帖数
+ board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is null;").count
+ # 回帖数
+ message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is not null").count * 1
+ # 新闻回复
+ common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1
+ # 通知
+ common_count = News.find_by_sql("select n.* from news n where n.author_id = #{s.user_id} and n.course_id = #{course.id} ").count * 1
+ # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5
+ # 附件数
+ attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.user_id} and container_type ='Course'").count
+ # 课程留言数
+ journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.user_id, course.id, "Course").count * 1
+ # 作业留言
+ journal_homework_count = JournalsForMessage.find_by_sql("SELECT jfm.* FROM `journals_for_messages` jfm, homework_commons hc where hc.id = jfm.jour_id and hc.course_id =#{course.id} and jfm.user_id =#{s.user_id} and jfm.jour_type ='HomeworkCommon';").count * 1
+ # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1
+ # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1
+ total = board_count + message_reply_count + common_reply_count + attachment_count + journal_count
+ course_contributor = CourseContributorScore.where("course_id =? and user_id =?", course.id, s.user_id).first
+ if course_contributor.nil?
+ CourseContributorScore.create(:course_id => course.id, :user_id => s.user_id, :message_num => board_count, :message_reply_num => message_reply_count,
+ :news_reply_num => common_reply_count, :news_num => common_count, :resource_num => attachment_count, :journal_num => journal_count,
+ :homework_journal_num => journal_homework_count, :journal_reply_num => 0, :total_score => total)
+ else
+ course_contributor.message_num = board_count
+ course_contributor.message_reply_num = message_reply_count
+ course_contributor.news_reply_num = common_reply_count
+ course_contributor.news_num = common_count
+ course_contributor.resource_num = attachment_count
+ course_contributor.journal_num = journal_count
+ course_contributor.homework_journal_num = journal_homework_count
+ course_contributor.save
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160310033019_delete_student_work_data.rb b/db/migrate/20160310033019_delete_student_work_data.rb
new file mode 100644
index 000000000..9cb952064
--- /dev/null
+++ b/db/migrate/20160310033019_delete_student_work_data.rb
@@ -0,0 +1,8 @@
+class DeleteStudentWorkData < ActiveRecord::Migration
+ def up
+ StudentWork.where("homework_common_id = 2604 AND user_id = 10763 AND final_score = 0").destroy_all
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160311072540_add_visits_to_user.rb b/db/migrate/20160311072540_add_visits_to_user.rb
new file mode 100644
index 000000000..2169a4b0b
--- /dev/null
+++ b/db/migrate/20160311072540_add_visits_to_user.rb
@@ -0,0 +1,5 @@
+class AddVisitsToUser < ActiveRecord::Migration
+ def change
+ add_column :users, :visits, :integer, :default => 0
+ end
+end
diff --git a/db/migrate/20160311072622_add_visits_to_project.rb b/db/migrate/20160311072622_add_visits_to_project.rb
new file mode 100644
index 000000000..1e67d9409
--- /dev/null
+++ b/db/migrate/20160311072622_add_visits_to_project.rb
@@ -0,0 +1,5 @@
+class AddVisitsToProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :visits, :integer, :default => 0
+ end
+end
diff --git a/db/migrate/20160311072718_add_visits_to_course.rb b/db/migrate/20160311072718_add_visits_to_course.rb
new file mode 100644
index 000000000..4d4b682cf
--- /dev/null
+++ b/db/migrate/20160311072718_add_visits_to_course.rb
@@ -0,0 +1,5 @@
+class AddVisitsToCourse < ActiveRecord::Migration
+ def change
+ add_column :courses, :visits, :integer, :default => 0
+ end
+end
diff --git a/db/migrate/20160311072819_add_visits_to_organization.rb b/db/migrate/20160311072819_add_visits_to_organization.rb
new file mode 100644
index 000000000..74bbcb5c9
--- /dev/null
+++ b/db/migrate/20160311072819_add_visits_to_organization.rb
@@ -0,0 +1,5 @@
+class AddVisitsToOrganization < ActiveRecord::Migration
+ def change
+ add_column :organizations, :visits, :integer, :default => 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 76dd8e19c..2dad292f4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20160304234903) do
+ActiveRecord::Schema.define(:version => 20160225031230) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -432,11 +432,9 @@ ActiveRecord::Schema.define(:version => 20160304234903) do
t.integer "resource_num"
t.integer "journal_num"
t.integer "journal_reply_num"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.integer "total_score"
- t.integer "homework_journal_num", :default => 0
- t.integer "news_num", :default => 0
end
create_table "course_groups", :force => true do |t|
@@ -1387,7 +1385,6 @@ ActiveRecord::Schema.define(:version => 20160304234903) do
t.integer "changeset_num", :default => 0
t.integer "board_message_num", :default => 0
t.integer "board_num", :default => 0
- t.integer "act_num", :default => 0
t.integer "attach_num", :default => 0
t.datetime "commit_time"
end
@@ -2016,6 +2013,11 @@ ActiveRecord::Schema.define(:version => 20160304234903) do
add_index "wikis", ["project_id"], :name => "wikis_project_id"
+ create_table "wlcs", :force => true do |t|
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "workflows", :force => true do |t|
t.integer "tracker_id", :default => 0, :null => false
t.integer "old_status_id", :default => 0, :null => false
diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index 682714b9b..6b22496b6 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -99,6 +99,13 @@ module Redmine
result
end
+ def save_attachmentsex_public(attachments, author=User.current,attachment_type, is_public)
+ @curattachment_type = attachment_type
+ @is_public = true
+ result = save_attachments(attachments,author)
+ result
+ end
+
def save_attachments(attachments, author=User.current)
# 清除临时文件
if attachments
@@ -142,7 +149,11 @@ module Redmine
end
if a && !attachment['is_public_checkbox']
- a.is_public = false
+ if @is_public
+ a.is_public = true
+ else
+ a.is_public = false
+ end
elsif a && attachment['is_public_checkbox']
a.is_public = true
end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 8ebdacfa6..47ee3d38f 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -391,6 +391,9 @@ Redmine::MenuManager.map :admin_menu do |menu|
menu.push :messages_list, {:controller => 'admin', :action => 'messages_list'}, :caption => :label_message_plural
menu.push :notices, {:controller => 'admin', :action => 'notices'}, :caption => :label_notification_list
menu.push :latest_login_users, {:controller => 'admin', :action => 'latest_login_users'}, :caption => :label_latest_login_user_list
+ menu.push :excellent_courses, {:controller => 'admin', :action => 'excellent_courses'}, :caption => :label_excellent_courses_list
+ menu.push :course_resource_list, {:controller => 'admin', :action => 'course_resource_list'}, :caption => :label_course_resource_list
+ menu.push :project_resource_list, {:controller => 'admin', :action => 'project_resource_list'}, :caption => :label_project_resource_list
menu.push :homework, {:controller => 'admin', :action => 'homework'}, :caption => :label_user_homework
end
diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb
index 9fb1f5735..c9cbcee26 100644
--- a/lib/trustie/gitlab/helper.rb
+++ b/lib/trustie/gitlab/helper.rb
@@ -1,73 +1,78 @@
-#coding=utf-8
-
-module Trustie
- module Gitlab
- module Helper
- GUEST = 10
- REPORTER = 20
- DEVELOPER = 30
- MASTER = 40
- OWNER = 50
- # 项目公开和私有
- PUBLIC = 20
- PRIVATE = 0
-
- def change_password(uid, en_pwd, salt)
- return unless uid
- options = {:encrypted_password=>en_pwd, :password_salt=>salt}
- self.g.put("/users/ext/#{uid}", :body => options)
- # g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt)
- end
-
- def find_user(user)
- us = self.g.get("/users?search=#{user.mail}")
- if Array === us
- us.each do |u|
- return u if u.email == user.mail
- end
- end
- return nil
- end
-
- def add_user(user)
- u = nil
- begin
- u = find_user(user)
- unless u
- u = self.g.create_user(user.mail,
- user.hashed_password,
- name: user.show_name,
- username: user.login,
- confirm: "true")
- user.gid = u.id
- end
- change_password(u.id, user.hashed_password, user.salt)
- rescue => e
- puts e
- end
- return u
- end
-
- def del_user(user)
- return unless user.gid
- self.g.delete_user(user.gid)
- end
-
- def get_gitlab_role m
- case m.roles.first.position
- when 1,2
- GUEST
- when 5
- REPORTER
- when 4
- DEVELOPER
- when 3
- MASTER
- else
- GUEST
- end
- end
-
- end
- end
+#coding=utf-8
+
+module Trustie
+ module Gitlab
+ module Helper
+ GUEST = 10
+ REPORTER = 20
+ DEVELOPER = 30
+ MASTER = 40
+ OWNER = 50
+ # 项目公开和私有
+ PUBLIC = 20
+ PRIVATE = 0
+
+ def change_password(uid, en_pwd, salt)
+ return unless uid
+ options = {:encrypted_password=>en_pwd, :password_salt=>salt}
+ self.g.put("/users/ext/#{uid}", :body => options)
+ # g.edit_user(uid, :encrypted_password=>en_pwd, :password_salt=>salt)
+ end
+
+ def find_user(user)
+ us = self.g.get("/users?search=#{user.mail}")
+ if Array === us
+ us.each do |u|
+ return u if u.email == user.mail
+ end
+ end
+ return nil
+ end
+
+ def add_user(user)
+ u = nil
+ begin
+ u = find_user(user)
+ unless u
+ u = self.g.create_user(user.mail,
+ user.hashed_password,
+ name: user.show_name,
+ username: user.login,
+ confirm: "true")
+ user.gid = u.id
+ user.save
+ end
+ if user.gid.nil?
+ user.gid = u.id
+ user.save
+ end
+ change_password(u.id, user.hashed_password, user.salt)
+ rescue => e
+ puts e
+ end
+ return u
+ end
+
+ def del_user(user)
+ return unless user.gid
+ self.g.delete_user(user.gid)
+ end
+
+ def get_gitlab_role m
+ case m.roles.first.position
+ when 1,2
+ GUEST
+ when 5
+ REPORTER
+ when 4
+ DEVELOPER
+ when 3
+ MASTER
+ else
+ GUEST
+ end
+ end
+
+ end
+ end
end
\ No newline at end of file
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 6065a563f..060898b88 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -1,6094 +1,6136 @@
-//function dump_obj(myObject) {
-// var s = "";
-// for (var property in myObject) {
-// s = s + "\n "+property +": " + myObject[property] ;
-// }
-// alert(s);
-//}
-/*******************************************************************************
-* KindEditor - WYSIWYG HTML Editor for Internet
-* Copyright (C) 2006-2013 kindsoft.net
-*
-* @author Roddy
-* @website http://www.kindsoft.net/
-* @licence http://www.kindsoft.net/license.php
-* @version 4.1.10 (2013-11-23)
-*******************************************************************************/
-(function (window, undefined) {
- if (window.KindEditor) {
- return;
- }
-if (!window.console) {
- window.console = {};
-}
-if (!console.log) {
- console.log = function () {};
-}
-var _VERSION = '4.1.10 (2013-11-23)',
- _ua = navigator.userAgent.toLowerCase(),
- _IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
- _NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
- _GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
- _WEBKIT = _ua.indexOf('applewebkit') > -1,
- _OPERA = _ua.indexOf('opera') > -1,
- _MOBILE = _ua.indexOf('mobile') > -1,
- _IOS = /ipad|iphone|ipod/.test(_ua),
- _QUIRKS = document.compatMode != 'CSS1Compat',
- _IERANGE = !window.getSelection,
- _matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
- _V = _matches ? _matches[1] : '0',
- _TIME = new Date().getTime();
-function _isArray(val) {
- if (!val) {
- return false;
- }
- return Object.prototype.toString.call(val) === '[object Array]';
-}
-function _isFunction(val) {
- if (!val) {
- return false;
- }
- return Object.prototype.toString.call(val) === '[object Function]';
-}
-function _inArray(val, arr) {
- for (var i = 0, len = arr.length; i < len; i++) {
- if (val === arr[i]) {
- return i;
- }
- }
- return -1;
-}
-function _each(obj, fn) {
- if (_isArray(obj)) {
- for (var i = 0, len = obj.length; i < len; i++) {
- if (fn.call(obj[i], i, obj[i]) === false) {
- break;
- }
- }
- } else {
- for (var key in obj) {
- if (obj.hasOwnProperty(key)) {
- if (fn.call(obj[key], key, obj[key]) === false) {
- break;
- }
- }
- }
- }
-}
-function _trim(str) {
- return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
-}
-function _inString(val, str, delimiter) {
- delimiter = delimiter === undefined ? ',' : delimiter;
- return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
-}
-function _addUnit(val, unit) {
- unit = unit || 'px';
- return val && /^\d+$/.test(val) ? val + unit : val;
-}
-function _removeUnit(val) {
- var match;
- return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
-}
-function _escape(val) {
- return val.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"');
-}
-function _unescape(val) {
- return val.replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"').replace(/&/g, '&');
-}
-function _toCamel(str) {
- var arr = str.split('-');
- str = '';
- _each(arr, function(key, val) {
- str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
- });
- return str;
-}
-function _toHex(val) {
- function hex(d) {
- var s = parseInt(d, 10).toString(16).toUpperCase();
- return s.length > 1 ? s : '0' + s;
- }
- return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
- function($0, $1, $2, $3) {
- return '#' + hex($1) + hex($2) + hex($3);
- }
- );
-}
-function _toMap(val, delimiter) {
- delimiter = delimiter === undefined ? ',' : delimiter;
- var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
- _each(arr, function(key, val) {
- if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
- for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
- map[i.toString()] = true;
- }
- } else {
- map[val] = true;
- }
- });
- return map;
-}
-function _toArray(obj, offset) {
- return Array.prototype.slice.call(obj, offset || 0);
-}
-function _undef(val, defaultVal) {
- return val === undefined ? defaultVal : val;
-}
-function _invalidUrl(url) {
- return !url || /[<>"]/.test(url);
-}
-function _addParam(url, param) {
- return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
-}
-function _extend(child, parent, proto) {
- if (!proto) {
- proto = parent;
- parent = null;
- }
- var childProto;
- if (parent) {
- var fn = function () {};
- fn.prototype = parent.prototype;
- childProto = new fn();
- _each(proto, function(key, val) {
- childProto[key] = val;
- });
- } else {
- childProto = proto;
- }
- childProto.constructor = child;
- child.prototype = childProto;
- child.parent = parent ? parent.prototype : null;
-}
-function _json(text) {
- var match;
- if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
- text = match[0];
- }
- var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
- cx.lastIndex = 0;
- if (cx.test(text)) {
- text = text.replace(cx, function (a) {
- return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
- });
- }
- if (/^[\],:{}\s]*$/.
- test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
- replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
- replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
- return eval('(' + text + ')');
- }
- throw 'JSON parse error';
-}
-var _round = Math.round;
-var K = {
- DEBUG : false,
- VERSION : _VERSION,
- IE : _IE,
- GECKO : _GECKO,
- WEBKIT : _WEBKIT,
- OPERA : _OPERA,
- V : _V,
- TIME : _TIME,
- each : _each,
- isArray : _isArray,
- isFunction : _isFunction,
- inArray : _inArray,
- inString : _inString,
- trim : _trim,
- addUnit : _addUnit,
- removeUnit : _removeUnit,
- escape : _escape,
- unescape : _unescape,
- toCamel : _toCamel,
- toHex : _toHex,
- toMap : _toMap,
- toArray : _toArray,
- undef : _undef,
- invalidUrl : _invalidUrl,
- addParam : _addParam,
- extend : _extend,
- json : _json
-};
-var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
- _BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
- _SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
- _STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
- _CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
- _PRE_TAG_MAP = _toMap('pre,style,script'),
- _NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
- _AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
- _FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
- _VALUE_TAG_MAP = _toMap('input,button,textarea,select');
-// Begining of modification by Macrow
-function _getBasePath() {
- var refPath = '/assets/kindeditor/';
- var els = document.getElementsByTagName('script'), src;
- for (var i = 0, len = els.length; i < len; i++) {
- src = els[i].src || '';
- if (/(kindeditor|application)[\w\-\.]*\.js/.test(src)) {
- return src.substring(0, src.indexOf('assets')) + refPath;
- }
- }
- return refPath;
-}
-// End of modification by Macrow
-K.basePath = _getBasePath();
-K.options = {
- designMode : true,
- fullscreenMode : false,
- filterMode : true,
- wellFormatMode : true,
- shadowMode : true,
- loadStyleMode : true,
- basePath : K.basePath,
- emotionsBasePath: 'http://forge.trustie.net', //TODO
- themesPath : K.basePath + 'themes/',
- langPath : K.basePath + 'lang/',
- pluginsPath : K.basePath + 'plugins/',
- themeType : 'default',
- langType : 'zh_CN',
- urlType : '',
- newlineTag : 'p',
- resizeType : 2,
- syncType : 'form',
- pasteType : 2,
- dialogAlignType : 'page',
- useContextmenu : true,
- fullscreenShortcut : false,
- bodyClass : 'ke-content',
- indentChar : '\t',
- cssPath : K.basePath +'plugins/code/previewcode.css',
- cssData : 'font{color:black;}',
- minWidth : 650,
- minHeight : 100,
- minChangeSize : 1,
- zIndex : 811213,
- items : ['code','emoticons','fontname',
- 'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
- 'formatblock', 'fontsize', '|','indent', 'outdent',
- '|','imagedirectupload','table', 'media', 'preview',"more"
- ],
- noDisableItems : ['source', 'fullscreen'],
- colorTable : [
- ['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
- ['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
- ['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
- ['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
- ],
- fontSizeTable : ['选中的字体大小:','9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
- htmlTags : {
- font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
- span : [
- 'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
- '.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height', 'data-user-id'
- ],
- div : [
- 'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
- '.background-color', '.font-size', '.font-family', '.font-weight', '.background',
- '.font-style', '.text-decoration', '.vertical-align', '.margin-left'
- ],
- table: [
- 'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
- '.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
- '.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
- '.width', '.height', '.border-collapse'
- ],
- 'td,th': [
- 'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
- '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
- '.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
- ],
- a : ['id', 'class', 'href', 'target', 'name'],
- embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
- img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
- 'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
- 'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
- '.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
- ],
- pre : ['id', 'class'],
- hr : ['id', 'class', '.page-break-after'],
- 'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
- iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
- },
- layout : ''
-};
-var _useCapture = false;
-var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
-var _CURSORMOVE_KEY_MAP = _toMap('33..40');
-var _CHANGE_KEY_MAP = {};
-_each(_INPUT_KEY_MAP, function(key, val) {
- _CHANGE_KEY_MAP[key] = val;
-});
-_each(_CURSORMOVE_KEY_MAP, function(key, val) {
- _CHANGE_KEY_MAP[key] = val;
-});
-function _bindEvent(el, type, fn) {
- if (el.addEventListener){
- el.addEventListener(type, fn, _useCapture);
- } else if (el.attachEvent){
- el.attachEvent('on' + type, fn);
- }
-}
-function _unbindEvent(el, type, fn) {
- if (el.removeEventListener){
- el.removeEventListener(type, fn, _useCapture);
- } else if (el.detachEvent){
- el.detachEvent('on' + type, fn);
- }
-}
-var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
- 'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
- 'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
-function KEvent(el, event) {
- this.init(el, event);
-}
-_extend(KEvent, {
- init : function(el, event) {
- var self = this, doc = el.ownerDocument || el.document || el;
- self.event = event;
- _each(_EVENT_PROPS, function(key, val) {
- self[val] = event[val];
- });
- if (!self.target) {
- self.target = self.srcElement || doc;
- }
- if (self.target.nodeType === 3) {
- self.target = self.target.parentNode;
- }
- if (!self.relatedTarget && self.fromElement) {
- self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
- }
- if (self.pageX == null && self.clientX != null) {
- var d = doc.documentElement, body = doc.body;
- self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
- self.pageY = self.clientY + (d && d.scrollTop || body && body.scrollTop || 0) - (d && d.clientTop || body && body.clientTop || 0);
- }
- if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
- self.which = self.charCode || self.keyCode;
- }
- if (!self.metaKey && self.ctrlKey) {
- self.metaKey = self.ctrlKey;
- }
- if (!self.which && self.button !== undefined) {
- self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
- }
- switch (self.which) {
- case 186 :
- self.which = 59;
- break;
- case 187 :
- case 107 :
- case 43 :
- self.which = 61;
- break;
- case 189 :
- case 45 :
- self.which = 109;
- break;
- case 42 :
- self.which = 106;
- break;
- case 47 :
- self.which = 111;
- break;
- case 78 :
- self.which = 110;
- break;
- }
- if (self.which >= 96 && self.which <= 105) {
- self.which -= 48;
- }
- },
- preventDefault : function() {
- var ev = this.event;
- if (ev.preventDefault) {
- ev.preventDefault();
- } else {
- ev.returnValue = false;
- }
- },
- stopPropagation : function() {
- var ev = this.event;
- if (ev.stopPropagation) {
- ev.stopPropagation();
- } else {
- ev.cancelBubble = true;
- }
- },
- stop : function() {
- this.preventDefault();
- this.stopPropagation();
- }
-});
-var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
-function _getId(el) {
- return el[_eventExpendo] || null;
-}
-function _setId(el) {
- el[_eventExpendo] = ++_eventId;
- return _eventId;
-}
-function _removeId(el) {
- try {
- delete el[_eventExpendo];
- } catch(e) {
- if (el.removeAttribute) {
- el.removeAttribute(_eventExpendo);
- }
- }
-}
-function _bind(el, type, fn) {
- if (type.indexOf(',') >= 0) {
- _each(type.split(','), function() {
- _bind(el, this, fn);
- });
- return;
- }
- var id = _getId(el);
- if (!id) {
- id = _setId(el);
- }
- if (_eventData[id] === undefined) {
- _eventData[id] = {};
- }
- var events = _eventData[id][type];
- if (events && events.length > 0) {
- _unbindEvent(el, type, events[0]);
- } else {
- _eventData[id][type] = [];
- _eventData[id].el = el;
- }
- events = _eventData[id][type];
- if (events.length === 0) {
- events[0] = function(e) {
- var kevent = e ? new KEvent(el, e) : undefined;
- _each(events, function(i, event) {
- if (i > 0 && event) {
- event.call(el, kevent);
- }
- });
- };
- }
- if (_inArray(fn, events) < 0) {
- events.push(fn);
- }
- _bindEvent(el, type, events[0]);
-}
-function _unbind(el, type, fn) {
- if (type && type.indexOf(',') >= 0) {
- _each(type.split(','), function() {
- _unbind(el, this, fn);
- });
- return;
- }
- var id = _getId(el);
- if (!id) {
- return;
- }
- if (type === undefined) {
- if (id in _eventData) {
- _each(_eventData[id], function(key, events) {
- if (key != 'el' && events.length > 0) {
- _unbindEvent(el, key, events[0]);
- }
- });
- delete _eventData[id];
- _removeId(el);
- }
- return;
- }
- if (!_eventData[id]) {
- return;
- }
- var events = _eventData[id][type];
- if (events && events.length > 0) {
- if (fn === undefined) {
- _unbindEvent(el, type, events[0]);
- delete _eventData[id][type];
- } else {
- _each(events, function(i, event) {
- if (i > 0 && event === fn) {
- events.splice(i, 1);
- }
- });
- if (events.length == 1) {
- _unbindEvent(el, type, events[0]);
- delete _eventData[id][type];
- }
- }
- var count = 0;
- _each(_eventData[id], function() {
- count++;
- });
- if (count < 2) {
- delete _eventData[id];
- _removeId(el);
- }
- }
-}
-function _fire(el, type) {
- if (type.indexOf(',') >= 0) {
- _each(type.split(','), function() {
- _fire(el, this);
- });
- return;
- }
- var id = _getId(el);
- if (!id) {
- return;
- }
- var events = _eventData[id][type];
- if (_eventData[id] && events && events.length > 0) {
- events[0]();
- }
-}
-function _ctrl(el, key, fn) {
- var self = this;
- key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
- _bind(el, 'keydown', function(e) {
- if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
- fn.call(el);
- e.stop();
- }
- });
-}
-var _readyFinished = false;
-function _ready(fn) {
- if (_readyFinished) {
- fn(KindEditor);
- return;
- }
- var loaded = false;
- function readyFunc() {
- if (!loaded) {
- loaded = true;
- fn(KindEditor);
- _readyFinished = true;
- }
- }
- function ieReadyFunc() {
- if (!loaded) {
- try {
- document.documentElement.doScroll('left');
- } catch(e) {
- setTimeout(ieReadyFunc, 100);
- return;
- }
- readyFunc();
- }
- }
- function ieReadyStateFunc() {
- if (document.readyState === 'complete') {
- readyFunc();
- }
- }
- if (document.addEventListener) {
- _bind(document, 'DOMContentLoaded', readyFunc);
- } else if (document.attachEvent) {
- _bind(document, 'readystatechange', ieReadyStateFunc);
- var toplevel = false;
- try {
- toplevel = window.frameElement == null;
- } catch(e) {}
- if (document.documentElement.doScroll && toplevel) {
- ieReadyFunc();
- }
- }
- _bind(window, 'load', readyFunc);
-}
-if (_IE) {
- window.attachEvent('onunload', function() {
- _each(_eventData, function(key, events) {
- if (events.el) {
- _unbind(events.el);
- }
- });
- });
-}
-K.ctrl = _ctrl;
-K.ready = _ready;
-function _getCssList(css) {
- var list = {},
- reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
- match;
- while ((match = reg.exec(css))) {
- var key = _trim(match[1].toLowerCase()),
- val = _trim(_toHex(match[2]));
- list[key] = val;
- }
- return list;
-}
-function _getAttrList(tag) {
- var list = {},
- reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
- match;
- while ((match = reg.exec(tag))) {
- var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
- val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
- list[key] = val;
- }
- return list;
-}
-function _addClassToTag(tag, className) {
- if (/\s+class\s*=/.test(tag)) {
- tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
- if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
- return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
- } else {
- return $0;
- }
- });
- } else {
- tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
- }
- return tag;
-}
-function _formatCss(css) {
- var str = '';
- _each(_getCssList(css), function(key, val) {
- str += key + ':' + val + ';';
- });
- return str;
-}
-function _formatUrl(url, mode, host, pathname) {
- mode = _undef(mode, '').toLowerCase();
- if (url.substr(0, 5) != 'data:') {
- url = url.replace(/([^:])\/\//g, '$1/');
- }
- if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
- return url;
- }
- host = host || location.protocol + '//' + location.host;
- if (pathname === undefined) {
- var m = location.pathname.match(/^(\/.*)\//);
- pathname = m ? m[1] : '';
- }
- var match;
- if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
- if (match[1] !== host) {
- return url;
- }
- } else if (/^\w+:/.test(url)) {
- return url;
- }
- function getRealPath(path) {
- var parts = path.split('/'), paths = [];
- for (var i = 0, len = parts.length; i < len; i++) {
- var part = parts[i];
- if (part == '..') {
- if (paths.length > 0) {
- paths.pop();
- }
- } else if (part !== '' && part != '.') {
- paths.push(part);
- }
- }
- return '/' + paths.join('/');
- }
- if (/^\//.test(url)) {
- url = host + getRealPath(url.substr(1));
- } else if (!/^\w+:\/\//.test(url)) {
- url = host + getRealPath(pathname + '/' + url);
- }
- function getRelativePath(path, depth) {
- if (url.substr(0, path.length) === path) {
- var arr = [];
- for (var i = 0; i < depth; i++) {
- arr.push('..');
- }
- var prefix = '.';
- if (arr.length > 0) {
- prefix += '/' + arr.join('/');
- }
- if (pathname == '/') {
- prefix += '/';
- }
- return prefix + url.substr(path.length);
- } else {
- if ((match = /^(.*)\//.exec(path))) {
- return getRelativePath(match[1], ++depth);
- }
- }
- }
- if (mode === 'relative') {
- url = getRelativePath(host + pathname, 0).substr(2);
- } else if (mode === 'absolute') {
- if (url.substr(0, host.length) === host) {
- url = url.substr(host.length);
- }
- }
- return url;
-}
-function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
- if (html == null) {
- html = '';
- }
- urlType = urlType || '';
- wellFormatted = _undef(wellFormatted, false);
- indentChar = _undef(indentChar, '\t');
- var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
- html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
- return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
- });
- html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '');
- html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1\n') + $3;
- });
- html = html.replace(/\n\s*\n/g, '\n');
- html = html.replace(/\n/g, '\n');
- return _trim(html);
-}
-function _clearMsWord(html, htmlTags) {
- html = html.replace(//ig, '')
- .replace(//ig, '')
- .replace(/]*>[\s\S]*?<\/style>/ig, '')
- .replace(/]*>[\s\S]*?<\/script>/ig, '')
- .replace(/]+>[\s\S]*?<\/w:[^>]+>/ig, '')
- .replace(/]+>[\s\S]*?<\/o:[^>]+>/ig, '')
- .replace(/[\s\S]*?<\/xml>/ig, '')
- .replace(/<(?:table|td)[^>]*>/ig, function(full) {
- return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
- });
- return _formatHtml(html, htmlTags);
-}
-function _mediaType(src) {
- if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
- return 'audio/x-pn-realaudio-plugin';
- }
- if (/\.(swf|flv)(\?|$)/i.test(src)) {
- return 'application/x-shockwave-flash';
- }
- return 'video/x-ms-asf-plugin';
-}
-function _mediaClass(type) {
- if (/realaudio/i.test(type)) {
- return 'ke-rm';
- }
- if (/flash/i.test(type)) {
- return 'ke-flash';
- }
- return 'ke-media';
-}
-function _mediaAttrs(srcTag) {
- return _getAttrList(unescape(srcTag));
-}
-function _mediaEmbed(attrs) {
- var html = ' 0) {
- style += 'width:' + width + 'px;';
- }
- if (/\D/.test(height)) {
- style += 'height:' + height + ';';
- } else if (height > 0) {
- style += 'height:' + height + 'px;';
- }
- var html = ' ', doc);
- range.insertNode(dummy[0]);
- rng = doc.body.createTextRange();
- try {
- rng.moveToElementText(dummy[0]);
- } catch(ex) {}
- rng.collapse(false);
- rng.select();
- dummy.remove();
- win.focus();
- return self;
- }
- if (_WEBKIT) {
- var children = sc.childNodes;
- if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
- range.insertNode(doc.createTextNode('\u200B'));
- hasU200b = true;
- }
- }
- }
- if (_IERANGE) {
- try {
- rng = range.get(true);
- rng.select();
- } catch(e) {}
- } else {
- if (hasU200b) {
- range.collapse(false);
- }
- rng = range.get(true);
- sel.removeAllRanges();
- sel.addRange(rng);
- if (doc !== document) {
- var pos = K(rng.endContainer).pos();
- win.scrollTo(pos.x, pos.y);
- }
- }
- win.focus();
- return self;
- },
- wrap : function(val) {
- var self = this, doc = self.doc, range = self.range, wrapper;
- wrapper = K(val, doc);
- if (range.collapsed) {
- range.shrink();
- range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
- return self;
- }
- if (wrapper.isBlock()) {
- var copyWrapper = wrapper.clone(true), child = copyWrapper;
- while (child.first()) {
- child = child.first();
- }
- child.append(range.extractContents());
- range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
- return self;
- }
- range.enlarge();
- var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
- K(ancestor).scan(function(node) {
- if (!isStart && node == bookmark.start) {
- isStart = true;
- return;
- }
- if (isStart) {
- if (node == bookmark.end) {
- return false;
- }
- var knode = K(node);
- if (_inPreElement(knode)) {
- return;
- }
- if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
- var parent;
- while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
- knode = parent;
- }
- _wrapNode(knode, wrapper);
- }
- }
- });
- range.moveToBookmark(bookmark);
- return self;
- },
- split : function(isStart, map) {
- var range = this.range, doc = range.doc;
- var tempRange = range.cloneRange().collapse(isStart);
- var node = tempRange.startContainer, pos = tempRange.startOffset,
- parent = node.nodeType == 3 ? node.parentNode : node,
- needSplit = false, knode;
- while (parent && parent.parentNode) {
- knode = K(parent);
- if (map) {
- if (!knode.isStyle()) {
- break;
- }
- if (!_hasAttrOrCss(knode, map)) {
- break;
- }
- } else {
- if (_NOSPLIT_TAG_MAP[knode.name]) {
- break;
- }
- }
- needSplit = true;
- parent = parent.parentNode;
- }
- if (needSplit) {
- var dummy = doc.createElement('span');
- range.cloneRange().collapse(!isStart).insertNode(dummy);
- if (isStart) {
- tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
- } else {
- tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
- }
- var frag = tempRange.extractContents(),
- first = frag.firstChild, last = frag.lastChild;
- if (isStart) {
- tempRange.insertNode(frag);
- range.setStartAfter(last).setEndBefore(dummy);
- } else {
- parent.appendChild(frag);
- range.setStartBefore(dummy).setEndBefore(first);
- }
- var dummyParent = dummy.parentNode;
- if (dummyParent == range.endContainer) {
- var prev = K(dummy).prev(), next = K(dummy).next();
- if (prev && next && prev.type == 3 && next.type == 3) {
- range.setEnd(prev[0], prev[0].nodeValue.length);
- } else if (!isStart) {
- range.setEnd(range.endContainer, range.endOffset - 1);
- }
- }
- dummyParent.removeChild(dummy);
- }
- return this;
- },
- remove : function(map) {
- var self = this, doc = self.doc, range = self.range;
- range.enlarge();
- if (range.startOffset === 0) {
- var ksc = K(range.startContainer), parent;
- while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
- ksc = parent;
- }
- range.setStart(ksc[0], 0);
- ksc = K(range.startContainer);
- if (ksc.isBlock()) {
- _removeAttrOrCss(ksc, map);
- }
- var kscp = ksc.parent();
- if (kscp && kscp.isBlock()) {
- _removeAttrOrCss(kscp, map);
- }
- }
- var sc, so;
- if (range.collapsed) {
- self.split(true, map);
- sc = range.startContainer;
- so = range.startOffset;
- if (so > 0) {
- var sb = K(sc.childNodes[so - 1]);
- if (sb && _isEmptyNode(sb)) {
- sb.remove();
- range.setStart(sc, so - 1);
- }
- }
- var sa = K(sc.childNodes[so]);
- if (sa && _isEmptyNode(sa)) {
- sa.remove();
- }
- if (_isEmptyNode(sc)) {
- range.startBefore(sc);
- sc.remove();
- }
- range.collapse(true);
- return self;
- }
- self.split(true, map);
- self.split(false, map);
- var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
- range.cloneRange().collapse(false).insertNode(endDummy);
- range.cloneRange().collapse(true).insertNode(startDummy);
- var nodeList = [], cmpStart = false;
- K(range.commonAncestor()).scan(function(node) {
- if (!cmpStart && node == startDummy) {
- cmpStart = true;
- return;
- }
- if (node == endDummy) {
- return false;
- }
- if (cmpStart) {
- nodeList.push(node);
- }
- });
- K(startDummy).remove();
- K(endDummy).remove();
- sc = range.startContainer;
- so = range.startOffset;
- var ec = range.endContainer, eo = range.endOffset;
- if (so > 0) {
- var startBefore = K(sc.childNodes[so - 1]);
- if (startBefore && _isEmptyNode(startBefore)) {
- startBefore.remove();
- range.setStart(sc, so - 1);
- if (sc == ec) {
- range.setEnd(ec, eo - 1);
- }
- }
- var startAfter = K(sc.childNodes[so]);
- if (startAfter && _isEmptyNode(startAfter)) {
- startAfter.remove();
- if (sc == ec) {
- range.setEnd(ec, eo - 1);
- }
- }
- }
- var endAfter = K(ec.childNodes[range.endOffset]);
- if (endAfter && _isEmptyNode(endAfter)) {
- endAfter.remove();
- }
- var bookmark = range.createBookmark(true);
- _each(nodeList, function(i, node) {
- _removeAttrOrCss(K(node), map);
- });
- range.moveToBookmark(bookmark);
- return self;
- },
- commonNode : function(map) {
- var range = this.range;
- var ec = range.endContainer, eo = range.endOffset,
- node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
- function find(node) {
- var child = node, parent = node;
- while (parent) {
- if (_hasAttrOrCss(K(parent), map)) {
- return K(parent);
- }
- parent = parent.parentNode;
- }
- while (child && (child = child.lastChild)) {
- if (_hasAttrOrCss(K(child), map)) {
- return K(child);
- }
- }
- return null;
- }
- var cNode = find(node);
- if (cNode) {
- return cNode;
- }
- if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
- var prev = K(node).prev();
- if (prev) {
- return find(prev);
- }
- }
- return null;
- },
- commonAncestor : function(tagName) {
- var range = this.range,
- sc = range.startContainer, so = range.startOffset,
- ec = range.endContainer, eo = range.endOffset,
- startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
- endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
- function find(node) {
- while (node) {
- if (node.nodeType == 1) {
- if (node.tagName.toLowerCase() === tagName) {
- return node;
- }
- }
- node = node.parentNode;
- }
- return null;
- }
- var start = find(startNode), end = find(endNode);
- if (start && end && start === end) {
- return K(start);
- }
- return null;
- },
- state : function(key) {
- var self = this, doc = self.doc, bool = false;
- try {
- bool = doc.queryCommandState(key);
- } catch (e) {}
- return bool;
- },
- val : function(key) {
- var self = this, doc = self.doc, range = self.range;
- function lc(val) {
- return val.toLowerCase();
- }
- key = lc(key);
- var val = '', knode;
- if (key === 'fontfamily' || key === 'fontname') {
- val = _nativeCommandValue(doc, 'fontname');
- val = val.replace(/['"]/g, '');
- return lc(val);
- }
- if (key === 'formatblock') {
- val = _nativeCommandValue(doc, key);
- if (val === '') {
- knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
- if (knode) {
- val = knode.name;
- }
- }
- if (val === 'Normal') {
- val = 'p';
- }
- return lc(val);
- }
- if (key === 'fontsize') {
- knode = self.commonNode({'*' : '.font-size'});
- if (knode) {
- val = knode.css('font-size');
- }
- return lc(val);
- }
- if (key === 'forecolor') {
- knode = self.commonNode({'*' : '.color'});
- if (knode) {
- val = knode.css('color');
- }
- val = _toHex(val);
- if (val === '') {
- val = 'default';
- }
- return lc(val);
- }
- if (key === 'hilitecolor') {
- knode = self.commonNode({'*' : '.background-color'});
- if (knode) {
- val = knode.css('background-color');
- }
- val = _toHex(val);
- if (val === '') {
- val = 'default';
- }
- return lc(val);
- }
- return val;
- },
- toggle : function(wrapper, map) {
- var self = this;
- if (self.commonNode(map)) {
- self.remove(map);
- } else {
- self.wrap(wrapper);
- }
- return self.select();
- },
- bold : function() {
- return this.toggle('
');
- self.options = options;
- self._alignEl = options.alignEl;
- if (self.width) {
- self.div.css('width', self.width);
- }
- if (self.height) {
- self.div.css('height', self.height);
- }
- if (self.z) {
- self.div.css({
- position : 'absolute',
- left : self.x,
- top : self.y,
- 'z-index' : self.z
- });
- }
- if (self.z && (self.x === undefined || self.y === undefined)) {
- self.autoPos(self.width, self.height);
- }
- if (options.cls) {
- self.div.addClass(options.cls);
- }
- if (options.shadowMode) {
- self.div.addClass('ke-shadow');
- }
- if (options.css) {
- self.div.css(options.css);
- }
- if (options.src) {
- K(options.src).replaceWith(self.div);
- } else {
- K(self.doc.body).append(self.div);
- }
- if (options.html) {
- self.div.html(options.html);
- }
- if (options.autoScroll) {
- if (_IE && _V < 7 || _QUIRKS) {
- var scrollPos = _getScrollPos();
- K(self.win).bind('scroll', function(e) {
- var pos = _getScrollPos(),
- diffX = pos.x - scrollPos.x,
- diffY = pos.y - scrollPos.y;
- self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
- });
- } else {
- self.div.css('position', 'fixed');
- }
- }
- },
- pos : function(x, y, updateProp) {
- var self = this;
- updateProp = _undef(updateProp, true);
- if (x !== null) {
- x = x < 0 ? 0 : _addUnit(x);
- self.div.css('left', x);
- if (updateProp) {
- self.x = x;
- }
- }
- if (y !== null) {
- y = y < 0 ? 0 : _addUnit(y);
- self.div.css('top', y);
- if (updateProp) {
- self.y = y;
- }
- }
- return self;
- },
- autoPos : function(width, height) {
- var self = this,
- w = _removeUnit(width) || 0,
- h = _removeUnit(height) || 0,
- scrollPos = _getScrollPos();
- if (self._alignEl) {
- var knode = K(self._alignEl),
- pos = knode.pos(),
- diffX = _round(knode[0].clientWidth / 2 - w / 2),
- diffY = _round(knode[0].clientHeight / 2 - h / 2);
- x = diffX < 0 ? pos.x : pos.x + diffX;
- y = diffY < 0 ? pos.y : pos.y + diffY;
- } else {
- var docEl = _docElement(self.doc);
- x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
- y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
- }
- if (!(_IE && _V < 7 || _QUIRKS)) {
- x -= scrollPos.x;
- y -= scrollPos.y;
- }
- return self.pos(x, y);
- },
- remove : function() {
- var self = this;
- if (_IE && _V < 7 || _QUIRKS) {
- K(self.win).unbind('scroll');
- }
- self.div.remove();
- _each(self, function(i) {
- self[i] = null;
- });
- return this;
- },
- show : function() {
- this.div.show();
- return this;
- },
- hide : function() {
- this.div.hide();
- return this;
- },
- draggable : function(options) {
- var self = this;
- options = options || {};
- options.moveEl = self.div;
- options.moveFn = function(x, y, width, height, diffX, diffY) {
- if ((x = x + diffX) < 0) {
- x = 0;
- }
- if ((y = y + diffY) < 0) {
- y = 0;
- }
- self.pos(x, y);
- };
- _drag(options);
- return self;
- }
-});
-function _widget(options) {
- return new KWidget(options);
-}
-K.WidgetClass = KWidget;
-K.widget = _widget;
-function _iframeDoc(iframe) {
- iframe = _get(iframe);
- return iframe.contentDocument || iframe.contentWindow.document;
-}
-var html, _direction = '';
-if ((html = document.getElementsByTagName('html'))) {
- _direction = html[0].dir;
-}
-
-function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
- var arr = [
- (_direction === '' ? '' : ''),
- '
').css('background-color', color));
- } else {
- cell.html(self.options.noColor);
- }
- K(cell).attr('unselectable', 'on');
- self._cells.push(cell);
- },
- remove : function() {
- var self = this;
- _each(self._cells, function() {
- this.unbind();
- });
- KColorPicker.parent.remove.call(self);
- return self;
- }
-});
-function _colorpicker(options) {
- return new KColorPicker(options);
-}
-K.ColorPickerClass = KColorPicker;
-K.colorpicker = _colorpicker;
-function KUploadButton(options) {
- this.init(options);
-}
-_extend(KUploadButton, {
- init : function(options) {
- //dump_obj(options);
- var self = this,
- button = K(options.button),
- fieldName = options.fieldName || 'file',
- url = options.url || '',
- title = button.val(),
- extraParams = options.extraParams || {},
- cls = button[0].className || '',
- target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
- options.afterError = options.afterError || function(str) {
- alert(str);
- };
- var hiddenElements = [];
- for(var k in extraParams){
- hiddenElements.push('',
- (options.target ? '' : '
'),
- (options.form ? '
' : '
' : ''),
- '
').appendTo(self.div);
- if (_IE && _V < 7) {
- self.iframeMask = K('').appendTo(self.div);
- } else if (shadowMode) {
- K('
').appendTo(self.div);
- }
- var headerDiv = K('');
- contentDiv.append(headerDiv);
- headerDiv.html(title);
- self.closeIcon = K('
');
- contentDiv.append(bodyDiv);
- bodyDiv.append(body);
- var footerDiv = K('');
- if (previewBtn || yesBtn || noBtn) {
- contentDiv.append(footerDiv);
- }
- _each([
- { btn : previewBtn, name : 'preview' },
- { btn : yesBtn, name : 'yes' },
- { btn : noBtn, name : 'no' }
- ], function() {
- if (this.btn) {
- var button = _createButton(this.btn);
- button.addClass('ke-dialog-' + this.name);
- footerDiv.append(button);
- }
- });
- if (self.height) {
- bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
- }
- self.div.width(self.div.width());
- self.div.height(self.div.height());
- self.mask = null;
- if (showMask) {
- var docEl = _docElement(self.doc),
- docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
- docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
- self.mask = _widget({
- x : 0,
- y : 0,
- z : self.z - 1,
- cls : 'ke-dialog-mask',
- width : docWidth,
- height : docHeight
- });
- }
- self.autoPos(self.div.width(), self.div.height());
- self.footerDiv = footerDiv;
- self.bodyDiv = bodyDiv;
- self.headerDiv = headerDiv;
- self.isLoading = false;
- },
- setMaskIndex : function(z) {
- var self = this;
- self.mask.div.css('z-index', z);
- },
- showLoading : function(msg) {
- msg = _undef(msg, '');
- var self = this, body = self.bodyDiv;
- self.loading = K('')
- .width(body.width()).height(body.height())
- .css('top', self.headerDiv.height() + 'px');
- body.css('visibility', 'hidden').after(self.loading);
- self.isLoading = true;
- return self;
- },
- hideLoading : function() {
- this.loading && this.loading.remove();
- this.bodyDiv.css('visibility', 'visible');
- this.isLoading = false;
- return this;
- },
- remove : function() {
- var self = this;
- if (self.options.beforeRemove) {
- self.options.beforeRemove.call(self);
- }
- self.mask && self.mask.remove();
- self.iframeMask && self.iframeMask.remove();
- self.closeIcon.unbind();
- K('input', self.div).unbind();
- K('button', self.div).unbind();
- self.footerDiv.unbind();
- self.bodyDiv.unbind();
- self.headerDiv.unbind();
- K('iframe', self.div).each(function() {
- K(this).remove();
- });
- KDialog.parent.remove.call(self);
- return self;
- }
-});
-function _dialog(options) {
- return new KDialog(options);
-}
-K.DialogClass = KDialog;
-K.dialog = _dialog;
-function _tabs(options) {
- var self = _widget(options),
- remove = self.remove,
- afterSelect = options.afterSelect,
- div = self.div,
- liList = [];
- div.addClass('ke-tabs')
- .bind('contextmenu,mousedown,mousemove', function(e) {
- e.preventDefault();
- });
- var ul = K('');
- div.append(ul);
- self.add = function(tab) {
- var li = K('' + tab.title + ' ');
- li.data('tab', tab);
- liList.push(li);
- ul.append(li);
- };
- self.selectedIndex = 0;
- self.select = function(index) {
- self.selectedIndex = index;
- _each(liList, function(i, li) {
- li.unbind();
- if (i === index) {
- li.addClass('ke-tabs-li-selected');
- K(li.data('tab').panel).show('');
- } else {
- li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
- .mouseover(function() {
- K(this).addClass('ke-tabs-li-on');
- })
- .mouseout(function() {
- K(this).removeClass('ke-tabs-li-on');
- })
- .click(function() {
- self.select(i);
- });
- K(li.data('tab').panel).hide();
- }
- });
- if (afterSelect) {
- afterSelect.call(self, index);
- }
- };
- self.remove = function() {
- _each(liList, function() {
- this.remove();
- });
- ul.remove();
- remove.call(self);
- };
- return self;
-}
-K.tabs = _tabs;
-function _loadScript(url, fn) {
- var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
- script = document.createElement('script');
- head.appendChild(script);
- script.src = url;
- script.charset = 'utf-8';
- script.onload = script.onreadystatechange = function() {
- if (!this.readyState || this.readyState === 'loaded') {
- if (fn) {
- fn();
- }
- script.onload = script.onreadystatechange = null;
- head.removeChild(script);
- }
- };
-}
-function _chopQuery(url) {
- var index = url.indexOf('?');
- return index > 0 ? url.substr(0, index) : url;
-}
-function _loadStyle(url) {
- var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
- link = document.createElement('link'),
- absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
- var links = K('link[rel="stylesheet"]', head);
- for (var i = 0, len = links.length; i < len; i++) {
- if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
- return;
- }
- }
- head.appendChild(link);
- link.href = url;
- link.rel = 'stylesheet';
-}
-function _ajax(url, fn, method, param, dataType) {
- method = method || 'GET';
- dataType = dataType || 'json';
- var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
- xhr.open(method, url, true);
- xhr.onreadystatechange = function () {
- if (xhr.readyState == 4 && xhr.status == 200) {
- if (fn) {
- var data = _trim(xhr.responseText);
- if (dataType == 'json') {
- data = _json(data);
- }
- fn(data);
- }
- }
- };
- if (method == 'POST') {
- var params = [];
- _each(param, function(key, val) {
- params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
- });
- try {
- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
- } catch (e) {}
- xhr.send(params.join('&'));
- } else {
- xhr.send(null);
- }
-}
-K.loadScript = _loadScript;
-K.loadStyle = _loadStyle;
-K.ajax = _ajax;
-var _plugins = {};
-function _plugin(name, fn) {
- if (name === undefined) {
- return _plugins;
- }
- if (!fn) {
- return _plugins[name];
- }
- _plugins[name] = fn;
-}
-var _language = {};
-function _parseLangKey(key) {
- var match, ns = 'core';
- if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
- ns = match[1];
- key = match[2];
- }
- return { ns : ns, key : key };
-}
-function _lang(mixed, langType) {
- langType = langType === undefined ? K.options.langType : langType;
- if (typeof mixed === 'string') {
- if (!_language[langType]) {
- return 'no language';
- }
- var pos = mixed.length - 1;
- if (mixed.substr(pos) === '.') {
- return _language[langType][mixed.substr(0, pos)];
- }
- var obj = _parseLangKey(mixed);
- return _language[langType][obj.ns][obj.key];
- }
- _each(mixed, function(key, val) {
- var obj = _parseLangKey(key);
- if (!_language[langType]) {
- _language[langType] = {};
- }
- if (!_language[langType][obj.ns]) {
- _language[langType][obj.ns] = {};
- }
- _language[langType][obj.ns][obj.key] = val;
- });
-}
-function _getImageFromRange(range, fn) {
- if (range.collapsed) {
- return;
- }
- range = range.cloneRange().up();
- var sc = range.startContainer, so = range.startOffset;
- if (!_WEBKIT && !range.isControl()) {
- return;
- }
- var img = K(sc.childNodes[so]);
- if (!img || img.name != 'img') {
- return;
- }
- if (fn(img)) {
- return img;
- }
-}
-function _bindContextmenuEvent() {
- var self = this, doc = self.edit.doc;
- K(doc).contextmenu(function(e) {
- if (self.menu) {
- self.hideMenu();
- }
- if (!self.useContextmenu) {
- e.preventDefault();
- return;
- }
- if (self._contextmenus.length === 0) {
- return;
- }
- var maxWidth = 0, items = [];
- _each(self._contextmenus, function() {
- if (this.title == '-') {
- items.push(this);
- return;
- }
- if (this.cond && this.cond()) {
- items.push(this);
- if (this.width && this.width > maxWidth) {
- maxWidth = this.width;
- }
- }
- });
- while (items.length > 0 && items[0].title == '-') {
- items.shift();
- }
- while (items.length > 0 && items[items.length - 1].title == '-') {
- items.pop();
- }
- var prevItem = null;
- _each(items, function(i) {
- if (this.title == '-' && prevItem.title == '-') {
- delete items[i];
- }
- prevItem = this;
- });
- if (items.length > 0) {
- e.preventDefault();
- var pos = K(self.edit.iframe).pos(),
- menu = _menu({
- x : pos.x + e.clientX,
- y : pos.y + e.clientY,
- width : maxWidth,
- css : { visibility: 'hidden' },
- shadowMode : self.shadowMode
- });
- _each(items, function() {
- if (this.title) {
- menu.addItem(this);
- }
- });
- var docEl = _docElement(menu.doc),
- menuHeight = menu.div.height();
- if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
- menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
- }
- menu.div.css('visibility', 'visible');
- self.menu = menu;
- }
- });
-}
-function _bindNewlineEvent() {
- var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
- if (_IE && newlineTag !== 'br') {
- return;
- }
- if (_GECKO && _V < 3 && newlineTag !== 'p') {
- return;
- }
- if (_OPERA && _V < 9) {
- return;
- }
- var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
- pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
- function getAncestorTagName(range) {
- var ancestor = K(range.commonAncestor());
- while (ancestor) {
- if (ancestor.type == 1 && !ancestor.isStyle()) {
- break;
- }
- ancestor = ancestor.parent();
- }
- return ancestor.name;
- }
- K(doc).keydown(function(e) {
- if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
- return;
- }
- self.cmd.selection();
- var tagName = getAncestorTagName(self.cmd.range);
- if (tagName == 'marquee' || tagName == 'select') {
- return;
- }
- if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
- e.preventDefault();
- self.insertHtml('');
- }
- });
- K(doc).keyup(function(e) {
- if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
- return;
- }
- if (newlineTag == 'br') {
- return;
- }
- if (_GECKO) {
- var root = self.cmd.commonAncestor('p');
- var a = self.cmd.commonAncestor('a');
- if (a && a.text() == '') {
- a.remove(true);
- self.cmd.range.selectNodeContents(root[0]).collapse(true);
- self.cmd.select();
- }
- return;
- }
- self.cmd.selection();
- var tagName = getAncestorTagName(self.cmd.range);
- if (tagName == 'marquee' || tagName == 'select') {
- return;
- }
- if (!pSkipTagMap[tagName]) {
- _nativeCommand(doc, 'formatblock', '
');
- }
- var div = self.cmd.commonAncestor('div');
- if (div) {
- var p = K('
'),
- child = div[0].firstChild;
- while (child) {
- var next = child.nextSibling;
- p.append(child);
- child = next;
- }
- div.before(p);
- div.remove();
- self.cmd.range.selectNodeContents(p[0]);
- self.cmd.select();
- }
- });
-}
-function _bindTabEvent() {
- var self = this, doc = self.edit.doc;
- K(doc).keydown(function(e) {
- if (e.which == 9) {
- e.preventDefault();
- if (self.afterTab) {
- self.afterTab.call(self, e);
- return;
- }
- var cmd = self.cmd, range = cmd.range;
- range.shrink();
- if (range.collapsed && range.startContainer.nodeType == 1) {
- range.insertNode(K('@ ', doc)[0]);
- cmd.select();
- }
- self.insertHtml(' ');
- }
- });
-}
-function _bindFocusEvent() {
- var self = this;
- K(self.edit.textarea[0], self.edit.win).focus(function(e) {
- if(typeof self.options.enable_at === 'function'){
- self.options.enable_at();
- }
- if (self.afterFocus) {
- self.afterFocus.call(self, e);
- }
- }).blur(function(e) {
- if (self.afterBlur) {
- self.afterBlur.call(self, e);
- }
- });
-}
-function _removeBookmarkTag(html) {
- return _trim(html.replace(/]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
-}
-function _removeTempTag(html) {
- return html.replace(/]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
-}
-function _addBookmarkToStack(stack, bookmark) {
- if (stack.length === 0) {
- stack.push(bookmark);
- return;
- }
- var prev = stack[stack.length - 1];
- if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
- stack.push(bookmark);
- }
-}
-function _undoToRedo(fromStack, toStack) {
- var self = this, edit = self.edit,
- body = edit.doc.body,
- range, bookmark;
- if (fromStack.length === 0) {
- return self;
- }
- if (edit.designMode) {
- range = self.cmd.range;
- bookmark = range.createBookmark(true);
- bookmark.html = body.innerHTML;
- } else {
- bookmark = {
- html : body.innerHTML
- };
- }
- _addBookmarkToStack(toStack, bookmark);
- var prev = fromStack.pop();
- if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
- prev = fromStack.pop();
- }
- if (edit.designMode) {
- edit.html(prev.html);
- if (prev.start) {
- range.moveToBookmark(prev);
- self.select();
- }
- } else {
- K(body).html(_removeBookmarkTag(prev.html));
- }
- return self;
-}
-function KEditor(options) {
- var self = this;
- self.options = {};
- function setOption(key, val) {
- if (KEditor.prototype[key] === undefined) {
- self[key] = val;
- }
- self.options[key] = val;
- }
- _each(options, function(key, val) {
- setOption(key, options[key]);
- });
- _each(K.options, function(key, val) {
- if (self[key] === undefined) {
- setOption(key, val);
- }
- });
- var se = K(self.srcElement || '');
- if (!self.width) {
- self.width = se[0].style.width || se.width();
- }
- if (!self.height) {
- self.height = se[0].style.height || se.height();
- }
- setOption('width', _undef(self.width, self.minWidth));
- setOption('height', _undef(self.height, self.minHeight));
- setOption('width', _addUnit(self.width));
- setOption('height', _addUnit(self.height));
- if (_MOBILE && (!_IOS || _V < 534)) {
- self.designMode = false;
- }
- self.srcElement = se;
- self.initContent = '';
- self.plugin = {};
- self.isCreated = false;
- self._handlers = {};
- self._contextmenus = [];
- self._undoStack = [];
- self._redoStack = [];
- self._firstAddBookmark = true;
- self.menu = self.contextmenu = null;
- self.dialogs = [];
-}
-KEditor.prototype = {
- lang : function(mixed) {
- return _lang(mixed, this.langType);
- },
- loadPlugin : function(name, fn) {
- var self = this;
- if (_plugins[name]) {
- if (!_isFunction(_plugins[name])) {
- setTimeout(function() {
- self.loadPlugin(name, fn);
- }, 100);
- return self;
- }
- _plugins[name].call(self, KindEditor);
- if (fn) {
- fn.call(self);
- }
- return self;
- }
- _plugins[name] = 'loading';
- _loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
- setTimeout(function() {
- if (_plugins[name]) {
- self.loadPlugin(name, fn);
- }
- }, 0);
- });
- return self;
- },
- handler : function(key, fn) {
- var self = this;
- if (!self._handlers[key]) {
- self._handlers[key] = [];
- }
- if (_isFunction(fn)) {
- self._handlers[key].push(fn);
- return self;
- }
- _each(self._handlers[key], function() {
- fn = this.call(self, fn);
- });
- return fn;
- },
- clickToolbar : function(name, fn) {
- var self = this, key = 'clickToolbar' + name;
- if (fn === undefined) {
- if (self._handlers[key]) {
- return self.handler(key);
- }
- self.loadPlugin(name, function() {
- self.handler(key);
- });
- return self;
- }
- //if(name=='more')alert(fn);
- return self.handler(key, fn);
- },
- updateState : function() {
- var self = this;
- _each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
- 'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
- self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
- });
- return self;
- },
- addContextmenu : function(item) {
- this._contextmenus.push(item);
- return this;
- },
- afterCreate : function(fn) {
- return this.handler('afterCreate', fn);
- },
- beforeRemove : function(fn) {
- return this.handler('beforeRemove', fn);
- },
- beforeGetHtml : function(fn) {
- return this.handler('beforeGetHtml', fn);
- },
- beforeSetHtml : function(fn) {
- return this.handler('beforeSetHtml', fn);
- },
- afterSetHtml : function(fn) {
- return this.handler('afterSetHtml', fn);
- },
- create : function() {
- var self = this, fullscreenMode = self.fullscreenMode;
- if (self.isCreated) {
- return self;
- }
- if (self.srcElement.data('kindeditor')) {
- return self;
- }
- self.srcElement.data('kindeditor', 'true');
- if (fullscreenMode) {
- _docElement().style.overflow = 'hidden';
- } else {
- _docElement().style.overflow = '';
- }
- var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
- height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
- if ((_IE && _V < 8) || _QUIRKS) {
- height = _addUnit(_removeUnit(height) + 2);
- }
- var container = self.container = K(self.layout);
- if (fullscreenMode) {
- K(document.body).append(container);
- } else {
- self.srcElement.before(container);
- }
- var toolbarDiv = K('.toolbar', container),
- toolBarDivFull = K('.toolbar', container),
- editDiv = K('.edit', container),
- statusbar = self.statusbar = K('.statusbar', container);
- container.removeClass('container')
- .addClass('ke-container ke-container-' + self.themeType).css('width', width);
- if (fullscreenMode) {
- container.css({
- position : 'absolute',
- left : 0,
- top : 0,
- 'z-index' : 811211
- });
- if (!_GECKO) {
- self._scrollPos = _getScrollPos();
- }
- window.scrollTo(0, 0);
- K(document.body).css({
- 'height' : '1px',
- 'overflow' : 'hidden'
- });
- K(document.body.parentNode).css('overflow', 'hidden');
- self._fullscreenExecuted = true;
- } else {
- if (self._fullscreenExecuted) {
- K(document.body).css({
- 'height' : '',
- 'overflow' : ''
- });
- K(document.body.parentNode).css('overflow', '');
- }
- if (self._scrollPos) {
- window.scrollTo(self._scrollPos.x, self._scrollPos.y);
- }
- }
- var htmlList = [];
- K.each(self.items, function(i, name) {
- if (name == '|') {
- htmlList.push('
');
- } else {
- htmlList.push('');
- htmlList.push(' ');
- }
- });
- htmlList.unshift('
')
- htmlList.push(' 
';
- })
- .replace(/![](\"../../images/video.png\")
");
+ html[0] = html[0].join("");
+ html.push("/>");
+ return html.join("");
+ }else{
+ var html = '