From 23be95649f920f7794def0e39e91605b87c546a3 Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Tue, 13 Aug 2013 15:52:22 +0800
Subject: [PATCH] =?UTF-8?q?tag=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_show_projects.html.erb | 14 ++++++--------
 app/views/tags/index.html.erb          | 10 +++++-----
 app/views/welcome/index.html.erb       |  2 +-
 public/stylesheets/application.css     | 14 ++++++++++++++
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/views/tags/_show_projects.html.erb b/app/views/tags/_show_projects.html.erb
index 94d61c3ff..01d2161e7 100644
--- a/app/views/tags/_show_projects.html.erb
+++ b/app/views/tags/_show_projects.html.erb
@@ -1,15 +1,13 @@
 <div id="projects">
 <% if projects_results.size > 0 %>
 <hr />
-<h3>Projects:</h3>
-
+<h3><strong>Projects:</strong></h3>
 <% projects_results.each do |prj| %>
-<li>
-	项目名称：<%= link_to "#{prj.name}",:controller => "projects",:action => "show",:id => prj.id %>
-	<br />
-	项目描述：<%= prj.description %>;
-
-</li>
+<div>
+	<h3><strong>项目名称：<%= link_to "#{prj.name}",:controller => "projects",:action => "show",:id => prj.id %></strong></h3>	
+	<p class="font_description2"><strong>项目描述：</strong><%= prj.description %>;</p>	
+</div>
+<div class="line_under"></div>
 <% end %>
 
 <% end %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index af1fd38ca..83a30af13 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,13 +1,13 @@
-<div class="splitcontentleft">
+<div class="tag_left">
 	<ul>
 		<li>
-			Selected Tags
+			<strong>Selected Tags</strong>
 		</li>
 		<div id="selected_tags">		
 			 <%= render :partial => "selected_tags",:locals => {:selected_tags => $selected_tags,:show_flag => @obj_flag}%>		
 		</div>
 		<li>
-			Related Tags
+			<strong>Related Tags</strong>
 		</li>
 		<div id="related_tags">		
 			 <%= render :partial => "related_tags",:locals => {:related_tags => $related_tags,:show_flag => @obj_flag }%>		
@@ -15,8 +15,8 @@
 	</ul>
 </div>
 
-<div class="splitcontentright">
-	<h2>Search Results</h2>
+<div class="tag_right">
+	<h3><strong>Search Results</strong></h3>
 	<div id="filter-menu" align="right">
 		Tag统计：
 		Issue(<%=  @issues_tags_num %>)|
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index fe8602c89..b563cc65e 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -189,7 +189,7 @@ software development and software crowdsourcing.</td></tr>
 <!--info-->
 				<table width="200" border="0">
   <tr>
-    <td colspan="2" class="font_welcome_Cdescription" style=" word-wrap: break-word; word-break: break-all"><%= l(:label_welcome) %> <strong class="font_small_watch"><%=link_to User.current.name, user_path(User.current) %></strong> <%= l(:label_join) %></td>
+    <td colspan="2" class="font_welcome_Cdescription" style=" word-wrap: break-word; word-break: break-all"><%= l(:label_welcome) %> <strong class="font_small_watch"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
   </tr>
   <tr>
     <td rowspan="2" align="left"><%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %></td>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 41ae7eb28..f17af3147 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -11,6 +11,15 @@ h4 {border-bottom: 1px dotted #bbb;}
 
 /*new by huang*/
 /**/
+	
+.tag_left{
+	float: left;
+	width: 30%;
+}
+.tag_right{
+	float: right;
+	width: 68%;
+}
 .welcome_logo{
 	float: left;
 	padding-left: 5px;
@@ -207,6 +216,11 @@ ul.tool li{list-style-type:none;
 	line-height: 1.5em;	
 	
 }
+.font_description2{	
+	font-size:13px;
+	line-height: 1.5em;	
+	padding-left: 10px;
+}
 .font_tool{
 	font-family:微软雅黑;
 	font-size:14px;