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

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

This commit is contained in:
alan 2015-01-20 16:34:30 +08:00
parent 40d6c3b19c e493ae22cf
commit 9f36469d39
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/bids_controller.rb
View File

@ -9,6 +9,8 @@ class BidsController < ApplicationController
menu_item :homework_statistics, :only => :homework_statistics
menu_item :edit, :only => :edit
before_filter :can_show_course,only: []
before_filter :can_show_contest,only: []
#Ended by young

7
app/helpers/courses_helper.rb
View File

@ -561,12 +561,13 @@ module CoursesHelper
def course_in_current_or_next_term course
is_current_term = false
is_next_term = false
if course.time == Time.now.year && course.term == cur_course_term
year_now = Time.now.month < 3 ? Time.now.year - 1:Time.now.year
if course.time == year_now && course.term == cur_course_term
is_current_term = true
end
if cur_course_term == "秋季学期" && course.time == (Time.now.year + 1) && course.term == "春季学期"
if cur_course_term == "秋季学期" && course.time == (year_now + 1) && course.term == "春季学期"
is_next_term = true
elsif cur_course_term == "春季学期" && course.time == Time.now.year && course.term == "秋季学期"
elsif cur_course_term == "春季学期" && course.time == year_now && course.term == "秋季学期"
is_next_term = true
end
is_current_term || is_next_term

4
app/views/courses/_course_form.html.erb
View File

@ -127,9 +127,7 @@
<%= l(:label_new_course_description) %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</label>
<span class="jstEditor">
<textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40">
<%= @course.description %>
</textarea>
<textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40"><%= @course.description %></textarea>
</span>
</p>
<p style="margin-left:-10px;">

4
config/locales/zh.yml
View File

@ -765,7 +765,7 @@ zh:
label_news_view_all: 查看所有新闻
label_news_added: 新闻已添加
label_settings: 配置
label_overview: 项目动态
label_overview: 近期动态
label_course_overview: "课程动态"
label_question_student: 作业交流 #bai
label_homework_commit: 提交作业 #huang
@ -2127,7 +2127,7 @@ zh:
excel_homework_list: 作品列表
excel_been_rated: 已评
excel_not_rated: 未评
label_export_excel: 导出Excel
label_export_excel: 导出列表
label_softapplication: 应用软件
label_attending_contest: 参加竞赛

5
public/stylesheets/course_group.css
View File

@ -41,8 +41,9 @@ input.f_2 {
.st_search{ margin:10px 0;}
.st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
.st_search input{ border:1px solid #1c9ec7; height:20px; width:200px;}
a:hover.xls{ background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent !important;
padding: 2px 0px 3px 16px;
a:hover.xls{ /*background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent !important;*/
/*padding: 2px 0px 3px 16px;*/
background:#ffffff !important;
font-family:微软雅黑 !important;
font-size: 12px !important;
color: #136b3b !important;