hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改课程列表显示内容，修复作业列表显示bug

Browse Source
exceptionHandle
nieguanghui 12 years ago
parent bf6fe70ec9
commit 606c998247
4 changed files with 132 additions and 109 deletions
Show Stats Download Patch File Download Diff File

4
app/controllers/bids_controller.rb
Unescape View File

@ -38,6 +38,7 @@ class BidsController < ApplicationController
@bids = @bids.offset(@offset).limit(@limit).all.reverse
else
limit = @bid_count % @limit
limit = @limit if limit == 0
@bids = @bids.offset(@offset).limit(limit).all.reverse
end
@s_state = 0
@ -46,6 +47,7 @@ class BidsController < ApplicationController
@bids = @bids.reorder('bids.commit').offset(@offset).limit(@limit).all.reverse
else
limit = @bid_count % @limit
limit = @limit if limit == 0
@bids = @bids.reorder('bids.commit').offset(@offset).limit(limit).all.reverse
end
@s_state = 1
@ -54,6 +56,7 @@ class BidsController < ApplicationController
@bids = @bids.offset(@offset).limit(@limit).all.reverse
else
limit = @bid_count % @limit
limit = @limit if limit == 0
@bids = @bids.offset(@offset).limit(@limit).all.reverse
end
@s_state = 0
@ -63,6 +66,7 @@ class BidsController < ApplicationController
@bids = @bids.reorder('bids.commit').offset(@offset).limit(@limit).all.reverse
else
limit = @bid_count % @limit
limit = @limit if limit == 0
@bids = @bids.reorder('bids.commit').offset(@offset).limit(limit).all.reverse
end
@s_state = 1

175
app/views/layouts/base_courses.html.erb
Unescape View File

@ -21,11 +21,11 @@
<div id="wrapper2">
<div id="wrapper3">
<% if session[:enterprise_college] == 2 %>
<%=render :partial => 'layouts/base_enterprise_header'%>
<%= render :partial => 'layouts/base_enterprise_header'%>
<% elsif session[:enterprise_college] == 1 %>
<%=render :partial => 'layouts/base_college_header'%>
<%= render :partial => 'layouts/base_college_header'%>
<% else %>
<%=render :partial => 'layouts/base_header'%>
<%= render :partial => 'layouts/base_header'%>
<% end %>
<div id="main">
@ -38,33 +38,29 @@
<% @course = Course.find_by_extra(@project.identifier)%>
<table>
<tr>
<td>
<% if(@project.project_type==1)%>
<% if get_avatar?(@project)%>
<%= link_to image_tag(url_to_avatar(@project), :class => "avatar2"), project_path(@project) %>
<% else %>
<%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(@project)%>
<% end %>
<% else %>
<%= link_to image_tag(url_to_avatar(@project), :class => "avatar2") %>
<% end %>
<!--<%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %>--></td>
<td> <% if(@project.project_type==1)%>
<% if get_avatar?(@project)%>
<%= link_to image_tag(url_to_avatar(@project), :class => "avatar2"), project_path(@project) %>
<% else %>
<%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(@project)%>
<% end %>
<% else %>
<%= link_to image_tag(url_to_avatar(@project), :class => "avatar2") %>
<% end %> </td>
<td align="center">
<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
<%= @project.name %>
</div>
<% unless @course.teacher.id == User.current.id%>
<%= @project.name %>
</div> <% unless @course.teacher.id == User.current.id%>
<%= join_in_course(@project, User.current)%>
<% end %>
</td>
<% end %> </td>
</tr>
</table>
</table>
</div>
<!--parameter-->
<div class="user_fans">
<table width="240" border="0">
<tr align="center" width="80px">
<% files_count = @project.attachments.count %>
@ -72,65 +68,64 @@
<% files_count += version.attachments.count %>
<% end %>
<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) ,:course =>'1'%></td>
<td class="font_index"><%=link_to files_count, project_files_path(@project) %></td>
<td class="font_index"><%= link_to "#{@project.members.count}", project_member_path(@project) ,:course =>'1'%></td>
<td class="font_index"><%= link_to files_count, project_files_path(@project) %></td>
<tr class="font_aram">
<td align="center" width="80px"> <%= "成员" %></td>
<td align="center" width="80px"> <%= "成员" %></td>
<td align="center" width="80px"><%= l(:label_course_data) %></td>
</tr>
</table>
<div class="user_underline"></div>
</div>
<!--info-->
<div class="inf_user_context">
<table style="font-family:微软雅黑" >
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_main_teacher) %></td><td class="font_lighter_sidebar"><%= @course.teacher.lastname+@course.teacher.firstname %></td>
</tr>
<!--info-->
<div class="inf_user_context">
<table style="font-family:微软雅黑" >
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_main_teacher) %></td><td class="font_lighter_sidebar"><%= @course.teacher.lastname+@course.teacher.firstname %></td>
</tr>
<!-- added by bai -->
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_course_time) %></td><td class="font_lighter_sidebar"><%= @course.time %></td>
</tr>
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_main_term) %></td><td class="font_lighter_sidebar"><%= @course.term %></td>
</tr>
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_course_time) %></td><td class="font_lighter_sidebar"><%= @course.time %></td>
</tr>
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_main_term) %></td><td class="font_lighter_sidebar"><%= @course.term %></td>
</tr>
<!-- end -->
<% unless @course.teacher.user_extensions.nil?%>
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %></td><td class="font_lighter_sidebar"><%= @course.teacher.user_extensions.occupation %></td>
</tr>
<% else %>
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %></td><td class="font_lighter_sidebar"><%= l(:field_course_un) %></td>
</tr>
<% end %>
</table>
<% unless @course.teacher.user_extensions.nil?%>
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %></td><td class="font_lighter_sidebar"><%= @course.teacher.user_extensions.occupation %></td>
</tr>
<% else %>
<tr>
<td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %></td><td class="font_lighter_sidebar"><%= l(:field_course_un) %></td>
</tr>
<% end %>
</div>
<div class="user_underline"></div>
</table>
</div>
<div class="user_underline"></div>
<!--description-->
<div class="inf_user_context">
<div class="font_title_left">
<%= l(:label_project_overview) %>
</div>
<div style="padding-bottom: 8px">
<% if @project.description.size>0 %>
<div class="font_lighter_sidebar">
<%= textilizable @project.description %>
</div>
<% else %>
<div class="font_lighter_sidebar">
<%= l(:label_course_description_no) %>
<%= l(:label_course_description_no) %>
</div>
<% end %>
<div class="created_on_project">
@ -139,50 +134,42 @@
</div>
<div class="user_underline"></div>
</div>
<!--tags-->
<div class="user_fans">
<!-- added by william -for tag -->
<div class="user_tags">
<!--tags-->
<div class="user_fans">
<!-- added by william -for tag -->
<div class="user_tags">
<div id="tags">
<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
</div></div>
</div>
</div>
</div>
<!--tool-->
<!-- <div class="user_underline"></div> -->
<!-- <div class="tool">
<div class="font_title_left">
<%= l(:label_project_tool)%>
</div>
<table class="font_tool">
<tr>
<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
</tr>
<tr>
<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
</td>
</tr>
</table>
</div> -->
<div class="user_underline"></div>
</div>
</div>
<div id="content">
<div id="content">
<div class="tabs_new">
<ul>
<li><%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview)%></li>
<li><%= link_to l(:label_homework), {:controller => 'projects', :action => 'homework'}, :class => link_class('Homework')%></li>
<li><%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%></li>
<li><%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news)%></li>
<!-- <li><%= link_to(l(:label_course_repository), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li> -->
<% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%>
<li><%= link_to l(:label_course_settings), {:controller => 'projects', :action => 'settings', :id => @project}, :class => link_class(:settings)%></li></ul>
<% end %>
<li>
<%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview)%>
</li>
<li>
<%= link_to l(:label_homework), {:controller => 'projects', :action => 'homework'}, :class => link_class('Homework')%>
</li>
<li>
<%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%>
</li>
<li>
<%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news)%>
</li>
<!-- <li><%= link_to(l(:label_course_repository), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li> -->
<% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%>
<li>
<%= link_to l(:label_course_settings), {:controller => 'projects', :action => 'settings', :id => @project}, :class => link_class(:settings)%>
</li>
</ul>
<% end %>
</div>
<%= yield %>
<%= call_hook :view_layouts_base_content %>

55
app/views/projects/_project.html.erb
Unescape View File

@ -8,15 +8,14 @@
<%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(project)%>
<% end %>
<% else %>
<%=link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
<% end %>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
</div>
<div class="wiki-description">
<p>
<%= textilizable(project.short_description, :project => project) %>
</p>
</div>
<div class="information">
<p class="stats">
<%= content_tag('span', @project.watcher_users.count, :class => "info") %><%= content_tag('span', l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
@ -31,26 +30,54 @@
<%= content_tag('span', "#{@project.repository.nil? ? '0' : @project.project_status.changesets_count }", :class => "info") %><%= content_tag('span', l(:label_commit_on)) %>
</p>
</div>
<% end %>
<% if(@project.project_type==1)%>
</div>
<div class="wiki-description">
<p>
<%= textilizable(project.short_description, :project => project) %>
</p>
</div>
<div class="information">
<p class="stats">
<%= content_tag('span', @project.watcher_users.count, :class => "info") %><%= content_tag('span', l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
</p>
<p class="stats">
<%= content_tag('span', "#{@project.homeworks.count}", :class => "info") %><%= content_tag('span', l(:label_x_task, :count => @project.users.count)) %>
</p>
<p class="stats">
<%= content_tag('span', "#{@project.members.count}", :class => "info") %><%= content_tag('span', l(:label_x_member)) %>
</p>
<p class="stats">
<% files_count = @project.attachments.count %>
<% @project.versions.each do |version| %>
<% files_count += version.attachments.count %>
<% end %>
<%= content_tag('span', files_count, :class => "info") %><%= content_tag('span', l(:label_x_data)) %>
</p>
</div>
<% end %>
</div>
<div class="add-info">
<div class="main-language">
<!-- add by huang -->
<% if(@project.project_type==1)%>
<%= content_tag('span', "#{l(:field_tea_name)}: ") %>
<% if(@project.project_type==1)%>
<%= content_tag('span', "#{l(:field_tea_name)}: ") %>
<% else %>
<%= content_tag('span', "#{l(:default_role_manager)}: ") %>
<% end %>
<%= content_tag('span', "#{l(:default_role_manager)}: ") %>
<% end %>
<!-- end -->
<!-- <%= content_tag('span', "#{l(:default_role_manager)}: ") %> -->
<% @admin = @project.project_infos%>
<% if @admin.size > 0 %>
<%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe) %>
<% end %>
<% end %>
<% if(@project.project_type==1)%>
&nbsp;&nbsp;&nbsp;大学：
<%= @admin.first.user.user_extensions.occupation %>
<% end %>
<%= @admin.first.user.user_extensions.occupation %>
<% end %>
</div>
<div class="licences">
<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
@ -64,10 +91,10 @@
<div class="tags">
<!-- added by william -for tag -->
<div id="tags">
<%= image_tag( "/images/sidebar/tags.png") %>
<%= render :partial => 'tags/tag_name', :locals => {:obj => @project,:object_flag => "2",:non_list_all => true }%>
</div>
</div>

7
config/locales/zh.yml
Unescape View File

@ -1550,4 +1550,9 @@ zh:
label_third_reward: 三等奖
label_excellence_reward: 优秀奖
label_comfort_reward: 入围奖
label_course_settings: 课程设置
label_course_settings: 课程设置
#added by nie
label_x_task: 份作业
label_x_member: 个成员
label_x_data: 份资料

Write Preview
Loading…
Cancel
Save