Merge remote-tracking branch 'origin/forum' into forum

Conflicts:
	app/views/memos/show.html.erb

app/views/boards/show.html.erb

@@ -1,4 +1,4 @@
-<%= board_breadcrumb(@board) %>
+<!-- <%= board_breadcrumb(@board) %> -->
 
 <!--new and follow-->
 <div class="content-title-top">

app/views/forums/_show_topics.html.erb

@@ -21,7 +21,7 @@
 				</table></td>
 			</tr>
 			<tr>
-				<td colspan="2" ><span class="font_description">标签</span></td>
+				<td colspan="2" ><span class="font_description">		</span></td>
 			</tr>
 			<tr>
 				<td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_at, topic.author %>

app/views/forums/show.html.erb

@@ -9,8 +9,8 @@
 	<%= %>
 </p>
 <!--modified by huang-->
-<%= link_to '新建', new_forum_memo_path(@forum), :class => 'icon icon-add' %>
+<%= link_to '发布帖子', new_forum_memo_path(@forum), :class => 'icon icon-add' %>
 <% if User.current.admin?||User.current.login==@forum.creator.login %>  | 
-<%= link_to '编辑', edit_forum_path(@forum), :class => 'icon icon-edit' %>
+<%= link_to '编辑帖子', edit_forum_path(@forum), :class => 'icon icon-edit' %>
 <% end %>
 <%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %>

app/views/layouts/base_forums.html.erb

@@ -64,7 +64,7 @@
 								</div>
 								<!--tags-->	
 								<% if User.current.logged? || User.current.admin? %>								
-								<div class="forums-tags"><%= render :partial => 'tags/tag', :locals => {:obj => @forum.creator,:object_flag => "1"} %></div>
+								<div class="forums-tags"><%= render :partial => 'tags/tag', :locals => {:obj => @forum,:object_flag => "5"}%></div>
 								<% end %>																							
 							</div>
 						</div>

app/views/memos/show.html.erb

@@ -27,7 +27,9 @@
 .memo-title{
 	margin: 1em 0;
 	padding-left: 1%;
-	border-bottom: 1px dashed 
+	padding-bottom: 1%;
+	font-weight: bold;
+	border-bottom: 1px dashed rgb(204, 204, 204); 
 }
 .memo-content{
 	padding: 1%;
@@ -58,7 +60,7 @@
 <div class="lz">
 	<div class="lz-left">	
 		<div class=""><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>	
-		<p class=""><%=h @memo.author.show_name %></p>
+		<p class=""><%=link_to @memo.author.show_name, user_path(@memo.author) %></p>
 	</div>
 	<div class="memo-section">
 			<div class="contextual-borad">
@@ -91,15 +93,15 @@
 			<p> <%= link_to_attachments @memo, :author => false %> </p>
 		</div>
 		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author.show_name %></div>
+
 	</div>
 	<br />
 </div>
-
 <div class="replies">
 	<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @replies.nil? ? 0 : @replies.size %>)</h3>
 	<% reply_count = @current_count.to_i %>
 	<% @replies.each do |reply| %>
-	<p class="font_lighter"><%= reply_count += 1 %>L	:</p>
+	<p class="font_lighter"><%= reply_count += 1 %>楼	:</p>
 	<div class="reply" id="<%= "reply-#{reply.id}" %>">
 		<div class="contextual-borad">
 			<%= link_to(

app/views/messages/show.html.erb

@@ -58,7 +58,10 @@
 .memo-title{
 	margin: 1em 0;
 	padding-left: 1%;
-	border-bottom: 1px dashed 
+	padding-bottom: 1%;
+	font-weight: bold; 
+	border-bottom: 1px dashed rgb(204, 204, 204);
+	
 }
 .memo-content{
 	padding: 1%;
@@ -89,10 +92,10 @@
 <div class="lz">
 	<div class="lz-left">	
 		<div class=""><%= link_to image_tag(url_to_avatar(@topic.author), :class => "avatar"), user_path(@topic.author) %></div>	
-		<p class=""><%=h @topic.author %></p>
+		<p class=""><%=link_to @topic.author, user_path(@topic.author) %></p>
 	</div>
 	<div class="memo-section">
-		<div class="memo-title"><%= label_tag l(:field_subject) %>: <%=h @topic.subject %></div>
+		<div class="memo-title"><%= label_tag l(:field_subject) %>: <%=link_to @topic.subject, project_boards_path(@topic.project) %></div>
 		<div class="memo-content"><%= textilizable(@topic, :content) %></div>
 		<div class="memo-timestamp"> <%= authoring @topic.created_on, @topic.author %></div>
 	</div>

app/views/projects/settings/_boards.html.erb

@@ -13,14 +13,14 @@
     <td style="padding-left: <%= level * 18 %>px;"><%= link_to board.name, project_board_path(@project, board) %></td>
     <td><%=h board.description %></td>
     <td align="center">
-    <% if authorize_for("boards", "edit") %>
+    <!-- <% if authorize_for("boards", "edit") %>
       <%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %>
-    <% end %>
+    <% end %> -->
     </td>
     <td class="buttons">
     <% if User.current.allowed_to?(:manage_boards, @project) %>
       <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>
-      <%= delete_link project_board_path(@project, board) %>
+      <!-- <%= delete_link project_board_path(@project, board) %> -->
 		<% end %>
     </td>
   </tr>
@@ -31,6 +31,6 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 
-<% if User.current.allowed_to?(:manage_boards, @project) %>
+<!-- <% if User.current.allowed_to?(:manage_boards, @project) %>
 <p><%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %></p>
-<% end %>
+<% end %> -->

config/locales/zh.yml

@@ -795,7 +795,7 @@ zh:
   label_topic_plural: 主题
   label_message_plural: 帖子
   label_message_last: 最新的帖子
-  label_message_new: 新贴
+  label_message_new: 发布帖子
   label_message_posted: 发帖成功
   label_reply_plural: 回复
   label_send_information: 给用户发送帐号信息