Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/layouts/_tag.html.erb

@@ -1,9 +1,10 @@
-<div id="tags" class="inf_user_context">
+<div id="tags">
+	<%= tag('img', {:src => "/images/sidebar/tags.png"}, false, false) %>
 	<label><%= l(:label_tag) %>:</label>
 	<!-- 1代表是user类型   2代表是project类型  3代表是issue类型  -->
 	<!--  3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
   <% if  object_flag == '3' %>
-	<%= toggle_link (image_tag "/images/add.png"), 'put-tag-form-issue', {:focus => 'name'} %>
+	<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name'} %>
 	<div id="tags_show_issue">
 		<%= render :partial => "layouts/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
 	</div>
@@ -15,13 +16,13 @@
 		<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
 		<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
 		<%= f.submit "add"%>
-		<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
+		<%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%>
 		<% end %>
 	</div>
 </div>
 
 <% else %>
-<%= toggle_link (image_tag "/images/add.png"), 'put-tag-form', {:focus => 'name'} %>
+<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %>
 <div id="tags_show">
 	<%= render :partial => "layouts/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
 </div>

app/views/layouts/_tag_name.html.erb

@@ -17,7 +17,7 @@
 		cursor: pointer;
 	}
 </style>
-<!-- 1代表是user类型   2代表是project类型  3代表是issue类型  -->
+<!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求-->
 <% @tags = obj.reload.tag_list %>
 
 <% if non_list_all and (@tags.size > 0) %>

app/views/projects/show_new.html.erb

@@ -10,7 +10,6 @@
     <% end %>
   <% end %>
 </div>
-
 <h3><%=l(:label_overview)%></h3>
 
 <% unless @project.active? %>

app/views/tags/_related_tags.html.erb

@@ -2,7 +2,7 @@
 <ul>
 	<% for rt in related_tags %>
 	<li>
-		<%= link_to image_tag("/images/add.png"),:action => "add_tag",:remote => true,:tag => rt %>
+		<%= link_to image_tag("/images/sidebar/add.png"),:action => "add_tag",:remote => true,:tag => rt %>
 		<%= rt %> 
 		<% @issue_size = Issue.tagged_with("#{rt}").size %>
 		<% @project_size = Project.tagged_with(rt).size %>

app/views/tags/_selected_tags.html.erb

@@ -2,7 +2,7 @@
 <ul>
 	<% for sg in selected_tags %>
 	<li>
-		<%= link_to image_tag("/images/delete.png"),:action => "delete_tag",:remote=>true,:tag => sg %>
+		<%= link_to image_tag("/images/sidebar/minus.png"),:action => "delete_tag",:remote=>true,:tag => sg %>
 		<%= sg %> 
 		<% @issue_size = Issue.tagged_with("#{sg}").size %>
 		<% @project_size = Project.tagged_with(sg).size %>