From 0be9de3a17efb1af21617b41a2ccb2a9c805b285 Mon Sep 17 00:00:00 2001
From: william <silentbinary@gmail.com>
Date: Fri, 27 Sep 2013 16:02:49 +0800
Subject: [PATCH] =?UTF-8?q?tag=E6=90=9C=E7=B4=A2=E4=B8=AD=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3tag=E6=94=B9=E6=88=90=E5=8F=AA=E6=98=BE=E7=A4=BA10?=
 =?UTF-8?q?=E4=B8=AA=EF=BC=8C=E5=8F=A6=E5=A4=96=E7=BB=9F=E4=B8=80=E4=BA=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A3=8E=E6=A0=BC=EF=BC=88=E9=99=A4=E5=8E=BB?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E6=8C=89=E9=92=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_related_tags.html.erb          |  3 +++
 app/views/tags/_tag.html.erb                   |  4 ++--
 app/views/tags/_tag_name.html.erb              |  2 +-
 app/views/tags/remove_tag.js.erb               | 10 ++++++++++
 app/views/tags/show_all.html.erb               |  2 +-
 .../stylesheets/application.css                | 18 ++++++++++++++++++
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 app/views/tags/remove_tag.js.erb

diff --git a/app/views/tags/_related_tags.html.erb b/app/views/tags/_related_tags.html.erb
index 2dd1d93e8..04b356598 100644
--- a/app/views/tags/_related_tags.html.erb
+++ b/app/views/tags/_related_tags.html.erb
@@ -1,6 +1,8 @@
 <% if related_tags %>
 <ul style="list-style-type: none">
+	<% i = 0 %>
 	<% for rt in related_tags %>
+    <% i += 1 %>
 	<li>	
 		<%= link_to image_tag("/images/sidebar/add.png"),:action => "index",
 		                      :current_selected_tags => selected_tags,:tag => rt,:do_what => "1",
@@ -8,6 +10,7 @@
 		<span id="tag">
 		<%= rt %> 
 		</span>
+		<% break if i >= 10 %>
 		<!-- 这里用例计数某类对象的所有该tag总数 -->
 	 <%= render :partial => 'sidebar_tags',:locals => {:show_flag => obj_flag,:sg => rt }%>
 	</li>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 0cd53450c..ef1cedd4a 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -19,7 +19,7 @@
 	<%= f.text_field :name ,:id => "name-issue",:size=>"30",:require=>true,:maxlength => 25,:minlength=>1 %>
 	<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
 	<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
-	<%= f.submit l(:button_project_tags_add)%>
+	<%= f.submit l(:button_project_tags_add),:class => "small"%>
 	<%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%>
 	<% end %> 
 </div>
@@ -44,7 +44,7 @@
 	<%= f.text_field :name ,:id => "name",:size=>"28",: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"%>
-	<%= f.submit "#{l(:button_project_tags_add)}"%>
+	<%= f.submit l(:button_project_tags_add),:class => "small" %>
 	<%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%>
 	<% end %>
 </div>
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 552246da1..489594274 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -5,7 +5,7 @@
 	// }, function() {
 		// $(this).children("span").hide();
 	// });
-})
+// })
 </script>
 <!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求-->
 <% @tags = obj.reload.tag_list %>
diff --git a/app/views/tags/remove_tag.js.erb b/app/views/tags/remove_tag.js.erb
new file mode 100644
index 000000000..f74cb355d
--- /dev/null
+++ b/app/views/tags/remove_tag.js.erb
@@ -0,0 +1,10 @@
+
+<% 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}) %>');
+
+<% else %>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/tags/show_all.html.erb b/app/views/tags/show_all.html.erb
index 8b6fc6199..06be862da 100644
--- a/app/views/tags/show_all.html.erb
+++ b/app/views/tags/show_all.html.erb
@@ -5,7 +5,7 @@
 <div id="show_all_tags">
 <% for tag in @tags %>
     <span id="tag" class="tag<%= tag.id %>">	
-        <%= link_to tag.name,:remote=>true,:action=>"delete",:q => tag.id,:confirm => "Are you Sure?"%>   
+       <%= link_to tag.name,:remote=>true,:action=>"delete",:q => tag.id,:confirm => "Are you Sure?"%>   
     </span>
 <% end %>
 <% end %>
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 8fa8fdd3f..5f23beb47 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -1757,4 +1757,22 @@ input[type='text'].noline {
 div.tableline{
 	height: 1px;
 	background-color: #ACAEB1;
+}
+
+/* 统一按钮风格 
+ * 
+ * @2013-09-27
+ * added by william */
+input[type="submit"] {
+	width: auto;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color: rgb(5, 5, 5);
+    padding: 0px;
+    background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent;
+    border-radius: 4px;
+    border: 1px solid rgb(148, 148, 148);
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
+    cursor: pointer;
 }
\ No newline at end of file