diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 88f5a16a..abdff2a6 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -4,34 +4,42 @@
 
 <% if non_list_all and (@tags.size > 0) %>
 <!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替  -->
-<% if @tags.size > Setting.show_tags_length.to_i then %>
-<% i = 0 %>
-<% until i>Setting.show_tags_length.to_i do %>
-<div id="tag">
-	<%= link_to @tags[i], :controller => "tags",:action => "index",:q => @tags[i],:object_flag => object_flag,:obj_id => obj.id %>
-</div>
-<% i += 1%>
-<% end %>
-<%= link_to l(:label_more_tags),:action => "show",:id => obj.id %>
+    <% if @tags.size > Setting.show_tags_length.to_i then %>
+        <% i = 0 %>
+
+          <% until i>Setting.show_tags_length.to_i do %>
+              <div id="tag">
+              	<%= link_to @tags[i], :controller => "tags",:action => "index",:q => @tags[i],:object_flag => object_flag,:obj_id => obj.id %>
+              </div>
+             <% i += 1%>
+         <% end %>
+
+       <%= link_to l(:label_more_tags),:action => "show",:id => obj.id %>
+
+    <% else %>
+
+        <% @tags.each do |tag| %>
+           <div id="tag">
+	            <%= link_to tag,:controller => "tags",:action => "index",:q=>tag,:object_flag => object_flag,:obj_id => obj.id %>
+           </div>
+        <% end %>
+
+    <% end %>
 
 <% else %>
 
-<% @tags.each do |tag| %>
-<div id="tag">
-	<%= link_to tag,:controller => "tags",:action => "index",:q=>tag,:object_flag => object_flag,:obj_id => obj.id
-%>
-</div>
-<% end %>
-<% end %>
 
-<% else %>
 <!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
-<% if @tags.size > 0  %>
-<% @tags.each do |tag| %>
-<div id="tag">
-	<%= link_to tag,:controller => "tags",:action => "index",:q=>tag ,:object_flag => object_flag,:obj_id => obj.id %>
-</div>
-<% end %>
-<% end %>
+     <% if @tags.size > 0  %>
+         <% @tags.each do |tag| %>
+              <div id="tag">
+	          <%= link_to tag,:controller => "tags",:action => "index",:q=>tag ,:object_flag => object_flag,:obj_id => obj.id %>
+              </div>
+         <% end %>
+    <% else %>
+         <div id="tag">暂无标签！</div>
+    <% end %>
+
+
 
 <% end %>
\ No newline at end of file