diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index ec19b5b97..52309912e 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -21,7 +21,7 @@
         function edit_desc(){
             if(<%=@forum.creator.id == User.current.id%>) {
                 desc = $("#forum_desc_span").html();
-                $("#forum_desc_span").html("<textarea id='forum_desc_input' onblur='change_forum_desc();' class='homepageSignatureTextarea'>" + desc + "</textarea>");
+                $("#forum_desc_span").html("<textarea id='forum_desc_input' onblur='change_forum_desc();'  style='width: 200px;height: 80px; max-width: 207px; max-height: 80px; border: 1px solid #d9d9d9;outline: none;margin: 0px 0px 12px 0px;'>" + desc + "</textarea>");
                 $("#forum_desc_input").focus();
             }
         }
@@ -154,10 +154,9 @@
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
-            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description%></span>
+            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
               <%if @forum.creator.id == User.current.id%>
                   <a href="javascript:void(0);" onclick="edit_desc();">
-                  <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->
                   <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
                   </a>
                <%end%>
diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb
index 15473e6e7..ca0f41d16 100644
--- a/app/views/memos/_attachments_links.html.erb
+++ b/app/views/memos/_attachments_links.html.erb
@@ -1,4 +1,4 @@
-<div class="mt10 fl" >
+<div class="mt10 fl" style="width: 600px">
   <% for attachment in attachments %>
       <!--<p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">-->
           <!--<div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">-->
@@ -20,43 +20,13 @@
             <div class="cl"></div>
         <% else %>
             <span class="pic_files fl "></span>
-          <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 32 -%>
+          <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 45 -%>
           <a  href="javascript:void(0);" class="fl FilesName02"> (<%= number_to_human_size attachment.filesize , :precision => 0 %>)</a>
           <% if options[:deletable] %>
-              <%#= link_to image_tag('delete.png'), attachment_path(attachment),
-                          :data => {:confirm => l(:text_are_you_sure)},
-                          :method => :delete,
-                          :class => 'delete',
-                          #:remote => true,
-                          #:id => "attachments_" + attachment.id.to_s,
-                          :title => l(:button_delete) %>
               <a href="<%=attachment_path(attachment) %>" onclick="confirm(<%=l(:text_are_you_sure) %>)" data-method="delete">  <span class="pic_del fl "></span> </a>
           <% end %>
             <div class="cl"></div>
         <% end %>
-
-      <%# if attachment.is_text? %>
-          <%#= link_to image_tag('magnifier.png'),
-                      :controller => 'attachments',
-                      :action => 'show',
-                      :id => attachment,
-                      :filename => attachment.filename%>
-      <%# end %>
-      <!--<span title="<%#= attachment.description%>">-->
-    <!--<%#= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>-->
-  <!--</span>-->
-
-      <!--<%# if options[:wrap] %>-->
-          <!--<br/>-->
-          <!--&nbsp;-->
-      <!--<%# end %>-->
-      <!--<%# if options[:author] %>-->
-    <!--<span class="author" title="<%#= attachment.author%>">-->
-      <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>
-      <!--<%#= format_time(attachment.created_on) %>-->
-    <!--</span>-->
-      <!--<%# end %>-->
-      <!--</p>-->
   <% end %>
   <% if defined?(thumbnails) && thumbnails %>
       <% images = attachments.select(&:thumbnailable?) %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 1e2f0f25b..550c7a4fe 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -69,7 +69,7 @@
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>
-      <div class=" fl">
+      <div class=" fl" style="width: 600px">
         <% if @memo.attachments.any?%>
             <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
             <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index afd2f142b..8798002c9 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -1,3 +1,4 @@
+<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
@@ -45,18 +46,29 @@
       <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <%= activity.description.html_safe %>
       </div>
-      <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity_id %>">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+      <% if is_teacher%>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
+                  </li>
+                  <li>
+                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                  </li>
+                  <li>
+                    <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
+                  </li>
+                  <li>
+                    <%= homework_anonymous_comment activity %>
+                  </li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
+          </div>
+      <% end%>
       </div>
-    </div>
     <div class="cl"></div>
   </div>
 </div>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 17539fb6b..4fd8d99d2 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -98,7 +98,7 @@ a.homepagePostTypeForum {background:url(../images/homepage_icon.png) -10px -310p
 a.homepagePostTypeQuiz {background:url(../images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
 a.homepagePostTypeQuestion {background:url(../images/homepage_icon.png) -10px -273px no-repeat; padding-left:23px;}
 a.homepagePostTypeMine {background:url(../images/homepage_icon.png) -187px -277px no-repeat; padding-left:23px;}
-a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -185px -308px no-repeat; padding-left:23px;}
+a.homepagePostTypeAll {background:url(../images/homepage_icon.png) -189px -308px no-repeat; padding-left:23px;}
 a.postTypeGrey {color:#888888;}
 a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostBrief {width:710px; margin:0px auto; position:relative;}