jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

This commit is contained in:
cxt 2016-01-07 15:29:38 +08:00
parent 151c08ac5c e9d986b311
commit 2b75c1e11a
3 changed files with 684 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1360
app/controllers/exercise_controller.rb
View File

File diff suppressed because it is too large Load Diff

3
app/views/users/_course_homework.html.erb
View File

@ -152,6 +152,7 @@
<div class="fl mr20 fontGrey3 w80">
已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
</div>
<div class="cl"></div>
<% projects.each do |pro| %>
<% project = Project.find pro.project_id %>
<script type="text/javascript">
@ -164,7 +165,7 @@
});
</script>
<div class="mr20 mb10 fl w80" style="text-align: center;">
<div class="mr20 mb10 mt10 fl w110 fontGrey3" style="text-align: center;">
<% 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 %>

3
public/stylesheets/new_user.css
View File

@ -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;}