From 76ea93c89c4dd66b5097d9b855e72f3ba9319970 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 1 Aug 2015 13:47:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=B8=8E=E4=B8=8A=E9=9D=A2=E5=9D=97=E4=B9=8B=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 33973b047..7730b597a 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -235,7 +235,7 @@
         <div class="cl"></div>
       </div>
 
-      <div class="cl"></div>
+      <!--<div class="cl"></div>-->
 
       <!-- tag模块 -->
       <div class="project_Label">

From 14673e79d83b45d0be0ee0d11ba00ad33816139c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 1 Aug 2015 15:09:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb  |  2 +-
 app/views/tags/_tag_user_new_name.html.erb | 30 ++++++++++++++++++++++
 app/views/tags/_user_tag.html.erb          |  5 ++++
 app/views/tags/remove_tag.js.erb           |  3 +++
 app/views/tags/tag_save.js.erb             |  4 +++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 app/views/tags/_tag_user_new_name.html.erb
 create mode 100644 app/views/tags/_user_tag.html.erb

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 7730b597a..654e5c30e 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -242,7 +242,7 @@
         <h4 class="mb5"><%= l(:label_tag)%>:</h4>
         <div class="tag_h">
           <div id="tags">
-            <%= render :partial => 'tags/project_tag', :locals => {:obj => @user,:object_flag => "1"}%>
+            <%= render :partial => 'tags/user_tag', :locals => {:obj => @user,:object_flag => "1"}%>
           </div>
         </div>
         <div class="cl"></div>
diff --git a/app/views/tags/_tag_user_new_name.html.erb b/app/views/tags/_tag_user_new_name.html.erb
new file mode 100644
index 000000000..95730c22c
--- /dev/null
+++ b/app/views/tags/_tag_user_new_name.html.erb
@@ -0,0 +1,30 @@
+<% @tags = obj.reload.tag_list %>
+<% if non_list_all && @tags.size > 0 %>
+
+<% else %>
+    <!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
+    <% if @tags.size > 0 %>
+        <% @tags.each do |tag| %>
+            <span class="re_tag f_l " id="tag">
+              <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id, :class => 'pt5' %>
+              <span class="del">
+                <%= link_to('x', remove_tag_path(:tag_name => tag,:taggable_id => obj.id, :taggable_type => object_flag), :remote => true, :confirm => l(:text_are_you_sure) ) if User.current.eql?(obj) %>
+              </span>
+            </span>
+        <% end %>
+    <% end %>
+<% end %>
+
+<% if User.current.logged?%>
+    <a href="javascript:void(0)" class="yellowBtn f_l" onclick="$('#add_tag03').slideToggle();"><%= l(:label_add_tag)%></a>
+    <span id="add_tag03" style="display:none; vertical-align: middle;" class="ml10 f_l">
+       <%= form_for "tag_for_save",:remote => true,:url=>save_tag_path,:update => "tags_show",:complete => '$("#put-tag-form").slideUp();' do |f| %>
+          <%= f.text_field :name ,:id => "tags_name3",:size=>"20",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class =>"isTxt w90 f_l" %>
+          <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+          <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+          <input type="button" class="submit f_l" onclick="$('#tags_name3').parent().submit();" />
+       <% end %>
+    </span>
+<% end%>
+
+
diff --git a/app/views/tags/_user_tag.html.erb b/app/views/tags/_user_tag.html.erb
new file mode 100644
index 000000000..d04fb50a6
--- /dev/null
+++ b/app/views/tags/_user_tag.html.erb
@@ -0,0 +1,5 @@
+<div id="tags">
+  <div id="tags_show">
+    <%= render :partial => "tags/tag_user_new_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
+  </div>
+</div>
diff --git a/app/views/tags/remove_tag.js.erb b/app/views/tags/remove_tag.js.erb
index cd56fef1a..4c4409c1c 100644
--- a/app/views/tags/remove_tag.js.erb
+++ b/app/views/tags/remove_tag.js.erb
@@ -2,6 +2,9 @@
 <% if  @object_flag == '3'%>
 $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
+<% elsif @object_flag == '1'%>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_user_new_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
 <% elsif @object_flag == '2'%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_project_new_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
diff --git a/app/views/tags/tag_save.js.erb b/app/views/tags/tag_save.js.erb
index 992c472ed..5a29c113c 100644
--- a/app/views/tags/tag_save.js.erb
+++ b/app/views/tags/tag_save.js.erb
@@ -4,6 +4,10 @@ $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_n
                                         :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
 //$('#put-tag-form-issue').hide();
 $('#name-issue').val("");
+<% elsif  @obj_flag == '1'%>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_user_new_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+$('#tags_name3').val("");
 <% elsif  @obj_flag == '2'%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_project_new_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');