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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Browse Source
dev_repository_hjq
z9hang 11 years ago
parent 411d201fc3 33e9a3e326
commit 509a37a575
6 changed files with 74 additions and 53 deletions
Show Stats Download Patch File Download Diff File

4
app/controllers/poll_controller.rb
Unescape View File

@ -23,6 +23,10 @@ class PollController < ApplicationController
def show def show
@poll = Poll.find params[:id] @poll = Poll.find params[:id]
if @poll.polls_status != 2 && !User.current.allowed_to?(:as_teacher,@course)
render_403
return
end
#已提交问卷的用户不能再访问该界面 #已提交问卷的用户不能再访问该界面
if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?) if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
render_403 render_403

2
app/controllers/welcome_controller.rb
Unescape View File

@ -84,7 +84,7 @@ class WelcomeController < ApplicationController
def course def course
@course_page = FirstPage.find_by_page_type('course') @course_page = FirstPage.find_by_page_type('course')
@school_id = params[:school_id] || User.current.user_extensions.school.try(:id) @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117
@logoLink ||= logolink() @logoLink ||= logolink()
##3-8月份为查找春季课程，9-2月份为查找秋季课程 ##3-8月份为查找春季课程，9-2月份为查找秋季课程

2
app/views/layouts/base_projects.html.erb
Unescape View File

@ -134,7 +134,7 @@
</td> </td>
<!-- 项目sidebar栏显示问题数目为项目总问题数排除已关闭和已解决的项目问题数，即排除3（已解决），5（已关闭）的 项目问题数 !--> <!-- 项目sidebar栏显示问题数目为项目总问题数排除已关闭和已解决的项目问题数，即排除3（已解决），5（已关闭）的 项目问题数 !-->
<td class="font_index"> <td class="font_index">
<%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}", project_issues_path(@project) %> <%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}/#{@project.issues.count}", project_issues_path(@project) %>
</td> </td>
</tr> </tr>
<tr class="font_aram"> <tr class="font_aram">

100
app/views/users/user_watchlist.html.erb
Unescape View File

@ -1,47 +1,63 @@
<h3><%= l(:label_user_watcher)%></h3> <h3><%= l(:label_user_watcher)%></h3>
<div class="inf_user_image"> <div class="inf_user_image">
<% for user in User.watched_by(@user.id) %> <% for user in User.watched_by(@user.id) %>
<ul class="list_watch"><li> <ul class="list_watch">
<table width="660px" border="0" align="center"> <li>
<tr> <table width="660px" border="0" align="center">
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td> <tr>
<td><table width="580px" border="0"> <td colspan="2" valign="top" width="50" >
<tr> <!-- modified by bai 增加了关注人的名字全称--> <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %>
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong> </td>
</td> <td>
</tr> <table width="580px" border="0">
<tr> <!-- modified by bai 区别了“关注”里个人参与的项目与课程--> <tr> <!-- modified by bai 增加了关注人的名字全称-->
<td colspan="2" width="580px" ><p class="font_description"> <td colspan="2" valign="top">
<%# unless user.memberships.empty? %> <strong>
<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %> <%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
<% memberships = user.memberships.all(:conditions => cond) %> </strong>
<%= l(:label_x_contribute_to, :count => memberships.count) %> </td>
<% for member in memberships %> </tr>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <tr> <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
<% end %> <td colspan="2" width="580px" >
<%# end %> <p class="font_description">
</p> <%# unless user.memberships.empty? %>
<p class="font_description"> <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
<%# unless user.memberships.empty? %> <% memberships = user.memberships.all(:conditions => cond) %>
<% user_courses = user_courses_list(user) %> <%= l(:label_x_contribute_to, :count => memberships.count) %>
<%= l(:label_x_course_contribute_to, :count => user_courses.count) %> <%= "：" unless memberships.empty? %>
<% for course in user_courses %> <% for member in memberships %>
<%# if course.name != nil %> <%= link_to_project(member.project) %>
<%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %> <%= (user.memberships.last == member) ? '' : '，' %>
<%# end %> <% end %>
<% end %> <%# end %>
<%# end %> </p>
</p> <p class="font_description">
</td> <%# unless user.memberships.empty? %>
</tr> <% user_courses = user_courses_list(user) %>
<!-- end --> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
<%= "：" unless user_courses.empty? %>
<tr> <% for course in user_courses %>
<td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %> <%# if course.name != nil %>
</td> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
</tr> <%# end %>
</table></td> <% end %>
</tr> <%# end %>
</table></li></ul> </p>
</td>
</tr>
<!-- end -->
<tr>
<td width="200" align="right" class="font_lighter">
<%= l(:label_user_joinin) %>
<%= format_date(user.created_on) %>
</td>
</tr>
</table>
</td>
</tr>
</table>
</li>
</ul>
<% end %> <% end %>
</div> </div>

7
app/views/welcome/course.html.erb
Unescape View File

@ -108,12 +108,13 @@
</span> </span>
<div class="d-p-projectlist-box"> <div class="d-p-projectlist-box">
<ul class="d-p-projectlist"> <ul class="d-p-projectlist">
<% if User.current.logged? %> <%# if User.current.logged? %>
<li> <li>
<%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %> <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
</li> </li>
<% end %> <%# end %>
<% User.current.logged? ? course_count = 9 : course_count = 10 %> <%# User.current.logged? ? course_count = 9 : course_count = 10 %>
<% course_count = 9 %>
<% all_new_hot_course = find_all_new_hot_course(course_count, @school_id, year_now, course_term)%> <% all_new_hot_course = find_all_new_hot_course(course_count, @school_id, year_now, course_term)%>
<% while all_new_hot_course.count < course_count%> <% while all_new_hot_course.count < course_count%>
<% if course_term == "春季学期" <% if course_term == "春季学期"

12
config/locales/zh.yml
Unescape View File

@ -1420,9 +1420,9 @@ zh:
label_contribute_to: 参与了 %{project_count} 个项目： label_contribute_to: 参与了 %{project_count} 个项目：
#modify by men #modify by men
label_x_contribute_to: label_x_contribute_to:
zero: 参与了 %{count} 个项目： zero: 参与了 %{count} 个项目
one: 参与了 %{count} 个项目： one: 参与了 %{count} 个项目
other: 参与了 %{count} 个项目： other: 参与了 %{count} 个项目
#end #end
label_total_commit: 共%{total_commit}次提交 label_total_commit: 共%{total_commit}次提交
label_question_number: 第%{question_number}题： label_question_number: 第%{question_number}题：
@ -1809,9 +1809,9 @@ zh:
label_course_contribute_to: 参与了 %{project_count} 个项目： label_course_contribute_to: 参与了 %{project_count} 个项目：
label_x_course_contribute_to: label_x_course_contribute_to:
zero: "参与了 %{count} 个课程：" zero: "参与了 %{count} 个课程"
one: "参与了 %{count} 个课程：" one: "参与了 %{count} 个课程"
other: "参与了 %{count} 个课程：" other: "参与了 %{count} 个课程"
label_join_contest: 加入竞赛 label_join_contest: 加入竞赛
label_exit_contest: 退出竞赛 label_exit_contest: 退出竞赛

Write Preview
Loading…
Cancel
Save