-
+
迟交扣分：{{act.homework_common_detail.late_penalty}}分 匿评开启时间：{{act.homework_common_detail.evaluation_start}}
缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品 匿评关闭时间：{{act.homework_common_detail.evaluation_end}}
-
- 
-
欢迎加入Trustie创新实践社区！在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。
Trustie社区的理想是：让创新过程变的更美好！
+
+Trustie社区的理想是：让创新过程变的更美好！
+
+
<%= course.course_activities.count%>
+
+ <%= course.time %>
+
<%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'set_excellent_course', :id => course.id },:remote=>true, :class => 'icon-del') %>
diff --git a/app/views/admin/excellent_all_courses.html.erb b/app/views/admin/excellent_all_courses.html.erb
index 8c7f246fc..e5a89573a 100644
--- a/app/views/admin/excellent_all_courses.html.erb
+++ b/app/views/admin/excellent_all_courses.html.erb
@@ -48,11 +48,14 @@
资源数
-
+
帖子数
-
- <%=link_to '动态数', excellent_all_courses_path(:order=> @order == "desc" ? 'asc' : 'desc') %>
+
+ <%=link_to '动态数', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'act') %>
+
+
+ <%=link_to '开课学期', excellent_all_courses_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'time') %>
diff --git a/app/views/admin/excellent_courses.html.erb b/app/views/admin/excellent_courses.html.erb
index fef6da84d..c107713a0 100644
--- a/app/views/admin/excellent_courses.html.erb
+++ b/app/views/admin/excellent_courses.html.erb
@@ -2,7 +2,7 @@
<%=l(:label_excellent_courses_list)%>
@@ -33,12 +33,14 @@
+
- 欢迎加入Trustie创新实践社区
+在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。
-
+<%# 注册 %>
+
-
-
-
-
- -
-
- 登录 - -
<%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %>
-
+
+
- 登录 + 立即注册 +
+
+ <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
+ <%= back_url_hidden_field_tag %>
+
-
-
+
- + <%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%> + +
-
+ <%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
+
<%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %>
+
- <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
- <%= back_url_hidden_field_tag %>
- - + <% if Setting.autologin? %> + + <% end %> + + <% if Setting.lost_password? %>忘记密码<% end %> + + + + +
- <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
- :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
-
-
- <% if Setting.openid? %>
-
- <%= text_field_tag "openid_url", nil, :tabindex => '3',:placeholder=>'请输入OpenId URL' %>
-
- <% end %>
-
-
- <%= password_field_tag 'password', nil, :tabindex => '2',:class=>'loginSignBox' ,:placeholder=>'请输密码', :onkeypress => "user_name_keypress(event);"%>
-
-
- <% if Setting.autologin? %>
-
+
- <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
-
- <%= l(:label_stay_logged_in) %>
- <% end %>
-
- <% if Setting.lost_password? %>
- 忘记密码?
- <% end %>
-
- 登录
-
-
-
-
-
- -
-
- 注册<%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %> - -
- <%= form_for :user, :url => register_path,:method=>'post',:html=>{:id=>'main_reg_form'} do |f| %>
- <%= error_messages_for 'user' %>
-
-
-
- <%= f.text_field :mail,:size => 25, :class=>'loginSignBox' ,:placeholder=>"请输入邮箱地址"%>
-
-
-
-
- <%= f.password_field :password, :size => 25,:placeholder=>"请输入密码",:class=>'loginSignBox' %>
-
-
-
-
- <%= f.password_field :password_confirmation, :size => 25,:placeholder=>"请再次输入密码",:class=>'loginSignBox' %>
-
-
-
-
- <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户登录名",:class=>'loginSignBox'%>
-
-
-
-
-
-
-
- 我已阅读并接受Trustie服务协议条款
- 注册
-
- <% end %>
-
+
+
diff --git a/app/views/admin/_course_detail_tr.html.erb b/app/views/admin/_course_detail_tr.html.erb
index 4de9cb001..1629dda83 100644
--- a/app/views/admin/_course_detail_tr.html.erb
+++ b/app/views/admin/_course_detail_tr.html.erb
@@ -30,6 +30,9 @@
+
+
+
+ 欢迎加入Trustie创新实践社区
+在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。
+
+
+
+ 注册已有账号 请登录
+
+ <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
+ <%= error_messages_for 'user' %>
+
+
+ -
+
- + <%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%> + + +
- + <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %> + + +
- + <%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_register_input' %> + + +
- + <%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_register_input'%> + + +
- + + +
-
+ + 注册 ++
<%=l(:label_excellent_courses_list)%>
-<%= render 'tab_excellent_courses' %> +<%= render 'admin/tab_excellent_courses' %>
<%=l(:label_excellent_courses_list)%>
@@ -33,12 +33,14 @@
资源数
-
+
帖子数
-
+
动态数
+
+
@@ -74,6 +76,9 @@
<%= course.course_activities.count%>
+
+ <%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'cancel_excellent_course', :id => course.id }, :class => 'icon-del') %>
+
<% end %>
diff --git a/app/views/admin/leave_messages.html.erb b/app/views/admin/leave_messages.html.erb
index dee8b7443..986823faa 100644
--- a/app/views/admin/leave_messages.html.erb
+++ b/app/views/admin/leave_messages.html.erb
@@ -59,12 +59,12 @@
<%= format_date(journal.created_on) %>
-
diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index fb2afd308..61ccef344 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -1,7 +1,7 @@
更新资源版本
-
+
当前版本
-
- (未选择文件)
- 您可以上传小于50MB的文件
+
+ (未选择文件)
+ 您可以上传小于50MB的文件
+
+
+ 描述：
+
+
+
+
+
+
diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
index ac953b254..8339ae5ad 100644
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -1,20 +1,24 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
- <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-
- <% if course_id%>
-
- <% end %>
-
-
-
-
-
-
- <% end%>
-
+ <% if User.current.logged? %>
+
+ <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+
+ <% if course_id%>
+
+ <% end %>
+
+
+
+
+
+
+ <% end%>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 9617b7f76..7d8aaed86 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -87,11 +87,7 @@
- <% 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 %>
+ <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
<%= format_time( @article.created_on)%>
@@ -126,11 +122,6 @@
-
<%@article.children.reorder('created_on desc').each_with_index do |reply,i| %>
@@ -146,11 +137,7 @@
- <% 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 %>
+ <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
<%= reply.content.html_safe%>
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 3b6d55d96..dbe03d67f 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/app/views/layouts/_user_brief_introduction.html.erb b/app/views/layouts/_user_brief_introduction.html.erb
index 3b0500fed..4b2645129 100644
--- a/app/views/layouts/_user_brief_introduction.html.erb
+++ b/app/views/layouts/_user_brief_introduction.html.erb
@@ -1,8 +1,10 @@
-<% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
- <%= user.user_extensions.brief_introduction %>
-<% else%>
- 这位童鞋很懒，什么也没有留下～
-<% end %>
+
+ <% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
+ <%= user.user_extensions.brief_introduction %>
+ <% else%>
+ 这位童鞋很懒，什么也没有留下～
+ <% end %>
+
<% if User.current == user%>
<%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
-<% end%>
\ No newline at end of file
+<% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c3f3a4a60..62ccb3a86 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -57,6 +57,12 @@
<%=render :partial=>'layouts/project_info' %>
+ <% if (User.current.logged? && User.current.member_of_course?(@course)) || is_teacher %>
+
+ 邀请码
+ <%=@course.generate_invite_code %>
+
+ <% end %>
- <%= l(:label_main_teacher)%> : <%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %>
@@ -173,7 +179,7 @@
<%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
- 访问计数 <%= @course.visits.to_i %>
+ 访问计数 <%= @course.visits.to_i %> （自2016年5月）
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 2a33a8acd..9ba31bfe6 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -136,7 +136,7 @@
<%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
- 访问计数 <%= @organization.visits.to_i %>
+ 访问计数 <%= @organization.visits.to_i %> （自2016年5月）
<%= render_flash_messages %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 44dfeeea2..f7b04924d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -146,7 +146,7 @@
- 访问计数 <%= @project.visits.to_i %>
+ 访问计数 <%= @project.visits.to_i %> （自2016年5月）
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 60ffbce1a..c20335b1d 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -14,19 +14,8 @@
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
-
-
-
-
+
- 访问计数 <%= @user.visits.to_i %>
+ 访问计数 <%= @user.visits.to_i %> （自2016年5月）
<%= yield %>
@@ -349,6 +349,7 @@
$(function(){
$('#user_hide_course').hide();
$('#user_hide_project').hide();
+ autoUrl("user_brief_introduction_show");
});
$("#courseMenu").mouseenter(function(){
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index ca179f9fc..69e36ca34 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -81,11 +81,6 @@
回复（<%=@reply_count %>）
-
-
-
-
-
<% @replies.each_with_index do |reply,i| %>
@@ -119,19 +114,23 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 746881bdc..560925070 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -71,11 +71,7 @@
- <% if @topic.try(:author).try(:realname) == ' ' %>
- <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% else %>
- <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% end %>
+ <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
<%= format_time( @topic.created_on)%>
@@ -114,11 +110,7 @@
- <% 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 %>
+ <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
<%= reply.content.html_safe%>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 145afcfd7..e5455bc85 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -103,11 +103,7 @@
- <% if @topic.try(:author).try(:realname) == ' ' %>
- <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% else %>
- <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% end %>
+ <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
<%= format_time( @topic.created_on)%>
@@ -127,11 +123,6 @@
回复（<%=@reply_count %>）
-
<% @replies.each_with_index do |reply,i| %>
@@ -147,11 +138,7 @@
- <% 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 %>
+ <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
<%= reply.content.html_safe%>
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
index faa0bd0ce..d4d9d77a0 100644
--- a/app/views/messages/_reply_message.html.erb
+++ b/app/views/messages/_reply_message.html.erb
@@ -2,17 +2,21 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
- <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-
-
-
-
-
-
-
- <% end%>
-
+ <% if User.current.logged? %>
+
+ <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+
+
+
+
+
+
+
+ <% end%>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
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 1813f5b5f..2494687b4 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,17 +1,21 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
- <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
-
-
-
-
-
-
-
- <% end%>
-
+ <% if User.current.logged? %>
+
+ <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
+
+
+
+
+
+
+
+ <% end%>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/org_member/deleteOrgMember.js.erb b/app/views/org_member/deleteOrgMember.js.erb
new file mode 100644
index 000000000..d87e62c17
--- /dev/null
+++ b/app/views/org_member/deleteOrgMember.js.erb
@@ -0,0 +1,3 @@
+$("#org_members_count_id").html("");
+$("#org_members_count_id").html("<%= @org.org_members.count %>")
+$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
\ No newline at end of file
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 952ed7b2c..a65f53719 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -4,6 +4,8 @@
$("#sub_field_left_lists").html("");
$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
$("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
+ //默认选中第一个
+ $("input[name='field_type']").get(0).checked=true;
<% end %>
$("#subfield_name").val("");
$("#sub_dir").val("");
\ No newline at end of file
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index bcbeca778..e33787a09 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -387,17 +387,21 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 03e986716..80125a03e 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -131,18 +131,22 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 8c260c21c..24870b470 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -98,16 +98,20 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 91ca5aafb..cf3fabb0e 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -1,11 +1,12 @@
+
- <%= image_tag(url_to_avatar(@organization), width:"67", height: "61", :id => 'nh_user_tx', :class => "por_logo fl ", :target => "_blank") %>
+ <%= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
<% if User.current.logged? %>
diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 4c1271ab8..8632dd57a 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -8,11 +8,11 @@
<%# if acts.count > 3 %>
@@ -114,9 +66,11 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
<% end %>
- <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
- <%= time_from_now(document.created_at) %><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
- <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+
+ <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
+ <%= time_from_now(document.created_at) %><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
+ <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+
<% else activity.container_type == 'OrgSubfield' %>
@@ -131,9 +85,11 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
<% end %>
- <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
- <%= time_from_now(message.created_on) %><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
- <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+
+ <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+ <%= time_from_now(message.created_on) %><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
+ <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+
<% else %>
<% end %>
<% end %>
@@ -157,9 +115,11 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
<% end %>
- <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
- <%= time_from_now(news.created_on) %><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
- <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+
+ <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
+ <%= time_from_now(news.created_on) %><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
+ <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+
<% end %>
<% end %>
@@ -167,4 +127,8 @@
<%# end %>
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index 3d5d01dee..ff412d869 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -71,8 +71,8 @@
<% end %>
<% end %>
- <% unless acts[1..5].nil? %>
- <% acts[1..5].each do |activity| %>
+ <% unless acts[1..4].blank? %>
+ <% acts[1..4].each do |activity| %>
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
<% document = activity.org_act %>
@@ -110,10 +110,10 @@
<% end %>
<% end %>
- <% unless acts[6..19].nil? %>
+ <% unless acts[5..16].blank? %>
- <% acts[6..19].each do |activity| %>
+ <% acts[5..16].each do |activity| %>
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
<% document = activity.org_act %>
- <%= link_to "#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %>
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index a461a38dc..a7f819ca2 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -33,9 +33,6 @@
-
@@ -65,29 +62,6 @@
<% end %>
-
-
- <% excellent_students.each do |student| %>
- -
- <%= link_to image_tag(url_to_avatar(student), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(student), :alt => "用户头像", :target => '_blank', :class => "fl" %>
-
- <%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name link-black fl", :target => '_blank' %>
-
<%= student.my_workplace %>
-
-
- <% unless student.my_blogs_count == 0 %>
- 博客 <%= student.my_blogs_count %>
- <% end %>
- <% unless student.courses.count == 0 %>
- 课程 <%= student.courses.count %>
- <% end %>
-
-
-
-
- <% end %>
-
-
\ No newline at end of file
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
new file mode 100644
index 000000000..507ded0fe
--- /dev/null
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -0,0 +1,25 @@
+
+ 分析结果
+
+
+ - 名称
+ - 版本
+ - 分支
+ - 语言
+ - 时间
+
+
+<% if @quality_analyses.count >0 %>
+ <% @quality_analyses.each do |qa| %>
+
+ - <%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %>
+ - 1.0
+ - <%= qa.branch %>
+ - <%= qa.language %>
+ - <%= format_time(qa.created_at) %>
+
+
+ <% end %>
+<% end %>
+
+
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
new file mode 100644
index 000000000..8f1cb8443
--- /dev/null
+++ b/app/views/quality_analysis/_show.html.erb
@@ -0,0 +1,114 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+ <%= render :partial => "hightchars" %>
+
+ 质量分析
+
+
+
+ 项目代码质量分析报告
+ 概要信息
+
+
+
+
+ 质量等级
+ <%= @complexity["msr"][9]["frmt_val"] %>
+
+
+
+ 复杂度
+ <%= @complexity["msr"][6]["val"] %>
+
+
+
+
+
+ 代码重复度
+ <%= @complexity["msr"][7]["frmt_val"] %>
+
+
+
+ 注释率
+ <%= @complexity["msr"][5]["frmt_val"] %>
+
+
+
+ 质量等级<%= score_sqale_rating(@complexity["msr"][9]["val"]) %>/5分可定性评价为：质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %>
+
+
+
+
+ 阻断<%= @sonar_issues["msr"][1]["frmt_val"] %>%;">
+ 严重<%= @sonar_issues["msr"][2]["frmt_val"] %>%;">
+ 主要<%= @sonar_issues["msr"][3]["frmt_val"] %>%;">
+ 次要<%= @sonar_issues["msr"][4]["frmt_val"] %>%;">
+ 信息<%= @sonar_issues["msr"][5]["frmt_val"] %>%;">
+
+
+ 代码规模可定性评价为：<%= lines_scale(@complexity["msr"][0]["frmt_val"]) %>
+
+
+ 代码行数
+ <%= @complexity["msr"][0]["frmt_val"] %>
+
+
+ 文件
+ <%= @complexity["msr"][2]["frmt_val"] %>
+
+
+ 目录
+ <%= @complexity["msr"][3]["frmt_val"] %>
+
+
+ 类
+ <%= @complexity["msr"][1]["frmt_val"] %>
+
+
+ 方法
+ <%= @complexity["msr"][4]["frmt_val"] %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
new file mode 100644
index 000000000..9b06e6483
--- /dev/null
+++ b/app/views/quality_analysis/index.html.erb
@@ -0,0 +1,6 @@
+<% if @name_flag %>
+ <%= render :partial => "result_list" %>
+<% else %>
+ <%= render "show" %>
+<% end %>
+
diff --git a/app/views/quality_analysis/show.html.erb b/app/views/quality_analysis/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
new file mode 100644
index 000000000..f9726fb9b
--- /dev/null
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -0,0 +1,23 @@
+代码质量分析
+
+ <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+
+
+
+
+
+
+ <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch', :class => "analysis-option-box" %>
+
+
+
+
+ <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+
+
+
+
+
+
+ <% end %>
+
diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb
new file mode 100644
index 000000000..69dae2629
--- /dev/null
+++ b/app/views/repositories/quality_analyses.html.erb
@@ -0,0 +1,76 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+
+ <%= l(:label_quality_analyses) %>
+
+
+
+ <%#= render :partial => 'navigation' %>
+
+
+
+
+
+
+
+
+
+
+<%= link_to l(:button_back), :action => 'show', :id => @project %>
+<% html_title(l(:label_repository), l(:label_statistics)) -%>
\ No newline at end of file
diff --git a/app/views/repositories/quality_analysis.js.erb b/app/views/repositories/quality_analysis.js.erb
new file mode 100644
index 000000000..bafe28cdf
--- /dev/null
+++ b/app/views/repositories/quality_analysis.js.erb
@@ -0,0 +1,8 @@
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analysis', :locals => {}) %>');
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("
");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 43be57760..22a64a219 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,13 @@
<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
ZIP下载
-
+ <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+ <%# if User.current.member_of?(@project) %>
+ <%#= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+ <%# end %>
+ <%# else %>
+ <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
+ <%# end %>
<% if @entries.nil? %>
@@ -45,7 +51,7 @@
<%= @changesets_latest_coimmit.message %>
<% else %>
-
+
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
<%= @changesets_latest_coimmit.message %>
@@ -57,7 +63,6 @@
<%=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 %>
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
index c47c31d9d..e7d776cea 100644
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -93,18 +93,33 @@
url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
type:'get'
});
- <% if defined?(edit_mode) && edit_mode %>
- <% pro = @homework.student_work_projects.where("user_id = ?",User.current.id).first.project_id.to_i %>
- <% members = @homework.student_work_projects.where("project_id = ? and is_leader =?",pro,0) %>
- <% members.each do |member| %>
- var link = "<%=member.user.show_name %>";
- <% unless member.user.user_extensions.student_id == "" %>
- link += "(<%=member.user.user_extensions.student_id %>)";
- <% end %>
- link += " ";
- $("#choose_students_list").append(link);
- <% end %>
- <% end %>
+ var ids = $("#group_member_ids").val().split(',');
+ if (ids.length > 1){
+ for(var i=1; i"+data.name;
+ if (data.student_id != "" ) {
+ link += "("+data.student_id+")";
+ }
+ link += "";
+ $("#choose_students_list").append(link);
+ }
+ else
+ {
+
+ }
+ }
+ );
+ }
+ }
+ }
});
<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 6a89b51b1..9875a4cc6 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,13 +1,9 @@
-
-
序号
<% if @homework.homework_type != 3 %>
-
+
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index c4a6a3e9b..1b3683506 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,7 +1,3 @@
-
-
序号
diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb
index 5a8c768cc..0926e3c74 100644
--- a/app/views/student_work/_no_teacher_score_notice.html.erb
+++ b/app/views/student_work/_no_teacher_score_notice.html.erb
@@ -1,7 +1,8 @@
- 当前作品未进行评分，是否确定提交？
+ <%#A if work.teacher_score.nil? || work. %>
+ 您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 4ca5a8f2d..c4df9e715 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -4,6 +4,7 @@
上交时间：
<%=format_time work.created_at %>
+ 收起
<% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
diff --git a/app/views/student_work/_set_score_rule_detail.html.erb b/app/views/student_work/_set_score_rule_detail.html.erb
index fe2c734e5..eaabc81df 100644
--- a/app/views/student_work/_set_score_rule_detail.html.erb
+++ b/app/views/student_work/_set_score_rule_detail.html.erb
@@ -2,12 +2,14 @@
评分设置
迟交扣分
-
+
+ 请输入0-50数值
<% if homework.anonymous_comment == 0 %>
-
+
缺评扣分
-
+
+ 请输入0-50数值
<% end %>
@@ -55,11 +57,23 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index eaf6b9304..cc078bf9c 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -4,14 +4,21 @@
(<%= @student_work_count%>人已交)
- <% my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+ <%# my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+ <% my_work = cur_user_works_for_homework @homework %>
<% if !@is_teacher && my_work.nil? && User.current.member_of_course?(@course) %>
您尚未提交作品
- <%=link_to "提交作品", new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
+ <% unless @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+ <%=link_to "提交作品", new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
+ <% end %>
<% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
- 您已提交且不可再修改，因为截止日期已过
+ 已提交且不可再修改，因为截止日期已过
<% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
- 您已提交，您还可以修改
+ <% if @homework.homework_type == 3 %>
+ 组长已提交，组长还可修改
+ <% else %>
+ 您已提交，您还可以修改
+ <% end %>
<% end %>
<%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%>
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 8e1a2a546..ed0b369e8 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -103,21 +103,11 @@
}
function popupRegex(){
- if($("#group_member_ids").length > 0) {
- if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
- $('#ajax-modal').html("作品信息完整性校验中，请稍等...
");
- showModal('ajax-modal', '500px');
- $('#ajax-modal').siblings().remove();
- $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
- $('#ajax-modal').parent().addClass("anonymos");
- }
- } else {
- $('#ajax-modal').html("作品信息完整性校验中，请稍等...
");
- showModal('ajax-modal', '500px');
- $('#ajax-modal').siblings().remove();
- $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
- $('#ajax-modal').parent().addClass("anonymos");
- }
+ $('#ajax-modal').html("作品信息完整性校验中，请稍等...
");
+ showModal('ajax-modal', '500px');
+ $('#ajax-modal').siblings().remove();
+ $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+ $('#ajax-modal').parent().addClass("anonymos");
}
function nh_check_field(params){
@@ -140,6 +130,12 @@
params.contentmsg.html('');
}
}
+ if(!result) {
+ return result;
+ }
+ }
+ if($("#group_member_ids").length > 0) {
+ result=regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())));
}
return result;
}
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 5d9df57c1..6bdc3753e 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -118,12 +118,14 @@
remote: true, class: "hworkExport resourcesGrey", :id => "download_homework_attachments" %>
<% end%>
-
- <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
-
-
- <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
-
+ <% if @homework.anonymous_comment == 0 %>
+
+ <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+
+
+ <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+
+ <% end %>
评分设置
diff --git a/app/views/student_work/index.js.erb b/app/views/student_work/index.js.erb
index da2428316..16aac9945 100644
--- a/app/views/student_work/index.js.erb
+++ b/app/views/student_work/index.js.erb
@@ -1,4 +1,2 @@
$("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
-/*
-$("th").each(function(){$(this).css("width",$(this).width()-1);});*/
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index 453f717c9..dfddea306 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -62,21 +62,11 @@
}
// 作品校验
function popupRegex(){
- if($("#group_member_ids").length > 0) {
- if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
- $('#ajax-modal').html("作品信息完整性校验中，请稍等...
");
- showModal('ajax-modal', '500px');
- $('#ajax-modal').siblings().remove();
- $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
- $('#ajax-modal').parent().addClass("anonymos");
- }
- } else {
- $('#ajax-modal').html("作品信息完整性校验中，请稍等...
");
- showModal('ajax-modal', '500px');
- $('#ajax-modal').siblings().remove();
- $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
- $('#ajax-modal').parent().addClass("anonymos");
- }
+ $('#ajax-modal').html("作品信息完整性校验中，请稍等...
");
+ showModal('ajax-modal', '500px');
+ $('#ajax-modal').siblings().remove();
+ $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+ $('#ajax-modal').parent().addClass("anonymos");
}
function nh_check_field(params){
@@ -99,6 +89,12 @@
params.contentmsg.html('');
}
}
+ if(!result) {
+ return result;
+ }
+ }
+ if($("#group_member_ids").length > 0) {
+ result=regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())));
}
return result;
}
diff --git a/app/views/student_work/retry_work.js.erb b/app/views/student_work/retry_work.js.erb
index c6f354875..c15b81e09 100644
--- a/app/views/student_work/retry_work.js.erb
+++ b/app/views/student_work/retry_work.js.erb
@@ -1,2 +1,3 @@
hideModal('#popbox02');
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false})%>");
\ No newline at end of file
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false})%>");
+$("#group_member_ids").val("<%=User.current.id %>");
\ No newline at end of file
diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
index c7aa982b9..65179317f 100644
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@@ -7,19 +7,20 @@ $("#all_students_list").empty();
link += "";
$("#all_students_list").append(link);
- var str = "";
+ var str = $("#group_member_ids").val();
+ var choose_str = "";
var lists = $("#choose_students_list li");
if(lists.length > 0) {
for(var i=0; i
- if (str.indexOf(<%=user.id.to_s %>) < 0) {
+ if (str.indexOf(<%=user.id.to_s %>) < 0 && choose_str.indexOf(<%=user.id.to_s %>) < 0) {
$("#student_<%=user.id %>").one("click",function choose_student() {
var li = "
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
index 20a3289ff..a74acc77c 100644
--- a/app/views/users/_all_replies.html.erb
+++ b/app/views/users/_all_replies.html.erb
@@ -13,7 +13,7 @@
<%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
- <%= format_activity_day(comment.created_time) %> <%= format_time(comment.created_time, false) %>
+ <%= time_from_now(comment.created_time) %>
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index caac3ee62..4ced798d0 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,20 +1,9 @@
-
<%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
-<% if comment.try(:user).try(:realname) == ' ' %>
- <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
-<% else %>
- <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
-<% end %>
-<%= time_from_now(comment.created_on) %>
-<%= comment.notes.html_safe %>
+ <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "content-username" %>
+ <%= time_from_now(comment.created_on) %>
+ <%= comment.notes.html_safe %>
\ 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 701f81da1..ee12c04dd 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -7,11 +7,8 @@
- <% if activity.try(:user).try(:realname) == ' ' %>
- <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
- <% else %>
- <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
- <% end %> TO
+ <%= link_to activity.user.show_name, user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+ TO
<%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
- <% count = fetch_user_leaveWord_reply(activity).count %>
+ <% all_comments = []%>
+ <% count=get_all_children(all_comments, activity).count %>
+ <% allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
+ <%# count = fetch_user_leaveWord_reply(activity).count %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
-
- <%if count>3 %>
-
-
- 展开更多
-
-
- <% end %>
-
+ <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
- <% comments = activity.children.reorder("created_on desc").limit(3) %>
+ <% all_comments = []%>
+ <% comments = get_all_children(all_comments, activity)[0..2] %>
<% if count > 0 %>
- <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+ <%= render :partial => 'users/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
<% end %>
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 76971e240..135013a62 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -6,11 +6,7 @@
- <% 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 %>
+ <%= link_to activity.author.show_name, user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
TO
<%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
@@ -49,33 +45,35 @@
<%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
+ <% end %>
@@ -87,22 +85,7 @@
<% count=activity.children.count%>
<% end %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
- <%#=format_date(activity.updated_on)%>
- <%if count > 3 %>
-
-
- 展开更多
-
-
- <% end %>
-
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
<% activity= activity.parent ? activity.parent : activity%>
<% comments = activity.children.reorder("created_on desc").limit(3) %>
@@ -116,18 +99,22 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 5ffa78158..efd3770aa 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -6,11 +6,8 @@
- <% 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.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+ TO
<%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
<% count=activity.comments.count %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
- <%#= format_date(activity.updated_on) %>
- <%if count>3 %>
-
-
- 展开更多
-
-
- <% end %>
-
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
<% comments = activity.comments.reorder("created_on desc").limit(3) %>
<% if count > 0 %>
@@ -92,16 +76,20 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_homework_replies.html.erb b/app/views/users/_homework_replies.html.erb
index 7f4dc379b..285d464b1 100644
--- a/app/views/users/_homework_replies.html.erb
+++ b/app/views/users/_homework_replies.html.erb
@@ -12,11 +12,7 @@
- <% 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 %>
+ <%= link_to comment.user.show_name, user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
<%= time_from_now(comment.created_on) %>
<% unless comment.m_parent_id.nil? %>
@@ -37,7 +33,7 @@
↓
- <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %>
+ <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
<%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
@@ -45,7 +41,8 @@
<% end %>
- <%= comment.notes.html_safe %>
+ <%= comment.notes.html_safe %>
+
-
-
- -
-
- -
- <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project) %>
-
- -
- <% if !defined?(project_id) && !defined?(user_id) %>
- <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
- <% elsif defined?(project_id) %>
- <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
- <% elsif defined?(user_id) %>
- <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
- <% end %>
-
- -
- <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+ <% if User.current.logged? %>
+
+
+ -
+
+ -
+ <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project) %>
+
+ -
+ <% if !defined?(project_id) && !defined?(user_id) %>
+ <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+ <% elsif defined?(project_id) %>
+ <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+ <% elsif defined?(user_id) %>
+ <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+ <% end %>
+
+ -
+ <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+
+
-
-
-
+
+ <% end %>
<% case activity.tracker_id %>
<% when 1%>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 1f4c4b44b..3dac8026a 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -1,21 +1,6 @@
<% count = activity.journals.count %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
- <%#= format_date(activity.updated_on) %>
- <% if count > 3 %>
-
-
- 展开更多
-
-
- <% end %>
-
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
<% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
<% if count > 0 %>
@@ -27,16 +12,20 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index f82dc35e7..1abc36a31 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -6,11 +6,7 @@
- <% 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 %>
+ <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
TO
<%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
@@ -49,33 +45,35 @@
<%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
-
+ <% end %>
@@ -86,18 +84,7 @@
<% count=activity.children.count%>
<% end %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
- <%#=format_date(activity.updated_on)%>
- <%if count>3 %>
-
- <% end %>
-
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
<% activity= activity.parent_id.nil? ? activity : activity.parent %>
<% comments = activity.children.reorder("created_on desc").limit(3) %>
@@ -111,17 +98,21 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 43b22b193..cdceb490d 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -6,11 +6,8 @@
- <% 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.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+ TO
<%= link_to activity.project.name.to_s+" | 新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
<% count=activity.comments.count %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
- <%#= format_date(activity.updated_on) %>
- <%if count>3 %>
-
-
- 展开更多
-
-
- <% end %>
-
-
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
+
<% comments = activity.comments.reorder("created_on desc").limit(3) %>
<% if count > 0 %>
@@ -89,16 +73,20 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_reply_banner.html.erb b/app/views/users/_reply_banner.html.erb
new file mode 100644
index 000000000..25175542f
--- /dev/null
+++ b/app/views/users/_reply_banner.html.erb
@@ -0,0 +1,18 @@
+
+
+ 回复
+ ︿
+ <%= count>0 ? "（#{count}）" : "" %> ▪
+
+ <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+
+
+ <%#= format_date(activity.updated_on) %>
+ <%if count>3 %>
+
+
+ 展开更多
+
+
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 30f4e3542..621b56fbd 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -1,20 +1,39 @@
-
- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
-
- <%= form_for('new_form',:url => {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
- >
- >
- >
-
-
-
-
-
-
- <% end%>
-
-
-
+
+ <% if User.current.logged? %>
+ <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
+
+ <% if @type == 'HomeworkCommon' %>
+ <%= form_for('new_form',:url => {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+ >
+ >
+ >
+
+
+
+
+
+
+ <% end%>
+ <% elsif @type == 'JournalsForMessage' %>
+ <%= form_for('new_form',:url => {:controller => 'words', :action => 'create_reply', :id => reply.id}, :method => "post", :remote => true) do |f|%>
+ <%= hidden_field_tag 'reference_id', params[:reference_id], :value => reply.id %>
+ <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => reply.user.id %>
+ <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => reply.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 'activity_id',params[:activity_id],:value =>@activity_id %>
+
+
+
+
+ <% end%>
+ <% end %>
+
+
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged_reply" %>
+ <% end %>
\ No newline at end of file
diff --git a/app/views/users/_show_unlogged.html.erb b/app/views/users/_show_unlogged.html.erb
index 258ebe7af..223ee3f40 100644
--- a/app/views/users/_show_unlogged.html.erb
+++ b/app/views/users/_show_unlogged.html.erb
@@ -1,3 +1,4 @@
- <%= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>后可添加回复
+ 登录后可添加回复
+ <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
\ No newline at end of file
diff --git a/app/views/users/_show_unlogged_reply.html.erb b/app/views/users/_show_unlogged_reply.html.erb
new file mode 100644
index 000000000..b428fd249
--- /dev/null
+++ b/app/views/users/_show_unlogged_reply.html.erb
@@ -0,0 +1,4 @@
+
+ 登录后可添加回复
+ <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
+
\ No newline at end of file
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 3b327c080..5d06a7001 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -86,7 +86,7 @@
<% case user_activity.act_type.to_s %>
<% when 'JournalsForMessage' %>
<% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
- <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
+ <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
<% end %>
<% end %>
<% when 'Blog'%>
diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index 8f0c6acaf..81139ab8e 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -1,4 +1,4 @@
-<% if AtMessage === ma && ma.at_valid? %>
+<% if ma.class == AtMessage && ma.at_valid? %>
- <%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %>
-
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 97b2737c8..77510c858 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -6,11 +6,8 @@
- <% 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.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
+ TO
<%= link_to activity.author.name.to_s+" | 博客", user_blogs_path(:user_id=>activity.author_id), :class => "newsBlue ml15" %>
@@ -46,22 +43,7 @@
<% count=activity.children.count %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
- <%#= format_date(activity.updated_on) %>
- <%if count>3 %>
-
-
- 展开更多
-
-
- <% end %>
-
+ <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
<% comments = activity.children.reorder("created_on desc").limit(3) %>
<% if count > 0 %>
@@ -74,21 +56,25 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index 681f158e7..952a3396e 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -3,11 +3,14 @@
每组最小人数：
人
+
每组最大人数：
人
+
+
- <% count=fetch_user_leaveWord_reply(activity).count %>
+ <% all_comments = []%>
+ <% count=get_all_children(all_comments, activity).count %>
+ <% allow_delete = (activity.user == User.current || User.current.admin?) %>
-
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-
-
-
- <%if count>3 %>
-
-
- 展开更多
-
-
- <% end %>
-
+ <%= render :partial => 'users/journal_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :allow_delete => allow_delete} %>
- <% comments = activity.children.reorder("created_on desc").limit(3) %>
+ <% all_comments = []%>
+ <% comments = get_all_children(all_comments, activity)[0..2] %>
<% if count > 0 %>
- <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+ <%= render :partial => 'users/journal_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :allow_delete => allow_delete, :activity_id =>activity.id}%>
<% end %>
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index afd498d06..517d66038 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -5,13 +5,13 @@
<%if jours %>
<% jours.each do |jour|%>
- <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
+ <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id && !User.current.admin?)) %>
- <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %>
+ <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id} %>
<%#= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
<% end %>
<%end%>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 0c18dbcc3..3e83b0f7a 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -326,7 +326,7 @@
<% end %>
- <% if ma.course_message_type == "StudentWorksScore" %>
+ <% if ma.course_message_type == "StudentWorksScore" && ma.course_message %>
-
<% if ma.course_message.reviewer_role == 3 %>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index c18c6aae4..6d227e93b 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -1,5 +1,7 @@
<% if params[:type] == 'HomeworkCommon' %>
$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/homework_replies', :locals => {:comments => @journals, :is_in_course =>@is_in_course,:course_activity=>@course_activity, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id}) %>');
+<% elsif params[:type] == 'JournalsForMessage' %>
+$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/journal_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>');
<% else %>
$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
<% end %>
diff --git a/app/views/users/edit_brief_introduction.js.erb b/app/views/users/edit_brief_introduction.js.erb
index c64482715..eeaec4e6d 100644
--- a/app/views/users/edit_brief_introduction.js.erb
+++ b/app/views/users/edit_brief_introduction.js.erb
@@ -1,3 +1,4 @@
$("#user_brief_introduction_show").html("<%= escape_javascript render(:partial => "layouts/user_brief_introduction", :locals => {:user => @user}) %>");
$("#user_brief_introduction_show").show();
-$("#user_brief_introduction_edit").hide();
\ No newline at end of file
+$("#user_brief_introduction_edit").hide();
+autoUrl("user_brief_introduction_show");
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 4a7e5cee3..238102879 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -7,6 +7,15 @@
$(function(){
$("#RSide").removeAttr("id");
$("#Container").css("width","1000px");
+ <%if @homework.anonymous_comment == 0 && @homework.homework_detail_manual.comment_status != 1%>
+ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_student_work_alert') %>');
+ showModal('ajax-modal', '360px');
+ $('#ajax-modal').siblings().remove();
+ $('#ajax-modal').before("" +
+ "");
+ $('#ajax-modal').parent().css("top","65%").css("left","60%").css("border","3px solid #269ac9");
+ $('#ajax-modal').parent().addClass("anonymos_work");
+ <% end%>
});
diff --git a/app/views/users/show_all_replies.js.erb b/app/views/users/show_all_replies.js.erb
index 99ab73b46..5f5ea6c3f 100644
--- a/app/views/users/show_all_replies.js.erb
+++ b/app/views/users/show_all_replies.js.erb
@@ -1,3 +1,7 @@
<% unless @comment.parent.nil? %>
-$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+ <% if params[:type] == 'JournalsForMessage' && (@comment.jour_type == 'Principal' || @comment.jour_type == 'Course') %>
+ $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/journal_comment_reply', :locals => {:comment => @comment.parent})%>");
+ <% else %>
+ $('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 391709b52..1ff8adc57 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -4,8 +4,9 @@
<% if (!@message_alls.nil? && @message_alls.count >0) %>
<% if params[:type].nil? || params[:type] == "unviewed" %>
- 有 <%= unviewed_message(@user) %> 条未读
- <% unless (unviewed_message(@user) == 0 || User.current != @user) %>
+ <% count = unviewed_message(@user) %>
+ 有 <%= count %> 条未读
+ <% unless (count == 0 || User.current != @user) %>
<%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %>
<% end %>
diff --git a/app/views/wechats/open_wechat.html.erb b/app/views/wechats/open_wechat.html.erb
new file mode 100644
index 000000000..4584e81b5
--- /dev/null
+++ b/app/views/wechats/open_wechat.html.erb
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 3d61d8fcf..1e3957ea9 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -2,17 +2,23 @@
我的动态
+ Trustie平台
+
@@ -20,8 +26,31 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index ded05887f..9f3b0164e 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -1,8 +1,8 @@
<% if @save_succ %>
<% if @user_activity_id %>
- <% if @is_activity %>
- $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
- <% else %>
+ <% if @activity.jour_type == 'Principal' %>
+ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
+ <% elsif @activity.jour_type == 'Course' %>
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
<% end %>
//init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index a2d606e76..c527474cd 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -3,8 +3,7 @@
<% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication','HomeworkCommon'].include? @journal_destroyed.jour_type)%>
<% if @is_user%>
<% if @activity %>
- $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
- //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
+ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
<% else %>
$("#user_activity_<%= @user_activity_id%>").hide();
@@ -20,7 +19,12 @@
<% if @bid && @jours_count %>
$('#jours_count').html("<%= @jours_count %>");
<% elsif @course && @jours_count%>
- $('#course_jour_count').html("(<%= @jours_count %>)");
+ <% if @user_activity_id %>
+ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
+ sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
+ <% else %>
+ $('#course_jour_count').html("(<%= @jours_count %>)");
+ <% end %>
<% elsif @user && @jours_count%>
$('#jour_count').html("<%= @jours_count %>");
<% elsif @homework%>
diff --git a/config/locales/account/zh.yml b/config/locales/account/zh.yml
index c6a23b964..532806356 100644
--- a/config/locales/account/zh.yml
+++ b/config/locales/account/zh.yml
@@ -37,7 +37,7 @@ zh:
label_password_lost: "忘记密码？"
button_login: 登录
# account_controller中判断用户名或密码输入有误的提示信息
- notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写，谢谢！"
+ notice_account_invalid_creditentials: "无效的用户名或密码，注意登录名区分大小写。"
# account_controller中判断未激活的提示信息
notice_account_invalid_creditentials_new: "您还未到邮箱激活。如果您丢失帐户，电子邮件验证帮助我们的支持团队验证帐户的所有权，并允许您接收所有您要求的通知。"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 033f12ad2..98d02cdb6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -602,6 +602,7 @@ en:
label_time_tracking: Time tracking
label_change_plural: Changes
label_statistics: Statistics
+ label_quality_analyses: Quality Analyses
label_commits_per_month: Commits per month
label_commits_per_author: Commits per author
label_diff: diff
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 94be8af6d..3dbd2e8ef 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -732,6 +732,7 @@ zh:
label_time_tracking: 时间跟踪
label_change_plural: 变更
label_statistics: 统计
+ label_quality_analyses: 质量分析
label_commits_per_month: 每月提交次数
label_commits_per_author: 每用户提交次数
@@ -1864,12 +1865,18 @@ zh:
excel_nickname: 登录名
excel_student_id: 学号
excel_mail: 电子邮箱
+ excel_rank: 排名
excel_homework_name: 作品名
excel_homework_des: 作品描述
+ excel_homework_project: 关联项目
+ excel_no_project: 无关联项目
+ excel_group_member: 组员
excel_t_score: 教师评分
excel_ta_score: 教辅评分
excel_n_score: 匿名评分
excel_s_score: 系统评分
+ excel_a_penalty: 缺评扣分
+ excel_l_penalty: 迟交扣分
excel_f_score: 成绩
excel_commit_time: 提交时间
excel_homework_score: 作业积分
diff --git a/config/menu.yml b/config/menu.yml
index c2579d8e6..213130240 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,30 +2,26 @@ button:
-
type: "view"
name: "我的动态"
- url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+ url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
-
name: "我的课程"
sub_button:
-
- type: "view"
+ type: "click"
name: "课程"
- url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+ key: "DEV"
-
- type: "view"
+ type: "click"
name: "资源"
- url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+ key: "DEV"
-
name: "更多"
sub_button:
-
- type: "view"
+ type: "click"
name: "加入班级"
- url: "https://www.trustie.net/"
- -
- type: "view"
- name: "点名"
- url: "https://www.trustie.net/organizations/1/downloads"
+ key: "JOIN_CLASS"
-
type: "click"
name: "反馈"
diff --git a/config/routes.rb b/config/routes.rb
index e4b462d93..3ad84d9b1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -116,6 +116,7 @@ RedmineApp::Application.routes.draw do
end
collection do
get 'org_member_autocomplete'
+ get 'deleteOrgMember'
end
end
@@ -130,6 +131,7 @@ RedmineApp::Application.routes.draw do
end
member do
match "quote_resource_show_org_subfield", :via => [:get]
+ get "update_file_description"
end
end
@@ -329,6 +331,7 @@ RedmineApp::Application.routes.draw do
post 'last_codecomparetime'
post 'set_score_rule'
get 'work_canrepeat'
+ get 'get_user_infor'
end
end
@@ -779,9 +782,17 @@ RedmineApp::Application.routes.draw do
member do
match "quote_resource_show", :via => [:get]
get "file_hidden"
+ get "update_file_description"
end
end
+ resources :quality_analysis, :only => [:index, :new, :create] do
+ collection do
+ end
+ member do
+
+ end
+ end
# resources :files, :only => [:index, :new, :create] do
# member do
# match "quote_resource_show_project",:via => [:get]
@@ -902,6 +913,7 @@ RedmineApp::Application.routes.draw do
# repositories routes
get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats', :as => "stats_repository_project"
+ get 'projects/:id/repository/:repository_id/quality_analysis', :to => 'repositories#quality_analysis', :as => "quality_analysis"
get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))', :to => 'repositories#changes'
@@ -920,6 +932,7 @@ RedmineApp::Application.routes.draw do
}
get 'projects/:id/repository/statistics', :to => 'repositories#stats'
+
get 'projects/:id/repository/graph', :to => 'repositories#graph'
get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes'
@@ -975,7 +988,6 @@ RedmineApp::Application.routes.draw do
match 'delete_softapplications', :via => [:get, :post]
end
end
-
resources :groups do
member do
get 'autocomplete_for_user'
@@ -1019,6 +1031,7 @@ RedmineApp::Application.routes.draw do
get 'admin/excellent_courses', as: :excellent_courses
get 'admin/excellent_all_courses', as: :excellent_all_courses
match 'admin/set_excellent_course/:id', :to => 'admin#set_excellent_course'
+ match 'admin/cancel_excellent_course/:id', :to => 'admin#cancel_excellent_course'
get 'admin/course_resource_list'
get 'admin/project_resource_list'
match 'admin/users', :via => :get
@@ -1114,6 +1127,7 @@ RedmineApp::Application.routes.draw do
match "quote_resource_show", :via => [:get]
get "file_hidden"
post "republish_file"
+ get "update_file_description"
end
end
resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
@@ -1249,7 +1263,7 @@ RedmineApp::Application.routes.draw do
get :login
get :user_activities
post :bind
- post :get_open_id
+ post :get_bind
end
end
diff --git a/config/wechat.yml b/config/wechat.yml
index cf5be1f2b..9bc33029e 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -12,10 +12,10 @@ default: &default
secret: "beb4d3bc4b32b3557811680835357841"
token: "123456"
- access_token: "1234567"
+ access_token: ".access_token"
encrypt_mode: false # if true must fill encoding_aes_key
encoding_aes_key: "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
- jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
+ jsapi_ticket: "tmp/wechat_jsapi_ticket"
#template
binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
@@ -30,4 +30,4 @@ development:
<<: *default
test:
- <<: *default
\ No newline at end of file
+ <<: *default
diff --git a/db/migrate/20160613064914_create_syllabuses.rb b/db/migrate/20160613064914_create_syllabuses.rb
new file mode 100644
index 000000000..a9a926d7e
--- /dev/null
+++ b/db/migrate/20160613064914_create_syllabuses.rb
@@ -0,0 +1,12 @@
+class CreateSyllabuses < ActiveRecord::Migration
+ def change
+ create_table :syllabuses do |t|
+ t.string :title
+ t.text :description
+ t.references :user
+
+ t.timestamps
+ end
+ add_index :syllabuses, :user_id
+ end
+end
diff --git a/db/migrate/20160613065840_add_syllabus_to_course.rb b/db/migrate/20160613065840_add_syllabus_to_course.rb
new file mode 100644
index 000000000..b40d187d0
--- /dev/null
+++ b/db/migrate/20160613065840_add_syllabus_to_course.rb
@@ -0,0 +1,6 @@
+class AddSyllabusToCourse < ActiveRecord::Migration
+ def change
+ add_column :courses, :syllabus_id, :integer
+ add_index :courses, :syllabus_id
+ end
+end
diff --git a/db/migrate/20160614072229_add_invite_code_to_course.rb b/db/migrate/20160614072229_add_invite_code_to_course.rb
new file mode 100644
index 000000000..8f7bb8da1
--- /dev/null
+++ b/db/migrate/20160614072229_add_invite_code_to_course.rb
@@ -0,0 +1,5 @@
+class AddInviteCodeToCourse < ActiveRecord::Migration
+ def change
+ add_column :courses, :invite_code, :string
+ end
+end
diff --git a/db/migrate/20160622033322_create_quality_analyses.rb b/db/migrate/20160622033322_create_quality_analyses.rb
new file mode 100644
index 000000000..6316d5764
--- /dev/null
+++ b/db/migrate/20160622033322_create_quality_analyses.rb
@@ -0,0 +1,11 @@
+class CreateQualityAnalyses < ActiveRecord::Migration
+ def change
+ create_table :quality_analyses do |t|
+ t.integer :project_id
+ t.string :author_login
+ t.string :rep_identifier
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb b/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb
new file mode 100644
index 000000000..838d6d896
--- /dev/null
+++ b/db/migrate/20160622074138_add_jk_version_to_quality_analysis.rb
@@ -0,0 +1,5 @@
+class AddJkVersionToQualityAnalysis < ActiveRecord::Migration
+ def change
+ add_column :quality_analyses, :sonar_version, :integer, :default => false
+ end
+end
diff --git a/db/migrate/20160624032138_add_index_to_invite_code.rb b/db/migrate/20160624032138_add_index_to_invite_code.rb
new file mode 100644
index 000000000..420951874
--- /dev/null
+++ b/db/migrate/20160624032138_add_index_to_invite_code.rb
@@ -0,0 +1,6 @@
+class AddIndexToInviteCode < ActiveRecord::Migration
+ def change
+ add_column :courses, :qrcode, :string
+ add_index :courses, :invite_code, unique: true
+ end
+end
diff --git a/db/migrate/20160624054614_add_column_to_quality_analyses.rb b/db/migrate/20160624054614_add_column_to_quality_analyses.rb
new file mode 100644
index 000000000..ed3e6b137
--- /dev/null
+++ b/db/migrate/20160624054614_add_column_to_quality_analyses.rb
@@ -0,0 +1,6 @@
+class AddColumnToQualityAnalyses < ActiveRecord::Migration
+ def change
+ add_column :quality_analyses, :path, :string
+ add_column :quality_analyses, :branch, :string
+ end
+end
diff --git a/db/migrate/20160624055127_add_languae_to_quality_analyses.rb b/db/migrate/20160624055127_add_languae_to_quality_analyses.rb
new file mode 100644
index 000000000..de531b1db
--- /dev/null
+++ b/db/migrate/20160624055127_add_languae_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddLanguaeToQualityAnalyses < ActiveRecord::Migration
+ def change
+ add_column :quality_analyses, :language, :string
+ end
+end
diff --git a/db/migrate/20160624103411_add_name_to_quality_analyses.rb b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
new file mode 100644
index 000000000..a40342b42
--- /dev/null
+++ b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddNameToQualityAnalyses < ActiveRecord::Migration
+ def change
+ # add_column :quality_analyses, :language, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 95ffceef1..148a6e21b 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 => 20160612043259) do
+ActiveRecord::Schema.define(:version => 20160624032138) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -550,8 +550,14 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
t.integer "excellent_option", :default => 0
t.integer "is_copy", :default => 0
t.integer "visits", :default => 0
+ t.integer "syllabus_id"
+ t.string "invite_code"
+ t.string "qrcode"
end
+ add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
+ add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+
create_table "custom_fields", :force => true do |t|
t.string "type", :limit => 30, :default => "", :null => false
t.string "name", :limit => 30, :default => "", :null => false
@@ -1119,6 +1125,23 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
t.integer "viewed_count", :default => 0
end
+ create_table "mess", :id => false, :force => true do |t|
+ t.string "课程名"
+ t.integer "课程ID", :default => 0, :null => false
+ t.string "教师姓", :default => "", :null => false
+ t.string "教师名", :limit => 30, :default => "", :null => false
+ t.string "主贴名", :default => "", :null => false
+ t.integer "主贴或回帖ID", :default => 0, :null => false
+ t.integer "回帖对应主贴ID"
+ t.integer "帖子点赞数"
+ t.integer "主贴回复数", :default => 0, :null => false
+ t.text "主贴或回帖内容"
+ t.datetime "发帖时间", :null => false
+ t.integer "发帖或回帖用户ID", :default => 0, :null => false
+ t.string "发帖或回帖用户姓", :default => "", :null => false
+ t.string "发帖或回帖用户名", :limit => 30, :default => "", :null => false
+ end
+
create_table "message_alls", :force => true do |t|
t.integer "user_id"
t.integer "message_id"
@@ -1826,6 +1849,16 @@ ActiveRecord::Schema.define(:version => 20160612043259) do
t.datetime "updated_at", :null => false
end
+ create_table "syllabuses", :force => true do |t|
+ t.string "title"
+ t.text "description"
+ t.integer "user_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
+ add_index "syllabuses", ["user_id"], :name => "index_syllabuses_on_user_id"
+
create_table "system_messages", :force => true do |t|
t.integer "user_id"
t.string "content"
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 0354ed467..c78fd430e 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -300,8 +300,8 @@ K.options = {
'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
],
- a : ['id', 'class', 'href', 'target', 'name'],
- embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+ a : ['id', 'class', 'href', 'target', 'name','data-method','data-remote','rel'],
+ 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',
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 97d5e33c5..9f848b8e2 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -327,6 +327,7 @@ function enablePasteImg(_editor) {
};
$(nodeBody).on('pasteImage', function(ev, data) {
+ //粘贴图片时走这里会出现两张图片走df()即可
console.log('pasteImage');
console.log("dataURL: " + data.dataURL);
console.log("width: " + data.width);
@@ -348,7 +349,6 @@ function enablePasteImg(_editor) {
}
});
}
-
});
return;
};
@@ -371,7 +371,8 @@ function df(myself) {
sstr += that.attr("src") + "|";
}
else if (that.attr("src").indexOf("data:image") >= 0){
- that.parents().removeAttr("href"); //删除所有父节点的href
+ //去掉外链
+// that.parents().removeAttr("href"); //删除所有父节点的href
}
}
});
@@ -421,10 +422,10 @@ function uploadpic(piclist,myself) {
//复制过来带的链接class等都要去掉 和视频图片有关系
that.removeAttr("class");
- that.parent().removeAttr("class");
- that.parents().removeAttr("href"); //删除所有父节点的href
-// that.parent().removeAttr("href");
- that.parent().removeAttr("data-ke-src");
+ //去掉外链
+// that.parent().removeAttr("class");
+// that.parents().removeAttr("href"); //删除所有父节点的href
+// that.parent().removeAttr("data-ke-src");
tIndex = tIndex + 1;
}
}
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 69ea8f1fa..f042daba7 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -20,23 +20,25 @@
- 普通作业
- 编程作业
- 分组作业
- {{act.latest_update}}
- 
回复
- {{act.reply_count}}
- 
赞
- {{act.praise_count}}
- 
{{act.praise_count}}
-
+
+ 普通作业
+ 编程作业
+ 分组作业
+ {{act.latest_update}}
+ 回复
+ {{act.reply_count}}
+ 赞
+ {{act.praise_count}}
+ {{act.praise_count}}
+
+
@@ -58,14 +60,16 @@
- {{act.activity_type_name}}
- {{act.latest_update}}
- 回复
- {{act.reply_count}}
- 赞
- {{act.praise_count}}
- {{act.praise_count}}
-
+
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+ 回复
+ {{act.reply_count}}
+ 赞
+ {{act.praise_count}}
+ {{act.praise_count}}
+
+
@@ -87,14 +91,16 @@
- {{act.activity_type_name}}
- {{act.latest_update}}
- 回复
- {{act.reply_count}}
- 赞
- {{act.praise_count}}
- {{act.praise_count}}
-
+
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+ 回复
+ {{act.reply_count}}
+ 赞
+ {{act.praise_count}}
+ {{act.praise_count}}
+
+
@@ -127,21 +133,23 @@
-
+
状态：{{act.issue_detail.issue_status}} 优先级：{{act.issue_detail.issue_priority}}
指派给：{{act.issue_detail.issue_assigned_to}} 完成度：{{act.issue_detail.done_ratio}}%
- {{act.activity_type_name}}
- {{act.latest_update}}
- 回复
- {{act.reply_count}}
- 赞
- {{act.praise_count}}
- {{act.praise_count}}
-
+
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+ 回复
+ {{act.reply_count}}
+ 赞
+ {{act.praise_count}}
+ {{act.praise_count}}
+
+
@@ -164,14 +172,16 @@
- {{act.activity_type_name}}
- {{act.latest_update}}
- 回复
- {{act.reply_count}}
- 赞
- {{act.praise_count}}
- {{act.praise_count}}
-
+
+ {{act.activity_type_name}}
+ {{act.latest_update}}
+ 回复
+ {{act.reply_count}}
+ 赞
+ {{act.praise_count}}
+ {{act.praise_count}}
+
+
@@ -208,13 +218,15 @@
- {{act.latest_update}}
- 回复
- {{act.reply_count}}
- 赞
- {{act.praise_count}}
- {{act.praise_count}}
-
+
+ {{act.latest_update}}
+ 回复
+ {{act.reply_count}}
+ 赞
+ {{act.praise_count}}
+ {{act.praise_count}}
+
+
@@ -237,13 +249,15 @@
- {{act.latest_update}}
- 回复
- {{act.reply_count}}
- 赞
- {{act.praise_count}}
- {{act.praise_count}}
-
+
+ {{act.latest_update}}
+ 回复
+ {{act.reply_count}}
+ 赞
+ {{act.praise_count}}
+ {{act.praise_count}}
+
+
@@ -254,6 +268,7 @@
更多
+ 我的动态
+ 仅供本地调试使用
@@ -10,6 +10,7 @@
+
@@ -17,8 +18,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 60ffbce1a..c20335b1d 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -14,19 +14,8 @@
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
-
-
-
-
+
- 当前版本
-
-
(未选择文件)
- 您可以上传小于50MB的文件
+
+ (未选择文件)
+ 您可以上传小于50MB的文件
+
+
+
+
描述：
+
+
+
+
+
diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
index ac953b254..8339ae5ad 100644
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -1,20 +1,24 @@
-
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 9617b7f76..7d8aaed86 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -87,11 +87,7 @@
- <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-
- <% if course_id%>
-
- <% end %>
-
-
-
-
-
-
- <% end%>
-
+ <% if User.current.logged? %>
+
+ <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+
+ <% if course_id%>
+
+ <% end %>
+
+
+
+
+
+
+ <% end%>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% 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 %>
+ <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
<%= format_time( @article.created_on)%>
@@ -126,11 +122,6 @@
<%@article.children.reorder('created_on desc').each_with_index do |reply,i| %>
@@ -146,11 +137,7 @@
- <% 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 %>
+ <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
<%= reply.content.html_safe%>
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 3b6d55d96..dbe03d67f 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/app/views/layouts/_user_brief_introduction.html.erb b/app/views/layouts/_user_brief_introduction.html.erb
index 3b0500fed..4b2645129 100644
--- a/app/views/layouts/_user_brief_introduction.html.erb
+++ b/app/views/layouts/_user_brief_introduction.html.erb
@@ -1,8 +1,10 @@
-<% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
- <%= user.user_extensions.brief_introduction %>
-<% else%>
- 这位童鞋很懒，什么也没有留下～
-<% end %>
+
+ <% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
+ <%= user.user_extensions.brief_introduction %>
+ <% else%>
+ 这位童鞋很懒，什么也没有留下～
+ <% end %>
+
<% if User.current == user%>
<%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
-<% end%>
\ No newline at end of file
+<% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c3f3a4a60..62ccb3a86 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -57,6 +57,12 @@
<%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
-
<%=render :partial=>'layouts/project_info' %>
+ <% if (User.current.logged? && User.current.member_of_course?(@course)) || is_teacher %>
+
+
+ <% end %>
邀请码
+<%=@course.generate_invite_code %>
+- <%= l(:label_main_teacher)%> : <%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %> @@ -173,7 +179,7 @@
访问计数 <%= @course.visits.to_i %>
+ 访问计数 <%= @course.visits.to_i %> （自2016年5月）
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 2a33a8acd..9ba31bfe6 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -136,7 +136,7 @@
<%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
- 访问计数 <%= @organization.visits.to_i %>
+ 访问计数 <%= @organization.visits.to_i %> （自2016年5月）
<%= render_flash_messages %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 44dfeeea2..f7b04924d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -146,7 +146,7 @@
- 访问计数 <%= @project.visits.to_i %>
+ 访问计数 <%= @project.visits.to_i %> （自2016年5月）
访问计数 <%= @user.visits.to_i %>
+ 访问计数 <%= @user.visits.to_i %> （自2016年5月）
<%= yield %>
@@ -349,6 +349,7 @@
$(function(){
$('#user_hide_course').hide();
$('#user_hide_project').hide();
+ autoUrl("user_brief_introduction_show");
});
$("#courseMenu").mouseenter(function(){
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index ca179f9fc..69e36ca34 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -81,11 +81,6 @@
回复（<%=@reply_count %>）
-
-
-
-
-
<% @replies.each_with_index do |reply,i| %>
@@ -119,19 +114,23 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 746881bdc..560925070 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -71,11 +71,7 @@
- <% if @topic.try(:author).try(:realname) == ' ' %>
- <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% else %>
- <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% end %>
+ <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
<%= format_time( @topic.created_on)%>
@@ -114,11 +110,7 @@
- <% 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 %>
+ <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
<%= reply.content.html_safe%>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 145afcfd7..e5455bc85 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -103,11 +103,7 @@
");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 43be57760..22a64a219 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,13 @@
ZIP下载
-
+ <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+ <%# if User.current.member_of?(@project) %>
+ <%#= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
+ <%# end %>
+ <%# else %>
+ <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>
+ <%# end %>
<%=member.user.show_name %>";
- <% unless member.user.user_extensions.student_id == "" %>
- link += "(<%=member.user.user_extensions.student_id %>)";
- <% end %>
- link += " ";
- $("#choose_students_list").append(link);
- <% end %>
- <% end %>
+ var ids = $("#group_member_ids").val().split(',');
+ if (ids.length > 1){
+ for(var i=1; i"+data.name;
+ if (data.student_id != "" ) {
+ link += "("+data.student_id+")";
+ }
+ link += "";
+ $("#choose_students_list").append(link);
+ }
+ else
+ {
+
+ }
+ }
+ );
+ }
+ }
+ }
});
<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 6a89b51b1..9875a4cc6 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,13 +1,9 @@
-
-
- <% if @topic.try(:author).try(:realname) == ' ' %>
- <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% else %>
- <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
- <% end %>
+ <%= link_to @topic.author.show_name, user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
<%= format_time( @topic.created_on)%>
@@ -127,11 +123,6 @@
回复（<%=@reply_count %>）
-
<% @replies.each_with_index do |reply,i| %>
@@ -147,11 +138,7 @@
- <% 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 %>
+ <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
<%= reply.content.html_safe%>
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
index faa0bd0ce..d4d9d77a0 100644
--- a/app/views/messages/_reply_message.html.erb
+++ b/app/views/messages/_reply_message.html.erb
@@ -2,17 +2,21 @@
<% else %>
<% end %>
<% end %>
@@ -157,9 +115,11 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
<% end %>
- <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
-
<% end %>
<% end %>
@@ -167,4 +127,8 @@
<%# end %>
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index 3d5d01dee..ff412d869 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -71,8 +71,8 @@
<% end %>
<% end %>
- <% unless acts[1..5].nil? %>
- <% acts[1..5].each do |activity| %>
+ <% unless acts[1..4].blank? %>
+ <% acts[1..4].each do |activity| %>
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
<% document = activity.org_act %>
- <% unless acts[6..19].nil? %>
+ <% unless acts[5..16].blank? %>
-
\ No newline at end of file
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
new file mode 100644
index 000000000..507ded0fe
--- /dev/null
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -0,0 +1,25 @@
+<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
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 1813f5b5f..2494687b4 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,17 +1,21 @@
- <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-
-
-
-
-
-
-
- <% end%>
-
+ <% if User.current.logged? %>
+
+ <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+
+
+
+
+
+
+
+ <% end%>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
diff --git a/app/views/org_member/deleteOrgMember.js.erb b/app/views/org_member/deleteOrgMember.js.erb
new file mode 100644
index 000000000..d87e62c17
--- /dev/null
+++ b/app/views/org_member/deleteOrgMember.js.erb
@@ -0,0 +1,3 @@
+$("#org_members_count_id").html("");
+$("#org_members_count_id").html("<%= @org.org_members.count %>")
+$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
\ No newline at end of file
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 952ed7b2c..a65f53719 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -4,6 +4,8 @@
$("#sub_field_left_lists").html("");
$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
$("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
+ //默认选中第一个
+ $("input[name='field_type']").get(0).checked=true;
<% end %>
$("#subfield_name").val("");
$("#sub_dir").val("");
\ No newline at end of file
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index bcbeca778..e33787a09 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -387,17 +387,21 @@
- <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
-
-
-
-
-
-
-
- <% end%>
-
+ <% if User.current.logged? %>
+
+ <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
+
+
+
+
+
+
+
+ <% end%>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 03e986716..80125a03e 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -131,18 +131,22 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 8c260c21c..24870b470 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -98,16 +98,20 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
-
+ <% if User.current.logged? %>
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged" %>
+ <% end %>
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 91ca5aafb..cf3fabb0e 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -1,11 +1,12 @@
+
- <%= image_tag(url_to_avatar(@organization), width:"67", height: "61", :id => 'nh_user_tx', :class => "por_logo fl ", :target => "_blank") %>
+ <%= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
<% if User.current.logged? %>
diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index 4c1271ab8..8632dd57a 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -8,11 +8,11 @@
<%# if acts.count > 3 %>
@@ -114,9 +66,11 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
<% end %>
- <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
-
<% else activity.container_type == 'OrgSubfield' %>
@@ -131,9 +85,11 @@
<% else %>
<%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
<% end %>
- <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
- <%= time_from_now(document.created_at) %><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
- <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %> +
+ <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
+
<%= time_from_now(document.created_at) %><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %>
+ <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %> +<%= time_from_now(message.created_on) %><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
- <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %> +
+ <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+
<%= time_from_now(message.created_on) %><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %>
+ <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %> +<%= time_from_now(news.created_on) %><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
- <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %> +
+ <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
+
<%= time_from_now(news.created_on) %><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %>
+ <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %> +-
@@ -110,10 +110,10 @@
<% end %>
<% end %>
-
- <% acts[6..19].each do |activity| %>
+ <% acts[5..16].each do |activity| %>
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
<% document = activity.org_act %>
- <%= link_to "#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %> diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb index a461a38dc..a7f819ca2 100644 --- a/app/views/organizations/_org_custom_right3.html.erb +++ b/app/views/organizations/_org_custom_right3.html.erb @@ -33,9 +33,6 @@ -
-
-
- <% excellent_students.each do |student| %>
-
-
- <%= link_to image_tag(url_to_avatar(student), :width => "43", :height => "43", :class => "por_teachers_img fl mr15"), user_path(student), :alt => "用户头像", :target => '_blank', :class => "fl" %>
- - <%=link_to student.try(:realname) ? student.try(:realname) :student.try(:login), user_path(student), :class => "por_teachers_name link-black fl", :target => '_blank' %> -- -
<%= student.my_workplace %>
- -- <% unless student.my_blogs_count == 0 %> - 博客 <%= student.my_blogs_count %> - <% end %> - <% unless student.courses.count == 0 %> - 课程 <%= student.courses.count %> - <% end %> -
-
- <% end %>
-
+
+分析结果
+-
+
- 名称 +
- 版本 +
- 分支 +
- 语言 +
- 时间 + +
-
+
- <%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %> +
- 1.0 +
- <%= qa.branch %> +
- <%= qa.language %> +
- <%= format_time(qa.created_at) %> + +
+
+
+
+ 质量分析
+项目代码质量分析报告
+ 概要信息
+
+
+
+
+
+
+
+ 质量等级
+<%= @complexity["msr"][9]["frmt_val"] %>
+
+
+
+ 复杂度
+<%= @complexity["msr"][6]["val"] %>
+
+
+
+
+
+ 代码重复度
+<%= @complexity["msr"][7]["frmt_val"] %>
+
+
+
+ 注释率
+<%= @complexity["msr"][5]["frmt_val"] %>
+ 质量等级<%= score_sqale_rating(@complexity["msr"][9]["val"]) %>/5分可定性评价为：质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %>
+
+
+
+
+
+
+ 阻断<%= @sonar_issues["msr"][1]["frmt_val"] %>%;">
+ 严重<%= @sonar_issues["msr"][2]["frmt_val"] %>%;">
+ 主要<%= @sonar_issues["msr"][3]["frmt_val"] %>%;">
+ 次要<%= @sonar_issues["msr"][4]["frmt_val"] %>%;">
+ 信息<%= @sonar_issues["msr"][5]["frmt_val"] %>%;">
+ 代码规模可定性评价为：<%= lines_scale(@complexity["msr"][0]["frmt_val"]) %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
new file mode 100644
index 000000000..9b06e6483
--- /dev/null
+++ b/app/views/quality_analysis/index.html.erb
@@ -0,0 +1,6 @@
+<% if @name_flag %>
+ <%= render :partial => "result_list" %>
+<% else %>
+ <%= render "show" %>
+<% end %>
+
diff --git a/app/views/quality_analysis/show.html.erb b/app/views/quality_analysis/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
new file mode 100644
index 000000000..f9726fb9b
--- /dev/null
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -0,0 +1,23 @@
+
+
+ 代码行数
+<%= @complexity["msr"][0]["frmt_val"] %>
+
+
+ 文件
+<%= @complexity["msr"][2]["frmt_val"] %>
+
+
+ 目录
+<%= @complexity["msr"][3]["frmt_val"] %>
+
+
+ 类
+<%= @complexity["msr"][1]["frmt_val"] %>
+
+
+ 方法
+<%= @complexity["msr"][4]["frmt_val"] %>
+代码质量分析
+
+ <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+
diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb
new file mode 100644
index 000000000..69dae2629
--- /dev/null
+++ b/app/views/repositories/quality_analyses.html.erb
@@ -0,0 +1,76 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+
+
+ <% end %>
+
+
+
+
+
+
+ <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch', :class => "analysis-option-box" %>
+
+
+
+
+
+
+
+ <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+
+
+
+
+<%= l(:label_quality_analyses) %>
+
+ <%#= render :partial => 'navigation' %>
+
+
+
+
+
+
+
+
+
+
+<%= link_to l(:button_back), :action => 'show', :id => @project %>
+<% html_title(l(:label_repository), l(:label_statistics)) -%> \ No newline at end of file diff --git a/app/views/repositories/quality_analysis.js.erb b/app/views/repositories/quality_analysis.js.erb new file mode 100644 index 000000000..bafe28cdf --- /dev/null +++ b/app/views/repositories/quality_analysis.js.erb @@ -0,0 +1,8 @@ +$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analysis', :locals => {}) %>'); +showModal('ajax-modal', '615px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 43be57760..22a64a219 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,13 @@
<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
<% if @entries.nil? %>
@@ -45,7 +51,7 @@
<% end %>
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
index c47c31d9d..e7d776cea 100644
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -93,18 +93,33 @@
url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
type:'get'
});
- <% if defined?(edit_mode) && edit_mode %>
- <% pro = @homework.student_work_projects.where("user_id = ?",User.current.id).first.project_id.to_i %>
- <% members = @homework.student_work_projects.where("project_id = ? and is_leader =?",pro,0) %>
- <% members.each do |member| %>
- var link = "<%= @changesets_latest_coimmit.message %>
<% else %>
-
+
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
<%= @changesets_latest_coimmit.message %>
@@ -57,7 +63,6 @@
<%=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}"} %> 提交
-
| 序号 | <% if @homework.homework_type != 3 %> - + diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index c4a6a3e9b..1b3683506 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -1,7 +1,3 @@ - - |
|---|
| 序号 | diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb index 5a8c768cc..0926e3c74 100644 --- a/app/views/student_work/_no_teacher_score_notice.html.erb +++ b/app/views/student_work/_no_teacher_score_notice.html.erb @@ -1,7 +1,8 @@
|---|