diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb index 32e351c93..c138fac0a 100644 --- a/app/views/homework_common/_homework_detail_programing_form.html.erb +++ b/app/views/homework_common/_homework_detail_programing_form.html.erb @@ -78,7 +78,7 @@
  • - +
  • diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index c1e82ad25..a1f328721 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -54,7 +54,11 @@ <%= @homework.homework_type == 2 ? "提交代码" : "作品描述"%>    : - <%= f.text_area "description", :class => "w620 hwork_txt ", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();", :value => "#include\nint main(int argc, char** argv)\n{\n\t//在此填写逻辑代码\n\treturn 0;\n}"%> + <% if @homework.homework_type == 2%> + <%= f.text_area "description", :class => "w620 hwork_txt", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();", :value => "// 这是一个C语言的样例程序\n// 功能:输入两个整数,输出两者之和\n// 测试:老师可以给出以下测试集:\n// 输入1和2,输出3\n// 输入3和4,输出7\n// 那么下面这段代码将得到满分\n\n// 注意:编程作业采用命令行传参方式\n// 程序的所有输入都通过argv传入\n// 否则您的程序将被判错\n\n#include //引用必须头文件\n\nint main(int argc, char** argv) {\n\tint a = atoi(argv[1]); //将第一个输入转成整型\n\tint b = atoi(argv[2]); //将第二个输入转换为整型\n\tprintf('%d',a+b); //输出a+b\n\treturn 0;\n}"%> + <% else %> + <%= f.text_area "description", :class => "w620 hwork_txt h350", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();"%> + <% end%>

    diff --git a/config/locales/zh.yml b/config/locales/zh.yml index c79e76bfe..ec51afcee 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2057,6 +2057,3 @@ zh: label_file_lost_list: 缺失文件列表 lable_unset: 未设置 label_chose_group: 请选择分班 - - - diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index bdd01f804..fd9a4d44e 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -226,6 +226,7 @@ a:hover.ping_sub{ background:#14a8b9;} .w430{ width:470px;} .w557{ width:557px;} .w350{ width:350px;} +.h350{height: 350px !important;} .w620{ width:480px; height:160px; border:1px solid #CCC;} .bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px; } .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; }