From 5b044ec872e3d951d5975b491a80bb2eafca81ad Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Fri, 13 Dec 2013 19:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/show.html.erb | 9 +++++----
 app/views/news/index.html.erb    | 4 ++--
 app/views/welcome/index.html.erb | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 50feacb7..d2ff856f 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -171,17 +171,18 @@
   <%= link_to_attachments message, :author => false %> -->
  
 <% end %>
-<div class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></div>
-<% end %>
-
 <% if !@topic.locked? && authorize_for('messages', 'reply') %>
-<p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
+<p style="float: right;"><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
 <div id="reply" style="display:none;">
 <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
   <%= submit_tag l(:button_submit) %>
   <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
 <% end %>
+<div class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></div>
+<% end %>
+
+
 <div id="preview" class="wiki"></div>
 </div>
 <% end %>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 39fcfd7d..0e67766d 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -60,12 +60,12 @@
 			<table width="580px" border="0">
 				<% if @project.project_type == 1 %>
 				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span class="font_lighter"><%= l(:label_project_notice)%></span><span><%= link_to h(news.title), news_path(news) %></span>
+					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice)%></span><span><%= link_to h(news.title), news_path(news) %></span>
 						<span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td> 						
 				</tr>
 				<% else %>
 				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span class="font_lighter"><%= l(:label_project_newshare)%></span><span> <%= link_to h(news.title), news_path(news) %></span>
+					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_newshare)%></span><span> <%= link_to h(news.title), news_path(news) %></span>
 						<span style="float: right"> <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td>
 				</tr>
 				<% end %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 28ff0408..99cbed97 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -208,7 +208,7 @@
 <div class="left" style="float: left; height: 445px; width: 50%; margin-left: 30px;">  
 <ul class="welcome-message-list" style="width: 90%; ">
 	<div class="forum-topic" style="height: 25px;">
-	  <h3 style="color: rgb(21, 188, 207);margin-left: 8px;"><strong>论坛动态</strong></h3>
+	  <h3 style="color: rgb(21, 188, 207);margin-left: 8px;"><strong>贴吧动态</strong></h3>
 	  <!-- <ul class="inner-content">
 	  	<li>
 	    	<a href="#" id="hot-topic">最热帖子</a>