From f0132a0f5f0bce5067b0f25a2e72f464733ad9a1 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 21 Jan 2014 15:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E2=80=9C=E8=AF=BE=E7=A8=8B=E5=AE=9E?=
 =?UTF-8?q?=E8=B7=B5->=E8=AE=A8=E8=AE=BA=E5=8C=BA=E2=80=9D=E4=B8=BA?=
 =?UTF-8?q?=E5=8C=BF=E5=90=8D=E7=94=A8=E6=88=B7=E4=B8=8D=E8=83=BD=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=AF=84=E8=AE=BA=E6=B7=BB=E5=8A=A0=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BB=A5=E5=8F=8A=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E7=9A=84=E9=93=BE=E6=8E=A5=20=E5=9C=A8=E2=80=9C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E8=B7=B5->=E7=95=99=E8=A8=80=E2=80=9D?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=20=E5=B0=86?=
 =?UTF-8?q?=E2=80=9C=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=B7=B5=E2=80=9D=E4=B8=AD?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E3=80=81=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5=E5=92=8C=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E4=B8=AD=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/show.html.erb       | 13 +++++++++++++
 app/views/files/index.html.erb       |  3 +++
 app/views/news/index.html.erb        |  2 +-
 app/views/projects/feedback.html.erb |  1 +
 config/locales/zh.yml                |  7 +++++--
 public/stylesheets/application.css   |  6 +++---
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 34a3e4190..f518120ef 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -26,6 +26,19 @@
 
 <!--display the board-->
 <div class="borad-title"><%=h @board.name %></div>
+
+<% if !User.current.logged?%>
+	<div style="font-size: 14px;margin:20px;">
+		<% if @project.project_type == 1 %>
+		<%= l(:label_user_login_course_board) %>
+		<% else %>
+		<%= l(:label_user_login_project_board) %>
+		<% end %>
+		<%= link_to l(:label_user_login_new), signin_path %>
+		<hr/>
+	</div>
+<% end %>
+
 <!-- <div class="borad-description"><%=h @board.description %></div> -->
 <div class="borad-setitle">
 <span class="borad-topic-count">共有 <%=link_to @topics.count %> 个贴子</span> 
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 @@
 }
 	</style>
 
+ 
+<span class="borad-title"><%=(@project.project_type == 1) ? t(:label_user_course) : t(:label_project) %>文件共享专区</span>
+
 <div class="content-title-top">
 <% 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 @@
 </div>
 <% end %>
 <!--add by huang :list news-->
-<h3 style="font-weight:bold; border-bottom:1px solid #f0f0f0"><%=label_tips%></h3>
+<h3 style="font-weight:400; margin-left:0px; margin-top:-12px; margin-left:-5px; border-bottom:1px solid #f0f0f0"><%=label_tips%></h3>
 <div>
 	<% if @newss.empty? %>
 	<p class="nodata">
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 %>
 
 <h3><%= l(:label_user_response) %></h3>
+
 <% if !User.current.logged?%>
 	<div style="font-size: 14px;margin:20px;">
 		<%= 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{