From 9a735c71571223a2861e71a9f745a7f30901a85b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 17 Sep 2015 11:13:36 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_programing_attr.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/_user_programing_attr.html.erb b/app/views/users/_user_programing_attr.html.erb
index 6a3b4a773..0ebe997e2 100644
--- a/app/views/users/_user_programing_attr.html.erb
+++ b/app/views/users/_user_programing_attr.html.erb
@@ -29,6 +29,7 @@
   <% end %>
 
   <div class="mt10">
+    <span class="f12 c_red db mt5 fl">温馨提示：您可以在发布作业后，在作业“模拟答题”中进行标准代码的检测和提交。</span>
     <a href="javascript:void(0);" class="BlueCirBtn fr">确&nbsp;&nbsp;定</a>
     <div class="cl"></div>
   </div>

From 3f7c69e8e11a3c5aa259644daa461a14d314b4d0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Sep 2015 14:58:10 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index bbef67e6d..9eefbd1f1 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -11,7 +11,7 @@
     .ke-inline-block{display: none;}
     div.ke-container{float:left;}
 </style>
-<% first_user_activity = user_activities.first.id %>
+<% first_user_activity = user_activities.first.id unless user_activities.first.nil? %>
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
@@ -31,10 +31,10 @@
                 }
             }
 
-            function expand_reply_input(id) {
-                $(id).toggle();
-            }
-
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
             $(function() {
                 init_KindEditor_data(<%= user_activity.id%>,"30px","85%");
             });
@@ -45,22 +45,22 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'News' %>
-                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'Message'%>
-                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'Poll' %>
-                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% end %>
             <% end %>
         <% when 'Project' %>
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'Issue' %>
-                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% when 'Message' %>
-                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
                 <% end %>
             <% end %>
         <% end %>

From 68338c46e12be5e5622b1531e4d7f38355c7273b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Sep 2015 15:50:33 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=8C=89=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/comments_controller.rb        |  3 ++
 app/controllers/issues_controller.rb          |  3 ++
 app/controllers/messages_controller.rb        |  3 ++
 app/controllers/users_controller.rb           | 18 ++++----
 ...071652_update_user_activities_update_at.rb | 16 +++++++
 db/schema.rb                                  | 43 ++++++++-----------
 6 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 db/migrate/20150917071652_update_user_activities_update_at.rb

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 4088d4156..6b421bf2a 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -49,6 +49,9 @@ class CommentsController < ApplicationController
       # end
       # # ������ض�̬�ļ�¼add end
       flash[:notice] = l(:label_comment_added)
+      user_activity = UserActivity.where("act_type='News' and act_id =#{@news.id}").first
+      user_activity.updated_at = @comment.created_on
+      user_activity.save
     end
 
     if params[:user_activity_id]
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 47e425710..bf854abe8 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -394,6 +394,9 @@ class IssuesController < ApplicationController
       jour.notes = params[:notes]
       jour.journalized = @issue
       jour.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@issue.id}").first
+      user_activity.updated_at = jour.created_on
+      user_activity.save
       @user_activity_id = params[:user_activity_id]
       respond_to do |format|
         format.js
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 9b0fd56a0..aae33e52a 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -161,6 +161,9 @@ class MessagesController < ApplicationController
     @reply.content = @quote + @reply.content
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     @topic.children << @reply
+    user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
+    user_activity.updated_at = @reply.created_on
+    user_activity.save
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4796d0c0c..91518eaca 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -853,24 +853,24 @@ class UsersController < ApplicationController
     if params[:type].present?
       case params[:type]
         when "course_homework"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_news"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_message"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_poll"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_issue"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_message"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
         else
-          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
       end
     else
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
     @type = params[:type]
diff --git a/db/migrate/20150917071652_update_user_activities_update_at.rb b/db/migrate/20150917071652_update_user_activities_update_at.rb
new file mode 100644
index 000000000..7fbd425f4
--- /dev/null
+++ b/db/migrate/20150917071652_update_user_activities_update_at.rb
@@ -0,0 +1,16 @@
+class UpdateUserActivitiesUpdateAt < ActiveRecord::Migration
+  def up
+    count = UserActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      UserActivity.page(i).per(30).each do |activity|
+        activity.updated_at = activity.created_at
+        activity.save
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b696765f8..a3c8277bb 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 => 20150911064528) do
+ActiveRecord::Schema.define(:version => 20150917071652) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -476,13 +476,6 @@ ActiveRecord::Schema.define(:version => 20150911064528) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -497,26 +490,23 @@ ActiveRecord::Schema.define(:version => 20150911064528) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "dts", :primary_key => "Num", :force => true do |t|
-    t.string   "Defect",        :limit => 50
-    t.string   "Category",      :limit => 50
-    t.string   "File"
-    t.string   "Method"
-    t.string   "Module",        :limit => 20
-    t.string   "Variable",      :limit => 50
-    t.integer  "StartLine"
-    t.integer  "IPLine"
-    t.string   "IPLineCode",    :limit => 200
-    t.string   "Judge",         :limit => 15
-    t.integer  "Review",        :limit => 1
+  create_table "dts", :force => true do |t|
+    t.string   "IPLineCode"
     t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
+    t.string   "Num"
+    t.string   "Variable"
+    t.string   "TraceInfo"
+    t.string   "Method"
+    t.string   "File"
+    t.string   "IPLine"
+    t.string   "Review"
+    t.string   "Category"
+    t.string   "Defect"
+    t.string   "PreConditions"
+    t.string   "StartLine"
     t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -916,6 +906,7 @@ ActiveRecord::Schema.define(:version => 20150911064528) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"

From 3dccf8f77d1b72530aa65153ac1247b514ae6b67 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 17 Sep 2015 16:04:27 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=9B=BE=E6=A0=87=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9B=20=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E6=A0=87=E5=AE=BD=E5=BA=A6=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_new_homework_detail_manual_form.html.erb | 148 +++++++++---------
 .../users/_user_homework_attachment.html.erb  |   4 +-
 app/views/users/show.html.erb                 |   2 +-
 public/images/homepage_icon.png               | Bin 12533 -> 13042 bytes
 public/stylesheets/new_user.css               |  11 +-
 5 files changed, 82 insertions(+), 83 deletions(-)

diff --git a/app/views/homework_common/_new_homework_detail_manual_form.html.erb b/app/views/homework_common/_new_homework_detail_manual_form.html.erb
index 7fb728ad0..af5a8bf50 100644
--- a/app/views/homework_common/_new_homework_detail_manual_form.html.erb
+++ b/app/views/homework_common/_new_homework_detail_manual_form.html.erb
@@ -1,74 +1,74 @@
-<div class="homepageRight">
-  <div class="HomeWork">
-    <div class="RightBanner">
-      <div class="NewsBannerName">发布作业</div>
-    </div>
-    <div class="HomeWorkCon">
-        <div class="mt15">
-            <textarea class="InputBox  W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
-        </div>
-        <div class=" mt10">
-            <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
-            <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
-                <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
-                <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
-                <div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
-            <div class="cl"></div>
-        </div>
-        <div class="mt10">
-        <% if edit_mode %>
-            <%= f.kindeditor :description,:editor_id => 'homework_description_editor',: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' %>
-        <% end %>
-        </div>
-        <div class="mt10">
-            <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
-        </div>
-        <div class="mt5">
-            <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
-            <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
-            <div class="cl"></div>
-        </div>
-        
-        <div class="mt10">
-            <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
-            <div class="DropLine"></div>
-            <div class="cl"></div>
-        </div>
-        <div class="advanced_option" style="display:none;">
-          <div class="mt10">
-              <select class="InputBox W120" required="true">
-                  <option value="语言选择">语言选择</option>
-                  <option value="C语言">C语言</option>
-                  <option value="C++">C++</option>
-                </select>
-          </div>
-          
-          <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-              <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-              <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-              <div class="cl"></div>
-          </div>
-        </div>
-        <div class="mt10">
-            <a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
-            <span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
-            <div class="cl"></div>
-        </div>
-    </div>
-  </div><!----HomeWork end-->
-  
-</div>
-
-<script id="t:test-answer-list" type="text/html">
-  <div class="mt10">
-      <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-      <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-      <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-      <div class="cl"></div>
-  </div>
-</script>
-
+<div class="homepageRight">
+  <div class="HomeWork">
+    <div class="RightBanner">
+      <div class="NewsBannerName">发布作业</div>
+    </div>
+    <div class="HomeWorkCon">
+        <div class="mt15">
+            <textarea class="InputBox  W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
+        </div>
+        <div class=" mt10">
+            <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
+            <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
+                <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
+                <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
+                <div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
+            <div class="cl"></div>
+        </div>
+        <div class="mt10">
+        <% if edit_mode %>
+            <%= f.kindeditor :description,:editor_id => 'homework_description_editor',: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' %>
+        <% end %>
+        </div>
+        <div class="mt10">
+            <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
+        </div>
+        <div class="mt5">
+            <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr20">上传附件</a>
+            <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
+            <div class="cl"></div>
+        </div>
+        
+        <div class="mt10">
+            <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
+            <div class="DropLine"></div>
+            <div class="cl"></div>
+        </div>
+        <div class="advanced_option" style="display:none;">
+          <div class="mt10">
+              <select class="InputBox W120" required="true">
+                  <option value="语言选择">语言选择</option>
+                  <option value="C语言">C语言</option>
+                  <option value="C++">C++</option>
+                </select>
+          </div>
+          
+          <div class="mt10">
+              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
+              <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
+              <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
+              <div class="cl"></div>
+          </div>
+        </div>
+        <div class="mt10">
+            <a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
+            <span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
+            <div class="cl"></div>
+        </div>
+    </div>
+  </div><!----HomeWork end-->
+  
+</div>
+
+<script id="t:test-answer-list" type="text/html">
+  <div class="mt10">
+      <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
+      <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
+      <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
+      <div class="cl"></div>
+  </div>
+</script>
+
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 08927ab8f..9b7c6c06a 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -47,8 +47,8 @@
 
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
-  <a href="javascript:void(0);" class="AnnexBtn fl mt3" onclick="$('#_file').click();">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3",:remote => true%>
+  <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr20" onclick="$('#_file').click();">上传附件</a>
+  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr20",:remote => true%>
   <% if defined?(has_program) && has_program %>
     <a href="javascript:void(0);" class="ProBtn fl mt3">编程</a>
     <span class="fl C_lgrey mt3 program_detail_info"></span>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index aab715b16..de166b4e7 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -29,7 +29,7 @@
       <li>
         <ul class="homepagePostTypeProject fl">
           <li class="f14">更多</li>
-          <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%>
+          <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
           <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
         </ul>
       </li>
diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png
index a6f3223b6d26e4d4e5f428fd52e40d28b54c3d23..46f96a36ff00506b63eebe34ff99fd55c34b18e9 100644
GIT binary patch
delta 9871
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
Q1N!@Cq;IBIql=3AKlD+;y#N3J

delta 9306
zcmaKSXH*kW*KR`Sy*DW$y$J$JkWfVFT}0_cq)81;BEo=*0#bxX3n3^~LFv6l0TJmS
zAU)C|BE5xv$M?SXTi>snwI*xL%sG3X@|?Y&z4vUp?m3sY&;nwY^l#m`6FT`fJ1oOu
zsiAIzLYUT)oT>BXD%3*9dsP1_&fe&g1Pl2|$BokmajCo?YDUSzZgjGZ8Aw%6j@_TG
z8UE}OT%Hs8@|{+y_2d}qTI9M^y9t!#y_GaOlQ)aqoZxDo5p}mwN;hA|$@(fr8Xe3V
zI@Y+;ywP-bwrd+eFbUm?*fpbm{u-{O$0sC`$jqus9V`6rwpzpW(7U;%QS5M4!im=m
z>P^8(RtMe4_nsZ_4rK9XE@#c4Krjt971|69Xx+T|jEb3_QdV0S$Q|<dx;lcyKDu4o
z9U6W;ap%cpp#3|M@;!@t3d_Z8V?6UkD0!qP{)*>RD1bkR%rV4@=^w#TKRa!9zj*P&
zqVMH!P}Pyx+iTqPz7IV--~xK&&pv0z*}NLA{wEF{qmw7=kdwG@()@Ftp3=cf$fAW7
z%g_<UR^`1T=^wCx`J*gqd=m&HYol$Z$7V|Y#Ult(1RjDxH`)@DYY+Bpw(eE$-}|Jr
zVFEyL4}S?#lr#B1Gf{*b!(dS9S4xnUD6c4Wy#HG}=hc%{MMq?Rk8{>L?dv9W;@tGD
z42YDj%WX82&j5?X>*q(k_po`db_EdzL~dSQUPfqZaxF=bpgm%3OpF6(qaJ5Rbj&%7
zv$&fNSea(KKrT}p6$YEgf&D||xjzCBU;U|8L9-9#!DoA!WpL@ZU8XS0iNen?0lg$Y
zd2YKm+Yy|v)tNVq0_tsoX8$#5lN#3WPV7hOFnW4;=$-yR)W_uH7HGb-2es@ln~i@3
ze)#SDWqvds1*IdIOwP-Zolgu7ZbpNH`D{IZr}RQzHW0on-S3X)J~;+x59c!rb!!go
z@t2%*Co8w`Q}_!!M~VPF<+Bow+Fp2~#hZV7dADpp3&*E-n_=4h`o~WdEEy0Plgoo>
zm~nWvdz61-);)@6pAX|~R&V7EHJ6!oAvuYUPihg1)-ZZXoQG?ZZe&@$fiNb&L59f_
zvJQ@$guRq*vERK49QEpAYU5yMH?z~BY+Hhsdahh&fu0MSg4Jwc+vkyo_*J}~ljjSc
zGw8G{CWr}Clf+(&T|#vsv1z3P7x=q)h;WnHarcVWyPFVy(Y~8SO_3#0IV-z0aLsbM
zdNQ~yH@!LsJ>^TXu0n4GM$&D0ZtS|BK(mFpwBB2z@!LdY{;r0yL6_QsBy{X*lq1CA
z+sSjOKMRXLo{x;vP8Q9L1c8`SERpS!+UJ^Br*eZ-1!E@P#LDQ8T+S@=02M2m^h+$n
zwD1@zqG*Q>jjy78C3t}UIZe5W9XxU8H7hW7Um;|GySzViGmM}aZKsD#Q=#&YvN_p!
zlH(k~b-%2rr8Oz=g(r@m`eS?9W6LPVrdw5Obg}3ti%5<9t33|N^G^z2(_J0iU(BZu
z&t$-hrs(Kld!O(C4&~1*(pnNU5?1Fp9tt7%AG}Up1_qTpTg5z|AHg#v75UF@@F?{0
zM#BNEisw|!N#sh}ca%Ac_~7)RoNf4${BF~fGfh_nYp4Rd;RBg*fh6*4(f4B)qHZBr
z%{o_nFZJt;h^UgaT^#V&N2e>H(!J6V*``;D!}+1jPK$@MXU)x*l(!|v8T*zdgXKPI
z+KsEhfHpIHQlu<tFQzp$fPbLcC(Kfpp3w@QjDM()7TnUixDl|nrKdT}e%YAXirS9)
zua}J;6Vz*~M2DUV7ij;;OgBcD)~|TUzEq9f@V#A_^Dy>><ML(>z7wBK>g+G}nQ9%b
zUF*i9NYU>L4X~xgU;oL&C+d=MfUPU?0hQ4Q7zVKtBSqtCX`d-ysW6YJ{Z+hN_q(6z
z9V^Y==nA_q1gl4lT^M+*7Df6pNeA3>pXFw+&g^=Aov1ynUu|r$8*k|fo^f_dKUL_k
zn-4-V(sZ&)jXNMbO{h2_emtJO%9(B-eWsEcOQ)!SjsS(hk>HunB#I$UJ!~nUD*qZ3
zE|Eskl1TezQ);iQ6PV(5G2(QfrcnQhc*JKSvesuD?8z0%{a!(1byIhAEcxasU+hT3
zA~<IO8gLfA)6X>mu5s4$a5Frasa@-`8|QbrFG$%>c?}9&Nnxn+3Cr$SnY1SQoRm2&
zeh-hc>3?o4SlRo8d&X-D2x(bud<iv$-Z(L@#*s{S&pEhVr}i}hRO&lcrlC)pdum?Z
zr%Cl1NPtBGFhN)jgsY)6jAK*j41JO+COir&BRlV^U3(O$2DZ1`zWfgqcS_Zi??T&+
zDUp${d8mIUo!6Y5ZV5g*Vw3+`yLPaxQg6T$5;3+y^Or4&95@?q*7#ao^I2~E>;Zz6
zB*AWo1%Wqf))64UN1~J;-wj@GKTlaAMsbh^DAk{7h=1jts+}7+Ah8yCea|oBsJ6$3
zZy8pZ%3FuGc25$aa}>BP!L*37*9(SxL)l9cO!c$h0`pfePdpTcjHYVqI3Ih*3g3cy
z_-p=iUL9x)g-gJY+V9sYO}RtA&74^MGZ)~35`VRL#FZ&wT#&XTojfWj@V02lD3CEi
zC0gnvQ)d}cL#pbe6GAHJ1yY{fK~Rwal$XiQ<Tf#1F7Jm-E|rW7dF-;E#O~kDaxH^#
zBrd%7ZZZ=Tf2Jh<Yal*Ds*jSusxK^J;^x^Jukm5_Ga&hDj#7%h%X}i_pGd`TdVwAo
zB}cT9RyekI_{}e_ApSQ(Bk##-%)WMiL6TCFHPV!F*(JvOcXvojlP?$MN_Z}NhPeMM
zcjieSp8+~Wn_D~(S*yA>s&!Xo4-%V0SseLPl%JgX<@8q1&3C@y_~Coeq*CW(JhBX)
zm{++5d@?&A1QWN3G^KmnJDF317jk&JzZU6?+0StGpQQ4)?niNP)cB5du^hT$8*P)G
z{IpT^L%iPn&iL~y{tt?tyE5M4w3e*g#Y^Mb_`S+PH*C$$vsO*KYRL5TW_-du>4j<&
z7Z(>(0{zLhggZ26et_rH<)nK&tY~eR4ba*L>Uw&5G?L-=X4pnms)5?ObLZg~fANQn
zHgCooE86rL)d?U=YW9<nn)nMrr>0-(npO1YtEKv#PKv#{3O-FTdiM|3$-!o+F3ZWu
zo!ja%GRD|p+yjdQ=0y75u5S1l^G5y?)Lb^JNTFv{vT+_U^K3l3M6dSy`TRXh1PjnM
zZ?jFbJkhehFcL8a+ZaOBk2;6*CDQ@8P2IKyjro;LS-)92vx6+puFZzLv6o#&(+eNs
z8pW4)sgp8E)}+ElieL*}`ig7n;lgDm4v?s49KD<?RMQN*WC19ff|s7fdlrI4uYP@U
z^e^4JpGqgvY@V?6>k6Aj$t#@7>=Cfh<h%d<$d^vz$sfrk{lNCHwyN6Jkd%Ybu)^nl
z#kOV#9aw>}FWWj73E8$@wz>&pPB-=oCj%oX{`R`mDd45$<k~ciYf3wokA{pV#4_#G
zAFoP4yoj}}!KS?{$r#U%pUSey$$#2ukY7Z&&AZPg3*#uA+H?J+-pU5B`>O-;GD$f*
zeG#BJ>PSm<hYp@ErZ(+4wg&9j&o<Pg7hD_t;vyEY9KN*N)GVw!-J@SOJrNYY*eY16
z>Hzgg9-j=;*h5~AGp*w%$43hFoRo?4=wmeojKkZG10p^9=&0zezXEd<f}aHQBWu4+
zQLNY9;3+DpFr7OvUj86K;syjisZvG`@YmRY(h^vUnkrnp+6r5H^BxJ_IT(4R<2F^j
zUc{B~F>JHZZAkseDmR6^_*mUR1Zz<qY5u(<tlVw3ewlMGyUq&8Ml`Lz6n~<ORvL2@
zA8<47Q^s(L9T*E3K3H&EYsq<$r%JuiUZeIYdPz0v`N1CX#fz>1JK)~G1x5ruoSr<q
z;aE0czN%7sq#QvPJ|y9_>LreHrSf+9J^b#MbWw|=@}oaj#sn{0k&!oVIx<!<()!-L
zqd4;OXDDqs<h<4B^37pa{9UIY6zZ^qwTSMD_fPphzH0N%UTeY&E$X^zf{7HZjAw(2
zWkwhupC^x>Pbfh|nt_`GsMsojMlqGiyIlGwpN~RMQL`2I`WOa&2Gs~Otk{W|=*I1I
zU~!1RKPFy8Dw?u6{jz8v;#)z})q!P`y<_=f!ImjBxv}!i9!6^Ulhn%1jMyfT#12Uw
zWISJ&El^J|zW6J3Z|3WVD)H#D^R>$OXRrfD^KNOho2_cyAz-SPV>`9GM;0rLG%(<c
zY}DNlz^ClYRfI%nqBUVJWEL(4KHE7>6|ZV&t<=w`ggJfNpnM4~Tq@#4M>1Sg+yt%J
z=Xm9t`g^A%rIj90P_Z=<ll36o@ykm;{s9nD6)vknpqYp{O>*F9J*yC}S`$Ws0Yn&o
zBUI{n2f(5=Pc4M}Z(#AfgC!T{aZqOR@_uaKCb4cZAymXk@<eO?fjhta=*gMvKGxox
z`s%2{gER(G;J(1aeCx7uI#=wnn6)5*_e7<bl3*%nLxrHf6}7tQes9{%AzETBo-Iz)
zgmM-VLCNP?`P~`cLQ+h$qnhSSB9D0c8hEv?nI*VQ-^rTOmD78qNQes+*(`b!><(?~
zEYmzK0Pjqr?IadRaIvO%gVe9PerM$I<myyL=JnAXo^I@BTuJ12AMo&5(IDvJ&Fd8x
z8rKa=S069yqCcd^z#Yl&)>InjtsKYnVzal8RcLiRV|D~S4Q!ujYo1;ZLf*Cl=;@g{
zSzo&IAmH@e&=ZGWoUBEeO?^mCkX#85=c|ylak?-CZRi9E$0-msCDQ7tL#LbVV;q4k
z4@G~7{51g@M2WvUKi|(ak)O3b4W-Ao4d#fVQ?-`IRavfl@$4M<yhsM4Yh~vYSQ$?x
zr@<MCNnzzJJ;H|OEg=q8-D(ltDkEe0tE0~`PGCs)-;Kbs5|el$27)txU-B3Z7J7sB
zx*`k&-Pj#nVa%<l*rL-^lb81yeT6?<T3S+NFKD4s<Da=QY}A<}wHhyzB}1wH?UxxK
zD<_xpAx3K94K1<yA_J+jKHy!F)<j>&goC{zbK4tT?zT%)Zaex%3$s^8z1SbVE1bj)
z=l3r*K)~nbc#kS??+wgDV*?2hlQ<=)lPIvM>=Xn>ZN`$TiSn1idEWoFw>Z@h{n>^h
z|83cEb6o;7ga+yBvvYTjp&+HNe`LJ3{DY&#t615mth9lfB<RGu*~c2cwW9eprpxem
z<=T@tq##j?uoC2XdvSsu;ZrNEJ;r$$x*9YQ!h~d`yjEQa`szW}gsr1Xf*Z2-K<&&;
zECZhAlXoE5W=QPUP<t*7+;0)&GK|Z&tn|Y-g-|nRjOUJMqCz5w3(j(y_fz0Rm5ed(
zNE}7V(1Z6M#E^}2osCI5q9+F4&y3wk8+atX0-r@{|50Li1)q?Rpv!T1U!$?P`AN&=
znHG%&r}cq5kc9*#;sR5aLjnMty9Lv9g$i$aCMVX6@R<ftA#3lA-yu^p`a1EDvyG0A
zsrRRYeW1<<%6d@5Jr=orhUL&)wB%UTLk@h+@<Dj-s@@I_O*wC9!}En^MtC6|qf$)&
z--UeFoL?km#K0Q3o+(-~Kkl$;Rhxcg(c<|ZIQ%EzM~7SyM*~-wfFOC-PK1?28aH__
z#Z!EQ+g1pH!$}LlYW3+gcoJs{8mO!&u$h+_H2ny6PN@?*F)g^<-bK&n8Q4Y{0U9ee
z`y;^&jwJHJH}}ggT)6N`!RH|g)lgvgNY1bLKLLe4>aT(%yCH%PWP%by8KzWcw+XF9
zFpVFsQ))+WCV=el37HMPEV9Z#X<7PvPft2$M#cW9=v4R-yoj^h)a;#~WeP4%>!2Ur
zVsWgrk}szmjyq*P;w(_%=cb%~=Mgj)Z$VuwJFHL@B?&J2OKJ8Q<ppo5$3;oF8u?<%
z%~-9Rt5bHgSfAN5=6W6T6&w#Sm2BVB?DxBh3gme;aBvJ!wBQWS0}sM2?c%VwKzp3A
z98<>ILD;61i^~Fy<VG14ndC+oS)=DPf9I707dPTagxs$%_=kxlEhqS<%TBA{nHnzW
zvbVQ)vu66k@m!Cqnl~#tWC+I(+KLu<JPY5H%LvGmS$Shhy4`*rYG(XZPI2rK{31w+
z_#{qc-q=OZRM;_M>||w1ITRYW7v;74+MR6)pVP;L*VmLg$?BF}6K>3c>)=M;tg}HI
z0=PHDm}UJPhh{ohRJNp}HJ`!$<#0e#3tHZxREbG6l3$IkEZ2jL)$PNxDyj)|1HS|i
z6c69&OJZgf*IkC*%g8~|R{i$)^2^^fY<)^#9zh+Sq)XN`pNzlkgkT=|z|P<6^UFWf
z2hJyu^HP4H{nw@qp*E3|s7`1E?Wc7>)M5CgO^a;9p(r~B8JNH|GRxXG&hhe0S>dI=
zYXog++=V#N2zJmO503dfmk2<waVw*5e7zvK{=THdHf>m>iQzr@GA4L6K&7<U<kjsz
zJ0haiZk+cDd)`R1>b@z~WWN*-Iu3^4l<(2b7p?)h7tF@evhBxZsY)qcKsemCXx|Ei
z4%V*eL|X;v(&9e02hVK4G{_&jPdreS2ZN>@iQe4BPNaPuS2;5`<zIZxcF2{@*oj38
zr}*w$ExnEAwLTkW_1cmL$O!NJ32LnG)II}V7tiVx>oc|IHqq^t<&2-9t&y-sf>A9C
z2}tZ#a-OQamtna&Tvy{0#&Kp8s~WihhE7kv$QoQ-u!HR?@t==dh*+n4x=huw6-the
z{FT0?AE(&ctd4U%wdF}u!_}5Ci;DMGEC-{~_A(Vr1Ez#Ie9gZ<gH4bgr7gAedYMM6
zdd+RQX}=45RW;j;OL3lwlR3s_)Rz6U2QZ7L@<R!o*4_?XZrs%Gt9_aj+SR*#(j}(D
z^a5e>(moR_aYhGh#2Zdr@<a5-;-(?dtBttTMu$ml|4R`(?e_Sav<JQwnURi1Lk6}r
z--2g^;>?s;yXbEWTsci^WJevj*2|la|LLu5)8lVVQ(9Nvq@%UvxeL&Rf^8K5?c&wj
z@w&dt8E!vy-O$;jq-mpDNz?gX`@EKJb{kBDsGJ2x46LxOf#dw(MowK6^svo6Vt9hl
zX!s_MVvF@m*pRg-YZrN&;)sTsJmSl`@I&d|%D4F}-{F}{p5$VZ@hTOfO9!phPaIeI
zoEo*pj5}FS;otb)48P=|JGm!ji2{RQ8a{GF+56!3LW~FcRuYUY(g;R*PGjdXwQr(r
zFdw6~lu7qQ^%)}1XR7qx^TulwK(Gxv)p)Sq7eS*HaPv%FC?tNnvU9>-uRScWK>aRW
z7|p;cfi4%I1UxR4S^L_JGb{{1!$Wa^yW$x+`+&q^F1w<M&@hA^pCfG@lfq8iymlgM
z`GBop;*Md;^&6py#t38Yiz11)m|2VTc*G?w3|F6<eKo(v%BmZV?SC6xKMkUaKkoGr
z{E~+6BYUpyk>Kt}@FPJVlI@1X^n_yQc9%@!$hW`}Aa_KqBh&0H<U*7e`#M&;ks|{-
zEre>kVbNE+=6*%_#t6ns(Ps)*=+9}1o3b14{PxUeN|8OaMS0=DylzV2=^}JpetSAM
z=I_!onB>V|txxvgCA90N>kE*jwAf*Jmf6hNQExBmCU?wAB<8QYmO&q=DONmE8oj0J
z#w&yrc@8=_a4T4K!F7qviw9%bSoaG<!9%-dTI`WasH1W=Egp2#1s=e>Qc11kn(KFV
z1vPCa>oFd@D~@<d{qw%{Sm?k`D+Qmk^%xzF*hhZ14|COU$Q$;~YM!2;K+wf=Iw3Y?
z3Dg7%CpXZo6zDCPD)Gv;=TtctEWnfM%4e(y4+wX=kRhB{q)ZPj3RgF{(@Yl?9;JdK
zsy(nCvvF!AqS|GFp2v*b`6DA@o?3XVx03xN?dCDEov2^<z;{+!$jk9jcqKxGhtl;c
zuawxLx_U!kQ^R*u`*xbI_f($I*u`tKe<y#-ThE%|Z9Rs<5%;QOyo&pcKM!Lme?Y@J
zR0L@3c#_D)U_|ICq_Y9S*JaIct8dD&u*YTgT;Xuc+wnC3FT$AO8Swr+m4%sw?Wt+5
zeTEb3!Gv@iF*^7$ZHikRJj=9c3!l2B2aXP;WWj;=If!4DGBNr%`r*ahUvKoWin2X6
zaT=p*dILL!S?Yao0`e`FKa+f~5^*0E^5@5*Y+t6P1vYA>&{Xj<$OHxAL?44bG)$|a
zL%s@lHE;I>B_MqZV>FLtl!44v%6N(RHyx7m(IIGew-A0fA_^Ua!x0%MORpWrOc!{@
zRV5exXCy;rGDB1uR7RAKU)-nZYzSZEv5iq$nWwLoS*7Wz9D9s=^nr+aggNVlzvcW*
zhoHX$wM=vU1asI#`0>lz7KylfQj(bh8Hwiwg{Brh3dTMXX+LHA@z+nxuXZ-nZ}%$s
zxi3o_H^P-OS+XneeRvPTs$0G@q@0@CHZAyCdG}6p8^lYthu6)d_*+6e5=_`7fzv94
z!`xw6k!{@FFFJ*xoeiPeMli-}W!2i)aw3We;+p1~K($WsC#pTN2!sU&0CQUSji@%V
zJP+GG>}?TxL?poEgYfr5u)hCCx&NE@nwbZQ20L-SXD8y_@wFMq9%2JRn8SDBh~Xeo
zwKc!&G+zLR@)tF$lIFTsAyYED)68Y8xS$rT;fI;0e?n%*9w*9*Pry47_}(TR4nAh7
zR}!F+=(h*rf5cbOa<8LiH6UF(&98~59hsg#ekRLjIHD{Rj3SbiD8To=3Nf(fy_)~F
zu@G*ExqLa%)w+$c)lK~{g7OZ83*sJ%J3#eRIzSxu5q=_Peb>#o!PlH|qWdw5n<z!*
zO$B*{fBM31d_~cdI5sT^$ev2dOtE&CAg2l<YLArXxgqWCbH5J0pi%mR-F@U%Nt`ZO
zTp*WNu+|sT$O|$(HWWtS#$~Xq-t4K&#TyOm)IPlap_V0yTpi41DrbmIk)K@XR*PiX
z+K}sw*Cn&%_)wa#Y{{0J0A{gYG719!WfIyFFtFxAA&5uvX`8<(gy#l=-CLscNpoc3
zbQu?t$mipFXJz{Z#5o4_W$jXMq^c=;=v}fl2#!L^;#wAWoTx7-UBjYdGRZ^fvDrJt
znfwFfW3q9`Rh_i(KK&Lpz<0rKVPI#^KDx!pZ2<^=%qLH0g%bl9A}M-lJ6Uz5?AFBk
zX7FvjURj;phxugJKODMespEq^UzvWdJX9x*XvfYQDx#OaGg<T<KkXdS_W?|<S|jc;
zf@o-Augx_?^9>nrW(I7h7U|lWNJT7>CEM0E@K~i0eXrubn#myFU9t-DY+Zx*FBKjq
z*CF(gwCW#*Jb*jmSC!A&l>&E`m``YZa_fhCq4H&@o{^j4HSIq~UxYK=BTa(ID5GJK
z?u!F&?f#<}=hxoKd**k+E3zr7XQV(MO$?}-!Hh9lr3KuU8`bx@=SxmTvP{_dC5UH_
zF7r2{SP@(-pIMNEQL4n|p(p!0grgWpJGWl>M!HdLv*$u~gQ`L5BLu|k>+BQ<%Y!M%
z4ZJ4dBEiN<OnwxJeV;pWd25z7lw^TCRrlHJ#%nJh^ze6~YMqb|y}ZzEiDbU+2fDxR
zWw_E+@s}4D8@QLa9>Ki$x+Yi?bf_?{Wl}P0I;Kup$@#!!<4w;qRwA_X8@!I^MoQ&J
zSmG5{S^3rVL6z=fU}WP-;C4zb_P)co#PzkWUiftA6cRf=+}|Z6#<m7=h}Fqk*epso
z`iaDvwT5FK6i&ox6xlG>cQoI{EY)SL-HH%V1k;`epz37!T2~(aPmm{QTv1G+P+&dY
z75_}rkzg480PM)a@T2HciE>YR&DaAr<D7@EsJ0?m0GFwdWpM7H^apCo*QKJzB7HsF
z6UAF~w){9Gvd8G_VL3BW%4p}KdXM^^TX=N8zKJ(9h5y{EFE$S2HhCy^-2AYXt<zmq
z)>Nm8E_57;RgP2zQ^VAROs!+Mw9SO+{9?=k+;+3bn%_fxbPS%Tc$GKdvc8yT7cx!i
z_Sz$WHZo$!Bj~#Pz^=PGY#-JSW_<p}>EvDMLe3W+50{uBZO~f7i?erZ?<*KuXmly{
zrN~^_i!J8s$}EfF$UcpF6t$vB4%AL65QGVu=;X%`al*jQYT@)kn<UQ4?$<KM^!lFt
zv18T`F>c)-73PApt{7K)Og=WZ8zaksj6?!En^binnMR82p;O)#TnRc!l$20m8`a+e
zRntGl#uC2>2FzldBb{Qb#|J)6x%g`yAZ_{(U76$Djaw5#L;~5{F{M#;%4?7u%;+&$
z7w?D1s)>P44m?H0#SewfVyrb3CkG)2Plxo(rGt4c-N!%kRfnz@5t6W<-l42)U}OM)
z&-uKDw$rb<Hq@-hi^u4#^B0b>F77wNvBky3svy?x4W2A&Y8xo7hlBvRZ^_Qj`rCpX
zDkFv&Is}bvF_%~#;(|$<2|YMdCiYun?xRM_-Jv;!wY4EPCN)1RbdOx>7FxL~`K7t|
zLQa?*Mc<;et!>uixIX_KZbwVYn%fG_95dNZTko1#T3VX!EGVyJf@SKFrwD1qZ&fB>
zzC&CYC1s@OLlMR~$)Od_Cv=NN0nH@E^{)^YBw88q=^|L$%I;Papz*MgFdu&KWKoRW
zuv!T%t|QR5C@ErMQ)nHT8F*2E=10-TDW86*tAG#^v*aP4S)gEvQ9`9brRS41&4hZB
zM()SPkJ6^;l3}V{<OKQN%in&0?H-YFj9R`c{pJjhSxUxpV#L?XYM%Nkz{_)i)Kd`?
z=Lwxr+Upr+GUiDd{CCtgi>gPV1hC@ZR~oBJRx&AN;&odO^W~e>CnuE1MdV~sc$6{8
zu@V9Inc><Lm#*F{>aY|nqI1nO8l_dJa7Br{eMr$c0DlA}LR=P-@v5GyN020f>9eqB
zhZmbDNfH7yM*Ve3flVlTClNqD-R;I?NG^wv2X6VA3e@?}n>s^_u~+j|+*Y{D2`gnl
zyyL9@#k1aGrp%8)HnTik)WehE*s#9iPxu6|Lbvl_35Ob!Ng_{Fl}*z#iB$~()yL9I
z$t~DH=)p*F4y05XMuP7t;iFF?eLySUzTF4U$jZvIpoHp-AS8h<j}ZsH1PzAuN;8>v
zp8i#IRg2YDUkp7<8I(5A9Q0{ePQ%cmPS$iuo3$^DHf2dW4qzct8Du<O3WEc5{CxQ7
zX}gThVG2(eMUPg+tpWv8os{Ujl<55BEU~E?x5MFTD9qf>mn@N?leIlEJwXE3u%84g
zh5Ykyh6~96o)T^JotCqRLuw*iY#<-8u#g<-wrwPYav4$T!^@?n_g>oxUZ|SkiPXqE
zk|7uq0!hL?=U)UZ!{$Q$;SqaJ`AO(1^dpN;S9?8dMKRrqf+n8@RV-?rCN6Pcbo)wS
zv!CVGwtSpqHeakfZDxrRJ<8ls%5PC%+|qM$l}NLDpWm=c<smkZMoD?+(_6L}aLM#n
z?$dv1TRD{6j9hsX;dFP75$jQzFylL)|IOmY4s&pUiKULhUFpGu0Y;+5NY@ID3>B|2
zKy{M!RuJk=9KJJRgai3_D^v;{!zl3od^CmUmKO!+9GD5mcxtED*3Gn5<R`sI>;b!$
zdEA3jn;S~JE$l!e)|(CK4QpM2_iwQ4fDkXpOgdi@0PS!^Z{rVs1VN!&*q}9uEkTEg
zA|hML*l-@&mZ+1Lb5BD10~6ykWVdgDJ3Q(Fhk^N@`FI%uT$mj&FgJL>YpJSUV~RF8
z3K$_u{%h-w)%y9)EbjIIyd)AmqBBsLP%Jv6q?@~_*q=+5xD&4>X<(0aB+O0sruvXv
zHJ(e@BSBZdMH1^%<g0!D@_ZNHL|Y&sYV&x}js7fQ5LWs380uex<7H-bH$|l|p&a5h
z7Mo#KK1WJi2P;CRU~-e$hnJ7}e|^D%ZsivS{_h7Z+4`@d3qb6E|MSU_%Y4kD`eQ0o
z-~*HYJaB7ZVHMZL%+MNw+_UH7R9^X;MHbPyE)YN{t~8K-NXdvAMEGk)7d)5H<l{(V
z&E=@%Of%T`9M*UAJwp6@tG>Ygl-4jd<$q7t+*wlDe49u2f4W_AM1nSCHoBl!UF!|K
ztXcrt!dX)7>P3-$+;+8<l>rlq7A#$Qj1VHxNC{4Ks07ph=c4B^zjzKnMCO~v{T)k^
QAmC45+vHZMmebS!1A}b2+5i9m

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 219418a37..54802251e 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -547,7 +547,8 @@ a.homepagePostTypeNotice {background:url(../images/homepage_icon.png) -87px -280
 a.homepagePostTypeForum {background:url(../images/homepage_icon.png) -10px -310px no-repeat; padding-left:23px;}
 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.homepagePostTypeAll {background:url(../images/homepage_icon2.png) -10px -360px 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.postTypeGrey {color:#888888;}
 a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostBrief {width:710px; margin:0px auto; position:relative;}
@@ -869,8 +870,6 @@ a:hover.BlueCirBtn{ background:#269ac9; color:#fff;}
 .w720{width:721px;}
 .w709{width: 709px;}
 .w701{width: 701px;}
-a.AnnexBtn{  background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
-a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;}
 a.FilesBtn{  background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#269ac9;}
 a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
@@ -887,13 +886,13 @@ a:hover.BlueCirBtn{ background:#3598db; color:#fff;}
 .W440{ width:440px;}
 .W120{ width:110px;}
 .W700{ width:700px;}
-a.AnnexBtn{  background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a.AnnexBtn{  background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:50px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}
-a.FilesBtn{  background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a.FilesBtn{  background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:38px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;}
 a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;}
-a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
+a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:30px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.ProBtn{background: url(../images/homepage_icon.png) -86px -426px no-repeat; color:#3598db;}
 
 a.DropBtn{background: url(../images/homepage_icon.png) -125px -339px no-repeat; width:85px; height:20px; display:block;  color:#888888; font-size:14px;}

From 062a9ff231ca642ed35ecfc6ab8a0c6a49f0f865 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 17 Sep 2015 16:12:31 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=EF=BC=8C=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=AD=97=E5=8F=B7=E5=A4=A7=E5=B0=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb | 4 ++--
 app/views/layouts/new_base_user.html.erb  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 91357d09a..807fb2caa 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -331,8 +331,8 @@
         <span>48px*48px</span> <br />
       </div>
       <div class="cl mb10"></div>
-      <a href="javascript:hideModal();" class=" fr grey_btn mr15"> 取&nbsp;&nbsp;消</a>
-      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10">确&nbsp;&nbsp;定</a>
+      <a href="javascript:hideModal();" class=" fr grey_btn mr15 f14"> 取&nbsp;&nbsp;消</a>
+      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10 f14">确&nbsp;&nbsp;定</a>
 
     </div><!--talknew end-->
     <div class="cl"></div>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 7f8b4c69e..77d54b3c0 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -195,8 +195,8 @@
         <span>48px*48px</span> <br />
       </div>
       <div class="cl mb10"></div>
-      <a href="javascript:hideModal();" class=" fr grey_btn mr15"> 取&nbsp;&nbsp;消</a>
-      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10">确&nbsp;&nbsp;定</a>
+      <a href="javascript:hideModal();" class=" fr grey_btn mr15 f14"> 取&nbsp;&nbsp;消</a>
+      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10 f14">确&nbsp;&nbsp;定</a>
     </div><!--talknew end-->
     <div class="cl"></div>
   </div><!--floatbox end-->

From 210425277e20c3651e73af0c5097272562fcba1d Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 17 Sep 2015 17:17:36 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/header.css   | 234 ++++++++++++++++----------------
 public/stylesheets/new_user.css |   2 +-
 2 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 2d6f5e0b8..998ae6fbd 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -1,117 +1,117 @@
-/*新个人主页框架css*/
-.navContainer {width:100%; background-color:#269ac9;}
-.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
-.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
-.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
-.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
-.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
-.navHomepageMenu:hover {background-color:#297fb8;}
-.navHomepageSearchBoxcontainer {margin-top:11px; }
-.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
-.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
-.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
-a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
-#navSearchAlert {display:none;}
-.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
-.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
-.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
-.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
-.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
-.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
-/*.navHomepageProfile ul li ul {display:none;}
-.navHomepageProfile ul li:hover ul {display:block;}*/
-.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
-.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
-.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
-.homepagePortraitImage:hover {border:1px solid #15bccf;}
-.homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
-.homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
-.homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
-.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;}
-.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
-.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
-.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
-.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
-.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
-.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
-.homepageImageNumber {font-size:12px; color:#484848;}
-a.homepageImageNumber:hover {color:#15bccf;}
-.homepageImageText {font-size:12px; color:#888888;}
-.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
-.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
-.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
-.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
-.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
-.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
-a.coursesLineGrey {color:#808080; display:block;}
-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-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:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
-.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
-.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 {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
-.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
-a.homepageWhite {color:#ffffff !important;}
-a.homepageWhite:hover {color:#a1ebff !important;}
-a.newsGrey {color:#4b4b4b;}
-a.newsGrey:hover {color:#000000;}
-a.replyGrey {color:#888888; display:inline-block;}
-a.replyGrey:hover {color:#4b4b4b;}
-a.replyGrey1 {color:#888888;}
-a.replyGrey1:hover {color:#4b4b4b;}
-a.newsBlue {color:#15bccf;}
-a.newsBlue:hover {color:#0781b4;}
-a.menuGrey {color:#808080;}
-a.menuGrey:hover {color:#fe7d68;}
-.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
-#navSearchAlert {display:none;}
-.none{display: none;}
-.db {display:block !important;}
-
-/*myctrip*/
-.userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
-a.topnav_login_a{color:#fff; display:inline-block;}
-a.topnav_login_a:hover {color:#a1ebff;}
-a.topnav_login_mes{color:#fff; width:10px;height:20px; padding-left:15px; background: url(../images/item.png) -84px -145px no-repeat; display:inline-block; vertical-align:top;}
-a.topnav_login_mes:hover {color:#a1ebff;}
-a.topnav_login_box{ color:#fff; font-size:14px; font-weight:bold; width:90px; display:inline-block;}
-.menuArrow {background:url(../images/item.png) -20px -40px no-repeat;}
-li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
-a.topnav_login_box:hover {color:#a1ebff;}
-.navRow1 {margin:0; padding:0;}
-.navRow2 {margin:0; padding:0;}
-.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;}
-.topnav_login_list a{color:#269ac9;}
-.topnav_login_list li{ }
-.portraitRadius {border-radius: 3px;}
-
-/*底部*/
-#Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
-.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
-.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
-.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
-.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
-a.f_grey {color:#666666 !important;}
-a.f_grey:hover {color:#000000 !important;}
-.mr30 {margin-right: 30px;}
-
-
-/*注册登陆页面*/
-#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
-#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
-#loginSignButton:hover {background-color:#297fb8;}
-#loginInButton:hover {background-color:#297fb8;}
+/*新个人主页框架css*/
+.navContainer {width:100%; background-color:#269ac9;}
+.homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
+.homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
+.navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
+.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
+.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
+.navHomepageMenu:hover {background-color:#297fb8;}
+.navHomepageSearchBoxcontainer {margin-top:11px; }
+.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
+.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;}
+.homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
+a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
+#navSearchAlert {display:none;}
+.navHomepageNews {width:30px; display:block; float:right; margin-top:8px; position:relative;}
+.homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
+.newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
+.navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
+.homepageProfileMenuIconhover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
+/*.navHomepageProfile ul li ul {display:none;}
+.navHomepageProfile ul li:hover ul {display:block;}*/
+.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
+.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
+.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
+.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage:hover {border:1px solid #15bccf;}
+.homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
+.homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
+.homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
+.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;}
+.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
+.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
+.homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
+.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
+.homepageImageNumber {font-size:12px; color:#484848;}
+a.homepageImageNumber:hover {color:#15bccf;}
+.homepageImageText {font-size:12px; color:#888888;}
+.homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;}
+.homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
+.homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
+.homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
+.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
+.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
+a.coursesLineGrey {color:#808080; display:block;}
+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-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:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
+.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
+.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 {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
+.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
+a.homepageWhite {color:#ffffff !important;}
+a.homepageWhite:hover {color:#a1ebff !important;}
+a.newsGrey {color:#4b4b4b;}
+a.newsGrey:hover {color:#000000;}
+a.replyGrey {color:#888888; display:inline-block;}
+a.replyGrey:hover {color:#4b4b4b;}
+a.replyGrey1 {color:#888888;}
+a.replyGrey1:hover {color:#4b4b4b;}
+a.newsBlue {color:#15bccf;}
+a.newsBlue:hover {color:#0781b4;}
+a.menuGrey {color:#808080 !important;}
+a.menuGrey:hover {color:#fe7d68 !important;}
+.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
+#navSearchAlert {display:none;}
+.none{display: none;}
+.db {display:block !important;}
+
+/*myctrip*/
+.userImage{position:absolute; right:140px; top:5px; width:30px;height:30px; background: url(../images/item.png) 2px 4px no-repeat; line-height:1.4;}
+a.topnav_login_a{color:#fff; display:inline-block;}
+a.topnav_login_a:hover {color:#a1ebff;}
+a.topnav_login_mes{color:#fff; width:10px;height:20px; padding-left:15px; background: url(../images/item.png) -84px -145px no-repeat; display:inline-block; vertical-align:top;}
+a.topnav_login_mes:hover {color:#a1ebff;}
+a.topnav_login_box{ color:#fff; font-size:14px; font-weight:bold; width:90px; display:inline-block;}
+.menuArrow {background:url(../images/item.png) -20px -40px no-repeat;}
+li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
+a.topnav_login_box:hover {color:#a1ebff;}
+.navRow1 {margin:0; padding:0;}
+.navRow2 {margin:0; padding:0;}
+.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px; font-size: 12px;}
+.topnav_login_list a{color:#269ac9;}
+.topnav_login_list li{ }
+.portraitRadius {border-radius: 3px;}
+
+/*底部*/
+#Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
+.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
+.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
+.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
+.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
+.copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
+a.f_grey {color:#666666 !important;}
+a.f_grey:hover {color:#000000 !important;}
+.mr30 {margin-right: 30px;}
+
+
+/*注册登陆页面*/
+#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginSignButton:hover {background-color:#297fb8;}
+#loginInButton:hover {background-color:#297fb8;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 54802251e..7d7566903 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -261,7 +261,7 @@ li.menuArrow:hover {background:url(../images/item.png) -20px -70px no-repeat;}
 a.topnav_login_box:hover {color:#a1ebff;}
 .navRow1 {margin:0; padding:0;}
 .navRow2 {margin:0; padding:0;}
-.topnav_login_list{ border:1px solid #269ac9; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2;}
+.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;}
 .topnav_login_list a{color:#269ac9;}
 .topnav_login_list li{ }
 

From 7254cf4689d52e320d1b3e33af2d9b3b4f6da0a8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Sep 2015 17:26:48 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7=E5=8F=98=E5=8C=96=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A8=E6=80=81=E8=A1=A8=E4=B8=AD=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=9A=84=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index f7f596e17..2a6da44c5 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1399,6 +1399,7 @@ class Issue < ActiveRecord::Base
   def attachment_added(obj)
     if @current_journal && @current_journal.user_id == obj.author_id && JournalDetail.find_all_by_value(obj.filename).count == 0
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)
+
     end
   end
 
@@ -1407,6 +1408,9 @@ class Issue < ActiveRecord::Base
     if @current_journal && !obj.new_record?
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :old_value => obj.filename)
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
     end
   end
 
@@ -1513,6 +1517,9 @@ class Issue < ActiveRecord::Base
         }
       end
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
       # reset current journal
       init_journal @current_journal.user, @current_journal.notes
     end

From 8f317711b87f60e6819ac6eebbf8284b0a138f27 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Sep 2015 19:06:15 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6=E7=9A=84=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/comments/create.js.erb          | 2 +-
 app/views/issues/add_journal.js.erb       | 2 +-
 app/views/messages/reply.js.erb           | 2 +-
 app/views/users/_user_activities.html.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
index f0e7a6a11..b8494b02a 100644
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data('<%= @user_activity_id%>',"30px","85%");
+init_KindEditor_data('<%= @user_activity_id%>',"","85%");
diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb
index c5b698702..d2ce36b68 100644
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data(<%= @user_activity_id%>,"30px","85%");
\ No newline at end of file
+init_KindEditor_data(<%= @user_activity_id%>,"","85%");
\ No newline at end of file
diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb
index 883051365..44b4fca12 100644
--- a/app/views/messages/reply.js.erb
+++ b/app/views/messages/reply.js.erb
@@ -3,4 +3,4 @@
 <%elsif @course%>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 <%end%>
-init_KindEditor_data(<%= @user_activity_id%>,"30px","85%");
\ No newline at end of file
+init_KindEditor_data(<%= @user_activity_id%>,"","85%");
\ No newline at end of file
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 9eefbd1f1..d0d60266d 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -36,7 +36,7 @@
             }
 
             $(function() {
-                init_KindEditor_data(<%= user_activity.id%>,"30px","85%");
+                init_KindEditor_data(<%= user_activity.id%>,"","85%");
             });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>

From ad610cb0b23551e3430b6b98ad9613a48d7bd0fc Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Sep 2015 11:29:38 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=9B=86=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E8=BE=93=E5=87=BA=E6=A1=86=E7=9A=84=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_user_programing_attr.html.erb      | 13 ++-
 public/javascripts/homework.js                |  9 +-
 public/javascripts/new_user.js                | 91 ++++++++++++++++++-
 3 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_user_programing_attr.html.erb b/app/views/users/_user_programing_attr.html.erb
index 0ebe997e2..0bfbd379f 100644
--- a/app/views/users/_user_programing_attr.html.erb
+++ b/app/views/users/_user_programing_attr.html.erb
@@ -11,7 +11,7 @@
       <% homework.homework_tests.each_with_index do |test, index| %>
           <div class="mt10">
             <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"><%= test.input %></textarea>
-            <textarea class="InputBox  W320  fl mr5" placeholder="测试输出"><%= test.output %></textarea>
+            <textarea class="InputBox  W320  fl mr5" placeholder="测试输出"  id="textarea_output_test"><%= test.output %></textarea>
             <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
             <% if index != 0 %>
                 <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
@@ -22,7 +22,7 @@
   <% else %>
       <div class="mt10">
         <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea>
-        <textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
+        <textarea class="InputBox  W320  fl mr5" placeholder="测试输出" id="textarea_output_test"></textarea>
         <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
         <div class="cl"></div>
       </div>
@@ -34,4 +34,11 @@
     <div class="cl"></div>
   </div>
 
-</div><!----HomeWorkCon end-->
\ No newline at end of file
+</div><!----HomeWorkCon end-->
+
+<script>
+    var text = document.getElementById("textarea_input_test");
+    var text2 = document.getElementById("textarea_output_test");
+    autoTextarea2(text,text2);
+    autoTextarea2(text2,text);
+</script>
\ No newline at end of file
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index ca07093fe..0499ac5fb 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -168,7 +168,14 @@ $(function(){
     $("#BluePopupBox").on('click', 'a.icon_add', function(){
         var html = bt('t:test-answer-list', null);
         $(this).parent('.mt10').after(html);
-
+        var inputs = document.getElementsByName("program[input][]");
+        var outputs = document.getElementsByName("program[output][]");
+        if (inputs.length == outputs.length) {
+            for (var i=0; i<inputs.length; i++) {
+                autoTextarea2(inputs[i], outputs[i]);
+                autoTextarea2(outputs[i], inputs[i]);
+            }
+        }
     });
     $("#BluePopupBox").on('click', 'a.icon_remove', function(){
         $(this).parent('.mt10').remove();
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 4f2cbeeff..e5f5e8b4c 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -314,4 +314,93 @@ function clickOK(path)
         }
     });
 }
-/////////////////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
+/////////////////////////////////////////////////////////////////////////////////////////
+
+var autoTextarea2 = function (elem,elem2, extra, maxHeight) {
+    extra = extra || 0;
+    var isFirefox = !!document.getBoxObjectFor || 'mozInnerScreenX' in window,
+        isOpera = !!window.opera && !!window.opera.toString().indexOf('Opera'),
+        addEvent = function (element, type, callback) {
+            element.addEventListener ?
+                element.addEventListener(type, callback, false) :
+                element.attachEvent('on' + type, callback);
+        },
+        getFirstStyle = elem.currentStyle ? function (name) {
+            var val = elem.currentStyle[name];
+
+            if (name === 'height' && val.search(/px/i) !== 1) {
+                var rect = elem.getBoundingClientRect();
+                return rect.bottom - rect.top -
+                    parseFloat(getFirstStyle('paddingTop')) -
+                    parseFloat(getFirstStyle('paddingBottom')) + 'px';
+            };
+
+            return val;
+        } : function (name) {
+            return getComputedStyle(elem, null)[name];
+        },
+        minHeight = parseFloat(getFirstStyle('height'))
+
+    elem.style.resize = 'none';
+    elem2.style.resize = 'none';
+    var change = function () {
+        var scrollTop, height,
+            padding = 0,
+            style = elem.style,
+            style2 = elem2.style;
+
+
+        if (elem._length === elem.value.length) return;
+        elem._length = elem.value.length;
+        elem2._length = elem._length;
+        if (!isFirefox && !isOpera) {
+            padding = parseInt(getFirstStyle('paddingTop')) + parseInt(getFirstStyle('paddingBottom'));
+        };
+        scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+
+        elem.style.height = minHeight + 'px';
+        elem2.style.height = minHeight + 'px';
+        if (elem.scrollHeight > minHeight) {
+            if (maxHeight && elem.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+                style2.overflowY = 'auto';
+            } else {
+                height = elem.scrollHeight - padding;
+                style.overflowY = 'hidden';
+                style2.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            style2.height = height + extra + 'px';
+            scrollTop += parseInt(style.height) - elem.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem.currHeight = parseInt(style.height);
+        };
+        if (elem2.scrollHeight > minHeight) {
+            if (maxHeight && elem2.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+                style2.overflowY = 'auto';
+            } else {
+                height = elem2.scrollHeight - padding;
+                style.overflowY = 'hidden';
+                style2.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            style2.height = height + extra + 'px';
+            scrollTop += parseInt(style2.height) - elem2.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem2.currHeight = parseInt(style2.height);
+        };
+    };
+
+    addEvent(elem, 'propertychange', change);
+    addEvent(elem, 'input', change);
+    addEvent(elem, 'focus', change);
+    addEvent(elem2, 'propertychange', change);
+    addEvent(elem2, 'input', change);
+    addEvent(elem2, 'focus', change);
+    change();
+};
\ No newline at end of file