diff --git a/app/models/comment.rb b/app/models/comment.rb
index 1f6655bc4..bdb642d3c 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -27,7 +27,7 @@ class Comment < ActiveRecord::Base
def send_mail
if self.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')
- Mailer.news_comment_added(self)
+ Mailer.run.news_comment_added(self)
end
end
after_destroy :delete_kindeditor_assets
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 6233063a3..fa23f3843 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -257,48 +257,6 @@
-
-
- <%=l(:label_issue_feedback_activities)%>
- <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
- <%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
-
-
<%= link_to l(:label_more_information), forums_path %>
-
-
- <% find_new_forum_topics(9 - @contest_notifications.count).each do |topic|%>
- -
-
-
- <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %>
- <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
-
-
-
- <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
-
-
- <%=l(:label_question_sponsor)%> <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
-
-
- <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
- <%=l(:label_final_reply)%>
- <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
- <% end %>
-
-
- <%=l(:label_reply)%>
- (<%= link_to topic.try(:replies_count), topic.event_url %>)
-
-
-
- <% end %>
-
-
-
<%=l(:label_current_attendingcontest_work)%>
@@ -340,6 +298,46 @@
+
+
+ <%=l(:label_issue_feedback_activities)%>
+ <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+ <%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+
+
<%= link_to l(:label_more_information), forums_path %>
+
+
+ <% find_new_forum_topics(9 - @contest_notifications.count).each do |topic|%>
+ -
+
+
+ <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %>
+ <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
+
+
+
+ <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
+
+
+ <%=l(:label_question_sponsor)%> <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
+
+
+ <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
+ <%=l(:label_final_reply)%>
+ <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
+ <% end %>
+
+
+ <%=l(:label_reply)%>
+ (<%= link_to topic.try(:replies_count), topic.event_url %>)
+
+
+
+ <% end %>
+
+
+
<% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
+ ,
+
+ <%= l(:label_welcome_trustie_course_description) %>
+
<% else %>
<% if @school_id == "0" %>
+
<% else %>
<% if @school_id.nil? %>
<%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course', :school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
@@ -65,23 +75,6 @@
<%= l(:label_welcome_trustie_course) %>
- <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
- ,
-
- <%= l(:label_welcome_trustie_course_description) %>
-
- <% else %>
- <% if @school_id == "0" %>
- ,
- <%= @course_page.description %>
-
- <% end %>
- <% end %>
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3e5fc22fe..9cf572830 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1169,15 +1169,6 @@ en:
#end
- # label_welcome_trustie: Trustie
- # label_welcome_trustie_project: Online projects hosting platform
- # label_welcome_trustie_course: Online Courses practice platform
- # label_welcome_trustie_contest: Online Contests practice platform
- # label_welcome_trustie_project_description: Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange.
- # label_welcome_trustie_course_description: Teachers and Students for Chinese universities to provide social-oriented curriculum management, resource sharing, cooperation achieved, collaborative research.
- # label_welcome_trustie_contest_description: Software for Chinese college students and practitioners to provide social-oriented contest management, code hosting, resource sharing, cooperation and exchange.
- # label_welcome_trustie_description: a socialized collaboration platform for project management, collaborative research, software development and software crowdsourcing for creative university students and entrepreneurs.
-
label_bid_if_agreement: If you like me, please press me #bai
diff --git a/config/locales/users/zh.yml b/config/locales/users/zh.yml
index 26cf61e28..bbea322b0 100644
--- a/config/locales/users/zh.yml
+++ b/config/locales/users/zh.yml
@@ -81,7 +81,7 @@ zh:
label_brief_introduction: 个性签名
label_my_brief_introduction: 今天的心情如何？留下你的脚印吧~
- label_user_joinin: 加入时间
+ label_user_join: 加入时间
label_user_login: 最后登录
label_technical_title: 职称
@@ -213,6 +213,7 @@ zh:
#
# Followers & Fans
#
+ label_user_joinin: 加入时间
label_x_contribute_to:
zero: "参与了 %{count} 个项目"
one: "参与了 %{count} 个项目——"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index dd3b5d395..c0a6e652a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -763,7 +763,7 @@ zh:
label_feedback_fail: "留言失败"
label_user_login: "最后登录"
label_user_mail: "邮件地址"
- label_user_joinin: "加入时间"
+
label_overview: "概述"
@@ -1411,13 +1411,7 @@ zh:
label_project_sort: 排序方式
- label_welcome_trustie: Trustie
- label_welcome_trustie_project: 在线项目托管平台
- label_welcome_trustie_course: 在线课程实践平台
- label_welcome_trustie_contest: 在线竞赛实战平台
- label_welcome_trustie_project_description: 面向中国大学生与软件从业者，提供社交化的项目管理、代码托管、资源共享、合作交流。
- label_welcome_trustie_course_description: 面向中国高校教师与大学生，提供社交化的课程管理、资源共享、合作实验、协同研究。
- label_welcome_trustie_contest_description: 面向中国大学生与编程爱好者，提供社交化的竞赛管理、应用管理、代码托管、合作交流。
+
label_user_project: 项目
label_user_course: 课程
label_user_homework: 作业
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a18a282e4..f61738935 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -893,3 +893,22 @@ $(function(){
})
});
+
+
+//firefox的pre标签换行
+$(document).ready(function () {
+ var userAgent = navigator.userAgent.toLowerCase();
+ var browser = {
+ version: (userAgent.match(/.+(?:rv|it|ra|ie)[/: ]([d.]+)/) || [])[1],
+ safari: /webkit/.test(userAgent),
+ opera: /opera/.test(userAgent),
+ msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
+ mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+ };
+ if (browser.mozilla || browser.opera){
+ $("pre").addClass("break_word_firefox");
+ }
+ else{
+ $("pre").addClass("break_word");
+ }
+});
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 2b3ee1f18..fd80a3e0f 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -407,8 +407,23 @@ $(function(){
});
//将右侧的最小高度设置成左侧高度，美化界面
+// firefox pre标签换行
$(document).ready(function () {
$("#RSide").css("min-height",$("#LSide").height()-30);
+ var userAgent = navigator.userAgent.toLowerCase();
+ var browser = {
+ version: (userAgent.match(/.+(?:rv|it|ra|ie)[/: ]([d.]+)/) || [])[1],
+ safari: /webkit/.test(userAgent),
+ opera: /opera/.test(userAgent),
+ msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
+ mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+ };
+ if (browser.mozilla || browser.opera){
+ $("pre").addClass("break_word_firefox");
+ }
+ else{
+ $("pre").addClass("break_word");
+ }
});
// 日历选择日期后关闭
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 658f30480..6ff013740 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3150,6 +3150,11 @@ input[class~='m3p10'], .m3p10 {
cursor:pointer;
}
+/*pre标签换行*/
+.break_word{word-break: break-all;word-wrap: break-word;}
+.break_word_firefox{white-space: pre-wrap;word-break: break-all;}
+
+
/*lizanle 日誌搜索結果樣式*/
.search_results {
color: red;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index cd4dc337a..481eb2e4e 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -212,6 +212,7 @@ a:hover.close_btn {background-position:-66px 0;}
.show_btn {background-position:-119px 0;}
.msgserver a:hover { color: #0fa9bb; }
.break_word{word-break: break-all;word-wrap: break-word;}
+.break_word_firefox{white-space: pre-wrap;word-break: break-all;}
/***** Ajax indicator ******/
#ajax-indicator {
position: absolute; /* fixed not supported by IE */