From 6f54e1680d390f853544636689547cd81411ccb9 Mon Sep 17 00:00:00 2001
From: william <silentbinary@gmail.com>
Date: Tue, 13 Aug 2013 15:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86tag=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9Btag=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb     |  2 ++
 app/helpers/projects_helper.rb         |  2 +-
 app/views/tags/_related_tags.html.erb  |  6 +++--
 app/views/tags/_selected_tags.html.erb |  4 ++--
 app/views/tags/_show_projects.html.erb |  6 ++---
 app/views/tags/_show_users.html.erb    |  2 +-
 app/views/tags/_tag_name.html.erb      | 32 ++++----------------------
 app/views/tags/add_tag.js.erb          |  4 ++--
 app/views/tags/delete_tag.js.erb       |  4 ++--
 app/views/tags/index.html.erb          | 11 +++++----
 app/views/tags/show_all.html.erb       | 13 -----------
 public/stylesheets/application.css     | 12 ++++++++++
 12 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 1d193ef42..35e99dc6c 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -53,6 +53,7 @@ class TagsController < ApplicationController
 
   def add_tag
     @tag = params[:tag]
+    @show_flag = params[:show_flag]
     $selected_tags << @tag
     $related_tags.delete(@tag)
 
@@ -63,6 +64,7 @@ class TagsController < ApplicationController
 
   def delete_tag
     @tag = params[:tag]
+    @show_flag = params[:show_flag]
     $related_tags << @tag
     $selected_tags.delete(@tag)
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index d4738a831..cbe57d1c7 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -85,7 +85,7 @@ module ProjectsHelper
      # this method is used to get all projects that tagged one tag
   # added by william
   def get_projects_by_tag(tag_name)
-    Project.tagged_with(tag_name).by_join_date
+    Project.tagged_with(tag_name)
   end
 
 end
diff --git a/app/views/tags/_related_tags.html.erb b/app/views/tags/_related_tags.html.erb
index b7ebd5899..84fb06923 100644
--- a/app/views/tags/_related_tags.html.erb
+++ b/app/views/tags/_related_tags.html.erb
@@ -1,9 +1,11 @@
 <% if related_tags %>
 <ul>
 	<% for rt in related_tags %>
-	<li>
-		<%= link_to image_tag("/images/sidebar/add.png"),:action => "add_tag",:remote => true,:tag => rt %>
+	<li>	
+		<%= link_to image_tag("/images/sidebar/add.png"),:action => "add_tag",:remote => true,:tag => rt,:show_flag => show_flag %>
+		<span id="tag">
 		<%= rt %> 
+		</span>
 		<% @issue_size = Issue.tagged_with("#{rt}").size %>
 		<% @project_size = Project.tagged_with(rt).size %>
 		<% @user_size = User.tagged_with("#{rt}").size %>
diff --git a/app/views/tags/_selected_tags.html.erb b/app/views/tags/_selected_tags.html.erb
index 51ba6c87a..f3afa4d8e 100644
--- a/app/views/tags/_selected_tags.html.erb
+++ b/app/views/tags/_selected_tags.html.erb
@@ -2,8 +2,8 @@
 <ul>
 	<% for sg in selected_tags %>
 	<li>
-		<%= link_to image_tag("/images/sidebar/minus.png"),:action => "delete_tag",:remote=>true,:tag => sg %>
-		<%= sg %> 
+		<%= link_to image_tag("/images/sidebar/minus.png"),:action => "delete_tag",:remote=>true,:tag => sg,:show_flag => show_flag %>
+		<span id="tag"><%= sg %> </span>
 		<% @issue_size = Issue.tagged_with("#{sg}").size %>
 		<% @project_size = Project.tagged_with(sg).size %>
 		<% @user_size = User.tagged_with("#{sg}").size %>
diff --git a/app/views/tags/_show_projects.html.erb b/app/views/tags/_show_projects.html.erb
index 22b406ace..94d61c3ff 100644
--- a/app/views/tags/_show_projects.html.erb
+++ b/app/views/tags/_show_projects.html.erb
@@ -3,11 +3,11 @@
 <hr />
 <h3>Projects:</h3>
 
-<% projects_results.each do |project| %>
+<% projects_results.each do |prj| %>
 <li>
-	项目名称：<%= link_to project.name,:controller => "projects",:action => "show",:id => project.id %>
+	项目名称：<%= link_to "#{prj.name}",:controller => "projects",:action => "show",:id => prj.id %>
 	<br />
-	项目描述：<%= project.description %>;
+	项目描述：<%= prj.description %>;
 
 </li>
 <% end %>
diff --git a/app/views/tags/_show_users.html.erb b/app/views/tags/_show_users.html.erb
index c049acc62..fc2e94969 100644
--- a/app/views/tags/_show_users.html.erb
+++ b/app/views/tags/_show_users.html.erb
@@ -6,7 +6,7 @@
 <% users_results.each do |user| %>
 <li>
 	用户名：<%= link_to ("#{user.firstname+user.lastname}"),
-	:controller => "users",:action => "show",:id => user.id %>
+	:controller => "users",:action => "show",:id => user.id%>
 	<br />
 	用户邮箱：<%= mail_to(h(user.mail)) %>
 </li>
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index ceffa0ad7..88f5a16a4 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -1,28 +1,4 @@
-<style type="text/css">
-	.click {
-		background: #b77b1b;
-	}
-	.unclick {
-		background: #b77b1b;
-	}
-	#tag {
-		background: url(/images/issue_tag.png) no-repeat right -19px;
-		border-radius: 5px 5px 5px 5px;
-		color: #3a587d !important;
-		padding: 0px 4px;
-		margin: 3px;
-		display: inline-block;
-		font-size: 11px;
-		text-decoration: none;
-		cursor: pointer;
-	}
-	#tag:hover {
-		color: #fff;
-	}
-	a:visited {
-		text-decoration: none;
-	}
-</style>
+
 <!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求-->
 <% @tags = obj.reload.tag_list %>
 
@@ -31,7 +7,7 @@
 <% if @tags.size > Setting.show_tags_length.to_i then %>
 <% i = 0 %>
 <% until i>Setting.show_tags_length.to_i do %>
-<div id="tag" class="click unclick">
+<div id="tag">
 	<%= link_to @tags[i], :controller => "tags",:action => "index",:q => @tags[i],:object_flag => object_flag,:obj_id => obj.id %>
 </div>
 <% i += 1%>
@@ -41,7 +17,7 @@
 <% else %>
 
 <% @tags.each do |tag| %>
-<div id="tag" class="click unclick">
+<div id="tag">
 	<%= link_to tag,:controller => "tags",:action => "index",:q=>tag,:object_flag => object_flag,:obj_id => obj.id
 %>
 </div>
@@ -52,7 +28,7 @@
 <!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
 <% if @tags.size > 0  %>
 <% @tags.each do |tag| %>
-<div id="tag" class="click unclick">
+<div id="tag">
 	<%= link_to tag,:controller => "tags",:action => "index",:q=>tag ,:object_flag => object_flag,:obj_id => obj.id %>
 </div>
 <% end %>
diff --git a/app/views/tags/add_tag.js.erb b/app/views/tags/add_tag.js.erb
index 6c623ddd9..b8226ccb4 100644
--- a/app/views/tags/add_tag.js.erb
+++ b/app/views/tags/add_tag.js.erb
@@ -1,7 +1,7 @@
 $('#selected_tags').html('<%= j(render :partial => "selected_tags",
-:locals => {:selected_tags => $selected_tags })%>');
+:locals => {:selected_tags => $selected_tags ,:show_flag => @show_flag })%>');
 $('#related_tags').html('<%= j(render :partial => "related_tags",
-  :locals => {:related_tags => $related_tags })%>')
+  :locals => {:related_tags => $related_tags ,:show_flag => @show_flag })%>')
 
 $('#show_results').html('<%= j(render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
     	 	:projects_results => @projects_results,:users_results => @users_results,:show_flag => @show_flag })%>')
diff --git a/app/views/tags/delete_tag.js.erb b/app/views/tags/delete_tag.js.erb
index 808eb5388..60a7d7361 100644
--- a/app/views/tags/delete_tag.js.erb
+++ b/app/views/tags/delete_tag.js.erb
@@ -1,7 +1,7 @@
 $('#selected_tags').html('<%= j(render :partial => "selected_tags",
-:locals => {:selected_tags => $selected_tags })%>');
+:locals => {:selected_tags => $selected_tags ,:show_flag => @show_flag })%>');
 $('#related_tags').html('<%= j(render :partial => "related_tags",
-:locals => {:related_tags => $related_tags })%>')
+:locals => {:related_tags => $related_tags,:show_flag => @show_flag })%>')
 
 $('#show_results').html('<%= j(render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
 :projects_results => @projects_results,:users_results => @users_results,:show_flag => @show_flag })%>')
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index f8d6c40b1..af1fd38ca 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -4,13 +4,13 @@
 			Selected Tags
 		</li>
 		<div id="selected_tags">		
-			 <%= render :partial => "selected_tags",:locals => {:selected_tags => $selected_tags }%>		
+			 <%= render :partial => "selected_tags",:locals => {:selected_tags => $selected_tags,:show_flag => @obj_flag}%>		
 		</div>
 		<li>
 			Related Tags
 		</li>
 		<div id="related_tags">		
-			 <%= render :partial => "related_tags",:locals => {:related_tags => $related_tags }%>		
+			 <%= render :partial => "related_tags",:locals => {:related_tags => $related_tags,:show_flag => @obj_flag }%>		
 		</div>
 	</ul>
 </div>
@@ -18,9 +18,10 @@
 <div class="splitcontentright">
 	<h2>Search Results</h2>
 	<div id="filter-menu" align="right">
-		<%= link_to "Issue",:action => "index"%>(<%=  @issues_tags_num %>)|
-		<%= link_to "Project",:action => "index"%>(<%= @projects_tags_num %>) |
-		<%= link_to "User",:action => "index"%>(<%= @users_tags_num %>)
+		Tag统计：
+		Issue(<%=  @issues_tags_num %>)|
+		Project(<%= @projects_tags_num %>)|
+		User(<%= @users_tags_num %>)
 	</div>
     <div id="show_results">
     	 <%= render :partial => "tag_search_results",:locals => {:issues_results => @issues_results,
diff --git a/app/views/tags/show_all.html.erb b/app/views/tags/show_all.html.erb
index df5c851b1..bcdc7fd31 100644
--- a/app/views/tags/show_all.html.erb
+++ b/app/views/tags/show_all.html.erb
@@ -1,16 +1,3 @@
-<style type="text/css">
-	#tag {
-		background-color: #dbe4ee;
-		border-radius: 5px 5px 5px 5px;
-		color: #3a587d !important;
-		padding: 0px 4px;
-		margin: 3px;
-		display: inline-block;
-		font-size: 11px;
-		text-decoration: none;
-		cursor: pointer;
-	}
-</style>
 <% for tag in @tags %>
     <span id="tag">
         <%= tag.name %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index cd0fd5aad..41ae7eb28 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1865,3 +1865,15 @@ h2 img { vertical-align:middle; }
   overflow:hidden;
 }
 
+/*added by william*/
+#tag {
+		background: url(/images/issue_tag.png) no-repeat right -19px;
+		border-radius: 5px 5px 5px 5px;
+		color: #3a587d !important;
+		padding: 0px 4px;
+		margin: 3px;
+		display: inline-block;
+		font-size: 11px;
+		text-decoration: none;
+		cursor: pointer;
+}