diff --git a/app/views/account/avatar.html.erb b/app/views/account/avatar.html.erb index b0a5eed9f..4fd128767 100644 --- a/app/views/account/avatar.html.erb +++ b/app/views/account/avatar.html.erb @@ -16,7 +16,7 @@
- 本地上传 + 本地上传 @@ -100,7 +100,7 @@ testend = teststr.match(/[^\\]+\.[^\(]+/i); //直接完整文件名的 filename.innerHTML = testend; $(filename).css("color", '#333'); - $(".avatar-save").removeClass("task-btn-grey").addClass("task-btn-blue"); + $(".avatar-save").removeClass("task-btn-grey").addClass("task-btn-orange"); $(".avatar-save").on("click", save_avatar); } diff --git a/app/views/account/security_settings.html.erb b/app/views/account/security_settings.html.erb index 7c60bf230..13f6fe657 100644 --- a/app/views/account/security_settings.html.erb +++ b/app/views/account/security_settings.html.erb @@ -4,7 +4,7 @@ <% if @user.phone.blank? %>
  • 未绑定
  •  
    • -
  • 绑定
    • +
  • 绑定
    • <% else %>
  • 已绑定
  • 您绑定的手机：<%= @user.user_phone %>
    • @@ -16,7 +16,7 @@ <% if @user.mail.blank? %>
  • 未绑定
  •  
    • -
  • 绑定
    • +
  • 绑定
    • <% else %>
  • 已绑定
  • 您绑定的邮箱：<%= @user.user_mail %>
    • @@ -27,7 +27,7 @@ - + diff --git a/app/views/admin/_authentication_list.html.erb b/app/views/admin/_authentication_list.html.erb index a2e1a2862..d35d2b6e6 100644 --- a/app/views/admin/_authentication_list.html.erb +++ b/app/views/admin/_authentication_list.html.erb @@ -36,7 +36,7 @@
  • - 确定 + 确定 取消
    • diff --git a/app/views/courses/_compare_code_tips_1.html.erb b/app/views/courses/_compare_code_tips_1.html.erb index 19bf87edb..da52a5ae0 100644 --- a/app/views/courses/_compare_code_tips_1.html.erb +++ b/app/views/courses/_compare_code_tips_1.html.erb @@ -10,8 +10,8 @@

    代码查重已完成，点击查看结果

    - 重新查重 - 查看结果 + 重新查重 + 查看结果
    diff --git a/app/views/courses/_compare_code_tips_2.html.erb b/app/views/courses/_compare_code_tips_2.html.erb index 699ff94dd..434265a86 100644 --- a/app/views/courses/_compare_code_tips_2.html.erb +++ b/app/views/courses/_compare_code_tips_2.html.erb @@ -10,7 +10,7 @@

    <%=des%>

    - 确定 + 确定
    diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb index 6c6362652..fd7e0be01 100644 --- a/app/views/courses/_join_private_course.html.erb +++ b/app/views/courses/_join_private_course.html.erb @@ -28,7 +28,7 @@

    请至少选择一个身份

  • - 确定 + 确定 取消
    • diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index b83aaf3f9..8be672ced 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -84,7 +84,7 @@
  • - 保存 + 保存 <%= link_to '取消', courses_path, :class => 'task-btn fl' %>
    • diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index fe69cbbd1..962077bbb 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -79,7 +79,7 @@
  • - 保存 + 保存 <%= link_to '取消', course_path(@course), :class => 'task-btn fl ' %>
    • diff --git a/app/views/courses/settings/_add_teachers.html.erb b/app/views/courses/settings/_add_teachers.html.erb index 86fc7b18f..5fb7a0e7b 100644 --- a/app/views/courses/settings/_add_teachers.html.erb +++ b/app/views/courses/settings/_add_teachers.html.erb @@ -52,7 +52,7 @@ 取消 - 确定 + 确定 <% end %> diff --git a/app/views/courses/settings/_change_manager.html.erb b/app/views/courses/settings/_change_manager.html.erb index b201df8b0..6484a0bba 100644 --- a/app/views/courses/settings/_change_manager.html.erb +++ b/app/views/courses/settings/_change_manager.html.erb @@ -28,7 +28,7 @@ <% end %> 请选择一个教师 - 确定 + 确定 取消
    diff --git a/app/views/courses/settings/_choose_course_group.html.erb b/app/views/courses/settings/_choose_course_group.html.erb index c5e8acedc..2a1b6b4ac 100644 --- a/app/views/courses/settings/_choose_course_group.html.erb +++ b/app/views/courses/settings/_choose_course_group.html.erb @@ -15,7 +15,7 @@ <% end %>
    - 确定 + 确定 取消
    \ No newline at end of file diff --git a/app/views/courses/settings/_import_students.html.erb b/app/views/courses/settings/_import_students.html.erb index 2a6e8aed7..452f0670f 100644 --- a/app/views/courses/settings/_import_students.html.erb +++ b/app/views/courses/settings/_import_students.html.erb @@ -20,7 +20,7 @@
    - 确定 + 确定 取消
    <% end %> diff --git a/app/views/courses/settings/_moduels.html.erb b/app/views/courses/settings/_moduels.html.erb index 19b50d9ce..79f79f640 100644 --- a/app/views/courses/settings/_moduels.html.erb +++ b/app/views/courses/settings/_moduels.html.erb @@ -29,7 +29,7 @@ <% end %> -保存 +保存 取消
    \ No newline at end of file + diff --git a/app/views/exercise/_edit_multi.html.erb b/app/views/exercise/_edit_multi.html.erb index c8d0d913a..bf5b49605 100644 --- a/app/views/exercise/_edit_multi.html.erb +++ b/app/views/exercise/_edit_multi.html.erb @@ -26,7 +26,7 @@

    温馨提示：[简答题]属于主观题需要人工评分，未作答的情况下系统将自动评分   参考答案仅作为人工评分的参考 - 保存 + 保存 取消

    diff --git a/app/views/exercise/_edit_single.html.erb b/app/views/exercise/_edit_single.html.erb index 212522326..70aa2b17a 100644 --- a/app/views/exercise/_edit_single.html.erb +++ b/app/views/exercise/_edit_single.html.erb @@ -49,7 +49,7 @@

    温馨提示：[填空题]属于客观题将由系统自动评分，请设置标准答案 - 保存 + 保存 取消

    diff --git a/app/views/exercise/_exercise_setting.html.erb b/app/views/exercise/_exercise_setting.html.erb index bb06b5ddf..758229dcc 100644 --- a/app/views/exercise/_exercise_setting.html.erb +++ b/app/views/exercise/_exercise_setting.html.erb @@ -350,7 +350,7 @@
    - 保存 + 保存 取消
    \ No newline at end of file diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb index 46f201dc7..934218340 100644 --- a/app/views/exercise/_new_MC.html.erb +++ b/app/views/exercise/_new_MC.html.erb @@ -55,7 +55,7 @@

    温馨提示：[单选题]属于客观题将由系统自动评分，请设置标准答案 - 保存 + 保存 取消

    diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index 5320f79e5..a5439bd21 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -50,7 +50,7 @@

    温馨提示：[多选题]属于客观题将由系统自动评分，请设置标准答案 - 保存 + 保存 取消

    diff --git a/app/views/exercise/_new_head.html.erb b/app/views/exercise/_new_head.html.erb index d651b3d0d..419ec5825 100644 --- a/app/views/exercise/_new_head.html.erb +++ b/app/views/exercise/_new_head.html.erb @@ -12,6 +12,6 @@

    - 保存 + 保存

    <% end %> \ No newline at end of file diff --git a/app/views/exercise/_new_multi.html.erb b/app/views/exercise/_new_multi.html.erb index 6e627a8ef..53caea779 100644 --- a/app/views/exercise/_new_multi.html.erb +++ b/app/views/exercise/_new_multi.html.erb @@ -24,7 +24,7 @@

    温馨提示：[简答题]属于主观题需要人工评分，未作答的情况下系统将自动评分   参考答案仅作为人工评分的参考 - 保存 + 保存 取消

    diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb index 7980355ff..9623b9657 100644 --- a/app/views/exercise/_new_single.html.erb +++ b/app/views/exercise/_new_single.html.erb @@ -33,7 +33,7 @@

    温馨提示：[填空题]属于客观题将由系统自动评分，请设置标准答案 - 保存 + 保存 取消

    diff --git a/app/views/exercise/_select_examination_list.html.erb b/app/views/exercise/_select_examination_list.html.erb new file mode 100644 index 000000000..9b84fb7ef --- /dev/null +++ b/app/views/exercise/_select_examination_list.html.erb @@ -0,0 +1,85 @@ + +
    +
    +

    选择试卷

    + +
    +
    +
    + 我的试卷 + +
    +
    + + × +
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + +
    + + +
    + + +
    + + +
    + + +
    +
    +
    +
    + +
    +
    + +
    + 确认 + 取消 +
    +
    +
    + +
    +
    + diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index 5816d35d8..22412b59b 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -59,6 +59,7 @@

    试卷列表

    <% if @is_teacher %> + 新建 + + 试卷选用 <% end %> @@ -72,4 +73,11 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/views/exercise/setting.html.erb b/app/views/exercise/setting.html.erb index 5e6272494..dc2c41bb0 100644 --- a/app/views/exercise/setting.html.erb +++ b/app/views/exercise/setting.html.erb @@ -370,7 +370,7 @@
    - 保存 + 保存 取消
    diff --git a/app/views/files/_attachment_history_popub.html.erb b/app/views/files/_attachment_history_popub.html.erb index ab7946407..d6459e546 100644 --- a/app/views/files/_attachment_history_popub.html.erb +++ b/app/views/files/_attachment_history_popub.html.erb @@ -57,7 +57,7 @@

    - 确定 + 确定 取消
    <% end %> diff --git a/app/views/files/_hidden_file.html.erb b/app/views/files/_hidden_file.html.erb index 8c9edefec..b72173a9b 100644 --- a/app/views/files/_hidden_file.html.erb +++ b/app/views/files/_hidden_file.html.erb @@ -25,7 +25,7 @@
    - 确定 + 确定 取消
    <% end %> diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb index d46ccd01b..36ba71019 100644 --- a/app/views/files/_upload_course_files.erb +++ b/app/views/files/_upload_course_files.erb @@ -71,7 +71,7 @@
    - 确定 + 确定 取消
    <% end %> diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index 9d026ad1a..8897b4190 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -8,14 +8,14 @@
    <% if @game.challenge.position > 1 %> <%= link_to "上一关 ", {:controller => 'games', :action => "prev_step", :id => @game, :myshixun_id => @myshixun}, - :class => "shixun-task-btn task-btn-blue mr15 mt8", :id => "prev_step", :remote => true %> + :class => "shixun-task-btn task-btn-orange mr15 mt8", :id => "prev_step", :remote => true %> <% end %>
    <% if @st == 0 %> - 评测 + 评测 <% else %> - 评测 + 评测 <% end %>
    @@ -25,11 +25,11 @@ <% if @had_done == 0 %> <% if show_next_stage?(@game, @myshixun.shixun.try(:status)) %> <%= link_to "下一关 ", {:controller => 'games', :action => "next_step", :id => @game, :myshixun_id => @myshixun}, - :class => "shixun-task-btn task-btn-blue mr15 mt8", :id => "next_step", :remote => true %> - + :class => "shixun-task-btn task-btn-orange mr15 mt8", :id => "next_step", :remote => true %> + <% end %> <% else %> - 离开 + 离开 <% end %>
    \ No newline at end of file diff --git a/app/views/student_work/_homework_setting.html.erb b/app/views/student_work/_homework_setting.html.erb index 3547bc864..81e5b8f3f 100644 --- a/app/views/student_work/_homework_setting.html.erb +++ b/app/views/student_work/_homework_setting.html.erb @@ -50,7 +50,7 @@
    - 保存 + 保存 取消
    diff --git a/app/views/student_work/_new_pro_student_work.html.erb b/app/views/student_work/_new_pro_student_work.html.erb index 9c0d8c3ca..b20d16083 100644 --- a/app/views/student_work/_new_pro_student_work.html.erb +++ b/app/views/student_work/_new_pro_student_work.html.erb @@ -66,7 +66,7 @@
  • - 测试代码 + 测试代码
    • @@ -135,7 +135,7 @@ <% unless @is_test %>
  • - 提交 + 提交 <%= link_to '取消', student_work_index_path(:homework => @homework.id), :class => 'task-btn fr mr10' %>
    • <% end %> \ No newline at end of file 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 9230a0153..dab17b9f3 100644 --- a/app/views/student_work/_no_teacher_score_notice.html.erb +++ b/app/views/student_work/_no_teacher_score_notice.html.erb @@ -8,7 +8,7 @@ 是否确定提交？

    取消 - 确定 + 确定
    diff --git a/app/views/student_work/_score_appeal_box.html.erb b/app/views/student_work/_score_appeal_box.html.erb index b10a17e35..6897b3078 100644 --- a/app/views/student_work/_score_appeal_box.html.erb +++ b/app/views/student_work/_score_appeal_box.html.erb @@ -19,7 +19,7 @@
    - 确定 + 确定 取消
    diff --git a/app/views/student_work/_student_work_replies.html.erb b/app/views/student_work/_student_work_replies.html.erb index 3154829fb..814d4df18 100644 --- a/app/views/student_work/_student_work_replies.html.erb +++ b/app/views/student_work/_student_work_replies.html.erb @@ -15,7 +15,7 @@ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value => @homework.id %>
    - 发布 + 发布

    <% end%> diff --git a/app/views/student_work/_student_work_score_div.html.erb b/app/views/student_work/_student_work_score_div.html.erb index b24fde87e..17d8b3436 100644 --- a/app/views/student_work/_student_work_score_div.html.erb +++ b/app/views/student_work/_student_work_score_div.html.erb @@ -44,7 +44,7 @@
  • - 确定 + 确定
    • diff --git a/app/views/student_work/_upload_attachment.html.erb b/app/views/student_work/_upload_attachment.html.erb index 5cedbbcd7..71c8a627c 100644 --- a/app/views/student_work/_upload_attachment.html.erb +++ b/app/views/student_work/_upload_attachment.html.erb @@ -16,7 +16,7 @@
    - + 选择文件 <%= file_field_tag 'attachments[dummy][file]', :id => '_file', @@ -50,7 +50,7 @@

    - 确定 + 确定 取消
    diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb index 47c54f64e..770a40052 100644 --- a/app/views/student_work/edit.html.erb +++ b/app/views/student_work/edit.html.erb @@ -121,7 +121,7 @@
    <% end %>
  • - 提交 + 提交 <%=link_to '取消', student_work_index_path(:homework => @homework.id),:class=>'task-btn fr mr10' %>
    • <% else %> diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index db00d8010..0d15ffd2d 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -326,7 +326,7 @@ <%#= user_work_status @homework %> <%# end %> <%# if @homework.homework_type == 4 && !@homework.student_works.where(:user_id => User.current.id, :work_status => 0).blank? %> - <%#= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %> + <%#= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-orange fr mr10',:target => "_blank" %> <%# end %> <% end %> diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index a8c9fc348..7a502d7b3 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -121,7 +121,7 @@ <% end %>
  • - 提交 + 提交 <%=link_to '取消', student_work_index_path(:homework => @homework.id),:class=>'task-btn fr mr10' %>
    • <% end %> diff --git a/app/views/subjects/_choose_shixun.html.erb b/app/views/subjects/_choose_shixun.html.erb index cb314cf8f..0022810e8 100644 --- a/app/views/subjects/_choose_shixun.html.erb +++ b/app/views/subjects/_choose_shixun.html.erb @@ -16,7 +16,7 @@

    请至少选择一个课程

  • - 确定 + 确定 取消
    • diff --git a/app/views/subjects/_course_shixun_list.html.erb b/app/views/subjects/_course_shixun_list.html.erb index 579ee004b..8171c479a 100644 --- a/app/views/subjects/_course_shixun_list.html.erb +++ b/app/views/subjects/_course_shixun_list.html.erb @@ -36,7 +36,7 @@
    - 选择 + 选择 取消
    diff --git a/app/views/subjects/_my_course_shixun_list.html.erb b/app/views/subjects/_my_course_shixun_list.html.erb index 6b4416489..dd4c34e8a 100644 --- a/app/views/subjects/_my_course_shixun_list.html.erb +++ b/app/views/subjects/_my_course_shixun_list.html.erb @@ -1,6 +1,6 @@
    -

    选择实训

    +

    选择实训

    diff --git a/app/views/subjects/_publish_notice.html.erb b/app/views/subjects/_publish_notice.html.erb index 7b546e7eb..749d1c0f3 100644 --- a/app/views/subjects/_publish_notice.html.erb +++ b/app/views/subjects/_publish_notice.html.erb @@ -17,9 +17,9 @@
    <% if @status == 1 %> - <%= link_to "知道啦", subject_path(@subject), :class => "task-btn task-btn-blue pop_close" %> + <%= link_to "知道啦", subject_path(@subject), :class => "task-btn task-btn-orange pop_close" %> <% else %> - 知道啦 + 知道啦 <% end %>
    diff --git a/app/views/subjects/edit.html.erb b/app/views/subjects/edit.html.erb index 845ad9424..fe5139a6a 100644 --- a/app/views/subjects/edit.html.erb +++ b/app/views/subjects/edit.html.erb @@ -48,7 +48,7 @@
  • <%= link_to "取消", subject_path(@subject), :class => "task-btn fl mr10 ml20" %> - 保存 + 保存
    • <% end %> diff --git a/app/views/subjects/new.html.erb b/app/views/subjects/new.html.erb index cfa6ae8ea..2c34ce5db 100644 --- a/app/views/subjects/new.html.erb +++ b/app/views/subjects/new.html.erb @@ -54,7 +54,7 @@
  • <%= link_to "取消", subjects_path(), :class => "task-btn fl mr10 ml20" %> - 保存 + 保存
    • <% end %> diff --git a/app/views/syllabus_member/_sy_change_manager.html.erb b/app/views/syllabus_member/_sy_change_manager.html.erb index 17ae3157a..9a32d61bc 100644 --- a/app/views/syllabus_member/_sy_change_manager.html.erb +++ b/app/views/syllabus_member/_sy_change_manager.html.erb @@ -27,7 +27,7 @@ <% end %> 请先选择成员 - 确定 + 确定 取消
    diff --git a/app/views/syllabuses/_add_sy_member_box.html.erb b/app/views/syllabuses/_add_sy_member_box.html.erb index 453fac9e0..527cc7e70 100644 --- a/app/views/syllabuses/_add_sy_member_box.html.erb +++ b/app/views/syllabuses/_add_sy_member_box.html.erb @@ -22,7 +22,7 @@ <% end %> 该用户已添加至右侧列表 - 确定 + 确定 取消
    diff --git a/app/views/syllabuses/_delete_syllabus.html.erb b/app/views/syllabuses/_delete_syllabus.html.erb index 632dcddc3..253528553 100644 --- a/app/views/syllabuses/_delete_syllabus.html.erb +++ b/app/views/syllabuses/_delete_syllabus.html.erb @@ -18,12 +18,12 @@ <% if @syllabus.courses.not_deleted.empty? %>
    - 取消 - <%=link_to '确认', syllabus_path(@syllabus), :class => 'task-btn task-btn-blue fr', :method => 'delete'%> + 取消 + <%=link_to '确认', syllabus_path(@syllabus), :class => 'task-btn task-btn-orange fr', :method => 'delete'%>
    <% else %>
    - 确定 + 确定
    <% end %> \ No newline at end of file diff --git a/app/views/syllabuses/_sy_send_homework.html.erb b/app/views/syllabuses/_sy_send_homework.html.erb index 9b7f994b3..c076066ef 100644 --- a/app/views/syllabuses/_sy_send_homework.html.erb +++ b/app/views/syllabuses/_sy_send_homework.html.erb @@ -26,7 +26,7 @@ <% end %>
    - 确定 + 确定 取消
    diff --git a/app/views/syllabuses/_sy_send_resource.html.erb b/app/views/syllabuses/_sy_send_resource.html.erb index 68f8bfe33..c65c1f57d 100644 --- a/app/views/syllabuses/_sy_send_resource.html.erb +++ b/app/views/syllabuses/_sy_send_resource.html.erb @@ -26,7 +26,7 @@ <% end %>
    - 确定 + 确定 取消
    diff --git a/app/views/syllabuses/_sy_send_resource_and_homework.html.erb b/app/views/syllabuses/_sy_send_resource_and_homework.html.erb index 05dca5296..01b75bd26 100644 --- a/app/views/syllabuses/_sy_send_resource_and_homework.html.erb +++ b/app/views/syllabuses/_sy_send_resource_and_homework.html.erb @@ -23,7 +23,7 @@ <% end %>
    - 确定 + 确定 取消
    diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb index 7151e2b5b..a56e3cbbe 100644 --- a/app/views/syllabuses/edit.html.erb +++ b/app/views/syllabuses/edit.html.erb @@ -104,7 +104,7 @@
  • - 保存 + 保存 <%= link_to "取消",syllabus_path(@syllabus),:class => "task-btn fr mr10"%>
    • diff --git a/app/views/syllabuses/new.html.erb b/app/views/syllabuses/new.html.erb index 8e09b90c6..afecf5cb3 100644 --- a/app/views/syllabuses/new.html.erb +++ b/app/views/syllabuses/new.html.erb @@ -107,7 +107,7 @@
  • - 保存 + 保存 <%= link_to "取消",user_path(User.current),:class => "task-btn fr mr10"%>
    • diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index 55494445a..0c4ee4554 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -58,7 +58,7 @@ --> <%# if @is_syllabus_teacher || @is_authen_teacher %> - <%#= link_to '选用', choose_user_course_syllabus_path(@syllabus, :type => 'A'), :class => 'task-btn task-btn-blue fr ml20', :style => '', :remote => true %> + <%#= link_to '选用', choose_user_course_syllabus_path(@syllabus, :type => 'A'), :class => 'task-btn task-btn-orange fr ml20', :style => '', :remote => true %> <%# end %> diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb index 3fcd856bb..33ac05126 100644 --- a/app/views/users/_course_attachment.html.erb +++ b/app/views/users/_course_attachment.html.erb @@ -6,7 +6,7 @@
    - <%= link_to activity.filename, course_files_path(activity.course), :class => "color-dark" %> + <%= link_to activity.filename, course_files_path(activity.course), :class => "color-grey3" %>
    <% if activity.try(:author).show_real_name == ' ' %> diff --git a/app/views/users/_import_resource_info.html.erb b/app/views/users/_import_resource_info.html.erb index 7139e1e7b..b90b41df2 100644 --- a/app/views/users/_import_resource_info.html.erb +++ b/app/views/users/_import_resource_info.html.erb @@ -57,7 +57,7 @@ <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
    - 选用 + 选用 取消
    diff --git a/app/views/users/_myjoin_shixun_list.html.erb b/app/views/users/_myjoin_shixun_list.html.erb index d693a1bae..e8fb646c7 100644 --- a/app/views/users/_myjoin_shixun_list.html.erb +++ b/app/views/users/_myjoin_shixun_list.html.erb @@ -25,7 +25,7 @@ <%= time_from_now(shixun.updated_at) %>更新

    - 查看详情 + 查看详情 <% end %> <% end %> diff --git a/app/views/users/_myshixuns_list.html.erb b/app/views/users/_myshixuns_list.html.erb index 5a5a5c5fb..774e50be9 100644 --- a/app/views/users/_myshixuns_list.html.erb +++ b/app/views/users/_myshixuns_list.html.erb @@ -16,7 +16,7 @@ <%= format_time(shixun.updated_at) %> 更新

    - 查看详情 + 查看详情 <% end %> <% end %> diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb index 2c4a7b6cc..0696d0755 100644 --- a/app/views/users/_reply_to.html.erb +++ b/app/views/users/_reply_to.html.erb @@ -9,7 +9,7 @@
    - +

    <% end%> @@ -19,7 +19,7 @@
    - +

    <% end%> @@ -33,7 +33,7 @@ <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@activity_id %>
    - +
    <% end%> <% elsif @type == 'Message' %> @@ -43,7 +43,7 @@ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
    - +

    <% end%> @@ -54,7 +54,7 @@ <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %>
    - +

    <% end%> @@ -64,7 +64,7 @@ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
    - +

    <% end%> @@ -73,7 +73,7 @@ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
    - +

    <% end%> @@ -83,7 +83,7 @@ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
    - +

    <% end %> @@ -92,7 +92,7 @@
    - +

    <% end%> @@ -105,7 +105,7 @@ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
    - +

    <% end%> @@ -114,7 +114,7 @@
    - 发送 + 发送

    <% end%> <% end %> diff --git a/app/views/users/_reply_to_comment.html.erb b/app/views/users/_reply_to_comment.html.erb index 7449c1285..d6bd8cb3e 100644 --- a/app/views/users/_reply_to_comment.html.erb +++ b/app/views/users/_reply_to_comment.html.erb @@ -6,7 +6,7 @@ <%= form_for('new_form',:url => {:controller => 'users', :action => 'reply_detail', :reply_id => reply.id, :type => @type, :is_project => @is_project, :user_activity_id => @user_activity_id},:method => "post", :remote => true) do |f| %>
    - +

    <% end%> diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb index 3bcb67e7c..9c8adf94c 100644 --- a/app/views/users/_resource_share_popup.html.erb +++ b/app/views/users/_resource_share_popup.html.erb @@ -24,7 +24,7 @@
    - 确定 + 确定 取消
    diff --git a/app/views/users/_share_message_to_course.html.erb b/app/views/users/_share_message_to_course.html.erb index 86a59b22f..1e713fd77 100644 --- a/app/views/users/_share_message_to_course.html.erb +++ b/app/views/users/_share_message_to_course.html.erb @@ -29,7 +29,7 @@
    <%#= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %> - 确定 + 确定 取消
    diff --git a/app/views/users/_show_user_homework_form.html.erb b/app/views/users/_show_user_homework_form.html.erb index 029912924..b674289a5 100644 --- a/app/views/users/_show_user_homework_form.html.erb +++ b/app/views/users/_show_user_homework_form.html.erb @@ -25,7 +25,7 @@
    - 确定 + 确定 取消
    diff --git a/app/views/welcome/_one_btn_mask_pop.html.erb b/app/views/welcome/_one_btn_mask_pop.html.erb index af9ccf6a6..977713bb7 100644 --- a/app/views/welcome/_one_btn_mask_pop.html.erb +++ b/app/views/welcome/_one_btn_mask_pop.html.erb @@ -21,7 +21,7 @@ <%#= tip2 %>

    -->
    - 知道了 + 知道了
    diff --git a/app/views/welcome/_two_btn_mask_pop.html.erb b/app/views/welcome/_two_btn_mask_pop.html.erb index 6b035ca4b..46d028f4c 100644 --- a/app/views/welcome/_two_btn_mask_pop.html.erb +++ b/app/views/welcome/_two_btn_mask_pop.html.erb @@ -26,12 +26,12 @@ <% end %> <%# if @authentication %> - + <%# else %> - - + + <%# end %>
    @@ -41,7 +41,7 @@

    请填写推荐人信息或申请理由

    - 试用申请 + 试用申请
    <% end %> diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js index 0c0c8885f..e7d63f74f 100644 --- a/public/javascripts/edu/application.js +++ b/public/javascripts/edu/application.js @@ -267,14 +267,14 @@ function pop_box_new(value, Width, Height){ function op_confirm_box(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 578, 205); } function op_confirm_box_loading(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 578, 205); } @@ -282,7 +282,7 @@ function op_confirm_box_loading(url, str){ function s_op_confirm_box(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 205); } @@ -290,7 +290,7 @@ function s_op_confirm_box(url, str){ function delete_confirm_box(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -298,7 +298,7 @@ function delete_confirm_box(url, str){ function delete_confirm_box_2(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -306,7 +306,7 @@ function delete_confirm_box_2(url, str){ function delete_confirm_box_3(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -314,7 +314,7 @@ function delete_confirm_box_3(url, str){ function delete_confirm_box_4(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -323,7 +323,7 @@ function delete_confirm_box_4(url, str){ function notice_sure_box(str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '知道啦
    '; + '知道啦'; pop_box_new(htmlvalue, 480, 140); } @@ -332,7 +332,7 @@ function notice_sure_box(str){ function notice_box(str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -342,7 +342,7 @@ function notice_box(str){ function long_notice_box(str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 575, 140); } @@ -351,7 +351,7 @@ function long_notice_box(str){ function yes_notice_box(str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '知道啦
    '; + '知道啦'; pop_box_new(htmlvalue, 575, 200); } @@ -360,7 +360,7 @@ function yes_notice_box(str){ function sure_box_redirect(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '知道啦
    '; + '知道啦'; pop_box_new(htmlvalue, 480, 140); } @@ -369,7 +369,7 @@ function sure_box_redirect(url, str){ function sure_box_redirect_without_newtab(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '知道啦
    '; + '知道啦'; pop_box_new(htmlvalue, 480, 140); } @@ -378,7 +378,7 @@ function sure_box_redirect_without_newtab(url, str){ function notice_box_redirect(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -387,7 +387,7 @@ function notice_box_redirect(url, str){ function notice_box_redirect_remote(url, str){ var htmlvalue = '

    提示

    '+ '

    ' + str + '

    '+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -395,7 +395,7 @@ function notice_box_redirect_remote(url, str){ function re_entry(url){ var htmlvalue = '

    提示

    '+ '

    您的会话已退出，请重新登录^_^

    '+ - '重新登录
    '; + '重新登录'; pop_box_new(htmlvalue, 480, 140); } diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js index d99948fc5..9c6aa1469 100644 --- a/public/javascripts/edu/base_edu.js +++ b/public/javascripts/edu/base_edu.js @@ -836,7 +836,7 @@ function hide_edit_setting(){ function setting_cancel_edit(fn){ var htmlvalue = '

    提示

    '+ '

    修改的内容将全部丢失
    是否确认取消保存

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); } @@ -1088,7 +1088,7 @@ function alert_choose_homework_bank_type(){ '
    请先选择作业类型
    ' + '
    ' + '取消' + - '确定' + + '确定' + '
    ' + '' + '' + @@ -1174,7 +1174,7 @@ function destroy_all_hb(url){ $("#choose_homework_bank_to_send_notice_h").html("").hide(); var htmlvalue = '

    提示

    '+ '

    确定要删除所选题目吗?

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue,480,140); $("#destroy_all_hb_btn").on('click',function(){ $.ajax({ diff --git a/public/javascripts/edu/course.js b/public/javascripts/edu/course.js index f3817df3a..d1474a019 100644 --- a/public/javascripts/edu/course.js +++ b/public/javascripts/edu/course.js @@ -161,7 +161,7 @@ function add_new_group(id){ '' + '
    ' + '该分班已存在' + - '确定' + + '确定' + '取消' + '' + ''; @@ -217,7 +217,7 @@ function rename_group_name(course_id, group_id){ '' + '
    ' + '该分班已存在' + - '确定' + + '确定' + '取消' + '' + ''; @@ -262,7 +262,7 @@ function delete_group(course_id, group_id){ '

    确定要删除吗？
    删除分班后，该分班的学生需要重新选择分班。' + '' + '

    ' + - '确定' + + '确定' + '取消' + '
    ' + ''; @@ -552,7 +552,7 @@ function delete_students(type, id, group_id){ $("#no_student_notice").hide(); var htmlvalue = '

    提示

    '+ '

    确定要删除这些学生吗？

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue, 480, 140); $("#confirm-button").on('click',function(){ hideModal(); diff --git a/public/javascripts/edu/homework.js b/public/javascripts/edu/homework.js index 7d28bd571..3ef194430 100644 --- a/public/javascripts/edu/homework.js +++ b/public/javascripts/edu/homework.js @@ -123,7 +123,7 @@ $(function(){ if($('.edu-tab-con-box .ProResultList').length<=0){ var htmlvalue = '

    提示

    '+ '

    测试后才能提交，是否立刻测试?

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue,575,140); $("#code-test-button").on('click',function(){ test_program(); @@ -139,7 +139,7 @@ $(function(){ console.log(tested); var htmlvalue = '

    提示

    '+ '

    测试不通过，是否强制提交?

    取消'+ - '确定
    '; + '确定'; pop_box_new(htmlvalue,575,140); $('#commit-program-work-btn').show(); return; @@ -314,7 +314,7 @@ function alert_choose_homework_type(id){ '
    请先选择作业类型
    ' + '
    ' + '取消' + - '确定' + + '确定' + '
    ' + '' + '' + diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index fb481a197..d37444981 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -130,11 +130,10 @@ a.task-btn{cursor: pointer;display: inline-block;font-weight: bold;border: none; a:hover.task-btn {background: #c3c3c3; color: #666;} a.task-btn-green{background: #29bd8b; color: #fff!important;} a:hover.task-btn-green{background: #19b17e;} -a.task-btn-orange{ background:#fc8675; color:#fff !important;} -a:hover.task-btn-orange{ background:#fc8675;} -a.task-btn-blue{background: #3498db; color:#fff!important;} a.task-btn-orange{background: #FF7500; color:#fff!important;} -a:hover.task-btn-blue{background: #5faee3;color:#fff;} +a:hover.task-btn-orange{ background:#ff7500;} +a.task-btn-blue{background: #199ed8; color:#fff!important;} +a:hover.task-btn-blue{background: #199ed8;color:#fff;} a.task-btn-grey{background-color: #d4d6d8; color: #4d555d!important;} a:hover.task-btn-grey{background-color: #d4d6d8; color: #4d555d;} a.task-btn-grey-white{background-color: #c2c4c6; color: #fff;}