diff --git a/app/models/project.rb b/app/models/project.rb
index 36a28e1b6..f371af8e4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1092,8 +1092,13 @@ class Project < ActiveRecord::Base
# 创建项目后在项目下同步创建一个讨论区
def create_board_sync
@board = self.boards.build
+ if project_type == 1
+ self.name=" #{l(:label_borad_course) }"
+ else
+ self.name =" #{l(:label_borad_project) }"
+ end
@board.name = self.name
- @board.description = self.name.to_s << " #{l(:label_board) }"
+ @board.description = self.name.to_s
if @board.save
logger.debug "[Project Model] ===> #{@board.to_json}"
else
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 7761e499e..ad05362b2 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,13 +1,13 @@
-
<% if User.current.logged? %>
@@ -25,7 +25,15 @@
<%=h @board.name %>
-
共有 <%=link_to @topics.count %> 个贴子
+
+共有 <%=link_to @topics.count %> 个贴子
+
+ <%= link_to l(:label_message_new),
+ new_board_message_path(@board),
+ :class => 'icon icon-add',
+ :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %>
+
+
<% if @topics.any? %>
<%= authoring topic.created_on, topic.author %>
|
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index d98067d61..768ddfe0d 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,18 +1,16 @@
-
-
- <%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %> |
-
+
+ <%= l(:label_welcome_trustie) %>
+ , <%= l(:label_welcome_trustie_description) %>
-
-
- <%= call_hook :view_account_login_top %>
+
+ <%= call_hook :view_account_login_top %>
@@ -75,9 +71,8 @@
<%= javascript_tag "$('#password').focus();" %>
<% else %>
<%= javascript_tag "$('#username').focus();" %>
- <% end %> |
-
-
+ <% end %>
+
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 526f12c56..343502e3e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1732,3 +1732,5 @@ zh:
label_memo_create: 发布
label_memo_new: 新建主题
label_memo_edit: 修改主题
+ label_borad_project: 项目讨论区
+ label_borad_course: 课程讨论区
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6895e08b5..7e81ad09e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -135,17 +135,23 @@ span.forums-avatar-right{
}
.borad-title{
- font-size: 16px;
+ font-size: 15px;
color: #ed8924;
padding-left: 5px;
padding-top: -5px;
font-weight: bold;
}
+.borad-setitle{
+ padding-bottom: 5px;
+ padding-top: 10px;
+ border-bottom: 1px dashed rgb(204, 204, 204);
+}
+
.borad-topic-count{
padding-top: 10px;
padding-left: 5px;
- border-bottom: 1px dashed rgb(204, 204, 204);
+ padding-right: 5px;
}
.borad-topic-count-message{
@@ -577,15 +583,14 @@ ul.tool li{list-style-type:none;
.spaceright{float:left; width:620px;}
-.welcone_left{
+.welcome_left{
margin-top: 70px;
- margin-left: 80px;
+ margin-left: -20px;
float:left;
- width: 49%;
+ width: 30%;
}
-.welcome_right{
- margin-right:200px;
+.welcome_right{
float:right;
width: 49%;
}