diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb
index 28bb3fa83..030c8ff0e 100644
--- a/app/views/forums/_file_form.html.erb
+++ b/app/views/forums/_file_form.html.erb
@@ -43,11 +43,11 @@
 </span>
   <% project = project %>
   <div class="cl"></div>
-  <span class="add_attachment" style="font-weight:normal;">
+  <!--<span class="add_attachment" style="font-weight:normal;">-->
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
     <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %>
-    <a href="javascript:void(0);" onclick="$('#_file').click();" class="AnnexBtn fl mt3"></a>
+    <a href="javascript:void(0);" onclick="$('#_file').click();" class="AnnexBtn fl mr15">上传附件</a>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
                        :class => 'file_selector',
@@ -71,7 +71,7 @@
     <!--(<%#= l(:label_max_size) %>:-->
     <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>
     <!--)-->
-</span>
+<!--</span>-->
 
   <% content_for :header_tags do %>
       <%= javascript_include_tag 'attachments' %>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 79341d458..962331fad 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -167,7 +167,14 @@
             <input type="text"  name="addTag" size="20" class="isTxt w90 f_l"  maxlength="<%=Setting.tags_max_length%>" minlength="<%= Setting.tags_min_length%>" />
             <input type="button" class="submit f_l" onclick="addTag();" />
             </span></div>
+            <%if @forum.creator.id == User.current.id%>
             <div class="cl"></div>
+             <span class="postEdit">
+            </span>
+            <a href="javascript:void(0);" class="linkGrey3">编辑贴吧</a>
+            <a href="javascript:void(0);" class="fr linkGrey3">删除贴吧</a>
+            <span class="postDelete"></span>
+             <% end %>
           </div>
           <div class="postDetailContainer mt10">
             <div class="fl mr10"><%= link_to image_tag(url_to_avatar(User.current),:width=>50,:height => 50,:alt=>'贴吧图像' ),user_path( User.current) %></div>
diff --git a/public/stylesheets/images/post_image_list.png b/public/stylesheets/images/post_image_list.png
index 86aab4c79..07636288d 100644
Binary files a/public/stylesheets/images/post_image_list.png and b/public/stylesheets/images/post_image_list.png differ
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 1b0dd5533..4e1aad655 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -759,7 +759,8 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no
 .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;}
 a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}
-
+.postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;}
+.postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;}
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
@@ -943,8 +944,8 @@ a:hover.BlueCirBtn{ background:#269ac9; color:#fff;}
 .w720{width:721px;}
 .w709{width: 709px;}
 .w701{width: 701px;}
-a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
-a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;}
+/*a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/
+/*a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;}*/
 a.FilesBtn{  background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#269ac9;}
 a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
@@ -961,8 +962,8 @@ a:hover.BlueCirBtn{ background:#3598db; color:#fff;}
 .W440{ width:440px;}
 .W120{ width:110px;}
 .W700{ width:700px;}
-a.AnnexBtn{  background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
-a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}
+/*a.AnnexBtn{  background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/
+/*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/
 a.FilesBtn{  background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;}
 a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}