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

shang

This commit is contained in:
yanxd 2014-03-27 17:12:35 +08:00
parent 35d1c33a29
commit 3097f23c06
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/base.html.erb
View File

@ -19,11 +19,11 @@
@nav_dispaly_contest_label = 1 @nav_dispaly_contest_label = 1
elsif (realUrl.match(/course\.trustie\.net/)) elsif (realUrl.match(/course\.trustie\.net/))
@nav_dispaly_course_all_label = 1 @nav_dispaly_course_all_label = 1
@nav_dispaly_teacher_all_label = 1 # @nav_dispaly_teacher_all_label = 1
@nav_dispaly_forum_label = 1 @nav_dispaly_forum_label = 1
elsif (realUrl.match(/user\.trustie\.net/)) elsif (realUrl.match(/user\.trustie\.net/))
@nav_dispaly_project_label = 1 @nav_dispaly_project_label = 1
@nav_dispaly_user_label = 1 # @nav_dispaly_user_label = 1
@nav_dispaly_forum_label = 1 @nav_dispaly_forum_label = 1
elsif (realUrl.match(/forge\.trustie\.net/)) elsif (realUrl.match(/forge\.trustie\.net/))
@nav_dispaly_project_label = 1 @nav_dispaly_project_label = 1

10
app/views/welcome/course.html.erb
View File

@ -122,11 +122,13 @@
(<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>) (<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>)
</div> </div>
<div class='desc_item' style=""> <div class='desc_item' style="">
<span class='font_bolder'> <span class=''>
<%=l :label_main_teacher%>: <%=Course.find_by_extra(project.identifier).try(:teacher).try(:name)%> <% course = Course.find_by_extra(project.identifier) %>
<%= course.teacher.user_extensions.occupation.try(:gsub, /(.+)$/, '\1:') %>
</span> </span>
<span class='font_italic'> <span class='font_bolder'>
<%= Course.find_by_extra(project.identifier).teacher.user_extensions.occupation %> <%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %>
<%#=course.try(:teacher).try(:name)%>
</span> </span>
</div> </div>
<!-- <div class='desc_item' style=""> <!-- <div class='desc_item' style="">