diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb index 064444f04..b2bf0bd59 100644 --- a/app/views/student_work/_evaluation_title.html.erb +++ b/app/views/student_work/_evaluation_title.html.erb @@ -2,8 +2,8 @@ 序号   - 作品名称 <% if @homework.homework_type != 3 %> + 作品名称 姓名 @@ -11,9 +11,12 @@ 学号 <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + 作品名称 关联项目 + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + 作品名称 <% end %> 时间 diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index 98e9f1f64..b52f34580 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -2,9 +2,9 @@ 序号   - 作品名称 <% if @homework.homework_type != 3 %> - + 作品名称 + <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%> <% if @show_all && @order == "lastname"%> <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> @@ -17,9 +17,12 @@ <% end%> <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + 作品名称 关联项目 + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + 作品名称 <% end %> <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%> diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index ecdde77d8..a184d4140 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -5,20 +5,26 @@ <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %> - - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> -
- <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> -
- - <% if @homework.homework_type != 3 %> + <% if @homework.homework_type != 3 %> + + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> +
+ <%= student_work.user.show_name%> " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;"> - <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> +
+ <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> <%= link_to( student_work.project.name, project_path(student_work.project.id))%> @@ -28,7 +34,14 @@ <%= student_work.project.name %> <% end %> - <% end %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> +
+ + <% end %> <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 0259fddf7..5007b7e47 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -20,6 +20,12 @@ <% if @homework.homework_type != 3 %> + +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
+ <%= student_work.user.show_name%> @@ -27,6 +33,12 @@ <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
+ <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> <%= link_to( student_work.project.name, project_path(student_work.project.id))%> @@ -36,6 +48,13 @@ <%= student_work.project.name %> <% end %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
+ <% end %> <% else%> <%=index + 1 %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 55f2a0ffc..101a54efc 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -61,6 +61,8 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .hworkList160 {width:160px; text-align:center;} .hworkList220 {width:220px; text-align:center;} .hworkList260 {width:260px; text-align:left;} +.hworkList290 {width:290px; text-align:left;} +.hworkList420 {width:420px; text-align:left;} .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px; width:714px; margin-bottom:10px; } .hworkName {width:80px; float:left; line-height:18px;} .hworkName div{max-height: 36px;overflow: hidden;} @@ -91,6 +93,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re .width130{width: 130px;} .width165{width: 165px;} .width180{width: 180px;} +.width290{width: 290px;} .width525{width: 525px;} .width285{width: 285px;} .width255{width: 255px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 4ffc33776..9e1d97608 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -159,6 +159,7 @@ h4{ font-size:14px; color:#3b3b3b;} .w230{width:230px !important;} .w235{ width:235px !important;} .w250{ width:250px !important;} +.w410{ width:410px !important;} .w280{ width:280px;} .w265{ width: 265px;} .w270{ width: 270px;}