From e9d986b311b3d140d3fc0c1c2f61797e18844d93 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 6 Jan 2016 11:01:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=85=B3=E8=81=94=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 3 ++- public/stylesheets/new_user.css | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index f74cdcf54..f7eae22db 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -152,6 +152,7 @@
已关联项目:<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
+
<% projects.each do |pro| %> <% project = Project.find pro.project_id %> -
+
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> <% else %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 346d6b3a7..7c59f673b 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -121,6 +121,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .w70{ width:70px;} .w80{ width:80px;} .w90{ width:90px;} +.w110{width:110px;} .w210{ width:210px;} .w150{ width:150px;} .w280{ width:280px;} @@ -1384,7 +1385,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;} .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .mr150 {margin-right:150px;} -.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} +.captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} /* @功能 定义 */ span.at {color:#269ac9;}