From 92bc517350612eaa1d9636ef56af686a5c548b23 Mon Sep 17 00:00:00 2001
From: william <silentbinary@gmail.com>
Date: Tue, 13 Aug 2013 21:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9project=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 14 ------
 app/views/tags/_tag.html.erb             | 57 ++++++++++++------------
 public/stylesheets/application.css       | 12 +----
 3 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 8f187c27..31176e18 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -53,8 +53,6 @@
 
 											<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>
-										</tr>  <!-- 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>
@@ -82,17 +80,6 @@
 									<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>
@@ -145,7 +132,6 @@
 					<div id="ajax-modal" style="display:none;"></div>
 				</div>
 			</div>
-		</div>
 			<%= call_hook :view_layouts_base_body_bottom %>
 	</body>
 </html>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 922a6f82..22bab5e3 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -1,42 +1,41 @@
 <div id="tags">
 	<!-- 1代表是user类型   2代表是project类型  3代表是issue类型  -->
 	<!--  3 代表的是issue 当是issue是 处理方式与前2个对象不同 -->
- <% if  object_flag == '3' %>
-  
-    <span><%= image_tag("/images/sidebar/tags.png") %></span> 
-	  <span class="font_title_tag"><%= l(:label_tag) %>:</span>
-	  	
-	  
-    <% if User.current.logged? %>
-	   <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %>
+	<% if  object_flag == '3' %>
+	<span><%= image_tag("/images/sidebar/tags.png") %></span>
+	<span class="font_title_tag"><%= l(:label_tag) %>:</span>
+
+	<% if User.current.logged? %>
+	<span> <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name-issue'} %></span>
 	<% end %>
-	
-	<div id="tags_show_issue">
-		<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
-	</div>
-	<div id="put-tag-form-issue" style="display: none">
-		<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
-		:update => "tags_show",
-		:complete => '$("#put-tag-form-issue").hide();' do |f| %>
-		<%= f.text_field :name ,:id => "name-issue",:size=>"30" %>
-		<%= 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-issue").hide();'%>
-		<% end %>
-	</div>
+
+<div id="tags_show_issue">
+	<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
+</div>
+<div id="put-tag-form-issue" style="display: none">
+	<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
+	:update => "tags_show",
+	:complete => '$("#put-tag-form-issue").hide();' do |f| %>
+	<%= f.text_field :name ,:id => "name-issue",:size=>"30",:require=>true %>
+	<%= 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-issue").hide();'%>
+	<% end %>
+</div>
 </div>
 
 <% else %>
 
-  <span><%= image_tag("/images/sidebar/tags.png") %></span> 
-	  <span class="font_title_tag"><%= l(:label_tag) %>:</span>
-	  	
-	  
+<span><%= image_tag("/images/sidebar/tags.png") %></span>
+<span class="font_title_tag"><%= l(:label_tag) %>:</span>
+
 <% if User.current.logged? %>
- <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %>
+<span><%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %></span>
 <% end %>
 
+
+
 <div id="tags_show">
 	<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
 </div>
@@ -44,7 +43,7 @@
 	<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
 	:update => "tags_show",
 	:complete => '$("#put-tag-form").hide();' do |f| %>
-	<%= f.text_field :name ,:id => "name",:size=>"28"%>
+	<%= f.text_field :name ,:id => "name",:size=>"28",:require=>true%>
 	<%= 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"%>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4646f021..2025b5d1 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -11,15 +11,7 @@ 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;
@@ -1890,7 +1882,7 @@ h2 img { vertical-align:middle; }
 
 /*added by william*/
 #tag {
-		background: url(/images/issue_tag.png) no-repeat right -19px;
+		background: url(../images/issue_tag.png) no-repeat right -19px;
 		border-radius: 5px 5px 5px 5px;
 		color: #3a587d !important;
 		padding: 0px 4px;