Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/controllers/words_controller.rb

@@ -13,6 +13,9 @@ class WordsController < ApplicationController
         refer_user_id = params[:new_form][:reference_user_id].to_i
         
         @user.add_jour(User.current, message, refer_user_id)
+        unless refer_user_id == 0
+          User.find(refer_user_id).add_jour(User.current, message, refer_user_id)
+        end
         @user.count_new_jour
         # if a_message.size > 5
           # @message = a_message[-5, 5]

app/views/layouts/base_projects.html.erb

@@ -128,42 +128,7 @@
 								<!--tool-->
 								<div class="user_underline"></div>
 								<div class="tool">
-									<div class="font_title_left">
+								<%= render 'projects/tools_expand' %>
-										<%= l(:label_project_tool)%>
-									</div>
-									
-									<table class="font_tool">
-										<tr>
-											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
-												<%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
-											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %>
-												<%= link_to l(:project_module_wiki),project_wiki_path(@project) %></td>
-										</tr>
-										<tr>
-											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
-												<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
-											</td>
-											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
-												<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
-											</td>
-										</tr>
-										<tr>
-												<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
-													<%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %>
-												</td>
-												<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
-													<%= link_to l(:project_module_files) ,project_files_path(@project) %>
-												</td>
-										</tr>
-										<tr>
-												<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
-													<%= link_to l(:label_module_share) ,share_show_path(@project) %>
-												</td>
-												<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
-													<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %>
-												</td>
-										</tr>
-									</table>
 								</div>
 								<div class="user_underline"></div>
 							</div>

app/views/projects/_tools_expand.html.erb

@@ -0,0 +1,71 @@
+<style type='text/css'>
+
+ .tools a:link{
+  color:#336601;
+  text-decoration:none;
+  width:100px;
+  padding:3px 5px 0px 5px;
+}
+.tools a:visited{
+  color:#336601;
+  text-decoration:none;
+  padding:3px 5px 0px 5px;
+  width:100px;
+}
+.tools a:hover{
+  color:white;
+  padding:3px 3px 0px 20px;
+  width:88px;
+  text-decoration:none;
+  background-color:#539D26;
+}
+.tools a:active{
+  color:white;
+  padding:3px 3px 0px 20px;
+  width:88px;
+  text-decoration:none;
+  background-color:#BD06B4;
+}
+
+.tools ul{
+  list-style-type: none;
+  margin: 0px 0px 0px 10% ;
+  padding: 0;
+}
+.tools li{
+  background: url("/images/sidebar/tool_tag_alpha.png") 10px 30% no-repeat transparent;
+  color: #3e3e3e;
+  font-weight: 400;
+  line-height: 1.2em;
+  margin: 0px 0px 10px;
+  padding: 0px 0px 0px 30px;
+  font-size: 1.0em;
+  /*border-bottom: 1px solid #CCC;*/
+}
+.tools li:last-child{
+  border: none;
+}
+
+</style>
+<div class="font_title_left">
+  <%= l(:label_project_tool)%>
+</div>
+
+<div class="tools ">
+  <ul><h3>项目交流</h3>
+    <li><%= link_to l(:project_module_documents), project_documents_path(@project) %></li>
+    <li><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li>
+    <li><%= link_to l(:project_module_files) ,project_files_path(@project) %></li>
+  </ul>
+  <ul><h3>进度跟踪</h3>
+    <li><%= link_to l(:project_module_calendar),project_calendar_path(@project) %></li>
+    <li><%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %></li>
+    <li><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %></li>
+  </ul>
+  <ul><h3>其他工具</h3>
+    <li><%= link_to l(:label_module_share) ,share_show_path(@project) %></li>
+    <li><%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %></li>
+    <li></li>
+  </ul>
+
+</div>

app/views/words/_message.html.erb

@@ -19,7 +19,7 @@
 			<tr>
 				<td colspan="2" width="580px" >
 				<p class="info-break">
-					<%= h journal.notes%>
+					<%= textilizable journal.notes%>
 				</p></td>
 			</tr>
 			<tr>

config/locales/zh.yml

@@ -513,7 +513,6 @@ zh:
   label_software_user: 软件创客
   label_contest_innovate: 创新竞赛
   label_requirement_enterprise: 软件众包
-  label_project_module_forums: 讨论吧
   label_new_homework: 作业
   label_new_contest: 竞赛
   label_requirement_focus: 关注需求
@@ -851,7 +850,7 @@ zh:
   label_user_activities: 您没有关注该用户，请尝试重新输入！
   label_user_activities_other: 该用户暂无任何动态！
   label_project_overview: "概述"
-  label_project_tool: "工具"
+  label_project_tool: "项目工具集"
   label_project_issues: "缺陷"
   label_project_newother: "查看其他评论"
   label_project_newshare: "分享了"
@@ -1728,17 +1727,18 @@ zh:
 
   label_newbie_faq: '新手指引 & 问答'
   label_hot_project: '热门项目'
+  label_borad_project: 项目讨论区
+  label_borad_course: 课程讨论区
   label_memo_create_succ: 发布成功
   label_memo_create_fail: 发布失败
-  label_forum_create_succ: 讨论吧新建成功
+  label_forum_create_succ: 贴吧新建成功
-  label_forum_create_fail: 讨论吧新建失败
+  label_forum_create_fail: 贴吧新建失败
   label_memo_create: 发布
   label_memo_new: 新建主题
   label_memo_edit: 修改主题
-  label_borad_project: 项目讨论区
-  label_borad_course: 课程讨论区
   label_memo_new_from_forum: 发布帖子
-  label_forum: 讨论吧
+  label_forum: 公共贴吧
-  label_forum_new: 新建讨论吧
+  label_forum_new: 新建贴吧
-  label_tags_forum_description: 讨论吧描述
+  label_tags_forum_description: 贴吧描述
-  label_tags_forum: 讨论吧名称
+  label_tags_forum: 贴吧名称
+  label_project_module_forums: 公共贴吧