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 %>
+ <% i = 0 %>
<% for rt in related_tags %>
+ <% i += 1 %>
-
<%= link_to image_tag("/images/sidebar/add.png"),:action => "index",
:current_selected_tags => selected_tags,:tag => rt,:do_what => "1",
@@ -8,6 +10,7 @@
<%= rt %>
+ <% break if i >= 10 %>
<%= render :partial => 'sidebar_tags',:locals => {:show_flag => obj_flag,:sg => rt }%>
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 %>
@@ -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 %>
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();
// });
-})
+// })
<% @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 @@
<% for tag in @tags %>
- <%= 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?"%>
<% 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