diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb
index 0e4ddd1ff..9881dd186 100644
--- a/app/views/account/lost_password.html.erb
+++ b/app/views/account/lost_password.html.erb
@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag 'new_user'%>
 
-<div class="homepageContentContainer " style="margin-top:20px;">
+<div class="homepageContentContainer ">
   <div class="homepageContent BgBox">
   	<h2 class="BgBox_h2">忘记密码</h2>
     <div class="BgBoxCon">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index a9a204e0c..6b44e278e 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -51,7 +51,7 @@
           <% end %>
           <div class="cl"></div>
           <% if @user.user_extensions && @user.user_extensions.identity %>
-              <p class="mb20 c_dark f14">
+              <p class="mb8 c_dark f14">
                 <%= get_user_roll @user %>
               </p>
           <% end%>
@@ -101,9 +101,9 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_course_path%>
+                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), new_course_path%>
               <% else%>
-                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), join_private_courses_courses_path ,:remote => true%>
+                  <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), join_private_courses_courses_path ,:remote => true%>
               <% end%>
           <% end%>
         </div>
@@ -117,7 +117,7 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuForge').slideToggle();">项目</a>
 
           <% if is_current_user%>
-              <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_project_path%>
+              <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting fr"), new_project_path%>
           <% end%>
         </div>
         <div class="homepageLeftMenuCourses" id="homepageLeftMenuForge">
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index accf285ed..f411aa98e 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -10,10 +10,10 @@
         <% else %>
             <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% end %> TO <!--+"(课程名称)" -->
-        <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle break_word"> <!--+"(作业名称)"-->
-        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
+        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey"%>
       </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
@@ -21,7 +21,7 @@
         </div>
         <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
       </div>
-      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">
         作业描述：<%= activity.description.html_safe %>
       </div>
       <!--<p style="display: none" id="activity_message_<%#= user_activity.id%>">
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 814d94af5..0f3201e64 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -11,14 +11,14 @@
                 <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
             <% end %>
             TO
-            <%= link_to activity.course.name.to_s+" | 课程讨论区", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
-            <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
+            <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course), :class => "newsBlue ml15 mr5"%>
+            <%#= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5"%>
           </div>
           <div class="homepagePostTitle break_word">
             <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-              <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
+              <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %>
             <% else %>
-                <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%>
+                <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"%>
             <% end %>
           </div>
           <div class="homepagePostDate">
@@ -26,7 +26,7 @@
           </div>
 
 
-          <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">帖子描述：
+          <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">帖子描述：
           <% if activity.parent_id.nil? %>
               <%= activity.content.to_s.html_safe%>
           <% else %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index bc090fa03..4295139e0 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -10,15 +10,15 @@
         <% else %>
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %> TO  <!--+"(课程名称)"-->
-        <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
+        <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word"> <!--+"(通知标题)"-->
-        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
+        <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
       </div>
       <div class="homepagePostDate">
         发布时间：<%= format_date(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id %>">通知描述：<%= activity.description.html_safe %></div>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id %>">通知描述：<%= activity.description.html_safe %></div>
 
       <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 7aafb5451..a6f21a97f 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -14,7 +14,7 @@
             <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %>
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
       <div class="homepagePostTitle break_word" >
@@ -28,7 +28,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_date(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
       <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 2c44a6f41..a04f899fd 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -10,10 +10,10 @@
         <% else %>
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>  TO
-        <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_path(activity.project), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_issues_path(activity.project), :class => "newsBlue ml15"%>
         </div>
       <div class="homepagePostTitle break_word">
-        <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %>
+        <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
         <span class='<%= get_issue_priority(activity.priority_id)[0] %>'><%= get_issue_priority(activity.priority_id)[1] %></span>
       </div>
       <div class="homepagePostSubmitContainer">
@@ -28,7 +28,7 @@
         </div>
         <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id %>">缺陷描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id %>">缺陷描述：
         <% if activity.description? %>
             <%= textAreailizable activity, :description, :attachments => activity.attachments %>
         <% end %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index f735aebb8..af6233d82 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -11,20 +11,22 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.project.name.to_s+" | 项目讨论区",project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
+        <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.project.name %>(项目讨论区)</a>-->
       </div>
       <div class="homepagePostTitle break_word">
         <% if activity.parent_id.nil? %>
-            <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %>
+            <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey"
+            %>
         <% else %>
-            <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%>
+            <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"
+            %>
         <% end %>
       </div>
       <div class="homepagePostDate">
         时间：<%= format_date(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">帖子描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id%>">帖子描述：
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 8340306e0..74859bc5d 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -1,44 +1,46 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <div class="HomeWorkCon">
   <div>
-    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  W700" maxlength="255" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
+    <input  type="text" name="homework_common[name]" id="homework_name" class="InputBox  W700" maxlength="255" onfocus="$('#homework_editor').show()" onkeyup="regex_homework_name();" placeholder="请输入作业标题" value="<%= homework.name%>" >
     <p id="homework_name_span" class="c_red mt5"></p>
   </div>
   <div class="cl"></div>
 
   <div class=" mt10">
     <%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%>
+    <span class="fl mt5 ml10">截止日期：</span>
     <div class="calendar_div fl">
-      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time || (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>" >
+      <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly"  >
       <%= calendar_for('homework_end_time')%>
     </div>
   </div>
   <div class="cl"></div>
+  <div id="homework_editor" style="display: none">
+    <div class="mt10">
+      <% if edit_mode %>
+          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %>
+      <% else %>
+          <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
+          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px" %>
+      <% end %>
+    </div>
+    <div class="cl"></div>
 
-  <div class="mt10">
-    <% if edit_mode %>
-        <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:height => "150px",:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-    <% else %>
-        <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-        <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:height => "150px" %>
-    <% end %>
-  </div>
-  <div class="cl"></div>
-
-  <div class="mt10">
-    <!--<input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />-->
-    <%= select_tag :course_id,options_for_select(get_as_teacher_courses(User.current),homework.course_id), {:class => "InputBox  w708"}  %>
-  </div>
-  <div class="cl"></div>
+    <div class="mt10">
+      <!--<input type="text" class="InputBox  W700 SearchIcon" placeholder="发送到课程" />-->
+      <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox  w708"} %>
+    </div>
+    <div class="cl"></div>
 
-  <div id="homework_attachments">
-    <%= render :partial => 'users/user_homework_attachment', :locals => { :container => homework } %>
-  </div>
+    <div id="homework_attachments">
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %>
+    </div>
 
-  <div class="mt5 fr">
-    <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_homework('new_homework_common');">发送</a>
-    <span class="fr mr10 mt3">或</span>
-    <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+    <div class="mt5 fr">
+      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_homework('new_homework_common');">发送</a>
+      <span class="fr mr10 mt3">或</span>
+      <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+    </div>
   </div>
+  <div class="cl"></div>
 </div>
-<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 819bec04d..2ecda7758 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -93,7 +93,7 @@
     </ul>
   </div>
   <form id="resources_list_form">
-  <div id="resources_list" class="resourcesList">
+  <div id="resources_list">
 
      <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
 
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 6b7aa209e..5c0c1ddb9 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -49,7 +49,7 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#b3e0ee;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; margin-left:155px;}
+.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
diff --git a/public/stylesheets/images/resource_icon_list.png b/public/stylesheets/images/resource_icon_list.png
index 1b5bc6f58..d1fdc2610 100644
Binary files a/public/stylesheets/images/resource_icon_list.png and b/public/stylesheets/images/resource_icon_list.png differ
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 45172501d..1e729cce2 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -405,7 +405,7 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/
 /* 个人主页右边部分*/
 .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;}
-input.homepageSearchIcon:hover {cursor: pointer;}
+input.homepageSearchIcon:hover {cursor: pointer;background:url(../images/nav_icon.png) -49px 3px no-repeat;}
 a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
 a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
 a.replyGrey {color:#888888; display:inline-block;}
@@ -429,12 +429,12 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
 /*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
-.sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight: bold;}
+.sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:110px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .boxContainer {height:33px; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
-.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
+.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
 .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}
@@ -528,20 +528,20 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; margin-left:155px;}
+.homepageMenuSetting {display:inline-block; margin-right: 17px; margin-top: 18px;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
-.homepageRightBanner {width:720px; height:30px; margin:0px auto;}
-.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;}
+.homepageRightBanner {width:720px; margin:0px auto;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
 .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
-.homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
-.homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;}
-.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageNewsType {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
+.homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
+.homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
@@ -608,10 +608,10 @@ a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:45px;}
 .homepagePostReplyDes {float:left; width:595px; margin-left:15px;}
-.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;}
+.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
-.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9; height:30px; line-height:30px; vertical-align:middle;}
+.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .postAttSize {color:#888888; font-size:12px;}
@@ -689,9 +689,9 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 
 
 /*20150826忘记密码 LB*/
-.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 20px auto}
+.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 10px auto 20px auto;}
 .BgBox_h2{ font-size:16px; color:#484848;  width:968px;border-bottom:1px solid #e3e3e3; padding-bottom:5px;}
-.NomalInput{width:308px; height:38px;  border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;}
+.NomalInput{width:308px; height:38px;  border:1px solid #98a1a6 !important; outline:none; color:#888888; font-size:14px;}
 .BgBoxCon{ width:310px; margin:80px auto;}
 .BgBoxConP{ font-size:14px; color:#484848;}
 .LoginButton {width:315px; height:40px; background-color:#269ac9; font-size:14px; text-align:center; line-height:40px; vertical-align:middle;}
@@ -870,7 +870,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .uppic_btn:hover {background-color: #329cbd;}
 
 /*20150820课程作业 LB*/
-.HomeWork {width:708px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;}
+.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;}
 .RightBanner {width:708px; height:34px;  border-bottom:1px solid #e9e9e9;}
 select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
 a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
@@ -954,7 +954,6 @@ img.ui-datepicker-trigger {
 .is_public_checkbox{display: none !important;}
 .is_public{display: none !important;}
 .ui-corner-left{background: #64bdd9;}
-.homepagePostIntro img{max-width: 100%;}