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

Merge branch 'szzh' into sw_new_course

This commit is contained in:
sw 2015-06-23 15:58:54 +08:00
parent 71ab5ed74f 358c344ca5
commit fa19d4c066
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/mailer/send_for_user_activities.html.erb
View File

@ -40,7 +40,7 @@
<% unless @course_news_comments.first.nil? %>
<ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
<span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
<%= l(:label_course_news) %>
<%= l(:label_course_mail_news_reply) %>
</span>
<% @course_news_comments.each do |course_news_comment|%>
<li style="clear: both; list-style: none;">
@ -243,12 +243,10 @@
<%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
:style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
<span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
<% if issues_journal.notes.nil? %>
<%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value),
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
<% if issues_journal.notes.blank? || issues_journal.notes.nil? %>
<%= l(:label_isuue_mail_status) %>
<% else %>
<%= link_to truncate(issues_journal.notes,length: 30,omission: '...'),issue_url(issues_journal.issue, :token => @token.value),
<%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue, :token => @token.value),
:style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
%>
<% end %>

2
app/views/student_work/_student_work.html.erb
View File

@ -12,7 +12,7 @@
<%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
</li>
<li class=" hwork_time_c">
<% if Time.parse(@homework.end_time.to_s) < Time.parse(student_work.created_at.to_s) %>
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
<span class="c_red">迟交</span>
<% else%>
<%= student_work.created_at.strftime("%m-%d").to_s%>

6
config/locales/courses/zh.yml
View File

@ -16,9 +16,11 @@ zh:
label_course_name: 课程名称
label_homework: 课程作业
label_course_news: 课程通知
label_course_news: 课程通知
label_course_mail_news_reply: 课程通知回复
label_main_teacher: 主讲教师
label_course_term: 开课学期
label_course_term: 开课学期
label_isuue_mail_status: 更新了issue状态
label_join_course: 加入
label_exit_course: 退出

1
db/migrate/20150619060110_homework_common_time.rb
View File

@ -10,7 +10,6 @@ class HomeworkCommonTime < ActiveRecord::Migration
end
end
end
puts i.to_s
end
end