diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index eb75536d9..0fc4fed4c 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -51,6 +51,9 @@
}
+
+
<% if @project.project_type == 1 %>
<% label_str = l(:label_file_upload) %>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index de734ef94..499c58b3c 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -28,7 +28,7 @@
<% if @newss.empty? %>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index a4e0a3a79..ede00d3e2 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -39,6 +39,7 @@ function checkMaxLength() {
<% reply_allow = JournalsForMessage.create_by_user? User.current %>
<%= l(:label_user_response) %>
+
<% if !User.current.logged?%>
<%= l(:label_user_login_tips) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f61570cba..ce81fda9c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -543,6 +543,8 @@ zh:
label_activities_settings: 显示设置
label_user_login_new: 登录
label_user_login_tips: 您还没有登录,请登录后留言
+ label_user_login_course_board: 您还没有登录,请登录后参与课程讨论
+ label_user_login_project_board: 您还没有登录,请登录后参与项目讨论
#end
#by huang # modified by bai
label_college: 高校进入
@@ -1314,7 +1316,7 @@ zh:
label_message: 留言板
field_add: 添加于 %{time} 之前
button_more: 更多
- label_user_response: 用户反馈
+ label_user_response: 用户留言
label_student_response: 作业答疑 # modified by bai
label_bidding_project: 参与项目
label_homework_project: 已提交作业 #huang
@@ -1410,6 +1412,7 @@ zh:
label_has_praisers: 赞(%{count})
label_has_watchers: 关注(%{count})
label_has_fans: 粉丝(%{count})
+ label_coursefile_sharingarea: 课程文件共享专区
#modify by men
label_x_has_fans:
zero: 粉丝(%{count})
@@ -1779,7 +1782,7 @@ zh:
label_forum_edit: 编辑讨论区
label_memo_create: 发布
label_memo_new: 新建主题
- label_memo_edit: 修改主题
+ label_memo_edit: 修改主题label_board_new
label_memo_new_from_forum: 发布帖子
label_forum: 公共贴吧
label_forum_new: 新建贴吧
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 49a0d7493..46baeb5e7 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -4,7 +4,7 @@ body { font-family:'微软雅黑', Verdana, sans-serif; font-size: 13px; color:#
h1, h2, h3, h4 {font-family: '微软雅黑', "Trebuchet MS", Verdana, sans-serif;padding: 2px 10px 1px 0px;margin: 0 0 10px 0;}
#content h1, h2, h3, h4 {color: #555;}
h2, .wiki h1 {font-size: 20px;}
-h3, .wiki h2 {font-size: 15px;}
+h3, .wiki h2 {font-size: 15px; padding-left: 5px}
h4, .wiki h3 {font-size: 13px;}
h4 {border-bottom: 1px dotted #bbb;}
/*huang*/
@@ -284,10 +284,10 @@ span.forums-avatar-right{
.borad-title{
font-size: 15px;
- color: #ed8924;
+ color: #555555;
padding-left: 5px;
padding-top: -5px;
- font-weight: bold;
+ font-weight: 400;
}
.borad-setitle{