user界面增加“标签”功能

project界面风格修改

app/views/layouts/base_projects.html.erb

@@ -30,7 +30,7 @@
 								<div class="inf_user_image">
 									<table>
 										<tr>
-											<td><%= link_to image_tag(url_to_avatar(@project), :class => 'avatar') %></td>
+											<td><%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
 											<td align="center">
 											<div class="info_font">
 												<%= textilizable @project.name %>
@@ -41,30 +41,22 @@
 												<% end %>
 											</div></td>
 										</tr>
-									</table>
-				
-									<!--tags-->
-									<div class="tags">
-										<!-- added by william -for tag -->
-										<div id="tags">
-											<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
-										</div>
-									</div>
+									</table>												
 								</div>
 
 								<!--parameter-->
 								<div class="user_fans">
-									<div class="user_underline"></div>
+									
 									<table width="240" border="0">
 										<tr align="center" width="80px">
 
-											<td class="font_index"><%= @project.members.count %></td>
-											<td class="font_index"><%= @project.issues.count %></td>
-											<td class="font_index"><%= @project.attachments.count %></td>
-										<tr>
-											<td align="center" width="80px"><strong style="font-size:13px"> <%= link_to(l(:label_member), project_member_path(@project), :class => 'project_infor_tag') %></strong></td>
-											<td align="center" width="80px"><strong style="font-size:13px"> <%= link_to(l(:label_project_defects), project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
-											<td align="center" width="80px"><strong style="font-size:13px"> <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %></strong></td>
+											<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) %></td>
+											<td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td>
+											<td class="font_index"><%=link_to "#{@project.attachments.count}", project_files_path(@project) %></td>  <!-- project_issues_path(@project), :class => 'project_infor_tag' -->
+										<tr class="font_aram">
+											<td align="center" width="80px"> <%= l(:label_member) %></td> 
+											<td align="center" width="80px"> <%= l(:label_project_defects) %></td>
+											<td align="center" width="80px"><%= l(:label_attachment) %></td>
 										</tr>
 									</table>
 									<div class="user_underline"></div>
@@ -86,8 +78,20 @@
 									</div>
 									<div class="user_underline"></div>
 								</div>
+								
+								
+								<!--tags-->																
+									
+									<div class="user_fans">
+										<!-- added by william -for tag -->
+										<div class="user_tags">
+										<div id="tags">
+											<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
+										</div></div>
+									</div>
 
 								<!--tool-->
+								<div class="user_underline"></div>
 								<div class="tool">
 									<div class="font_title_left">
 										<%= l(:label_project_tool)%>

app/views/layouts/base_users.html.erb

@@ -48,8 +48,8 @@
 
 										<div>
 											<%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%=link_to User.watched_by(@user.id).count ,:controller=>"users", :action=>"user_watchlist"%></strong>) &nbsp;
-											<%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(@user) }%>
-									
+											
+											<%= l(:label_user_fans) %>  (<strong class="font_small_watch"><%=link_to @user.watcher_users(@user.id).count, :controller=>"users", :action=>"user_fanslist" %></strong>)
 										</div>
 
 									</div>
@@ -69,9 +69,19 @@
 										</table>
 
 									</div>
+									
+									<!--tags-->
 									<div class="user_underline"></div>
+									<div class="user_fans">
+										<!-- added by william -for tag -->
+										<div class="user_tags">
+										<div id="tags">
+											<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
+										</div></div>
+									</div>
+									
 									<!--watch-->
-
+									<div class="user_underline"></div>									
 									<div class="user_fans">
 										<div class="font_title_left">
 											<strong><%= l(:label_user_watcher) %></strong>

public/stylesheets/application.css

@@ -58,6 +58,11 @@ ul.tool li{list-style-type:none;
 	font-family: 微软雅黑;
 	color:#068d9c;
 }
+.font_aram{
+	font-size: 14px;
+	font-family: 微软雅黑;
+	font-weight: bold;
+}
 .font_content{
 	font-size:14px;
 	font-family: 微软雅黑;
@@ -270,6 +275,13 @@ ul.tool li{list-style-type:none;
 	height: auto;
 	/*color:#fff; */
 }
+
+.user_tags{
+	padding-top: 5px;
+	padding-bottom: 5px;
+	padding-left: 8px;	
+}
+
 .tool{
 	padding-left:0px;
 	margin:0px 0px 0px 0px;