From b809e8844cbddd7cae32c9c2631bd9448705f58e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 12 Mar 2015 16:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb |  2 +-
 app/views/layouts/base_users.html.erb    |  2 +-
 app/views/tags/_project_tag.html.erb     | 22 +++++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 4f5e10990..69c37d2b3 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -123,7 +123,7 @@
 										<%= link_to "#{@project.members.count}", project_member_path(@project), :style => "color:#3CA5C6;font-weight:bold" %></span>）
 										<span>| </span>
 										<%= l(:label_user_watcher) %>（<span class="info_foot_num">
-										<%= link_to "#{@project.watcher_users.count}", :controller=>"projects", :action=>"watcherlist", :id => @project, :style => "color:#3CA5C6;font-weight:bold" %></span>）
+										<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :style => "color:#3CA5C6;font-weight:bold"  %></span>）
 										<span>| </span>
 										<%= l(:project_module_attachments) %>（<span class="info_foot_num" >
 										<%= link_to "#{@project.attachments.count}", project_files_path(@project), :style => "color:#3CA5C6;font-weight:bold" %></a>）</div>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index a7ed0aa25..3f483c18d 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -217,7 +217,7 @@
                                                     </td>
                                                   </tr>
                                                  <% end %>
-                                              <% unless @user.user_extensions.location.empty?%>
+                                              <% unless @user.user_extensions.location.blank? %>
                                                 <tr>
 
                                                     <td style=" float: right" width="70px">
diff --git a/app/views/tags/_project_tag.html.erb b/app/views/tags/_project_tag.html.erb
index 75e2ee801..8694d69ca 100644
--- a/app/views/tags/_project_tag.html.erb
+++ b/app/views/tags/_project_tag.html.erb
@@ -2,19 +2,31 @@
 	<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
 </div>
 <% if User.current.logged? %>
-	<span> <%= toggle_link ("+"+l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
+	<span> <%= toggle_link (l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
 <% end %>
 <div id="put-tag-form" style="display: none;text-align: center">
 	<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
 								:update => "tags_show",
 								:complete => '$("#put-tag-form").slideUp();' do |f| %>
-		<%= f.text_field :name ,:id => "tags_name",:size=>"20",
+		<table>	
+			<tr>
+				<td>
+					<%= f.text_field :name ,:id => "tags_name",:size=>"20",
     				 :require=>true,
     				 :maxlength => Setting.tags_max_length,
        				 :minlength=>Setting.tags_min_length %>
-		<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
-		<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
-		<a href="#"  onclick='$("#tags_name").parent().submit();' type="button" class="submit f_l" style="margin-top: 10px;"></a>
+				</td>
+				
+					<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+				
+				
+					<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+				
+				<td style="margin-left: 5px">
+					<a href="#"  onclick='$("#tags_name").parent().submit();' type="button" class="submit f_l"></a>
+				</td>
+			<tr>
+		</table>
 	<% end %>
 </div>