diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index e542d1e1d..403119e20 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -894,12 +894,15 @@ class CoursesController < ApplicationController
     #   return
     # end
     #更新创建课程消息状态
-    create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
-    create_course_messages.update_all(:viewed => true)
+    course_request_messages = CourseMessage.where(:user_id => User.current.id, :course_id => @course.id, :course_message_type => ["CourseRequestDealResult", "Course"], :viewed => false)
+    course_request_messages.update_all(:viewed => true)
+
+    # create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
+    # create_course_messages.update_all(:viewed => true)
 
     #更新申请结果反馈消息的状态
-    course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
-    course_request_messages.update_all(:viewed => true)
+    # course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
+    # course_request_messages.update_all(:viewed => true)
 
     course_activities = @course.course_activities
     @canShowRealName = User.current.member_of_course? @course
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index d1835408f..7361055b4 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -338,41 +338,17 @@ class StudentWorkController < ApplicationController
   end
 
   def index
-    # 作业消息状态更新
-    @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id && homework_message.viewed == 0
-        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
-      end
-    end
-
-    #修改作品提示消息更新
-    student_work_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, StudentWork.name, 0)
-    student_work_messages.each do |message|
-      message.update_attribute(:viewed, true)
-    end
-
+    # 作业消息状态更新?
+    homeworkcommon_messages = CourseMessage.where(:user_id => User.current.id, :viewed => 0, :course_message_id => @homework.id, :course_message_type => "HomeWorkCommon")
+    homeworkcommon_messages.update_all(:viewed => true)
+    studentwork_messages = CourseMessage.where(:user_id => User.current.id, :viewed => 0, :course_id => @homework.course, :course_message_type => "StudentWork")
+    studentwork_messages.update_all(:viewed => true)
     # 作品打分消息状态更新
     studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
-    studentworks_scores.each do |studentworks_score|
-      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
-    end
+    studentworks_scores.update_all(:viewed => true)
     # 作品评论消息状态更新
     journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
-    journals_for_teacher.each do |journal_for_teacher|
-      journal_for_teacher.update_attributes(:viewed => true)
-    end
-    #不能参与作业匿评消息状态更新
-    no_evaluation = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =? and status =?", User.current.id, @homework.course, "StudentWork", 0, 0)
-    no_evaluation.update_all(:viewed => true)
-    # 作品留言
-    # 消息end
-    #设置作业对应的forge_messages表的viewed字段
-    query_student_work = @homework.course_messages
-    query_student_work.each do |query|
-      if User.current.id == query.user_id
-        query.update_attributes(:viewed => true)
-      end
-    end
+    journals_for_teacher.update_all(:viewed => true)
     ##################################################################################################################
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name].to_s.strip || "",params[:group]
     @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc")
@@ -480,7 +456,7 @@ class StudentWorkController < ApplicationController
         elsif @order == 'student_id'
           @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
         else
-          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").includes(:user => {:user_extensions => []}, :project => {}, :student_works_scores => {}).order("#{@order} #{@b_sort}"),@name
         end
         @show_all = true
       elsif User.current.member_of_course?(@course)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7a24c53c7..5fa1bc6ec 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -345,7 +345,11 @@ module ApplicationHelper
 
   def link_to_isuue_user(user, options={})
     if user.is_a?(User)
-      name = h(user.name(options[:format]))
+      if options[:format]
+        name = h(user.name(options[:format]))
+      else
+        name = h(user.show_name)
+    end
       link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => "pro_info_p"
     else
       h(user.to_s)
@@ -921,6 +925,12 @@ module ApplicationHelper
     s.html_safe
   end
 
+  # 计算Pull Request的请求数目
+  def pull_request_count project
+    g = Gitlab.client
+    g.merge_requests(project.gpid).count
+  end
+
   #项目成员列表复选框生成
   def project_member_check_box_tags_ex name, principals
     s = ''
@@ -978,7 +988,7 @@ module ApplicationHelper
     groups = ''
     collection.sort.each do |element|
       selected_attribute = ' selected="selected"' if option_value_selected?(element, selected)
-      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
+      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.show_name}</option>)
     end
     unless groups.empty?
       s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index b3e946f95..ceff7a0a0 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -14,30 +14,21 @@ module CoursesHelper
 
 
   # 推荐的精品课程
-  def excellent_course_recommend new_course
-    q = "%#{new_course.name.strip}%"
-    result = find_excelletn_course(q, new_course)
-  end
-
-  # 查询符合条件的精品课程
-  # 用新课程名去匹配精品课程中按课程名和Tag名
-  def find_excelletn_course keywords, current_course
-    # 获取tag匹配结果ID
-    a_tags = []
-    Course.where("is_excellent =? and is_public =?", 1, 1).each do |ec|
-      if ec.tags.any?{|value| current_course.name.include?(value.to_s)}
-        a_tags << ec.id
-      end
-    end
-    # 课程本身不能搜索显示自己
-    excellent_ids = a_tags.uniq.delete_if{|i| i == current_course.id}
-    sql = "SELECT distinct c.id FROM course_activities cs, courses c where cs.course_id = c.id
+  def excellent_course_recommend current_course
+    q = "%#{current_course.name.strip}%"
+    recomment_courses = []
+    # 推荐过程过滤掉自身
+    sql = "SELECT distinct c.* FROM course_activities cs, courses c where cs.course_id = c.id
          and (c.is_excellent =1 or c.excellent_option =1) and c.is_public = 1 and c.id != #{current_course.id} order by cs.updated_at desc;"
-    default_ids = Course.find_by_sql(sql).flatten.map { |c| c.id }
-    excellent_ids << default_ids.flatten
-    arr_result = excellent_ids.flatten.uniq.first(3)
-    excellent_courses = Course.find(arr_result)
-    return excellent_courses
+    ex_courses = Course.find_by_sql(sql)
+    # 使用课程的tag去和课程名称进行匹配
+    c_courses = ex_courses.select{|ex_course| ex_course.tags.any?{|tag| q.include?(tag.to_s)}}
+    if c_courses.count < 3
+      results = c_courses.length == 0 ? ex_courses.first(3) : (c_courses + ex_courses.first(3 - ex_courses.count))
+    else
+      results = c_courses.first(3)
+    end
+    results
   end
 
   # 判断精品课程是否可见，非课程成员无法查看私有课程
@@ -63,6 +54,7 @@ module CoursesHelper
     # searchTeacherAndAssistant(project).count
   end
 
+  # 统计数目
   def show_nav?(count)
     count == 0 ? true : false
   end
@@ -807,11 +799,12 @@ module CoursesHelper
     link.html_safe
   end
 
+  # 可以查看到资源库的资源
   def visable_attachemnts_incourse course
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if (attachment.is_public? && attachment.is_publish == 1) ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,course)|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
+      if attachment.is_public? && attachment.is_publish == 1 || User.current == attachment.author || User.current.allowed_to?(:as_teacher,course) || (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index b161e29e9..5a124849f 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -111,9 +111,9 @@ module IssuesHelper
 
   def principals_options_for_isuue_list(project)
     if User.current.member_of?(project)
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c|  [User.find(c.user_id).show_name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
     else
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c| [User.find(c.user_id).show_name, c.user_id]}.unshift(["指派给", 0])
     end
   end
 
diff --git a/app/models/news.rb b/app/models/news.rb
index 0e83a39f8..58bbc40ac 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -62,7 +62,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message, :delay_news_send
+  after_create :act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message, :delay_news_send
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
@@ -140,19 +140,13 @@ class News < ActiveRecord::Base
     Watcher.create(:watchable => self, :user => author)
   end
 
-  ## fq
-  def act_as_activity
-    self.acts << Activity.new(:user_id => self.author_id)
-  end
-
   # Time 2015-02-27 15:48:17
   # Author lizanle
   # Description 公用表中也要记录
   def act_as_forge_activity
     # 如果是project为空，那么是课程相关的，不需要保存
     if self.project
-      self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
-                                             :project_id => self.project.id)
+      self.forge_acts << ForgeActivity.new(:user_id => self.author_id, :project_id => self.project.id)
     end
   end
 
@@ -198,7 +192,7 @@ class News < ActiveRecord::Base
   def contain_news_message
     self.course.members.each do |m|
       if m.user_id != self.author_id
-        self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => container_id, :viewed => false)
+        self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
       end
     end
   end
diff --git a/app/views/attachments/_activity_attach.html.erb b/app/views/attachments/_activity_attach.html.erb
index b37c80dad..48c01468a 100644
--- a/app/views/attachments/_activity_attach.html.erb
+++ b/app/views/attachments/_activity_attach.html.erb
@@ -9,8 +9,9 @@
           <span class="postAttSize">(
             <%= number_to_human_size attachment.filesize %>)
           </span>
-          <span class="author" title="<%= attachment.author%>">
-            <%= link_to h(truncate(attachment.author.name, length: 15, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+          <% user_name = attachment.author.show_name.empty? ? attachment.author : attachment.author.show_name %>
+          <span class="author" title="<%= user_name %>">
+            <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "linkBlue2" %>,
             <%= format_time(attachment.created_on) %>
           </span>
         </div>
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index 759a9a735..4d261c5d1 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -91,8 +91,8 @@
           &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),:class => "link-blue" %>,
+    <span class="author" title="<%= attachment.author.show_name%>">
+      <%= link_to h(truncate(attachment.author.show_name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
       <%= format_time(attachment.created_on) %>
     </span>
       <% end %>
diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index ec9f4f7de..9a52fb410 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -11,7 +11,8 @@
                 <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
               <div class="postDes"><%= textAreailizable forum.description%></div>
-              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
+              <% user_name = forum.creator.show_name.empty? ? forum.creator.name : forum.creator.show_name %>
+              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= user_name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>
             <div class="postStatics">
diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index 11b1403cd..c3b8b4dbe 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@@ -27,7 +27,7 @@
               </div>
               <% author = topic.last_reply.try(:author)%>
               <% if author%>
-                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
+                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.show_name%></a></div>
                   <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
               <% end%>
               <span class=" fr " style="color: #888888; font-size: 12px;">更新时间：<%= format_date(topic.updated_at)%></span>
diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index ac912a71c..9ae3dfc43 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -20,7 +20,7 @@
       <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span></p>
     <br>
     <div class="cl"></div>
-    由<%=link_to @issue.author, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
+    由<%=link_to @issue.author.show_name, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
   </div>
 
   <!--talk_txt end-->
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index ccd37dc91..ea15af42e 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -3,7 +3,7 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 
-<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true, :remote => true} do |f| %>
+<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
     <!--编辑的整个属性-->
diff --git a/app/views/issues/_jounal_refresh.js.erb b/app/views/issues/_jounal_refresh.js.erb
index db5a068bf..5ccbf69d2 100644
--- a/app/views/issues/_jounal_refresh.js.erb
+++ b/app/views/issues/_jounal_refresh.js.erb
@@ -1,3 +1,8 @@
+/* $("#reply_div_<%#= @issue.id %>").html("<%#=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue}) %>");
+$("#issue_detail_show").html('<%#= escape_javascript(render :partial => 'issues/detail') %>');
+$("#issue_edit_show").html('<%#= escape_javascript(render :partial => 'issues/edit') %>');
+$("#div_issue_attachment_<%#=@issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => @issue}) %>");
+sd_create_editor_from_data(<%#= @issue.id %>, null, "100%", "<%#= @issue.class.name %>");*/
 
 location.reload();
 issue_desc_editor = KindEditor.create('#issue_description',
@@ -14,3 +19,5 @@ issue_desc_editor = KindEditor.create('#issue_description',
             "uploadJson":"/kindeditor/upload",
             "fileManagerJson":"/kindeditor/filemanager"});
 //    $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>");
+// $(".homepagePostReplyBannerCount").html('<%#= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
+// sd_create_editor_from_data(<%#= @issue.id%>, null, "100%","<%#= @issue.class.name %>");
\ No newline at end of file
diff --git a/app/views/issues/update.js.erb b/app/views/issues/update.js.erb
index 733066d38..bcf4c3077 100644
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@@ -1,4 +1,13 @@
 <% if @saved %>
+/*$("#issue_detail").replaceWith('<%#= escape_javascript(render :partial => 'issues/detail') %>');
+$("#issue_edit").replaceWith('<%#= escape_javascript(render :partial => 'issues/edit') %>');
+
+$("#issue_detail").show();
+$("#issue_edit").hide();
+
+$("#reply_div_<%#= @issue.id %>").html("<%#=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+sd_create_editor_from_data(<%#= @issue.id%>, null, "100%","<%#=@issue.class.name%>");
+$(".homepagePostReplyBannerCount").html('<%#= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');*/
 location.reload();
 //edit里的编辑器貌似显示不出来，所以手动js生成。
 issue_desc_editor = KindEditor.create('#issue_description',
diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb
index ea63f680f..2bdb554ce 100644
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@@ -1,41 +1,49 @@
 <%= javascript_include_tag "feedback" %>
 
-<div class="scrollsidebar" id="scrollsidebar">
+<div class="scrollsidebar pr" id="scrollsidebar">
   <div class="side_content">
     <div class="side_list">
-      <div class="qr-code-border borderBottomNone"><img src="/images/wechat/trustie_QR.jpg" width="150" style="display:block;" /> </div>
-      <div class="side_title">
-        <a title="<%= l(:button_hide) %>" class="close_btn">
-          <span>
-          </span>
-        </a>
+      <div style="background-color:#fff; padding:10px 0; border:1px solid #aaa; border-bottom:none;">
+        <span class="fontGrey3 f14 ml40" style="vertical-align:top;">问题和建议</span>
+        <span class="hide-side-bar side-bar-circle fr mt3 mr10" title="关闭"><span class="side-bar-content">×</span></span>
+        <span class="close_btn side-bar-circle fr mt3 mr10" title="隐藏"><span class="side-bar-content" style="left:4px;">›</span></span>
       </div>
-      <div class="side_center">
-        <div class="custom_service">
+      <div style="background-color:#fff; border-left:1px solid #aaa; border-right:1px solid #aaa;">
+        <div class="custom_service tac">
           <% get_memo %>
           <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-              <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+              <%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => l(:label_feedback_tips) %>
               <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-              <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;height:21px" id="" onclick="f_submit();">
+              <span class="c_grey fl ml10">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>
+              <a href="javascript:void(0);" class="linkBlue f14 fr mr10" style="height:21px;" id="" onclick="f_submit();">
                 <%= l(:label_submit)%>
               </a>
+              <div class="cl"></div>
           <% end %>
         </div>
-        <div class="mt5" style="color: #269ac9;cursor: default">
+      </div>
+      <div style="background-color:#fff; border:1px solid #aaa; border-top:none; padding-top:5px;">
+        <div class="fl mt5 ml10 tac">
           <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
-            <%#= l(:label_technical_support) %>
+          <%#= l(:label_technical_support) %>
           <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
-           <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
-           <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
-          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Trustie师姐师兄答疑群" title="Trustie师姐师兄答疑群"></a>
+          <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
+          <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
+          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
+          <p class="fontGrey3" style="padding-bottom:10px; padding-top:3px;">加入QQ群</p>
+        </div>
+        <div class="fr mr10 tac">
+          <img src="/images/wechat/trustie_QR.jpg" width="80" style="display:inline-block; margin-right:-5px;" /><p class="fontGrey3" style="padding-bottom:10px;">关注官方微信</p>
         </div>
+        <div class="cl"></div>
       </div>
-      <div class="side_bottom"></div>
     </div>
   </div>
-  <div class="show_btn">
-    <span><%= l(:label_submit)%></span>
-    <a href="javascript:void(0)" class="closeSidebar"></a>
+  <div class="show_btn tac">
+    <div style=" border:1px solid #aaa;">
+      <img src="/images/dialog.png" width="18" class="mt10 mb5" />
+      <span class="f14 fontBlue">提<br />问</span>
+      <span  class="closeSidebar f16" style="margin-top:8px;">×</span>
+    </div>
   </div>
 </div>
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 754cfd10b..60db07db0 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -2,10 +2,17 @@
     <li>
       <span class="user_icons_class"></span>
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
-      <p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu" title="<%= course.syllabus.title+' · '+(course.is_public? ? '公开班级：' : '私有班级：')+course.name+'（'+current_time_and_term(course)+'）' %>">
-        <%= link_to course.syllabus.title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:85px; display:inline-block;"%>
+      <p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu pr" >
+        <% title = "<span class='course-name'>#{course.syllabus.title}</span>".html_safe %>
+        <%= link_to title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
         <font class="fb c_grey" style="height:39px; line-height:39px; vertical-align:top;">·</font>
-        <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:85px; display:inline-block;"%>
+        <% classes = "<span class='course-name'>#{course.name}</span>".html_safe %>
+        <%= link_to classes, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
+        <span class="sub-menu-title c_dark">
+          课程名称：<%= course.syllabus.title %><br />
+          班级名称：<%= course.name+'（'+current_time_and_term(course)+'）' %><br />
+          班级属性：<%= course.is_public? ? '公开' : '私有' %>
+        </span>
       </p>
       <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
                   :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
@@ -106,11 +113,25 @@
     }
 
     $(".course_list_menu").each(function(){
-       var courseWidth = $(this).children().eq(0).width();
-       var classWidth = 170 -courseWidth;
+       var courseWidth = $(this).children().eq(0).children().width();
+       var classWidth = $(this).children().eq(2).children().width();
+       var newClassWidth = 182 - courseWidth;
+       var newCourseWidth = 182 - classWidth;
         console.log(courseWidth, classWidth);
-       if(courseWidth < 80){
-           $(this).children().eq(2).css("max-width",classWidth + "px");
+       if(courseWidth < 91 && classWidth > 91){
+           $(this).children().eq(2).css("max-width",newClassWidth + "px");
+       }
+       if(classWidth < 91 && courseWidth > 91){
+           $(this).children().eq(0).css("max-width",newCourseWidth + "px");
        }
     })
+
+        $(".course-name").each(function(){
+            $(this).mouseenter(function(){
+                $(this).parent().parent().children().eq(3).show();
+            });
+            $(this).mouseleave(function(){
+                $(this).parent().parent().children().eq(3).hide();
+            });
+        })
 </script>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index fab9f61ad..f0a7eff6f 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -1,6 +1,7 @@
 <%# course_model %>
-<%# course_file_num = visable_attachemnts_incourse(@course).count%>
-<% course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+<%# course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% homework_num = visable_course_homework @course %>
 
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 021b281d9..b57feb5bd 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -187,7 +187,8 @@
             </div>
             <div class="fl">
               <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
-              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
+              <% user_name =  @forum.creator.show_name.empty? ? @forum.creator.name : @forum.creator.show_name %>
+              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= user_name %></a></div>
               <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>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index d684b4297..4145ee25f 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -58,7 +58,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
+        <%= link_to @memo.author.show_name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
       <div class="cl"></div>
       <div class="homepagePostIntro memo-content" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
@@ -90,7 +90,7 @@
       </div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
-        <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%= h reply.content.html_safe%></div>
+        <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%=  h reply.content.html_safe.gsub(/\<script\>/, "<script>") %></div>
       </div>
       <script type="text/javascript">
           $(function(){
@@ -100,6 +100,8 @@
                   postContent= postContent.replace(/ {2}/g,"&nbsp; ");
                   postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
                   postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                  postContent = postContent.gsub(/<script>*/, "<script>");
+                  postContent = postContent.gsub(/<html>*/, "<html>");
                   $(this).html(postContent);
               });
               autoUrl('activity_description_<%= reply.id %>');
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index e6f3ad3da..e3fa3cde1 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -44,6 +44,7 @@
 <% if allow_pull_request(@project) > 0 && allow_show_pull_request(@project) > 0 %>
     <div class="subNav">
       <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
+      <%= link_to "(#{pull_request_count(@project)})", project_pull_requests_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
       <% if User.current.member_of?(@project) %>
         <%= link_to "+新建请求", new_project_pull_request_path(:project_id => @project.id), :class => "subnav_green" %>
       <% end %>
diff --git a/app/views/users/_project_issue_detail.html.erb b/app/views/users/_project_issue_detail.html.erb
index 95e297f49..321ba663a 100644
--- a/app/views/users/_project_issue_detail.html.erb
+++ b/app/views/users/_project_issue_detail.html.erb
@@ -62,7 +62,7 @@
     <li>
       <p class="label03">&nbsp;指派&nbsp;&nbsp;:&nbsp;</p>
       <span class="pro_info_p" style="width:130px;">
-        <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %>
+        <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %>
         <a href="javascript:void(0)" class="pic_edit2 ml5" style="vertical-align:top;"></a></span>
       <%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project),
                { :include_blank => false,:selected => @assign_to_id ? @assign_to_id : 0},
diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb
index 3dc8332da..86177f2e4 100644
--- a/app/views/users/user_organizations.html.erb
+++ b/app/views/users/user_organizations.html.erb
@@ -25,7 +25,8 @@
                     <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %>
                 </div>
                 <div class="orgIntro"><%= org.description %></div>
-                <div class="postCreater">创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>
+                <% user_name =  User.find(org.creator_id).show_name.empty? ? User.find(org.creator_id) : User.find(org.creator_id).show_name %>
+                <div class="postCreater">创建者：<%= link_to user_name, user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>
                 <div class="postDate fl mr40">创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %></div>
                 <div class="postCreater">您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %></div>
               </div>
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 49d5f4d03..cfe52e11a 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -358,7 +358,7 @@ zh:
   #  意见反馈
   # 
   label_feedback: 意见反馈
-  label_feedback_tips: "请在此发布平台问题和建议，或直接加入答疑群，谢谢！"
+  label_feedback_tips: "在此输入对平台问题和建议，您也可以通过QQ、微信留言，谢谢！"
   label_technical_support: "QQ 在线支持："
   label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
   label_feedback_value: "该帖来自用户反馈:)"
diff --git a/db/migrate/20160913063446_add_index_to_student_works_scores.rb b/db/migrate/20160913063446_add_index_to_student_works_scores.rb
new file mode 100644
index 000000000..f21843289
--- /dev/null
+++ b/db/migrate/20160913063446_add_index_to_student_works_scores.rb
@@ -0,0 +1,6 @@
+class AddIndexToStudentWorksScores < ActiveRecord::Migration
+  def change
+    add_index :student_works_scores, :user_id, name: 'user_id'
+    add_index :student_works_scores, :student_work_id, name: 'student_work_id'
+  end
+end
diff --git a/db/migrate/20160914073340_update_user_extensions.rb b/db/migrate/20160914073340_update_user_extensions.rb
new file mode 100644
index 000000000..63d15437b
--- /dev/null
+++ b/db/migrate/20160914073340_update_user_extensions.rb
@@ -0,0 +1,9 @@
+class UpdateUserExtensions < ActiveRecord::Migration
+  def up
+    ues = UserExtensions.where(:school_id => 0)
+    ues.update_all(:school_id => nil)
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4b188ecbb..443e8c426 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160907061917) do
+ActiveRecord::Schema.define(:version => 20160907080621) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -56,10 +56,10 @@ ActiveRecord::Schema.define(:version => 20160907061917) do
     t.integer  "user_id"
     t.integer  "applied_id"
     t.string   "applied_type"
-    t.integer  "viewed",          :default => 0
-    t.integer  "status",          :default => 0
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
+    t.integer  "viewed"
+    t.integer  "status"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
     t.string   "name"
     t.integer  "applied_user_id"
     t.integer  "role"
@@ -157,13 +157,13 @@ ActiveRecord::Schema.define(:version => 20160907061917) do
   create_table "attachments", :force => true do |t|
     t.integer  "container_id"
     t.string   "container_type", :limit => 30
-    t.string   "filename",                     :default => "", :null => false
-    t.string   "disk_filename",                :default => "", :null => false
-    t.integer  "filesize",                     :default => 0,  :null => false
+    t.string   "filename",                     :default => "",    :null => false
+    t.string   "disk_filename",                :default => "",    :null => false
+    t.integer  "filesize",                     :default => 0,     :null => false
     t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => "", :null => false
-    t.integer  "downloads",                    :default => 0,  :null => false
-    t.integer  "author_id",                    :default => 0,  :null => false
+    t.string   "digest",         :limit => 40, :default => "",    :null => false
+    t.integer  "downloads",                    :default => 0,     :null => false
+    t.integer  "author_id",                    :default => 0,     :null => false
     t.datetime "created_on"
     t.string   "description"
     t.string   "disk_directory"
@@ -173,6 +173,7 @@ ActiveRecord::Schema.define(:version => 20160907061917) do
     t.integer  "quotes"
     t.integer  "is_publish",                   :default => 1
     t.date     "publish_time"
+    t.boolean  "init_file",                    :default => false
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
@@ -310,14 +311,16 @@ ActiveRecord::Schema.define(:version => 20160907061917) do
   add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
 
   create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
+    t.integer  "repository_id",                :null => false
+    t.string   "revision",                     :null => false
     t.string   "committer"
-    t.datetime "committed_on",  :null => false
+    t.datetime "committed_on",                 :null => false
     t.text     "comments"
     t.date     "commit_date"
     t.string   "scmid"
     t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "type",          :default => 0
   end
 
   add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
diff --git a/public/images/QQ_Logo.png b/public/images/QQ_Logo.png
new file mode 100644
index 000000000..1e3815efa
Binary files /dev/null and b/public/images/QQ_Logo.png differ
diff --git a/public/images/dialog.png b/public/images/dialog.png
new file mode 100644
index 000000000..b92274fef
Binary files /dev/null and b/public/images/dialog.png differ
diff --git a/public/images/user/icons_user_leftnav.png b/public/images/user/icons_user_leftnav.png
index 77900e9cf..7983c4dc6 100644
Binary files a/public/images/user/icons_user_leftnav.png and b/public/images/user/icons_user_leftnav.png differ
diff --git a/public/images/user/icons_user_leftnav_archive.png b/public/images/user/icons_user_leftnav_archive.png
new file mode 100644
index 000000000..77900e9cf
Binary files /dev/null and b/public/images/user/icons_user_leftnav_archive.png differ
diff --git a/public/images/user/user_navmore_icons.png b/public/images/user/user_navmore_icons.png
index 5dcd2608b..e4fb91b54 100644
Binary files a/public/images/user/user_navmore_icons.png and b/public/images/user/user_navmore_icons.png differ
diff --git a/public/images/user/user_navmore_icons_archive.png b/public/images/user/user_navmore_icons_archive.png
new file mode 100644
index 000000000..5dcd2608b
Binary files /dev/null and b/public/images/user/user_navmore_icons_archive.png differ
diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js
index 97209131e..066b5b96d 100644
--- a/public/javascripts/feedback.js
+++ b/public/javascripts/feedback.js
@@ -1,148 +1,148 @@
-(function($){
-    $.fn.fix = function(options){
-        var u = navigator.userAgent;
-        if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
-            $("#scrollsidebar").css("display","none");
-            return;
-        }
-        var defaults = {
-            float : 'right',
-            minStatue : true,
-            skin : 'blue',
-            durationTime : 1000
-        };
-        var options = $.extend(defaults, options);
-
-        this.each(function(){
-            //???????
-            var thisBox = $(this),
-                closeBtn = thisBox.find('.close_btn' ),
-                show_btn = thisBox.find('.show_btn' ),
-                sideContent = thisBox.find('.side_content');
-            var defaultTop = thisBox.offset().top;	//????????top
-            thisBox.css(options.float, 0);
-            if(options.minStatue == "true"){
-                show_btn.css("float", options.float);
-                sideContent.css('width', 0);
-                show_btn.css('width', 28);
-            }
-            //close
-            closeBtn.bind("click",function(){
-                sideContent.animate({width: '0px'},"fast");
-                show_btn.stop(true, true).delay(300).animate({ width: '28px'},"fast");
-                cookiesave('minStatue','true','','','');
-            });
-            //show
-            show_btn.bind("click",function() {
-                $(this).animate({width: '0px'},"fast");
-                sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
-                cookiesave('minStatue','false','','','');
-            });
-        });	//end this.each
-    };
-})(jQuery);
-
-function f_submit()
-{
-    $("#new_memo").submit();
-}
-
-function cookiesave(n, v, mins, dn, path)
-{
-    if(n)
-    {
-
-        if(!mins) mins = 365 * 24 * 60;
-        if(!path) path = "/";
-        var date = new Date();
-        date.setTime(date.getTime() + (mins * 60 * 1000));
-        var expires = "; expires=" + date.toGMTString();
-        if(dn) dn = "domain=" + dn + "; ";
-        document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
-
-    }
-}
-function cookieget(n)
-{
-    var name = n + "=";
-    var ca = document.cookie.split(';');
-    for(var i=0;i<ca.length;i++) {
-        var c = ca[i];
-        while (c.charAt(0)==' ') c = c.substring(1,c.length);
-        if (c.indexOf(name) == 0){
-            return c.substring(name.length,c.length);
-        }
-    }
-    return false;
-}
-
-
-$(function(){
-    var u = navigator.userAgent;
-    if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
-        $("#scrollsidebar").css("display","none");
-        return;
-    }
-    $(".closeSidebar").click(function(){
-        $(".show_btn").css("display","none");
-        $("#scrollsidebar").css("display","none");
-        return false;
-    });
-
-    $("#button1").click(function(){
-        myTips("反馈成功","success");
-    });
-
-    $("#scrollsidebar").fix({
-        float: 'right',	//default.left or right
-        minStatue: cookieget('minStatue'),
-        skin: 'green',	//default.gray or blue
-        durationTime: 600
-    });
-
-    $("#subject").keydown(function(){
-        var curLength=$("#subject").val().length;
-        if(curLength>50){
-            var num=$("#subject").val().substr(0,50);
-            $("#subject").val(num);
-        }
-        else{
-            $("#textCount").text(50-$("#subject").val().length)
-        }
-    }).keyup(function(){
-        var curLength=$("#subject").val().length;
-        if(curLength>50){
-            var num=$("#subject").val().substr(0,50);
-            $("#subject").val(num);
-        }
-        else{
-            $("#textCount").text(50-$("#subject").val().length)
-        }
-    });
-});
-
-//var browser={
-//    versions:function(){
-//        var u = navigator.userAgent, app = navigator.appVersion;
-//        return {//移动终端浏览器版本信息
-//            trident: u.indexOf('Trident') > -1, //IE内核
-//            presto: u.indexOf('Presto') > -1, //opera内核
-//            webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
-//            gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核
-//            mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端
-//            ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端
-//            android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器
-//            iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器
-//            iPad: u.indexOf('iPad') > -1, //是否iPad
-//            webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部
-//        };
-//    }(),
-//    language:(navigator.browserLanguage || navigator.language).toLowerCase()
-//}
-//document.writeln("语言版本: "+browser.language);
-//document.writeln(" 是否为移动终端: "+browser.versions.mobile);
-//document.writeln(" ios终端: "+browser.versions.ios);
-//document.writeln(" android终端: "+browser.versions.android);
-//document.writeln(" 是否为iPhone: "+browser.versions.iPhone);
-//document.writeln(" 是否iPad: "+browser.versions.iPad);
+(function($){
+    $.fn.fix = function(options){
+        var u = navigator.userAgent;
+        if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
+            $("#scrollsidebar").css("display","none");
+            return;
+        }
+        var defaults = {
+            float : 'right',
+            minStatue : true,
+            skin : 'blue',
+            durationTime : 1000
+        };
+        var options = $.extend(defaults, options);
+
+        this.each(function(){
+            //???????
+            var thisBox = $(this),
+                closeBtn = thisBox.find('.close_btn' ),
+                show_btn = thisBox.find('.show_btn' ),
+                sideContent = thisBox.find('.side_content');
+            var defaultTop = thisBox.offset().top;	//????????top
+            thisBox.css(options.float, 0);
+            if(options.minStatue == "true"){
+                show_btn.css("float", options.float);
+                sideContent.css('width', 0);
+                show_btn.css('width', 28);
+            }
+            //close
+            closeBtn.bind("click",function(){
+                sideContent.animate({width: '0px'},"fast");
+                show_btn.stop(true, true).delay(300).animate({ width: '28px'},"fast");
+                cookiesave('minStatue','true','','','');
+            });
+            //show
+            show_btn.bind("click",function() {
+                $(this).animate({width: '0px'},"fast");
+                sideContent.stop(true, true).delay(200).animate({ width: '180px'},"fast");
+                cookiesave('minStatue','false','','','');
+            });
+        });	//end this.each
+    };
+})(jQuery);
+
+function f_submit()
+{
+    $("#new_memo").submit();
+}
+
+function cookiesave(n, v, mins, dn, path)
+{
+    if(n)
+    {
+
+        if(!mins) mins = 365 * 24 * 60;
+        if(!path) path = "/";
+        var date = new Date();
+        date.setTime(date.getTime() + (mins * 60 * 1000));
+        var expires = "; expires=" + date.toGMTString();
+        if(dn) dn = "domain=" + dn + "; ";
+        document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
+
+    }
+}
+function cookieget(n)
+{
+    var name = n + "=";
+    var ca = document.cookie.split(';');
+    for(var i=0;i<ca.length;i++) {
+        var c = ca[i];
+        while (c.charAt(0)==' ') c = c.substring(1,c.length);
+        if (c.indexOf(name) == 0){
+            return c.substring(name.length,c.length);
+        }
+    }
+    return false;
+}
+
+
+$(function(){
+    var u = navigator.userAgent;
+    if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){
+        $("#scrollsidebar").css("display","none");
+        return;
+    }
+    $(".closeSidebar, .hide-side-bar").click(function(){
+        $(".show_btn").css("display","none");
+        $("#scrollsidebar").css("display","none");
+        return false;
+    });
+
+    $("#button1").click(function(){
+        myTips("反馈成功","success");
+    });
+
+    $("#scrollsidebar").fix({
+        float: 'right',	//default.left or right
+        minStatue: cookieget('minStatue'),
+        skin: 'green',	//default.gray or blue
+        durationTime: 600
+    });
+
+    $("#subject").keydown(function(){
+        var curLength=$("#subject").val().length;
+        if(curLength>50){
+            var num=$("#subject").val().substr(0,50);
+            $("#subject").val(num);
+        }
+        else{
+            $("#textCount").text(50-$("#subject").val().length)
+        }
+    }).keyup(function(){
+        var curLength=$("#subject").val().length;
+        if(curLength>50){
+            var num=$("#subject").val().substr(0,50);
+            $("#subject").val(num);
+        }
+        else{
+            $("#textCount").text(50-$("#subject").val().length)
+        }
+    });
+});
+
+//var browser={
+//    versions:function(){
+//        var u = navigator.userAgent, app = navigator.appVersion;
+//        return {//移动终端浏览器版本信息
+//            trident: u.indexOf('Trident') > -1, //IE内核
+//            presto: u.indexOf('Presto') > -1, //opera内核
+//            webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
+//            gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核
+//            mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端
+//            ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端
+//            android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器
+//            iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器
+//            iPad: u.indexOf('iPad') > -1, //是否iPad
+//            webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部
+//        };
+//    }(),
+//    language:(navigator.browserLanguage || navigator.language).toLowerCase()
+//}
+//document.writeln("语言版本: "+browser.language);
+//document.writeln(" 是否为移动终端: "+browser.versions.mobile);
+//document.writeln(" ios终端: "+browser.versions.ios);
+//document.writeln(" android终端: "+browser.versions.android);
+//document.writeln(" 是否为iPhone: "+browser.versions.iPhone);
+//document.writeln(" 是否iPad: "+browser.versions.iPad);
 //document.writeln(navigator.userAgent);
\ No newline at end of file
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 88f3e4cba..f7dd1b763 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -607,7 +607,6 @@ a:hover.sy_btn_blue{ background: #2788d0;}
 .is_public_checkbox{margin-left: 15px;margin-right: 10px;}
 .author_name{color: #3ca5c6 !important;}
 .ke-container-default{max-width: 100%;}
-.borderRadius {border-radius:5px;}
 
 /*状态提示图标*/
 .success-icon {background:url("/images/icons_ziliao.png") 0 -28px no-repeat; padding-left:25px;}
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index 77f7fdfe2..dcc6e9ff4 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -515,9 +515,6 @@ a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;borde
 a:hover.blueCir{ background:#3598db; color:#fff;}
 .proList {background-color:#eaeaea; padding:5px 10px; display:block; max-width:655px; float:left;}
 
-.borderRadius {border-radius:5px;}
-.tac {text-align:center;}
-
 .reCon{ margin:5px; width:710px;}
 .reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}
 .filesTag{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;cursor: pointer }
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 454fce294..d2be2e16c 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -549,7 +549,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .merge-discussion-input textarea {width:720px; height:80px; font-size:13px; line-height:16px; color:#484848; padding:5px;}
 
 /*新版项目列表新增*/
-.new_project_title{ font-size:16px; color:#333; max-width:560px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
+.new_project_title{ font-size:16px; color:#333; max-width:480px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
 .icons_project_list{ width:8px; height:8px; border:2px solid #fff; background:#3b94d6;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;-webkit-box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5);-moz-box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5);box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5); }
 .icons_project_favorite {background: url(/images/syllabus/sy_icons_star.png) 0px 0px no-repeat; width:20px; height:20px; display:block; float:left;}
 .icons_project_star{background: url(/images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; float:left;}
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index d4ba7b86c..923ec4dbb 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -116,36 +116,32 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n
 .softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}
 
 /*意见反馈*/
-.qr-code-border {border:2px solid #269ac9;}
 html{ overflow-x:hidden;}
 .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
-.side_content{width:154px; height:auto; overflow:hidden; float:left; }
-.side_content .side_list {width:154px;overflow:hidden;}
-.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;}
-.show_btn span { display:none;}
-.close_btn{width:24px;height:24px;cursor:pointer;}
-.side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat; }
+.side_content{width:180px; height:auto; overflow:hidden; float:left;}
+.side_content .side_list {width:180px;overflow:hidden;}
+.show_btn{ width:0; height:100px; overflow:hidden; float:left; margin-top:200px; cursor:pointer; background-color:#fff;}
+.close_btn{cursor:pointer;}
+.side_title,.side_bottom {background:url(/images/sidebar_bg.png) no-repeat; }
 .side_title {height:35px;}
 .side_bottom { height:8px;}
 .side_center {font-family:Verdana, Geneva, sans-serif; padding:0px 12px; font-size:12px;}
-.close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
-.close_btn span { display:none;}
 .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
 .msgserver { margin:10px 0 0px 5px;}
 .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; }
-.opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
+.opnionText{box-shadow:none; width:150px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
 a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;}
 a.opnionButton:hover{background: #297fb8; }
 /* blue skin as the default skin */
 .side_title {background-position:-195px 0;}
 .side_center {background:url(/images/blue_line.png) repeat-y center; }
 .side_bottom {background-position:-195px -50px;}
-.close_btn {background-position:-44px 0;}
-.close_btn:hover {background-position:-66px 0;}
-.show_btn {background-position:-119px 0;}
 .msgserver a {color:#269ac9; }
 .msgserver a:hover { text-decoration:underline; }
-.closeSidebar {background:url(/images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;}
+.closeSidebar {width:26px; height:18px; line-height:18px; vertical-align:middle; border-top:1px solid #aaa; color:#aaa; display:block;}
+
+.side-bar-circle {width:13px; height:13px; font-size:14px; color:#aaa; border:1px solid #aaa; border-radius:50%; display:block; font-weight:bold; position:relative; cursor:pointer;}
+.side-bar-content {position:absolute; top:-5px; left:1px;}
 
 
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 0675f51e4..5fc47ad81 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -596,7 +596,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
 .user_sub_menu li a:hover,.user_sub_menu li a:target {  color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;}
 .user_sub_menu li a:hover,.user_sub_menu li a:target{}
 .user_sub_menu li:last-child a {  }
-.user_sub_menu li p {padding:0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;}
+.user_sub_menu li p {padding:0 15px 0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;}
 .user_sub_menu li p:hover {background:#fff;}
 .user_sub_menu li p:hover a {background:#fff;}
 .user_sub_menu li p:hover,.user_sub_menu li p:target {color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;}
@@ -617,6 +617,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
     width:20px;
     height:20px;
     background:url(/images/user/icons_user_leftnav.png) 0px -34px no-repeat;
+    z-index:99;
 }
 a.user_navmorebox{ display:block; width:238px; height:20px; position:relative; background:#f8f8f8;border:1px solid #e5e5e5; border-bottom:none;}
 a:hover.user_navmorebox{ background:#fff;}
@@ -639,6 +640,7 @@ a.user_navmorebox .user_icons_closeclass{
     background:url(/images/user/icons_user_leftnav.png) -25px -347px no-repeat;
 }
 .show-all-sub {position:absolute; top:18px; right:15px;}
+.sub-menu-title {position:absolute; border:1px solid #ddd; background-color:#fff; padding:2px 5px; z-index:99; white-space:nowrap; left:25px; top:35px; display:none;}
 /* 个人主页左侧导航更多功能 */
 .user_navmore_box {position:absolute; width:15px; height:15px; right:13px; top:17px; cursor:pointer;}
 .user_navmore_box ul li:hover ul {display:block; }