From 0141735db4b0e3adc87f2e605ee0f96058e7bedd Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 6 Mar 2017 11:03:33 +0800 Subject: [PATCH 01/72] =?UTF-8?q?=E9=97=AE=E5=90=A7=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E5=9B=9E=E5=A4=8D=E7=9A=84Url=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B0=83=E6=95=B4=E4=B8=BA=E8=B6=85=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_comment_reply_detail.html.erb | 8 +++++++- app/views/projects/_project_comment_reply_detail.html.erb | 8 +++++++- .../_project_issue_comments_reply_detail.html.erb | 8 +++++++- app/views/users/_comment_reply_detail.html.erb | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/app/views/projects/_comment_reply_detail.html.erb b/app/views/projects/_comment_reply_detail.html.erb index 9c29a8ae9..c85bfbdc1 100644 --- a/app/views/projects/_comment_reply_detail.html.erb +++ b/app/views/projects/_comment_reply_detail.html.erb @@ -1,10 +1,16 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
+
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> -
+
<% if comment.class == Journal %> <% if comment.details.any? %> <% details_to_strings(comment.details).each do |string| %> diff --git a/app/views/projects/_project_comment_reply_detail.html.erb b/app/views/projects/_project_comment_reply_detail.html.erb index 70082dae4..590f62470 100644 --- a/app/views/projects/_project_comment_reply_detail.html.erb +++ b/app/views/projects/_project_comment_reply_detail.html.erb @@ -1,10 +1,16 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
+
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> -
+
<% if comment.class == Journal %> <% if comment.details.any? %> <% details_to_strings(comment.details).each do |string| %> diff --git a/app/views/projects/_project_issue_comments_reply_detail.html.erb b/app/views/projects/_project_issue_comments_reply_detail.html.erb index e3a675fc5..49ce59ce9 100644 --- a/app/views/projects/_project_issue_comments_reply_detail.html.erb +++ b/app/views/projects/_project_issue_comments_reply_detail.html.erb @@ -1,10 +1,16 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
+
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> -
+
<% if comment.class == Journal %> <% if comment.details.any? %> <% details_to_strings(comment.details).each do |string| %> diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb index d36ad498c..e7cd7e0b0 100644 --- a/app/views/users/_comment_reply_detail.html.erb +++ b/app/views/users/_comment_reply_detail.html.erb @@ -1,10 +1,16 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
+
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> -
+
<% if comment.class == Journal %> <% if comment.details.any? %> <% details_to_strings(comment.details).each do |string| %> From dd0cb87d4f4d89255cf7d46d3d9cc018021a9b26 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 6 Mar 2017 11:19:51 +0800 Subject: [PATCH 02/72] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E7=9A=84=E5=8A=A9=E6=95=99=E6=B2=A1=E6=9C=89=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E7=BD=AE=E9=A1=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_course_new.html.erb | 18 ++++++++---------- app/views/boards/_course_show.html.erb | 6 ++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb index 774d1c100..3ffc4f9b0 100644 --- a/app/views/boards/_course_new.html.erb +++ b/app/views/boards/_course_new.html.erb @@ -126,16 +126,14 @@

<% if activity.anonymous_comment == 0%>
- 匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%> 00:00 + 匿评开启时间：<%= activity.homework_detail_manual.evaluation_start.nil? ? '--' : (activity.homework_detail_manual.evaluation_start.to_s+" 00:00") %>
<% end %>
@@ -15,7 +15,7 @@ 缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
- 匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%> 23:59 + 匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end.nil? ? '--' : (activity.homework_detail_manual.evaluation_end.to_s+" 00:00") %>
<% end %>
@@ -111,12 +111,12 @@ <%= homework_anonymous_comment activity,hw_status,user_activity_id %> <% end %> - <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%> + <% if activity.anonymous_comment == 0 && comment_status == 1 %>
  • <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink", :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
    • - <% elsif activity.anonymous_comment == 1 %> + <% elsif activity.anonymous_comment == 1 && comment_status > 0 %>
  • <%= link_to("启用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink", :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%> From f4f0363b40db8b45452913a2c129047168807c40 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 9 Mar 2017 15:45:53 +0800 Subject: [PATCH 26/72] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=84=E5=88=86?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=BC=B9=E6=A1=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/_set_score_rule_non_pro.html.erb | 2 +- app/views/homework_common/_set_score_rule_pro.html.erb | 2 +- app/views/homework_common/score_rule_set.js.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/homework_common/_set_score_rule_non_pro.html.erb b/app/views/homework_common/_set_score_rule_non_pro.html.erb index 1ffe0d13f..cdcee01f1 100644 --- a/app/views/homework_common/_set_score_rule_non_pro.html.erb +++ b/app/views/homework_common/_set_score_rule_non_pro.html.erb @@ -7,7 +7,7 @@ <%= form_for('new_form',:url =>{:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:student_path => student_path,:user_activity_id=>user_activity_id,:hw_status=>hw_status},:method => "post", :remote => !student_path) do |f|%>
    -
      +
      • diff --git a/app/views/homework_common/_set_score_rule_pro.html.erb b/app/views/homework_common/_set_score_rule_pro.html.erb index c7235d581..725eca62e 100644 --- a/app/views/homework_common/_set_score_rule_pro.html.erb +++ b/app/views/homework_common/_set_score_rule_pro.html.erb @@ -7,7 +7,7 @@ <%= form_for('new_form',:url =>{:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:student_path => student_path,:user_activity_id=>user_activity_id,:hw_status=>hw_status},:method => "post", :remote => !student_path) do |f|%>
        -
          +
          • diff --git a/app/views/homework_common/score_rule_set.js.erb b/app/views/homework_common/score_rule_set.js.erb index c6adaf5bd..6d54c2bea 100644 --- a/app/views/homework_common/score_rule_set.js.erb +++ b/app/views/homework_common/score_rule_set.js.erb @@ -1,7 +1,7 @@ <% if @homework.homework_type == 2 %> <% if @homework.anonymous_comment == 0 %> var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>"; - pop_box_new(htmlvalue, 630, 772); + pop_box_new(htmlvalue, 630, 500); <% else %> var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>"; pop_box_new(htmlvalue, 530, 404); @@ -9,7 +9,7 @@ <% else %> <% if @homework.anonymous_comment == 0 %> var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_non_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>"; - pop_box_new(htmlvalue, 630, 742); + pop_box_new(htmlvalue, 630, 500); <% else %> var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_none_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>"; pop_box_new(htmlvalue, 530, 332); From a9fb270b542ea430d1808b695db68b4094fdae4d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 9 Mar 2017 16:42:30 +0800 Subject: [PATCH 27/72] =?UTF-8?q?=E9=97=AE=E5=90=A7=E7=9A=84=E5=B8=96?= =?UTF-8?q?=E5=AD=90=EF=BC=8C=E5=90=A7=E4=B8=BB=E5=92=8C=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9C=89=E7=BD=AE=E9=A1=B6=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/forums_controller.rb | 10 +++++----- app/controllers/memos_controller.rb | 10 ++++++++++ app/views/boards/_course_new.html.erb | 14 +++++++------- app/views/forums/_show_topics.html.erb | 7 +++++-- app/views/memos/_form.html.erb | 11 ++++++++++- app/views/memos/show.html.erb | 5 +++++ config/routes.rb | 3 +++ public/stylesheets/css/public.css | 2 +- 8 files changed, 46 insertions(+), 16 deletions(-) diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 0f5a55ab9..f15114d20 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -121,7 +121,7 @@ class ForumsController < ApplicationController order = "" @order_str = "" if(params[:reorder_complex]) - order = " last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}" + order = "last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}" @order_str = "reorder_complex="+params[:reorder_complex] elsif(params[:reorder_popu]) order = "replies_count #{params[:reorder_popu]}" @@ -166,16 +166,16 @@ class ForumsController < ApplicationController order = "" @order_str = "" if(params[:reorder_complex]) - order = " last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}" + order = "#{Memo.table_name}.sticky desc, last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}" @order_str = "reorder_complex="+params[:reorder_complex] elsif(params[:reorder_popu]) - order = "replies_count #{params[:reorder_popu]}" + order = "#{Memo.table_name}.sticky desc, replies_count #{params[:reorder_popu]}" @order_str = "reorder_popu="+params[:reorder_popu] elsif(params[:reorder_time]) - order = "#{Memo.table_name}.updated_at #{params[:reorder_time]}" + order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at #{params[:reorder_time]}" @order_str = "reorder_time="+params[:reorder_time] else - order = "#{Memo.table_name}.updated_at desc" + order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at desc" @order_str = "reorder_time=desc" end @memo = Memo.new(:forum => @forum) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 8e84f2659..eb31cf13f 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -50,6 +50,8 @@ class MemosController < ApplicationController @memo = Memo.new(params[:memo]) @memo.forum_id = @forum.id @memo.author_id = User.current.id + # 问吧置顶sticky:1 置顶；0不置顶 + @memo.sticky = params[:memo][:sticky].to_i if params[:memo][:parent_id] @memo.root_id = (Memo.find params[:memo][:parent_id]).root_id.nil? ? params[:memo][:parent_id].to_i : (Memo.find params[:memo][:parent_id]).root_id @@ -189,6 +191,14 @@ class MemosController < ApplicationController end end + #置顶功能 + def change_sticky + @memo.sticky ? @memo.update_attribute(:sticky, false) : @memo.update_attribute(:sticky, true) + respond_to do |format| + format.html { redirect_to forum_memo_path(@memo.forum, @memo) } + end + end + private def find_memo diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb index 774d1c100..21764a055 100644 --- a/app/views/boards/_course_new.html.erb +++ b/app/views/boards/_course_new.html.erb @@ -122,18 +122,18 @@
            - +

            -
            - <%=topic.subject%> +
            + <%= topic.subject %> + <% if topic.sticky && !params[:id].blank? %> + 顶 + <% end %>
            diff --git a/app/views/memos/_form.html.erb b/app/views/memos/_form.html.erb index bab98541b..084bc5bc8 100644 --- a/app/views/memos/_form.html.erb +++ b/app/views/memos/_form.html.erb @@ -6,7 +6,16 @@
            • - <%= f.text_field :subject, :no_label => true, :id => "memo_subject", :maxlength => "50", :style => "width:708px", :onblur => "check_memo_name();", :onfocus => "$('#memo_name_error_tips').hide();", :onmouseover => "this.style.borderColor='#d9d9d9'", :class => "wenba-tiwen-input", :placeholder => "请输入标题" %> + <%= f.text_field :subject, + :no_label => true, + :id => "memo_subject", + :maxlength => "50", + :style => "width:708px", + :onblur => "check_memo_name();", + :onfocus => "$('#memo_name_error_tips').hide();", + :onmouseover => "this.style.borderColor='#d9d9d9'", + :class => "wenba-tiwen-input", + :placeholder => "请输入标题" %> diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb index 17a482c37..1722b0b61 100644 --- a/app/views/messages/reply.js.erb +++ b/app/views/messages/reply.js.erb @@ -1,15 +1,29 @@ -<%if @project%> -<% if params[:is_project] %> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/act_messages', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); -<% else %> -$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); -<% end %> +<% if @project %> + <% if params[:is_project] %> + $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'projects/act_messages', + :locals => { :activity => @topic, + :user_activity_id => @user_activity_id, + :is_course => @is_course, + :is_board => @is_board}) %>"); + // ForgeActivity是具体项目的动态；UserActivity是社区的动态 + // sd_create_editor_from_data(<%#= @user_activity_id %>, "", "100%", "ForgeActivity"); + <% else %> + $("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', + :locals => { :activity => @topic, + :user_activity_id => @user_activity_id}) %>"); -<%elsif @course%> -$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); -<%elsif @contest%> -$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/contest_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); + <% end %> +<% elsif @course %> + $("#activity_post_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/course_message_post_reply', + :locals => { :activity => @topic, + :user_activity_id => @user_activity_id}) %>"); +<% elsif @contest %> + $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/contest_message_post_reply', + :locals => { :activity => @topic, + :user_activity_id => @user_activity_id}) %>"); <% elsif @org_subfield %> -$("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'organizations/org_message_post_reply', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); -<%end%> -sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity"); + $("#activity_post_reply_<%= @user_activity_id%>").html("<%= escape_javascript(render :partial => 'organizations/org_message_post_reply', + :locals => { :activity => @topic, + :user_activity_id => @user_activity_id}) %>"); +<% end %> +sd_create_editor_from_data(<%= @user_activity_id %>, "", "100%", "UserActivity"); \ No newline at end of file diff --git a/app/views/projects/_act_messages.html.erb b/app/views/projects/_act_messages.html.erb index 8e5aa4961..daa2aff4b 100644 --- a/app/views/projects/_act_messages.html.erb +++ b/app/views/projects/_act_messages.html.erb @@ -1,3 +1,6 @@ +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: true, prettify: false, init_activity: true) %> +<% end %>
              diff --git a/app/views/users/_course_message_post_reply.html.erb b/app/views/users/_course_message_post_reply.html.erb index 0684a57da..72d7fe5b3 100644 --- a/app/views/users/_course_message_post_reply.html.erb +++ b/app/views/users/_course_message_post_reply.html.erb @@ -1,3 +1,6 @@ +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: true, prettify: false, init_activity: true) %> +<% end %> <% all_replies = Message.where("root_id = #{activity.id}").reorder("created_on desc") %> <% count = all_replies.count %> <% no_children_comments = get_no_children_comments all_replies %> From e1c8fccf00265f188b0d8c498fe54d44888337ea Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 14 Mar 2017 09:35:56 +0800 Subject: [PATCH 53/72] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BA=86=E7=AB=9E?= =?UTF-8?q?=E8=B5=9B=E9=A2=98=E5=92=8C=E5=8F=91=E5=B8=83=E4=BA=86=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=9A=84=E6=B6=88=E6=81=AF=E9=93=BE=E6=8E=A5=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=BD=9C=E5=93=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=88=E5=9F=BA=E4=BA=8E=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E4=B8=8D=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/_show_messages_list.html.erb | 4 ++-- .../users/_user_message_contest.html.erb | 18 +++++---------- app/views/users/_user_message_course.html.erb | 22 +++++-------------- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb index 3a4472815..3e24f18cf 100644 --- a/app/views/layouts/_show_messages_list.html.erb +++ b/app/views/layouts/_show_messages_list.html.erb @@ -12,7 +12,7 @@ <% elsif ma.course_message_type == "Comment" %>
            • <%=ma.course_message.author.show_name %> 评论了通知：<%= ma.course_message.commented.title%>
              • <% elsif ma.course_message_type == "HomeworkCommon" && ma.status.nil? %> -
            • <%=ma.course_message.user.show_name %>老师 发布了班级作业：作业标题：<%= ma.course_message.name%>
              • +
            • <%=ma.course_message.user.show_name %>老师 发布了班级作业：作业标题：<%= ma.course_message.name%>
              • <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
            • <%=ma.course_message.user.show_name %>老师 发布的作业：作业标题：<%= ma.course_message.name%>的截止日期快到了
              • <% elsif ma.course_message_type == "HomeworkCommon" && ma.status == 2 %> @@ -101,7 +101,7 @@ <% elsif ma.contest_message_type == "Comment" %>
            • <%=ma.contest_message.author.show_name %> 回复了竞赛通知：<%= ma.contest_message.commented.title%>
              • <% elsif ma.contest_message_type == "Work" && ma.status.nil? %> -
            • <%=ma.contest_message.user.show_name %> 发布了竞赛题：<%= ma.contest_message.name%>
              • +
            • <%=ma.contest_message.user.show_name %> 发布了竞赛题：<%= ma.contest_message.name%>
              • <% elsif ma.contest_message_type == "Work" && ma.status == 1 %>
            • <%=ma.contest_message.user.show_name %> 发布的竞赛题：<%= ma.contest_message.name%>的截止时间快到啦
              • <% elsif ma.contest_message_type == "Work" && ma.status == 2 %> diff --git a/app/views/users/_user_message_contest.html.erb b/app/views/users/_user_message_contest.html.erb index b00af260e..5370ad218 100644 --- a/app/views/users/_user_message_contest.html.erb +++ b/app/views/users/_user_message_contest.html.erb @@ -141,19 +141,11 @@ 发布了竞赛题：
            • - <% if User.current.contestant_of_contest?(ma.contest_message.contest) && cur_user_works_for_work(ma.contest_message).nil? && ma.contest_message.work_status == 1 %> - <%= link_to ma.contest_message.name, new_contestant_work_path(:work => ma.contest_message.id), - :class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}", - :target => '_blank', - :title => "竞赛题：#{ma.contest_message.name}" - %> - <% else %> - <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), - :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", - :target => '_blank', - :title => "竞赛题：#{ma.contest_message.name}" - %> - <% end %> + <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), + :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", + :target => '_blank', + :title => "竞赛题：#{ma.contest_message.name}" + %>
          • <%= time_tag(ma.created_at).html_safe %>
            • diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index dd334d362..e970ec3a4 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -66,23 +66,11 @@ 发布了班级作业：
          • - <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %> - <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id), - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :target => '_blank', - :title => "作业标题：#{ma.course_message.name}" - %> - - - <% else %> - <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), - :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :target => '_blank', - :title => "作业标题：#{ma.course_message.name}" - %> - - - <% end %> + <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), + :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + :target => '_blank', + :title => "作业标题：#{ma.course_message.name}" + %>
        + \ No newline at end of file diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb index e850d96c2..f417700ac 100644 --- a/app/views/account/email_valid.html.erb +++ b/app/views/account/email_valid.html.erb @@ -1,97 +1,55 @@ -<%= l(:label_regiter_account)%> - <% email = @user.mail.split("@")[1] %> -
        -
        diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 267c7987e..5721e565b 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -1,164 +1,103 @@ -
        -
        -
      注册 - 登录 + 登录
    \ No newline at end of file diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb index 8c8057b9a..dd4185b5f 100644 --- a/app/views/games/_file_edit_form.html.erb +++ b/app/views/games/_file_edit_form.html.erb @@ -4,7 +4,7 @@
  • - \ No newline at end of file diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb index 703a0a8ef..c61030f1e 100644 --- a/app/views/shixuns/_shixun_top.html.erb +++ b/app/views/shixuns/_shixun_top.html.erb @@ -6,7 +6,10 @@ /

    <%= @shixun.name %>

    <% if allow_shixun_exec(@shixun) %> - <%= link_to "开始挑战", shixun_monitor_shixun_path(@shixun), :class => "fr task-btn task-btn-orange", :remote => true %> + <%= link_to "开始挑战", shixun_monitor_shixun_path(@shixun), + :class => "fr task-btn task-btn-orange", + :id => "challenge_begin", + :remote => true %> <% end %>
    • @@ -30,4 +33,4 @@
  • ">配置
    • <% end %> -
    +
    \ No newline at end of file diff --git a/app/views/shixuns/shixun_monitor.js.erb b/app/views/shixuns/shixun_monitor.js.erb index a6576a1e8..47b3f1526 100644 --- a/app/views/shixuns/shixun_monitor.js.erb +++ b/app/views/shixuns/shixun_monitor.js.erb @@ -1,2 +1,3 @@ +$("#challenge_begin").hide(); var htmlvalue = "<%= escape_javascript(render :partial => 'shixuns/monitor_tip') %>"; pop_box_new(htmlvalue,460,316); \ No newline at end of file