diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index 7a226f50d..63b0da009 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -1,9 +1,45 @@
 class BlogsController < ApplicationController
   before_filter :find_blog,:except => [:index,:create,:new,:set_homepage, :cancel_homepage]
   before_filter :find_user
+  include PraiseTreadHelper
+
   def index
     @article = BlogComment.new
+
+    @order, @b_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1
+
+    #确定 sort_type 1升序 2 降序
+    if @order.to_i == @type.to_i
+      @b_sort = @b_sort.to_i == 1 ? 2 : 1
+    else
+      @b_sort = 2
+    end
+
+    sort_name = "updated_at"
+
+    sort_type = @b_sort == 1 ? "asc" : "desc"
+
+    @topics = @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.#{sort_name} #{sort_type}")
+
+    #根据 赞+回复数排序
+    if @order.to_i == 2
+        @type = 2
+        @b_sort == 1 ? @topics = @topics.sort{|x,y| get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) <=> get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) } : @topics = @topics.sort{|x,y| get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) <=> get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) }
+        @topics = @topics.sort{|x,y| y.sticky <=> x.sticky}
+    else
+        @type = 1
+    end
+
+    #分页
+    @limit = 10
+    @is_remote = true
+    @atta_count = @topics.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    @topics = paginateHelper @topics,@limit
+
     respond_to do |format|
+      format.js
       format.html {render :layout=>'new_base_user'}
     end
   end
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index a77346d89..2e499ea1d 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -28,6 +28,7 @@ class BoardsController < ApplicationController
   helper :watchers
   helper :project_score
   helper :attachments
+  include PraiseTreadHelper
   def index
     #modify by nwb
     @flag = params[:flag] || false
@@ -62,13 +63,24 @@ class BoardsController < ApplicationController
       else
         render_403
       end
-
     end
-
   end
 
   def show
     # 讨论区消息状态更新（已读和未读）
+    @order, @b_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1
+
+    #确定 sort_type 1升序 2 降序
+    if @order.to_i == @type.to_i
+      @b_sort = @b_sort.to_i == 1 ? 2 : 1
+    else
+      @b_sort = 2
+    end
+
+    sort_name = "updated_at"
+
+    sort_type = @b_sort == 1 ? "asc" : "desc"
+
     if @project
       ForgeMessage.where("user_id =? and project_id =? and viewed =?", User.current.id, @project.id, 0).update_all(:viewed => true)
       # 更新@消息为已读
@@ -82,10 +94,10 @@ class BoardsController < ApplicationController
       CourseMessage.where("user_id =? and course_id =? and viewed =?", User.current.id, @course.id, 0).update_all(:viewed => true)
     end
 
-    sort_init 'updated_on', 'desc'
-    sort_update 'created_on' => "#{Message.table_name}.created_on",
-                'replies' => "#{Message.table_name}.replies_count",
-                'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"
+    # sort_init 'updated_on', 'desc'
+    # sort_update 'created_on' => "#{Message.table_name}.created_on",
+    #             'replies' => "#{Message.table_name}.replies_count",
+    #             'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"
 
     @is_new = params[:is_new]
     @topic_count = @board ? @board.topics.count : 0
@@ -93,52 +105,71 @@ class BoardsController < ApplicationController
       if @board
         limit = 10;
         @topic_count = @board.topics.count();
-        @topic_pages = (params[:page] ? params[:page].to_i + 1 : 0) *10
-        @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) desc").
-            limit(limit).offset(@topic_pages).includes(:last_reply).
+        @topic_pages = 0#(params[:page] ? params[:page].to_i + 1 : 0) *10
+        @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) #{sort_type}").
+            offset(@topic_pages).includes(:last_reply).
             preload(:author, {:last_reply => :author}).all();
       else
         @topics = [];
       end
     elsif @course
       if (@board)
-        limit = 10;
         @topic_count = @board.topics.count();
-        @topic_pages = (params[:page] ? params[:page].to_i + 1 : 0) *10
-        @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) desc").
-            limit(limit).offset(@topic_pages).includes(:last_reply).
-            preload(:author, {:last_reply => :author}).all();
+        @topic_pages = 0 #(params[:page] ? params[:page].to_i + 1 : 0) *10
+        @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) #{sort_type}").offset(@topic_pages).includes(:last_reply).preload(:author, {:last_reply => :author}).all();
       else
         @topics = [];
       end
     end
 
+    #根据 赞+回复数排序
+    if @order.to_i == 2
+      @type = 2
+      @b_sort == 1 ? @topics = @topics.sort{|x,y| get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) <=> get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) } : @topics = @topics.sort{|x,y| get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) <=> get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) }
+      @topics = @topics.sort{|x,y| y.sticky <=> x.sticky}
+    else
+      @type = 1
+    end
+
+    #分页
+    @limit = 10
+    @is_remote = true
+    @atta_count = @topics.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    @topics = paginateHelper @topics,@limit
+
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @message = Message.new(:board => @board)
     #modify by nwb
-    respond_to do |format|
-      format.js
-      format.html {
-        if @project
-          render :action => 'show', :layout => 'base_projects'
-        elsif @course
-          @params=params
-          render :action => 'show', :layout => 'base_courses'
-        end
-      }
-      format.atom {
-        @messages = @board.messages.
-            reorder('created_on DESC').
-            includes(:author, :board).
-            limit(Setting.feeds_limit.to_i).
-            all
-        if @project
-          render_feed(@messages, :title => "#{@project}: #{@board}")
-        elsif @course
-          render_feed(@messages, :title => "#{@course}: #{@board}")
-        end
-
-      }
+    if (params[:page] || params[:order])
+      respond_to do |format|
+        format.js{render "show.js.erb"}
+      end
+    else
+      respond_to do |format|
+        format.js
+        format.html {
+          if @project
+            render :action => 'show', :layout => 'base_projects'
+          elsif @course
+            @params=params
+            render :action => 'show', :layout => 'base_courses'
+          end
+        }
+        format.atom {
+          @messages = @board.messages.
+              reorder('created_on DESC').
+              includes(:author, :board).
+              limit(Setting.feeds_limit.to_i).
+              all
+          if @project
+            render_feed(@messages, :title => "#{@project}: #{@board}")
+          elsif @course
+            render_feed(@messages, :title => "#{@course}: #{@board}")
+          end
+        }
+      end
     end
   end
 
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 457b3bfa1..2dd6ce474 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -84,9 +84,6 @@ class OrganizationsController < ApplicationController
 
         @subfield_content = @organization.org_subfields.order("priority")
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
-
           # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
           # @org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
@@ -116,15 +113,13 @@ class OrganizationsController < ApplicationController
         #@project_acts_issues = get_project_activities_org @organization
         #@course_acts = get_course_activities_org @organization
 
-        render :layout => 'base_org_newstyle'
+        render :layout => 'base_org2'
       else
         render_403
       end
     else
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
         if params[:org_subfield_id]
           @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5c8d194b9..c8b272480 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -319,9 +319,25 @@ class ProjectsController < ApplicationController
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
     end
-    g = Gitlab.client
-    unless @project.gpid.nil?
-      @static_total_per_user = g.rep_stats(@project.gpid)
+    # g = Gitlab.client
+    unless @project.gpid.nil? || @project.project_score.changeset_num == 0
+      # rep_statics_commit = @project.rep_statics.order("commits_num desc")
+      rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")
+      rep_statics_code = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by changeset desc limit 10")
+      # rep_statics_code = @project.rep_statics.sort_by {|u| u.changeset}.reverse
+      @a_uname = rep_statics_commit.map {|s| s.uname }
+      @a_uname_code = rep_statics_code.map {|s| s.uname }
+      @a_commits_num = rep_statics_commit.map {|s| s.commits_num.to_i }
+      @a_commits_add = rep_statics_code.map {|s| s.add.to_i }
+      @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
+      @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
+      g = Gitlab.client
+      begin
+        g_branch = g.project(@project.gpid).default_branch.to_s
+      rescue
+        logger.error("get gitlab project failed!")
+      end
+      @rev = g_branch.nil? ? "master" : g_branch
     end
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 82a6196cb..b73ecf9b9 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -325,31 +325,17 @@ update
       end
     end
 
-    # unless @repository.gitlab?
-    #   # redirect_to to_gitlab_project_repository_path(@project, @repository)
-    #   render :to_gitlab
-    #   return
-    # end
-
-    #if( !User.current.member_of?(@project) || @project.hidden_repo)
-    # @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
-
-    # :name, :path, :kind, :size, :lastrev, :changeset
     @entries = @repository.entries(@path, @rev)
-    # @trees = g.trees(project, @path)
     @changeset = @repository.find_changeset_by_name(@rev)
-    #@project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-    #@ip               = RepositoriesHelper::REPO_IP_ADDRESS
-
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      #Modified by young
-      #  (show_error_not_found; return) unless @entries
       g = Gitlab.client
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
+      g_project = g.project(@project.gpid)
       # 总的提交数
-      @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count
+      @changesets_all_count = @project.gpid.nil? ? 0 : g_project.commit_count
+      @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
       # 访问该页面的是会后则刷新
       if @project.project_score.nil?
         ProjectScore.create(:project_id => @project.id, :score => false)
@@ -358,17 +344,16 @@ update
       if @changesets_all_count != @project.project_score.changeset_num && @changesets_all_count != 0
         update_commits_count(@project, @changesets_all_count)
       end
-      # end
       # 最近一次提交
       @changesets_latest_coimmit = @changesets[0]
       unless @changesets[0].blank?
         update_commits_date(@project, @changesets_latest_coimmit)
       end
       @creator = User.where("id =?", @project.user_id).first.try(:login)
-      @properties = @repository.properties(@path, @rev)
-      @repositories = @project.repositories
-      project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-      ip = RepositoriesHelper::REPO_IP_ADDRESS
+      # @properties = @repository.properties(@path, @rev)
+      # @repositories = @project.repositories
+      # project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
+      # ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
       if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
@@ -573,9 +558,17 @@ update
     g = Gitlab.client
     begin
     @static_total_per_user = g.rep_stats(project_id, :rev => rev)
-    @static_total_per_user
-    # @static_month__per_user = g.rep_stats(project_id, :rev => rev, :creator => creator, :period => 2)
-    # @static_week_per_user = g.rep_stats(project_id, :rev => rev, :creator => creator, :period => 3)
+    # 更新rep_statics统计数
+    @static_total_per_user.each do |static|
+      rep_static = RepStatics.where("project_id =? and email =?", @project.id, static.email.to_s).first
+      if rep_static.nil?
+        RepStatics.create(:project_id => @project.id, :uname => static.uname, :commits_num => static.commits_num, :email => static.email, :add => static.add, :del => static.del, :changeset => static.changes)
+      else
+        if @rev == params[:default_branch]
+          rep_static.update_attributes(:uname => static.uname, :commits_num => static.commits_num, :email => static.email, :add => static.add, :del => static.del, :changeset => static.changes)
+        end
+      end
+    end
     rescue
       render_404
       return
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 0daafdace..31daba728 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -504,6 +504,7 @@ class StudentWorkController < ApplicationController
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
+    @is_focus = params[:is_focus] ? params[:is_focus].to_i : 0
     # 消息传过来的ID
     @message_student_work_id = params[:student_work_id]
     respond_to do |format|
@@ -920,8 +921,6 @@ class StudentWorkController < ApplicationController
         student_work.late_penalty = @homework.late_penalty
         student_work.save
       end
-
-      @homework.save
     end
 
     if params[:absence_penalty] && homework_detail_manual.absence_penalty.to_s != params[:absence_penalty].to_s
@@ -944,7 +943,6 @@ class StudentWorkController < ApplicationController
       homework_detail_programing.ta_proportion = params[:sy_proportion] if homework_detail_programing
       @homework.teacher_priority = teacher_priority
 
-      @homework.save
       homework_detail_manual.save if homework_detail_manual
       homework_detail_programing.save if homework_detail_programing
 
@@ -953,6 +951,8 @@ class StudentWorkController < ApplicationController
         student_work.save
       end
     end
+    
+    @homework.save
     if params[:student_path]
       redirect_to student_work_index_url(:homework => @homework.id)
     else
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8e08508ed..774a8dabd 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -41,7 +41,7 @@ class UsersController < ApplicationController
                                       :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                       :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course]
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -2845,6 +2845,93 @@ class UsersController < ApplicationController
     end
   end
 
+  def user_courselist
+    @order, @c_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1
+
+    #确定 sort_type
+    if @order.to_i == @type.to_i
+      @c_sort = @c_sort.to_i == 1 ? 2 : 1   #1升序 2降序
+    else
+      @c_sort = 2
+    end
+
+    sort_name = "updated_at"
+    sort_type = @c_sort == 1 ? "asc" : "desc"
+
+    if @user.courses.visible.count > 0
+      course_order_ids = "(" + CourseActivity.find_by_sql("SELECT  c.course_id, updated_at FROM(SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") GROUP BY ca.course_id) AS c ").map {|c| c.course_id}.join(",") + ")"
+      @courses = Course.where("id in #{course_order_ids}").order("#{sort_name} #{sort_type}")
+    else
+      @courses = []
+    end
+
+    #根据 作业+资源数排序
+    if @order.to_i == 2
+      @type = 2
+      @courses.each do |course|
+        course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count)
+      end
+      @c_sort == 1 ? (@courses = @courses.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@courses = @courses.sort{|x,y| y[:infocount] <=> x[:infocount]})
+    else
+      @type = 1
+    end
+
+    #分页
+    @limit = 10
+    @is_remote = true
+    @atta_count = @courses.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    @courses = paginateHelper @courses,@limit
+
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  def user_projectlist
+    @order, @c_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1
+
+    #确定 sort_type
+    if @order.to_i == @type.to_i
+      @c_sort = @c_sort.to_i == 1 ? 2 : 1   #1升序 2降序
+    else
+      @c_sort = 2
+    end
+
+    sort_name = "created_on"
+    sort_type = @c_sort == 1 ? "asc" : "desc"
+
+    if @user.projects.visible.count > 0
+      project_order_ids = "(" +ForgeActivity.find_by_sql("SELECT  p.project_id, p.created_at FROM (SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ") GROUP BY fa.project_id) AS p ").map {|p| p.project_id}.join(",") + ")"
+      @projects = Project.where("projects.id in #{project_order_ids}").order("#{sort_name} #{sort_type}")
+    else
+      @projects = []
+    end
+
+    #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
+    if @order.to_i == 2
+      @type = 2
+      @c_sort == 1 ? (@projects = @projects.sort{|x,y| x.project_score.issue_num+x.project_score.attach_num <=> y.project_score.issue_num+y.project_score.attach_num }) : (@projects = @projects.sort{|x,y| y.project_score.issue_num+y.project_score.attach_num <=> x.project_score.issue_num+x.project_score.attach_num })
+    else
+      @type = 1
+    end
+
+    #分页
+    @limit = 10
+    @is_remote = true
+    @atta_count = @projects.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    @projects = paginateHelper @projects,@limit
+
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
   private
 
   def find_user
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 366cea06b..d7c72b805 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -120,60 +120,53 @@ module ApplicationHelper
     case type
       when "HomeworkCommon"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :homework_journal_num => 1)
         else
-          score = course_contributor_score.homework_journal_num + 1
-          course_contributor_score.update_attributes(:homework_journal_num => score)
+          score = course_contributor_score.homework_journal_num.to_i + 1
+          course_contributor_score.update_column(:homework_journal_num, score)
         end
       # 课程留言
       when "Course"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :journal_num => 1)
         else
-          score = course_contributor_score.journal_num + 1
-          course_contributor_score.update_attributes(:journal_num => score)
+          score = course_contributor_score.journal_num.to_i + 1
+          course_contributor_score.update_column(:journal_num, score)
         end
       when  "Message"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1)
         else
-          score = course_contributor_score.message_num + 1
-          course_contributor_score.update_attributes(:message_num => score)
+          score = course_contributor_score.message_num.to_i + 1
+          course_contributor_score.update_column(:message_num, score)
         end
       when "MessageReply"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_reply_num => 1)
         else
-          score = course_contributor_score.message_reply_num + 1
-          course_contributor_score.update_attributes(:message_reply_num => score)
+          score = course_contributor_score.message_reply_num.to_i + 1
+          course_contributor_score.update_column(:message_reply_num, score)
         end
       when "NewReply"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_reply_num => 1)
         else
-          score = course_contributor_score.news_reply_num + 1
-          course_contributor_score.update_attributes(:news_reply_num => score)
+          score = course_contributor_score.news_reply_num.to_i + 1
+          course_contributor_score.update_column(:news_reply_num, score)
         end
       when "News"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_num => 1)
         else
-          score = course_contributor_score.news_num + 1
-          course_contributor_score.update_attributes(:news_num => score)
+          score = course_contributor_score.news_num.to_i + 1
+          course_contributor_score.update_column(:news_num, score)
         end
       when "Attachment"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :news_num => 0, :resource_num => 1, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :resource_num => 1)
         else
-          score = course_contributor_score.resource_num + 1
-          course_contributor_score.update_attributes(:resource_num => score)
+          score = course_contributor_score.resource_num.to_i + 1
+          course_contributor_score.update_column(:resource_num, score)
         end
     end
   end
@@ -184,39 +177,39 @@ module ApplicationHelper
     case type
       when "HomeworkCommon"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.homework_journal_num - 1
-          course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score)
+          score = course_contributor_score.homework_journal_num.to_i - 1
+          course_contributor_score.update_column(:homework_journal_num, score < 0 ? 0 : score)
         end
       # 课程留言
       when "Course"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.journal_num - 1
-          course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score)
+          score = course_contributor_score.journal_num.to_i - 1
+          course_contributor_score.update_column(:journal_num, score < 0 ? 0 : score)
         end
       when  "Message"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.message_num - 1
-          course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score)
+          score = course_contributor_score.message_num.to_i - 1
+          course_contributor_score.update_column(:message_num, score < 0 ? 0 : score)
         end
       when "MessageReply"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.message_reply_num - 1
-          course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score)
+          score = course_contributor_score.message_reply_num.to_i - 1
+          course_contributor_score.update_column(:message_reply_num, score < 0 ? 0 : score)
         end
       when "NewReply"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.news_reply_num - 1
-          course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score)
+          score = course_contributor_score.news_reply_num.to_i - 1
+          course_contributor_score.update_column(:news_reply_num, score < 0 ? 0 : score)
         end
       when "News"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.news_num - 1
-          course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score)
+          score = course_contributor_score.news_num.to_i - 1
+          course_contributor_score.update_column(:news_num, score < 0 ? 0 : score)
         end
       when "Attachment"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.resource_num - 1
-          course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score)
+          score = course_contributor_score.resource_num.to_i - 1
+          course_contributor_score.update_column(:resource_num, score < 0 ? 0 : score)
         end
     end
   end
@@ -2990,8 +2983,12 @@ def homework_common_index_url_in_org(course_id)
   Setting.protocol + "://" + Setting.host_name + "/homework_common?course=" + course_id.to_s
 end
 
-def student_work_index_url_in_org(homework_id)
-  Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
+def student_work_index_url_in_org(homework_id, is_focus = '')
+  if is_focus != ''
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&is_focus=" + is_focus.to_s
+  else
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
+  end
 end
 
 def course_url_in_org(course_id)
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 4faa802a5..3fdfc3aa0 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -63,14 +63,67 @@ module OrganizationsHelper
   def subfield_status_option
     type = []
     option1 = []
-    option1 << "列表"
+    option1 << "左上"
     option1 << "1"
     type << option1
     option2 = []
-    option2 << "图片"
-    option2 << "0"
+    option2 << "中一"
+    option2 << "2"
     type << option2
+    option3 = []
+    option3 << "中二"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "中下"
+    option4 << "4"
+    type << option4
+    option5 = []
+    option5 << "左下"
+    option5 << "5"
+    type << option5
+    option6 = []
+    option6 << "右上"
+    option6 << "6"
+    type << option6
+    option7 = []
+    option7 << "右中"
+    option7 << "7"
+    type << option7
+    option8 = []
+    option8 << "右下"
+    option8 << "8"
+    type << option8
     type
   end
 
+  def subfield_list_type subfield
+    case subfield.to_i
+      when 1
+        resulet = "左上"
+      when 2
+        resulet = "中一"
+      when 3
+        resulet = "中二"
+      when 4
+        resulet = "中下"
+      when 5
+        resulet = "左下"
+      when 6
+        resulet = "右上"
+      when 7
+        resulet = "右中"
+      when 8
+        resulet = "右下"
+    end
+  end
+
+
+  def get_subfield_acts field
+    org_subfield = OrgSubfield.find(field.id)
+    org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0
+    org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc')
+    org_acts
+  end
+
 end
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 36187b460..3cf781f76 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -41,6 +41,23 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取文件目录的最新动态
+  def get_trees_last_changes(project_id, rev, ent_name)
+    g = Gitlab.client
+    begin
+      tree_changes = g.rep_last_changes(project_id, :rev => rev, :path => ent_name)
+      tree_changes
+    rescue
+      logger.error("faile to get tress activities!")
+    end
+  end
+
+  def translate_time time
+    case time
+      when time.include("")
+    end
+  end
+
   # 获取diff内容行号
   def diff_line_num content
     content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
diff --git a/app/models/message.rb b/app/models/message.rb
index d697db236..bb12473be 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -77,12 +77,10 @@ class Message < ActiveRecord::Base
   validates_length_of :subject, :maximum => 255
   validate :cannot_reply_to_locked_topic, :on => :create
 
-  after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
+  # after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
   after_update :update_messages_board, :update_activity
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score
-  
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity,
-               :act_as_system_message, :send_mail, :act_as_student_score, act_as_at_message(:content, :author_id)
+  after_create :act_as_course_activity, :act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -134,11 +132,11 @@ class Message < ActiveRecord::Base
     if self.project && !project.project_score.nil?
       # 讨论区
       if self.parent_id.nil?
-        count = self.project.project_score.board_num + 1
-        self.project.project_score.update_attribute(:board_num, count)
+        count = self.project.project_score.board_num.to_i + 1
+        self.project.project_score.update_column(:board_num, count)
       else # 回复
-        count = self.project.project_score.board_message_num + 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        count = self.project.project_score.board_message_num.to_i + 1
+        self.project.project_score.update_column(:board_message_num, count)
       end
     end
   end
@@ -259,13 +257,13 @@ class Message < ActiveRecord::Base
   def act_as_system_message
     if self.course
       if self.parent_id.nil?   # 主贴
-        self.course.members.each do |m|
+        self.course.members.includes(:user).each do |m|
           if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
         end
       else    # 回帖
-        self.course.members.each do |m|
+        self.course.members.includes(:user).each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
@@ -273,13 +271,13 @@ class Message < ActiveRecord::Base
       end
     elsif self.project  # 项目相关
       if self.parent_id.nil?   # 主贴
-        self.project.members.each do |m|
+        self.project.members.includes(:user).each do |m|
           if  m.user_id != self.author_id
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
           end
         end
       else    # 回帖
-        self.project.members.each do |m|
+        self.project.members.includes(:user).each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
           end
diff --git a/app/models/project.rb b/app/models/project.rb
index 184b3c7af..ceec0e182 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -115,6 +115,7 @@ class Project < ActiveRecord::Base
 
   has_many :org_projects,:dependent => :destroy
   has_many :organization,:through => :org_projects
+  has_many :rep_statics, :class_name => 'RepStatics'
 
   # has_many :journals
 
diff --git a/app/models/rep_statics.rb b/app/models/rep_statics.rb
new file mode 100644
index 000000000..584af6560
--- /dev/null
+++ b/app/models/rep_statics.rb
@@ -0,0 +1,4 @@
+class RepStatics < ActiveRecord::Base
+  belongs_to :project
+  attr_accessible :add, :commits_num, :del, :email, :project_id, :uname, :changeset
+end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 571bba1b9..305c82f97 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -44,7 +44,7 @@ class Repository < ActiveRecord::Base
   # validates_uniqueness_of :identifier, :allow_blank => true
   validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
   # donwcase letters, digits, dashes, underscores but not digits only
-  validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true
+  validates_format_of :identifier, :with => /^[a-zA-Z0-9_\-]*[a-zA-Z_\-]+[a-zA-Z0-9_\-]*$/, :allow_blank => true
   # Checks if the SCM is enabled when creating a repository
   validate :repo_create_validation, :on => :create
 
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index edbce26d3..ec6a6c7b5 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -1,226 +1,76 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>" >
-  <div class="homepagePostBrief" onmouseover="$('#message_setting_<%=activity.id%>').show();" onmouseout="$('#message_setting_<%= activity.id%>').hide();">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-    </div>
-    <div class="homepagePostDes">
-      <% if activity.author.id == User.current.id || User.current.admin? %>
-          <div class="homepagePostSetting" id="message_setting_<%= activity.id%>" style="display: none">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {:controller => 'blog_comments',:action => 'edit',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
-                                :class => 'postOptionLink'
-                        ) if User.current.admin? || User.current.id == activity.author.id %>
-                  </li>
-                  <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                {:controller => 'blog_comments',:action => 'destroy',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id},
-                                :method => :delete,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if User.current.admin? || User.current.id == activity.author.id %>
-                  </li>
-                  <li>
-                    <% if activity.id == activity.blog.homepage_id %>
-                        <%= link_to(
-                                    l(:button_cancel_homepage),
-                                    {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
-                                    :method => :post,
-                                    :class => 'postOptionLink'
-                            ) if User.current && User.current.id == activity.blog.author_id %>
-                    <% else %>
-                        <%= link_to(
-                                    l(:button_set_homepage),
-                                    {:controller => 'blogs',:action => 'set_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id},
-                                    :method => :post,
-                                    :class => 'postOptionLink'
-                            ) if User.current && User.current.id == activity.blog.author_id %>
-                    <% end %>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-      <%end%>
-      <div class="homepagePostTo  mt-4 fl">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+<div class = "cl"> </div>
+<div id="blog-list">
+    <div class="listbox mt10" >
+      <h2 class="list-h2">博客列表</h2>
+      <div class="category">
+        <span class="grayTxt ">排序：</span>
+        <%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type,  :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+        <% if @type.to_i == 1 %>
+            <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type,  :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
         <% end %>
-        TO
-        <%= link_to activity.blog.name+" | 博客", user_blogs_path(:user_id=>activity.author_id,:host=>Setting.host_user), :class => "newsBlue ml15 mr5"%>
-        <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %>
-            <span class="red_homework_btn_cir ml5">已设为首页</span>
+        <%= link_to "人气", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type,  :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+        <% if @type.to_i  == 2 %>
+            <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type,  :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
         <% end %>
-      </div>
-      <div class="cl"></div>
-      <div class="homepagePostTitle hidden m_w530 fl">
-        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-            <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey" %>
-        <% else %>
-            <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey"%>
-        <% end %>
-      </div>
-      <% if activity.sticky == 1%>
-          <span class="sticky_btn_cir ml10">置顶</span>
-      <% end%>
-      <% if activity.locked%>
-          <span class="locked_btn_cir ml10 fl" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-      <% end%>
-      <div class="cl"></div>
-      <div class="homepagePostDate fl">
-        发帖时间：<%= format_time(activity.created_on) %>
-      </div>
-      <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(activity.updated_on) %>
-      </div>
-      <div class="cl"></div>
-      <% if activity.parent_id.nil? %>
-          <% content= activity.content%>
-      <% else %>
-          <% content= activity.parent.content%>
-      <% end %>
-      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
 
-      <div class="cl"></div>
-      <!--<div class=" fl" style="width: 600px">
-        <%# if activity.attachments.any?%>
-            <%# options = {:author => true, :deletable => false } %>
-            <%#= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => activity.attachments, :options => options, :is_float => true} %>
-        <%# end %>
-      </div>
-      <div class="cl"></div>-->
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
-      <div class="mt10" style="font-weight:normal;">
-        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
+        <div class="cl"></div>
       </div>
-      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+      <div class="bloglistbox">
+        <% topics.each do |activity| %>
+            <ul class="list-file">
+              <li><span class="item_list fl"></span>
+                <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                    <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl" %>
+                <% else %>
+                    <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl"%>
+                <% end %>
+                <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %>
+                    <span class="c_red ml10 fr">[已设为首页]</span>
+                <% end %>
+                <% if activity.sticky == 1 %>
+                    <span class="fl ml10 red-cir-btn">顶</span>
+                <% end%>
+                <% if activity.locked %>
+                    <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+                <% end %>
+                <div class="cl"></div>
+              </li>
+              <% count=0 %>
+              <% if activity.parent %>
+                  <% count=activity.parent.children.count%>
+              <% else %>
+                  <% count=activity.children.count%>
+              <% end %>
+              <li class="ml15">
+                <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+                <span class="grayTxt">更新时间：<%= format_time(activity.updated_on) %></span>
+                <p class="list-info fr grayTxt">
+                    <span><%= count>0 ? "#{count}" :"0" %></span>
+                    <span>回复</span>
+                    <span>|</span>
+                    <span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" :"0" %></span>
+                    <span>赞</span>
+                </p>
+              </li>
+              <div class="cl"></div>
             </ul>
-          </li>
-        </ul>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <% count=0 %>
-  <% if activity.parent %>
-      <% count=activity.parent.children.count%>
-  <% else %>
-      <% count=activity.children.count%>
-  <% end %>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-      <%if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
-    <% activity= activity.parent ? activity.parent : activity%>
-    <% replies_all_i = 0 %>
-    <%  if count > 0 %>
-        <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.children.reorder("created_on desc").each do |reply|%>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i+1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
-                      <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.author == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
-                      <%= reply.content.html_safe %>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
+        <% end %>
+        <div>
+          <ul class="wlist" id="pages" >
+            <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
           </ul>
-        </div>
-    <% end %>
-
-    <% if !activity.locked?  %>
-        <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-          <div class="homepagePostReplyInputContainer  mb10">
-            <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'blog_comments',:action => 'reply', :id => activity.id, :blog_id => activity.blog.id, :user_id => activity.author_id},:method => "post",:remote=>true) do |f|%>
-                  <input type="hidden" name="quote[quote]" value="">
-                  <input type="hidden" name="blog_comment[sticky]" value="0">
-                  <input type="hidden" name="blog_comment[locked]" value="0">
-                  <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
-                  <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-                  <div class="cl"></div>
-                  <p nhname='contentmsg_<%= user_activity_id%>'></p>
-              <% end%>
-              <div class="cl"></div>
-            </div>
-            <div class="cl"></div>
-          </div>
           <div class="cl"></div>
         </div>
-    <% end %>
-  </div>
+      </div>
+    </div>
 </div>
 <script type="text/javascript">
-    $("#moreProject_<%=user_activity_id %>").click(function(){
-        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
-        $("#relatePWrap_<%=user_activity_id %>").css("height","auto");
-        $(this).hide();
-    });
-    $("#hideProject_<%=user_activity_id %>").click(function(){
-        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
-        $("#moreProject_<%=user_activity_id %>").show();
-    });
-</script>
+    //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
+    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-10;
+    var rightHeight = $(".homepageRight").height();
+    if (rightHeight < leftHeight){
+        var diffHeight = leftHeight - rightHeight;
+        var tmpHeight = $(".listbox").height()+diffHeight;
+        $(".listbox").css("height",tmpHeight);
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb
index f3fd1aa61..c52fa017e 100644
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@@ -38,7 +38,7 @@
 
 <div class="homepageRight mt0">
   <div class="homepageRightBanner">
-    <div class="NewsBannerName">
+    <div class="f16 fl fontGrey3">
       <%= @user.name%>的博客
     </div>
   </div>
@@ -51,44 +51,9 @@
   <% end %>
 
   <% if topics%>
-      <% topics.each do |topic| %>
-          <script>
-              function expand_reply(container, btnid) {
-                  var target = $(container);
-                  var btn = $(btnid);
-                  if (btn.data('init') == '0') {
-                      btn.data('init', 1);
-                      btn.html('收起回复');
-                      target.show();
-                  } else {
-                      btn.data('init', 0);
-                      btn.html('展开更多');
-                      target.hide();
-                      target.eq(0).show();
-                      target.eq(1).show();
-                      target.eq(2).show();
-                  }
-              }
-
-              function expand_reply_input(id) {
-                  $(id).toggle();
-              }
-
-              $(function () {
-                  sd_create_editor_from_data(<%= topic.id%>, null, "100%", "<%=topic.class.to_s%>");
-              });
-          </script>
-          <% if topic %>
-              <%= render :partial => 'blogs/article', :locals => {:activity => topic, :user_activity_id => topic.id} %>
-          <% end %>
-      <% end %>
-
-      <%# if topics.count == 10 %>
-          <!--<div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%#= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>-->
-      <%# end %>
+     <%= render :partial => 'blogs/article', :locals => {:topics => topics} %>
   <% end%>
 </div>
-
 <script type="text/javascript">
     $("#show_more_course_topic").mouseover(function () {
         $("#more_topic_link").click();
diff --git a/app/views/blogs/index.html.erb b/app/views/blogs/index.html.erb
index 35bc1cd7e..50db24063 100644
--- a/app/views/blogs/index.html.erb
+++ b/app/views/blogs/index.html.erb
@@ -30,7 +30,7 @@
 <%= import_ke(enable_at: false, prettify: false) %>
 
 
-<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.updated_on desc"), :page => 0, :user => @user} %>
+<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @topics, :page => 0, :user => @user} %>
 
 
 <script type="text/javascript">//侧导航
diff --git a/app/views/blogs/index.js.erb b/app/views/blogs/index.js.erb
new file mode 100644
index 000000000..cdbc3cc01
--- /dev/null
+++ b/app/views/blogs/index.js.erb
@@ -0,0 +1 @@
+$("#blog-list").replaceWith('<%= escape_javascript( render :partial => 'blogs/article', :locals => {:topics => @topics}  ) %>');
\ No newline at end of file
diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb
index d465571c5..64654f517 100644
--- a/app/views/boards/_course_show_detail.html.erb
+++ b/app/views/boards/_course_show_detail.html.erb
@@ -2,41 +2,7 @@
     <%= import_ke(enable_at: false, prettify: false) %>
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
-<% if topics %>
-    <% topics.each do |topic| %>
-        <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
-            function expand_reply_input(id) {
-                $(id).toggle();
-            }
-
-            $(function () {
-                sd_create_editor_from_data(<%= topic.id%>, null, "100%", "<%=topic.class.to_s%>");
-            });
-        </script>
-        <% if topic %>
-            <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id, :is_course => 1, :is_board=>1} %>
-        <% end %>
-    <% end %>
-
-    <% if topics.count == 10 %>
-        <%= link_to "点击展开更多",boards_topic_path(@board, :course_id => @board.course.id ,:page => page),:id => "show_more_course_topic",:remote => "true",:class => "loadMore mt10 f_grey"%>
-    <% end %>
-<% end%>
 
+<% if @topics || topics  %>
+    <%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics ? @topics: topics , :is_course => 1, :is_board=>1} %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb
index 1d5cc3b75..260fb88c1 100644
--- a/app/views/boards/_project_show_detail.html.erb
+++ b/app/views/boards/_project_show_detail.html.erb
@@ -2,60 +2,7 @@
     <%= import_ke(enable_at: false, prettify: false) %>
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
-<% if topics%>
-    <% topics.each do |topic| %>
-        <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
 
-            function expand_reply_input(id) {
-                $(id).toggle();
-            }
-
-            $(function () {
-                sd_create_editor_from_data(<%= topic.id%>, null, "100%");
-            });
-        </script>
-        <% if topic %>
-            <%= render :partial => 'users/project_message', :locals => {:activity => topic, :user_activity_id => topic.id,:is_course=>1,:is_board=>1} %>
-        <% end %>
-    <% end %>
-
-    <% if topics.count == 10 %>
-        <!--<div id="show_more_course_topic" class="loadMore mt10 f_grey">展开更多<%#= link_to "", boards_topic_path(@board, :course_id => @board.course.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %></div>-->
-        <%= link_to "点击展开更多", boards_topic_path(@board, :project_id => @board.project.id ,:page => page), :id => "show_more_project_topic",:remote => "true",:class => "loadMore mt10 f_grey"%>
-    <% end %>
-<% end%>
-
-<!--
-<script type="text/javascript">
-    $("#show_more_course_topic").mouseover(function () {
-        $("#more_topic_link").click();
-    });
-</script>-->
+<%if @topics || topics %>
+    <%= render :partial => 'users/project_boardlist', :locals => {:topics => @topics ? @topics: topics , :is_course => 1, :is_board=>1} %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/boards/show.js.erb b/app/views/boards/show.js.erb
index c9208fd2c..cb7ee64a1 100644
--- a/app/views/boards/show.js.erb
+++ b/app/views/boards/show.js.erb
@@ -1,5 +1,5 @@
 <% if @course %>
-    $("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/course_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
+    $("#course-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>');
 <% else %>
-    $("#show_more_project_topic").replaceWith("<%= escape_javascript( render :partial =>  'boards/project_show_detail',:locals => {:topics => @topics, :page => @page} )%>");
+    $("#project-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/project_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>');
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index c04081128..f5b421f62 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -5,17 +5,18 @@
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl">
-        <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db p10", :title => "回到个人首页"%>
+        <%= link_to "首页",user_activities_path(User.current), :class => "c_white f16 db p10", :title => "回到个人首页"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource', :id => User.current.id, :type => 6) %>" class="c_white f16 db p10">资源库</a></li>
+        <%= link_to "资源库", user_resource_user_path(User.current, :type => 6), :class => "c_white f16 db p10" %>
+      </li>
       <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
       <li class="navHomepageMenu fl">
-            <%= link_to "题库",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
+            <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
       </li>
       <% else %>
           <li class="navHomepageMenu fl">
-            <%= link_to "我的作业",  student_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
+            <%= link_to "我的作业",  student_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
           </li>
       <% end %>
       <li class="navHomepageMenu fl mr30">
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 20bccfef3..befc1a7ec 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -72,4 +72,14 @@
       <input type="hidden" value="<%= page%>" id="course_page_num">
       <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%= user_courses4show_user_path(user.id)%>');"></a>
     </li>
-<% end%>
\ No newline at end of file
+<% end%>
+
+<script type="text/javascript">
+    var coursecount = <%= @user.courses.visible.count%>;
+    var courseshowcount = document.getElementsByClassName("coursesLineGrey").length;
+
+    if((coursecount == courseshowcount)&&(coursecount > 5) ){
+        $("#user_show_more_course").hide();
+        $('#user_hide_course').show();
+    }
+</script>
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
index a82ea4103..e7bdacd22 100644
--- a/app/views/layouts/_user_projects.html.erb
+++ b/app/views/layouts/_user_projects.html.erb
@@ -1,7 +1,7 @@
 <% projects.each do |project|%>
     <li class="homepageLeftMenuCoursesLine pr">
       <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %>
-      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "coursesLineGrey hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "projectsLineGrey hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
           <li>
             <ul class="subNavMenu boxShadow">
@@ -53,4 +53,14 @@
       <input type="hidden" value="<%= page%>" id="project_page_num">
       <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_project('<%=  user_projects4show_user_path(user.id)%>');"></a>
     </li>
-<% end%>
\ No newline at end of file
+<% end%>
+
+<script type="text/javascript">
+    var projectcount = <%= @user.projects.visible.count%>;
+    var projectshowcount = document.getElementsByClassName("projectsLineGrey").length;
+
+    if((projectcount == projectshowcount)&&(projectcount > 5)){
+        $("#user_show_more_project").hide();
+        $('#user_hide_project').show();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index faf141600..b2cfa9877 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -113,6 +113,9 @@
         <!--<span class="img_private"><%#= l(:label_private)%></span>-->
         <!--<%# end %>-->
         <!--</div>-->
+        <%# 更新访问数,刷新的时候更新访问次数 %>
+        <%  update_visiti_count @organization %>
+        <%# over %>
 
         <div class="cl"></div>
         <div class="f12 fontGrey3">
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
new file mode 100644
index 000000000..fc550c90f
--- /dev/null
+++ b/app/views/layouts/base_org2.html.erb
@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= stylesheet_link_tag  'org2','jquery/jquery-ui-1.9.2' %>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'attachments' %>
+  <%#= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%#= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+  </script>
+  <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script><!--焦点图-->
+  <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
+
+  <script src="/javascripts/scrollPic.js"></script><!--滚动-->
+  <script>
+      window.onload = function(){
+          scrollPic();
+      }
+      function scrollPic() {
+          var scrollPic = new ScrollPic();
+          scrollPic.scrollContId   = "scrollPic"; //内容容器ID
+          scrollPic.arrLeftId      = "LeftArr";//左箭头ID
+          scrollPic.arrRightId     = "RightArr"; //右箭头ID
+
+          scrollPic.frameWidth     = 760;//显示框宽度
+          scrollPic.pageWidth      = 760; //翻页宽度
+
+          scrollPic.speed          = 10; //移动速度(单位毫秒，越小越快)
+          scrollPic.space          = 10; //每次移动像素(单位px，越大越快)
+          scrollPic.autoPlay       = true; //自动播放
+          scrollPic.autoPlayTime   = 3; //自动播放间隔时间(秒)
+
+          scrollPic.initialize(); //初始化
+      }
+  </script>
+
+</head>
+
+<!--add by huang-->
+<script type="text/javascript">
+    function org_new_files_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function org_new_files_banner_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
+<body onload="prettyPrint();">
+<!--内容开始-->
+<header>
+  <div class="sn-header">
+    <%= render :partial => 'organizations/org_logined_header' %>
+    <div class="sn-row sn-bg-white">
+      <div class="sn-logo"> <img src="/images/sn_logo.jpg" width="367" height="63" alt="logo" class="sn-mt13" /> <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
+        <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
+      </div>
+    </div>
+    <!--导航-->
+    <div class="sn-row sn-bg-blue">
+      <ul class="sn-nav">
+        <% @subfield_content.each do |field| %>
+            <% if is_default_field?(field) %>
+                <% case field.name %>
+            <% when 'activity' %>
+                    <li class="nav-element">
+                      <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+                    </li>
+                <% when 'course' %>
+                    <li class="nav-element">
+                      <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+                    </li>
+                <% when 'project' %>
+                    <li class="nav-element">
+                      <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+                    </li>
+                <% end %>
+            <% else %>
+                <% if field.field_type == "Post" && field.hide == 0 %>
+                    <li class="nav-element">
+                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                    </li>
+                <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                    <li class="nav-element">
+                      <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                    </li>
+                <% end %>
+            <% end %>
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <li class="nav-element">
+              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+            </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</header>
+<%# 更新访问数,刷新的时候更新访问次数 %>
+<%  update_visiti_count @organization %>
+<%# over %>
+<!--内容开始-->
+<div class="sn-content">
+<div class="sn-content-left fl sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 1 %>
+          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 2 %>
+          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
+            <div class="cl"></div>
+          </div>
+      <% elsif field.status.to_i == 4 %>
+          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 5 %>
+          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<!--右侧-->
+<div class="sn-content-right fr sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 6 %>
+          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 7 %>
+          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 8 %>
+          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<div class="cl"></div>
+</div>
+<!--内容结束-->
+<footer>
+  <!--footer-->
+  <div class="sn-row sn-bg-grey2">
+    <div class="sn-footer">
+      <ul class="sn-footer-link">
+        <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+        <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+        <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+      </ul>
+      <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+      <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+        卫星导航仿真与测试开放实验室</div>
+    </div>
+  </div>
+</footer>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<%#= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>
+
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index fcbbd8bfe..1fcf60d20 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -62,9 +62,9 @@
 
 <!--add by huang-->
 <script type="text/javascript">
-    function orge_new_files_upload()
+    function org_new_files_upload()
     {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
@@ -72,7 +72,7 @@
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 
-    function orge_new_files_banner_upload()
+    function org_new_files_banner_upload()
     {
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
         showModal('ajax-modal', '513px');
@@ -89,12 +89,20 @@
     <div class="header-con">
       <% if User.current.admin_of_org?(@organization) %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
-            <a href="" class="logo-add" title="点击替换LOGO" onclick="orge_new_files_upload();"></a>
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
+            <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
           </div>
        <% else %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
           </div>
        <% end %>
       <%= render :partial => 'organizations/org_logined_header' %>
@@ -140,7 +148,7 @@
           <% else %>
               <img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
           <% end %>
-          <a href="#" class="banner-add" title="点击替换图片" onclick="orge_new_files_banner_upload();"></a>
+          <a href="#" class="banner-add" title="点击替换图片" onclick="org_new_files_banner_upload();"></a>
           <div class="banner-txt">
             <p ><%= @organization.name  %></p>
           </div>
@@ -389,6 +397,9 @@
       <% end %>
   <% end %>
 
+  <%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+  <%# over %>
 
   <div class="footer">
     <div class="footer-con">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 0d40bb946..0ef49408d 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -105,13 +105,13 @@
         <div class="homepagePortraitImage fl" id="homepage_portrait_image">
           <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %>
           <% if User.current.logged?%>
-            <% if is_current_user%>
-              <div id="edit_user_file_btn" class="none">
-                <div class="homepageEditProfile">
-                  <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="homepageEditProfileIcon"></a>
-                </div>
-              </div>
-            <% end %>
+              <% if is_current_user%>
+                  <div id="edit_user_file_btn" class="none">
+                    <div class="homepageEditProfile">
+                      <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="homepageEditProfileIcon"></a>
+                    </div>
+                  </div>
+              <% end %>
           <% end%>
         </div>
         <div class="fl ml10">
@@ -189,7 +189,8 @@
         <% unvisiable = hidden_courses && hidden_courses.value == "1"%>
         <% if !unvisiable %>
             <div class="homepageLeftMenuBlock">
-              <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+              <%= link_to '课程',{:controller => "users", :action => "user_courselist", :id => @user.id}, :class => "homepageMenuText" %>
+
               <% if is_current_user%>
                   <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
                       <div class="courseMenu" id="courseMenu">
@@ -212,50 +213,63 @@
                   <% end%>
               <% end%>
             </div>
-            <% if @user.courses.visible.count > 0
-               course_order_ids = "(" +
-                CourseActivity.find_by_sql("SELECT  c.course_id, updated_at FROM
-        (SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ")
-        GROUP BY ca.course_id) AS c
-        ORDER BY c.updated_at DESC limit 5").map {|c| c.course_id}.join(",") + ")"
+        <% end %>
+        <% if @user.courses.visible.count > 0
+             course_order_ids = "(" +
+                     CourseActivity.find_by_sql("SELECT  c.course_id, updated_at FROM
+	(SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ")
+	GROUP BY ca.course_id) AS c
+	ORDER BY c.updated_at DESC limit 5").map {|c| c.course_id}.join(",") + ")"
              courses = Course.where("id in #{course_order_ids}")
-            else
-                 courses = []
+           else
+             courses = []
+
+           end
+        %>
+        <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
 
-            end
-            %>
-            <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
-            <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
+        <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" >
+          <div class = "leftCoursesList" id="homepageLeftMenuCourses">
               <ul>
                 <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
               </ul>
-            </div>
-        <% end %>
-
+          </div>
+          <% if !courses.empty? %>
+              <div class="homepageLeftMenuMore" id="user_hide_course">
+                <a href="javascript:void(0);" class="homepageLeftMenuHideIcon" id="hide_show_courseicon" onclick="leftCourseslistChange();"></a>
+              </div>
+          <% end %>
+        </div>
         <div class="homepageLeftMenuBlock">
-          <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuForge').slideToggle();">项目</a>
-
+          <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => "homepageMenuText" %>
           <% if is_current_user%>
               <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%>
           <% end%>
         </div>
         <% if @user.projects.visible.count > 0
-           project_order_ids = "(" +
-            ForgeActivity.find_by_sql("SELECT  p.project_id, p.created_at FROM
+             project_order_ids = "(" +
+                     ForgeActivity.find_by_sql("SELECT  p.project_id, p.created_at FROM
 	(SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ")
 	GROUP BY fa.project_id) AS p
 	ORDER BY p.created_at DESC limit 5").map {|p| p.project_id}.join(",") + ")"
-         projects = Project.where("projects.id in #{project_order_ids}")
-            else
+             projects = Project.where("projects.id in #{project_order_ids}")
+           else
              projects = []
            end
         %>
 
         <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
-        <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" id="homepageLeftMenuForge">
-          <ul>
-            <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
-          </ul>
+        <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" >
+          <div class = "leftProjecsList" id="homepageLeftMenuForge">
+              <ul>
+                <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
+              </ul>
+          </div>
+          <% if !projects.empty? %>
+              <div class="homepageLeftMenuMore" id="user_hide_project">
+                <a href="javascript:void(0);" class="homepageLeftMenuHideIcon" id="hide_show_projecticon" onclick="leftProjectslistChange();"></a>
+              </div>
+          <% end %>
         </div>
         <div class="homepageLeftMenuBlock">
           <!--<a href="javascript:void(0);" class="homepageMenuText">留言</a>-->
@@ -339,6 +353,22 @@
     $("#courseMenu").mouseleave(function(){
         $("#topnav_course_menu").hide();
     });
+
+    $('#user_hide_course').hide();
+    function leftCourseslistChange(){
+        $('#homepageLeftMenuCourses').slideToggle();
+        $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");
+        $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon");
+
+    }
+
+    $('#user_hide_project').hide();
+    function leftProjectslistChange(){
+        $('#homepageLeftMenuForge').slideToggle();
+        $('#hide_show_projecticon').toggleClass("homepageLeftMenuHideIcon");
+        $('#hide_show_projecticon').toggleClass("homepageLeftMenuMoreIcon");
+
+    }
 </script>
 </body>
 </html>
diff --git a/app/views/organizations/_org_content.html.erb b/app/views/organizations/_org_content.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 025bb48af..4ac2ebcbf 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -66,11 +66,16 @@
                 </div>
             <% end %>
         <% end %>
+        <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
         <div class="homepagePostSubmit">
-          <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
           <%= user_for_homework_common activity,is_teacher %>
         </div>
-
+        <% work = cur_user_works_for_homework activity %>
+        <% if activity.end_time < Date.today && !is_teacher && !work.nil? %>
+            <div class="homepagePostSubmit">
+              <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+            </div>
+        <% end %>
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
               <%= link_to "模拟答题", Setting.protocol + "://" + Setting.host_name + "/users/new_user_commit_homework?homework_id="+activity.id.to_s + "&is_test=true", class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb
index 75ec7106a..22cf920e9 100644
--- a/app/views/organizations/_org_logined_header.html.erb
+++ b/app/views/organizations/_org_logined_header.html.erb
@@ -1,48 +1,54 @@
-<% if User.current.logged? %>
-    <div class="navHomepageProfile" id="navHomepageProfile">
-      <ul>
-        <li class="homepageProfileMenuIcon fr" id="homepageProfileMenuIcon">
-          <%= link_to "<div class='mt5 mb8 user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
-          <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
-          <ul class="topnav_login_list none" id="topnav_login_list">
-            <li>
-              <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
-            </li>
-            <li>
-              <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
-            </li>
-            <li>
-              <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
-            </li>
-            <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
-            <li>
-              <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
-            </li>
-          </ul>
-        </li>
-      </ul>
-    </div>
-<% else %>
-    <div class="login fr" >
-      <a href="<%= signin_url_without_domain %>" class=" " >登录&nbsp;&nbsp;|&nbsp;</a>
-      <a href="<%= register_url_without_domain %>" class=" " >退出</a>
-    </div>
-<% end %>
-
-<script type="text/javascript">
-    $("#navHomepageProfile").mouseenter(function(){
-        $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
-        $("#topnav_login_list").show();
-    });
-    $("#navHomepageProfile").mouseleave(function(){
-        $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
-        $("#topnav_login_list").hide();
-    });
-
-    function signout(){
-        $.post(
-                '<%= signout_path%>',
-                {}
-        );
-    }
+<% if User.current.logged? %>
+    <div class="sn-row sn-bg-grey">
+      <div class="sn-login2">
+        <div class="navHomepageProfile sn-mt4" id="navHomepageProfile">
+          <ul>
+            <li class="homepageProfileMenuIcon fr" id="homepageProfileMenuIcon">
+              <%= link_to "<div class='mt5 mb8 user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
+              <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
+              <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
+                <li>
+                  <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
+                </li>
+                <li>
+                  <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
+                </li>
+                <li>
+                  <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
+                </li>
+                <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
+                <li>
+                  <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+<% else %>
+    <div class="sn-row sn-bg-grey">
+      <div class="sn-login">
+        <a href="<%= signin_url_without_domain %>" class="sn-link-blue">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp;
+        <a href="<%= register_url_without_domain %>" class="sn-link-blue">注册</a>
+      </div>
+    </div>
+<% end %>
+
+<script type="text/javascript">
+    $("#navHomepageProfile").mouseenter(function(){
+        $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").show();
+    });
+    $("#navHomepageProfile").mouseleave(function(){
+        $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").hide();
+    });
+
+    function signout(){
+        $.post(
+                '<%= signout_path%>',
+                {}
+        );
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftD.html.erb b/app/views/organizations/_org_subfield_leftD.html.erb
new file mode 100644
index 000000000..676d5d1c3
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftD.html.erb
@@ -0,0 +1,117 @@
+<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+  <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+  <div class="sn-index-partnerbox " >
+    <ul id="scrollPic" >
+      <li>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
+      </li>
+      <li>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
+      </li>
+    </ul>
+    <div class="cl"></div>
+    <div class="partner-btnbox">
+      <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
+      <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <p>暂无内容！</p>
+    <% when 'project' %>
+        <p>暂无内容！</p>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %> <%# 讨论类型 %>
+        <% org_acts = get_subfield_acts field %>
+        <% unless org_acts.blank? %>
+           <% org_acts.each do |activity| %>
+                <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                  <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                  <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+                    <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                        <% document = activity.org_act %>
+                        <% org_subfield_id = params[:org_subfield_id] %>
+                        <% flag = 2 %>
+                        <% iamge_path = get_image_path_from_content(document.content) %>
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                        <% end %>
+                    <% elsif activity.container_type == 'OrgSubfield' %>
+                        <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                            <% message = Message.find(activity.org_act_id) %>
+                            <% if message.board.org_subfield_id %>
+                                <% iamge_path = get_image_path_from_content(message.content) %>
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                                <% end %>
+                            <% else %>
+                                <% iamge_path = get_image_path_from_content(message.content) %>
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                                <% end %>
+                            <% end %>
+                        <% end %>
+                        <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                            <% news = News.find(activity.org_act_id) %>
+                            <% iamge_path = get_image_path_from_content(news.description) %>
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                            <% end %>
+                        <% end %>
+                    <% end %>
+                  </div>
+                </div>
+           <% end %>
+        <% else %>
+            <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+              <div class="sn-index-partnerbox " >
+                <ul id="scrollPic" >
+                  <li>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
+                  </li>
+                  <li>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
+                  </li>
+                </ul>
+                <div class="cl"></div>
+                <div class="partner-btnbox">
+                  <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
+                  <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
+                  <div class="cl"></div>
+                </div>
+              </div>
+            </div>
+        <% end %>
+    <% elsif field.field_type == "Resource" %>
+        <% org_attachs = get_attach_org2(field) %>
+        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+          <% if !field.subfield_subdomain_dir.nil? %>
+              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+              <% end %>
+          <% else %>
+              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+          <% end %>
+        </div>
+    <% end %>
+<% end %>
diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
new file mode 100644
index 000000000..a987e23cb
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -0,0 +1,256 @@
+<h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+<div class="cl"></div>
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <% if @course_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+        <% else %>
+            <% @course_acts.first(1).each do |act| %>
+                <% if act.org_act_type == "HomeworkCommon" %>
+                    <% activity = HomeworkCommon.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_at %></span>
+                      <div class="sn-news-txt">
+                        <p><%= activity.description.to_s.html_safe %></p>
+                      </div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <p><%= activity.content.to_s.html_safe %></p>
+                      </div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.created_on %></span>
+                      <div class="sn-news-txt">
+                        <p><%= activity.description.to_s.html_safe %></p>
+                      </div>
+                    </div>
+                <% elsif act.org_act_type == "Poll" %>
+                    <% activity = Poll.find(act.org_act_id) %>
+                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                    <% if ( activity.polls_status==2) %>
+                        <div class="sn-news-bigbox fl">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <% end %>
+                          <h3>
+                            <% if has_commit %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
+                            <% else %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title"  %>
+                            <% end %>
+                          </h3>
+                          <span class="txt-grey"><%= format_date activity.published_at %></span>
+                          <div class="sn-news-txt">
+                            <p><%= activity.polls_description.to_s.html_safe %></p>
+                          </div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+        <% else %>
+            <% @project_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "Issue" %>
+                    <% activity = Issue.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <p><%= activity.description.to_s.html_safe %></p>
+                      </div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date activity.updated_on %></span>
+                      <div class="sn-news-txt">
+                        <p><%= activity.content.to_s.html_safe %></p>
+                      </div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey">2016-04-08</span>
+                      <div class="sn-news-txt">
+                        <p><%= activity.description.to_s.html_safe %></p>
+                      </div>
+                    </div>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
+        <% else %>
+            <% org_acts.first(4).each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                    <% document = activity.org_act %>
+                    <% org_subfield_id = params[:org_subfield_id] %>
+                    <% flag = 2 %>
+                    <% iamge_path = get_image_path_from_content(document.content) %>
+                    <div class="sn-news-bigbox fl">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %>
+                      </h3>
+                      <span class="txt-grey"><%= format_date document.created_at %></span>
+                      <div class="sn-news-txt">
+                        <p><%= document.content.to_s.html_safe %></p>
+                      </div>
+                    </div>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = Message.find(activity.org_act_id) %>
+                        <% if message.parent_id.nil? %>
+                            <% content = message.content%>
+                        <% else %>
+                            <% content = message.parent.content%>
+                        <% end %>
+                        <% iamge_path = get_image_path_from_content(content) %>
+                        <% if message.board.org_subfield_id %>
+                            <div class="sn-news-bigbox fl">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey"><%= format_date message.created_on %></span>
+                              <div class="sn-news-txt">
+                                <p><%= content.to_s.html_safe %></p>
+                              </div>
+                            </div>
+                        <% else %>
+                            <div class="sn-news-bigbox fl">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey"><%= format_date message.created_on %></span>
+                              <div class="sn-news-txt">
+                                <p><%= content.to_s.html_safe %></p>
+                              </div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = News.find(activity.org_act_id) %>
+                        <% iamge_path = get_image_path_from_content(news.description) %>
+                        <div class="sn-news-bigbox fl">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
+                          <% end %>
+                          <h3>
+                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %>
+                          </h3>
+                          <span class="txt-grey"><%= format_date news.created_on %></span>
+                          <div class="sn-news-txt">
+                            <p><%= news.description.to_s.html_safe %></p>
+                          </div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+
+
diff --git a/app/views/organizations/_org_subfield_leftM1_default.html.erb b/app/views/organizations/_org_subfield_leftM1_default.html.erb
new file mode 100644
index 000000000..919d76363
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftM1_default.html.erb
@@ -0,0 +1,8 @@
+<div class="sn-news-bigbox fl">
+  <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/news/img-news-big.jpg" width="380" height="165" alt=""/></a>
+  <h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3>
+  <span class="txt-grey"></span>
+  <div class="sn-news-txt">
+    <p></p>
+  </div>
+</div>
diff --git a/app/views/organizations/_org_subfield_leftM2.html.erb b/app/views/organizations/_org_subfield_leftM2.html.erb
new file mode 100644
index 000000000..aec1a88fe
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftM2.html.erb
@@ -0,0 +1,233 @@
+<div class="sn-news-smallbox fl" style="display:<%= field.hide == 0?'block':'none' %>;">
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <% if @course_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
+        <% else %>
+            <% @course_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "HomeworkCommon" %>
+                    <% activity = HomeworkCommon.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_at %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.created_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "Poll" %>
+                    <% activity = Poll.find(act.org_act_id) %>
+                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                    <% if ( activity.polls_status==2) %>
+                        <div class="sn-news-small mb18">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% end %>
+                          <h3>
+                            <% if has_commit %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                            <% else %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                            <% end %>
+                          </h3>
+                          <span class="txt-grey fl "><%= format_date activity.published_at %></span>
+                          <div class="cl"></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
+        <% else %>
+            <% @project_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "Issue" %>
+                    <% activity = Issue.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.created_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
+        <% else %>
+            <% org_acts.first(4).each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                    <% document = activity.org_act %>
+                    <% org_subfield_id = params[:org_subfield_id] %>
+                    <% flag = 2 %>
+                    <% iamge_path = get_image_path_from_content(document.content) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date document.created_at %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = Message.find(activity.org_act_id) %>
+                        <% if message.parent_id.nil? %>
+                            <% content = message.content%>
+                        <% else %>
+                            <% content = message.parent.content%>
+                        <% end %>
+                        <% iamge_path = get_image_path_from_content(content) %>
+                        <% if message.board.org_subfield_id %>
+                            <div class="sn-news-small mb18">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey fl "><%= format_date message.created_on %></span>
+                              <div class="cl"></div>
+                            </div>
+                        <% else %>
+                            <div class="sn-news-small mb18">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey fl "><%= format_date message.created_on %></span>
+                              <div class="cl"></div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = News.find(activity.org_act_id) %>
+                        <% iamge_path = get_image_path_from_content(news.description) %>
+                        <div class="sn-news-small mb18">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% end %>
+                          <h3>
+                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %>
+                          </h3>
+                          <span class="txt-grey fl "><%= format_date news.created_on %></span>
+                          <div class="cl"></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+<div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftM2_default.html.erb b/app/views/organizations/_org_subfield_leftM2_default.html.erb
new file mode 100644
index 000000000..1b47d9d5c
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftM2_default.html.erb
@@ -0,0 +1,26 @@
+<div class="sn-news-smallbox fl">
+  <div class="sn-news-small mb18">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small01.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small mb18">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small02.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small mb18">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small03.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small ">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small04.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb
new file mode 100644
index 000000000..2db926776
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftMD.html.erb
@@ -0,0 +1,258 @@
+<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+  <h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+  <div class="sn-index-resourcescon">
+  <% if is_default_field?(field) %>
+      <% case field.name %>
+      <% when 'course' %>
+          <% if @course_acts.blank? %>
+              <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+          <% else %>
+              <% @course_acts.first(4).each do |act| %>
+                  <% if act.org_act_type == "HomeworkCommon" %>
+                      <% activity = HomeworkCommon.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-resourcesbox">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                        </h3>
+                        <div class="resources-tagbox">
+                          <%= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                        </div>
+                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                      </div>
+                  <% elsif act.org_act_type == "Message" %>
+                      <% activity = Message.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.content) %>
+                      <div class="sn-index-resourcesbox">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% end %>
+                        <h3>
+                          <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                              <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                          <% else %>
+                              <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                          <% end %>
+                        </h3>
+                        <div class="resources-tagbox">
+                          <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                        </div>
+                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                      </div>
+                  <% elsif act.org_act_type == "News" %>
+                      <% activity = News.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-resourcesbox">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                        </h3>
+                        <div class="resources-tagbox">
+                          <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                        </div>
+                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                      </div>
+                  <% elsif act.org_act_type == "Poll" %>
+                      <% activity = Poll.find(act.org_act_id) %>
+                      <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                      <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                      <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                      <% if ( activity.polls_status==2) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% end %>
+                            <h3>
+                              <% if has_commit %>
+                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title"  %>
+                              <% else %>
+                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title"  %>
+                              <% end %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%= link_to activity.polls_description.to_s.html_safe, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-tag" %>
+                            </div>
+                            <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                          </div>
+                      <% end %>
+                  <% end %>
+              <% end %>
+          <% end %>
+      <% when 'project' %>
+          <% if @project_acts.blank? %>
+              <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+          <% else %>
+              <% @project_acts.first(4).each do |act| %>
+                  <% if act.org_act_type == "Issue" %>
+                      <% activity = Issue.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-resourcesbox">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                        </h3>
+                        <div class="resources-tagbox">
+                          <%= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                        </div>
+                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                      </div>
+                  <% elsif act.org_act_type == "Message" %>
+                      <% activity = Message.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.content) %>
+                      <div class="sn-index-resourcesbox">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                          <% end %>
+                          <h3>
+                            <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                            <% else %>
+                                <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %>
+                            <% end %>
+                          </h3>
+                          <div class="resources-tagbox">
+                            <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                          </div>
+                          <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                      </div>
+                  <% elsif act.org_act_type == "News" %>
+                      <% activity = News.find(act.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(activity.description) %>
+                      <div class="sn-index-resourcesbox">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% end %>
+                        <h3>
+                            <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %>
+                        </h3>
+                        <div class="resources-tagbox">
+                          <%= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                        </div>
+                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                      </div>
+                  <% end %>
+              <% end %>
+          <% end %>
+      <% end %>
+  <% else %>
+      <% if field.field_type == "Post" %>
+          <% org_acts = get_subfield_acts field %>
+          <% if org_acts.blank? %>
+              <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+          <% else %>
+              <% org_acts.first(4).each do |activity| %>
+                  <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                      <% document = activity.org_act %>
+                      <% org_subfield_id = params[:org_subfield_id] %>
+                      <% flag = 2 %>
+                      <% iamge_path = get_image_path_from_content(document.content) %>
+                      <div class="sn-index-resourcesbox">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                        <% end %>
+                        <h3>
+                          <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title" %>
+                        </h3>
+                        <div class="resources-tagbox">
+                          <%= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
+                        </div>
+                        <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                      </div>
+                  <% else activity.container_type == 'OrgSubfield' %>
+                      <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                          <% message = Message.find(activity.org_act_id) %>
+                          <% if message.parent_id.nil? %>
+                              <% content = message.content%>
+                          <% else %>
+                              <% content = message.parent.content%>
+                          <% end %>
+                          <% iamge_path = get_image_path_from_content(content) %>
+                          <% if message.board.org_subfield_id %>
+                              <div class="sn-index-resourcesbox">
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <% end %>
+                                <h3>
+                                  <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                      <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %>
+                                  <% else %>
+                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %>
+                                  <% end %>
+                                </h3>
+                                <div class="resources-tagbox">
+                                  <%= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
+                                </div>
+                                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                              </div>
+                          <% else %>
+                              <div class="sn-index-resourcesbox">
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %>
+                                <% end %>
+                                <h3>
+                                  <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                      <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title" %>
+                                  <% else %>
+                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title" %>
+                                  <% end %>
+                                </h3>
+                                <div class="resources-tagbox">
+                                  <%= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
+                                </div>
+                                <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                              </div>
+                          <% end %>
+                      <% end %>
+                      <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                          <% news = News.find(activity.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(news.description) %>
+                          <div class="sn-index-resourcesbox">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %>
+                            <% end %>
+                            <h3>
+                              <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title" %>
+                            </h3>
+                            <div class="resources-tagbox">
+                              <%= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
+                            </div>
+                            <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                          </div>
+                      <% end %>
+                  <% end %>
+              <% end %>
+          <% end %>
+      <% end %>
+  <% end %>
+    <div class="cl"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftMD_default.html.erb b/app/views/organizations/_org_subfield_leftMD_default.html.erb
new file mode 100644
index 000000000..4268c7cc8
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftMD_default.html.erb
@@ -0,0 +1,11 @@
+<div class="sn-index-resourcesbox">
+  <a href="javascript:void()" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/files-default.jpg" width="185" height="125" alt=""/></a>
+  <h3><a href="javascript:void()" target="_blank" class="resources-title">仪器资源</a></h3>
+  <div class="resources-tagbox">
+    <a href="javascript:void()" target="_blank" class="resources-tag">测试服务</a>
+    <a href="javascript:void()" target="_blank" class="resources-tag">开放日</a>
+    <a href="javascript:void()" target="_blank" class="resources-tag">仪器共享</a>
+    <a href="javascript:void()" target="_blank" class="resources-tag">定制测试</a>
+  </div>
+  <a href="javascript:void()" target="_blank" class="more-btn">更多</a>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftT.html.erb b/app/views/organizations/_org_subfield_leftT.html.erb
new file mode 100644
index 000000000..e64044a6b
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftT.html.erb
@@ -0,0 +1,276 @@
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <% if @course_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftT_default', :locals => {:field => field} %>
+        <% else %>
+            <div class="sn-index-banner" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <!-- 代码 开始 -->
+              <div id="fsD1" class="focus">
+                <div id="D1pic1" class="fPic">
+                  <% @course_acts.first(4).each do |act| %>
+                      <% if act.org_act_type == "HomeworkCommon" %>
+                          <% activity = HomeworkCommon.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="fcon" style="display: none;">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% end %>
+                            <span class="shadow"><%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank' %></span>
+                          </div>
+                      <% elsif act.org_act_type == "Message" %>
+                          <% activity = Message.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.content) %>
+                          <div class="fcon" style="display: none;">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% end %>
+                            <span class="shadow">
+                              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
+                                <% else %>
+                                    <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
+                                <% end %>
+                            </span>
+                          </div>
+                      <% elsif act.org_act_type == "News" %>
+                          <% activity = News.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="fcon" style="display: none;">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% end %>
+                            <span class="shadow">
+                              <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %>
+                            </span>
+                          </div>
+                      <% elsif act.org_act_type == "Poll" %>
+                          <% activity = Poll.find(act.org_act_id) %>
+                          <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                          <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                          <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                          <% if ( activity.polls_status==2) %>
+                              <div class="fcon" style="display: none;">
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
+                                <% end %>
+                                <span class="shadow">
+                                    <% if has_commit %>
+                                        <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank' %>
+                                    <% else %>
+                                        <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s, :target => '_blank' %>
+                                    <% end %>
+                                </span>
+                              </div>
+                          <% end %>
+                      <% end %>
+                  <% end %>
+                </div>
+                <div class="fbg">
+                  <div class="D1fBt" id="D1fBt">
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class="current"></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                  </div>
+                </div>
+                <span class="prev"></span>
+                <span class="next"></span>
+              </div>
+            </div>
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftT_default', :locals => {:field => field} %>
+        <% else %>
+            <div class="sn-index-banner" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <!-- 代码 开始 -->
+              <div id="fsD1" class="focus">
+                <div id="D1pic1" class="fPic">
+                  <% @project_acts.first(4).each do |act| %>
+                      <% if act.org_act_type == "Issue" %>
+                          <% activity = Issue.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="fcon" style="display: none;">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% end %>
+                            <span class="shadow"><%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank' %></span>
+                          </div>
+                      <% elsif act.org_act_type == "Message" %>
+                          <% activity = Message.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.content) %>
+                          <div class="fcon" style="display: none;">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% end %>
+                            <span class="shadow">
+                              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
+                              <% else %>
+                                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank' %>
+                              <% end %>
+                            </span>
+                          </div>
+                      <% elsif act.org_act_type == "News" %>
+                          <% activity = News.find(act.org_act_id) %>
+                          <% iamge_path = get_image_path_from_content(activity.description) %>
+                          <div class="fcon" style="display: none;">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% end %>
+                            <span class="shadow">
+                              <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank' %>
+                            </span>
+                          </div>
+                      <% end %>
+                  <% end %>
+                </div>
+                <div class="fbg">
+                  <div class="D1fBt" id="D1fBt">
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class="current"></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                  </div>
+                </div>
+                <span class="prev"></span>
+                <span class="next"></span>
+              </div>
+            </div>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftT_default', :locals => {:field => field} %>
+        <% else %>
+            <div class="sn-index-banner" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <!-- 代码 开始 -->
+              <div id="fsD1" class="focus">
+                <div id="D1pic1" class="fPic">
+                  <% org_acts.first(4).each do |activity| %>
+                      <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                          <% document = activity.org_act %>
+                          <% org_subfield_id = params[:org_subfield_id] %>
+                          <% flag = 2 %>
+                          <% iamge_path = get_image_path_from_content(document.content) %>
+                          <div class="fcon" style="display: none;">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
+                            <% end %>
+                            <span class="shadow"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank' %></span>
+                          </div>
+                      <% elsif activity.container_type == 'OrgSubfield' %>
+                          <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                              <% message = Message.find(activity.org_act_id) %>
+                              <% if message.board.org_subfield_id %>
+                                  <% if message.parent_id.nil? %>
+                                      <% content = message.content%>
+                                  <% else %>
+                                      <% content = message.parent.content%>
+                                  <% end %>
+                                  <% iamge_path = get_image_path_from_content(content) %>
+                                  <div class="fcon" style="display: none;">
+                                    <% if iamge_path.nil? %>
+                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                    <% else %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                    <% end %>
+                                    <span class="shadow">
+                                      <% if message.parent_id.nil? %>
+                                            <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank' %>
+                                        <% else %>
+                                            <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank'%>
+                                        <% end %>
+                                    </span>
+                                  </div>
+                              <% else %>
+                                  <% if message.parent_id.nil? %>
+                                      <% content = message.content%>
+                                  <% else %>
+                                      <% content = message.parent.content%>
+                                  <% end %>
+                                  <% iamge_path = get_image_path_from_content(content) %>
+                                  <div class="fcon" style="display: none;">
+                                    <% if iamge_path.nil? %>
+                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
+                                    <% else %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
+                                    <% end %>
+                                    <span class="shadow">
+                                      <% if message.parent_id.nil? %>
+                                            <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :class=> "postGrey" %>
+                                        <% else %>
+                                            <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :class=> "postGrey" %>
+                                        <% end %>
+                                    </span>
+                                  </div>
+                              <% end %>
+                          <% end %>
+                          <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                              <% news = News.find(activity.org_act_id) %>
+                              <% iamge_path = get_image_path_from_content(news.description) %>
+                              <div class="fcon" style="display: none;">
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
+                                <% end %>
+                                <span class="shadow"><%= link_to news.title.to_s, news_path(news), :target => '_blank' %></span>
+                              </div>
+                          <% end %>
+                      <% end %>
+                  <% end %>
+                </div>
+                <div class="fbg">
+                  <div class="D1fBt" id="D1fBt">
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class="current"></a>
+                    <a href="javascript:void(0)" hidefocus="true" target="_self" class=""></a>
+                  </div>
+                </div>
+                <span class="prev"></span>
+                <span class="next"></span>
+              </div>
+            </div>
+        <% end %>
+    <% end %>
+<% end %>
+
+<script type="text/javascript">
+    Qfast.add('widgets', { path: "/javascripts/terminator2.2.min.js", type: "js", requires: ['fx'] });
+    Qfast(false, 'widgets', function () {
+        K.tabs({
+            id: 'fsD1',   //焦点图包裹id
+            conId: "D1pic1",  //** 大图域包裹id
+            tabId:"D1fBt",
+            tabTn:"a",
+            conCn: '.fcon', //** 大图域配置class
+            auto: 1,   //自动播放 1或0
+            effect: 'fade',   //效果配置
+            eType: 'click', //** 鼠标事件
+            pageBt:true, //是否有按钮切换页码
+            bns: ['.prev', '.next'],//** 前后按钮配置class
+            interval: 3000  //** 停顿时间
+        })
+    })
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_leftT_default.html b/app/views/organizations/_org_subfield_leftT_default.html
new file mode 100644
index 000000000..f2f66758f
--- /dev/null
+++ b/app/views/organizations/_org_subfield_leftT_default.html
@@ -0,0 +1,10 @@
+<div class="sn-index-banner" style="display:<%= field.hide == 0?'block':'none' %>;">
+    <!-- 代码 开始 -->
+    <div id="fsD1" class="focus">
+        <div  class="fPic">
+            <div class="fcon-default">
+                <a target="_blank" href="javascript:void(0);"><img src="/images/default_blank/banner-default.jpg" alt="" ></a>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_org_subfield_rightD.html.erb b/app/views/organizations/_org_subfield_rightD.html.erb
new file mode 100644
index 000000000..131ae5183
--- /dev/null
+++ b/app/views/organizations/_org_subfield_rightD.html.erb
@@ -0,0 +1,73 @@
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <p>暂无内容！</p>
+    <% when 'project' %>
+        <p>暂无内容！</p>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %> <%# 讨论类型 %>
+        <% org_acts = get_subfield_acts field %>
+        <% unless org_acts.blank? %>
+            <% activity = org_acts.first %>
+            <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                  <% document = activity.org_act %>
+                  <% org_subfield_id = params[:org_subfield_id] %>
+                  <% flag = 2 %>
+                  <% iamge_path = get_image_path_from_content(document.content) %>
+                  <% if iamge_path.nil? %>
+                      <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                  <% else %>
+                      <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                  <% end %>
+              <% elsif activity.container_type == 'OrgSubfield' %>
+                  <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                      <% message = Message.find(activity.org_act_id) %>
+                      <% if message.board.org_subfield_id %>
+                          <% iamge_path = get_image_path_from_content(message.content) %>
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                          <% end %>
+                      <% else %>
+                          <% iamge_path = get_image_path_from_content(message.content) %>
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                          <% end %>
+                      <% end %>
+                  <% end %>
+                  <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                      <% news = News.find(activity.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(news.description) %>
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                      <% end %>
+                  <% end %>
+              <% end %>
+            </div>
+        <% else %>
+            <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <a href="javascript:void(0);" target="_blank" ><img  src="/images/default_blank/ad-default.jpg" width="369" height="169" alt=""/></a>
+            </div>
+        <% end %>
+    <% elsif field.field_type == "Resource" %>
+        <% org_attachs = get_attach_org2(field) %>
+        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+          <% if !field.subfield_subdomain_dir.nil? %>
+              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+              <% end %>
+          <% else %>
+              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+          <% end %>
+        </div>
+    <% end %>
+<% end %>
diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb
new file mode 100644
index 000000000..d75b9f20f
--- /dev/null
+++ b/app/views/organizations/_org_subfield_rightM.html.erb
@@ -0,0 +1,98 @@
+<% if is_default_field?(field) %>
+    <% case field.name %>
+<% when 'course' %>
+        <p>暂无内容！</p>
+    <% when 'project' %>
+        <p>暂无内容！</p>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %> <%# 讨论类型 %>
+        <% org_acts = get_subfield_acts field %>
+        <% unless org_acts.blank? %>
+            <% activity = org_acts.first %>
+            <div class="sn-index-wxbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                  <% document = activity.org_act %>
+                  <% org_subfield_id = params[:org_subfield_id] %>
+                  <% flag = 2 %>
+                  <% iamge_path = get_image_path_from_content(document.content) %>
+                  <h2 class="h2-title "><%= field.name %></h2>
+                  <div class="sn-index-wx">
+                    <% if iamge_path.nil? %>
+                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                    <% else %>
+                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                    <% end %>
+                    <p class="fl sn-index-txt sn-w229"><%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></p>
+                    <div class="cl"></div>
+                  </div>
+              <% else activity.container_type == 'OrgSubfield' %>
+                  <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                      <% message = Message.find(activity.org_act_id) %>
+                      <% if message.board.org_subfield_id %>
+                          <% iamge_path = get_image_path_from_content(message.content) %>
+                          <h2 class="h2-title "><%= field.name %></h2>
+                          <div class="sn-index-wx">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
+                            <% end %>
+                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
+                            <div class="cl"></div>
+                          </div>
+                      <% else %>
+                          <% iamge_path = get_image_path_from_content(message.content) %>
+                          <h2 class="h2-title "><%= field.name %></h2>
+                          <div class="sn-index-wx">
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
+                            <% end %>
+                            <p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
+                            <div class="cl"></div>
+                          </div>
+                      <% end %>
+                  <% end %>
+                  <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                      <% news = News.find(activity.org_act_id) %>
+                      <% iamge_path = get_image_path_from_content(news.description) %>
+                      <h2 class="h2-title "><%= field.name %></h2>
+                      <div class="sn-index-wx">
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
+                        <% end %>
+                        <p class="fl sn-index-txt"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
+                        <div class="cl"></div>
+                      </div>
+                  <% end %>
+              <% end %>
+            </div>
+        <% else %>
+            <div class="sn-index-wxbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title "><%= field.name %></h2>
+              <div class="sn-index-wx">
+                <img class="fl sn-index-wximg" src="/images/wx.gif" width="104" height="104" alt=""/>
+                <p class="fl sn-index-txt">暂无内容！</p>
+                <div class="cl"></div>
+              </div>
+            </div>
+        <% end %>
+    <% elsif field.field_type == "Resource" %>
+        <% org_attachs = get_attach_org2(field) %>
+        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+          <% if !field.subfield_subdomain_dir.nil? %>
+              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+              <% end %>
+          <% else %>
+              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+          <% end %>
+        </div>
+    <% end %>
+<% end %>
diff --git a/app/views/organizations/_org_subfield_rightT.html.erb b/app/views/organizations/_org_subfield_rightT.html.erb
new file mode 100644
index 000000000..e93031991
--- /dev/null
+++ b/app/views/organizations/_org_subfield_rightT.html.erb
@@ -0,0 +1,223 @@
+<div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+<h2 class="h2-title mb18"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <% if @course_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+        <% else %>
+            <% @course_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "HomeworkCommon" %>
+                    <% activity = HomeworkCommon.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-index-active">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                      </h3>
+                      <span class="txt-grey "><%= format_date activity.updated_at %></span>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-index-active">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey "><%= format_date activity.updated_on %></span>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-index-active">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                      </h3>
+                      <span class="txt-grey "><%= format_date activity.created_on %></span>
+                    </div>
+                <% elsif act.org_act_type == "Poll" %>
+                    <% activity = Poll.find(act.org_act_id) %>
+                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                    <% if ( activity.polls_status==2) %>
+                        <div class="sn-index-active">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %>
+                          <% end %>
+                          <h3>
+                            <% if has_commit %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title"  %>
+                            <% else %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title"  %>
+                            <% end %>
+                          </h3>
+                          <span class="txt-grey "><%= format_date activity.published_at %></span>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+        <% else %>
+            <% @project_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "Issue" %>
+                    <% activity = Issue.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-index-active">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                      </h3>
+                      <span class="txt-grey "><%= format_date activity.updated_on %></span>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-index-active">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey "><%= format_date activity.updated_on %></span>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-index-active">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %>
+                      </h3>
+                      <span class="txt-grey "><%= format_date activity.created_on %></span>
+                    </div>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+        <% else %>
+            <% org_acts.first(4).each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                    <% document = activity.org_act %>
+                    <% org_subfield_id = params[:org_subfield_id] %>
+                    <% flag = 2 %>
+                    <% iamge_path = get_image_path_from_content(document.content) %>
+                    <div class="sn-index-active">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "active-title" %>
+                      </h3>
+                      <span class="txt-grey "><%= format_date document.created_at %></span>
+                    </div>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = Message.find(activity.org_act_id) %>
+                        <% if message.parent_id.nil? %>
+                            <% content = message.content%>
+                        <% else %>
+                            <% content = message.parent.content%>
+                        <% end %>
+                        <% iamge_path = get_image_path_from_content(content) %>
+                        <% if message.board.org_subfield_id %>
+                            <div class="sn-index-active">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey "><%= format_date message.created_on %></span>
+                            </div>
+                        <% else %>
+                            <div class="sn-index-active">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "active-title" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "active-title" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey "><%= format_date message.created_on %></span>
+                            </div>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = News.find(activity.org_act_id) %>
+                        <% iamge_path = get_image_path_from_content(news.description) %>
+                        <div class="sn-index-active">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %>
+                          <% end %>
+                          <h3>
+                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "active-title" %>
+                          </h3>
+                          <span class="txt-grey "><%= format_date news.created_on %></span>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+<div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 2c679eb3d..7db41cba5 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -27,7 +27,7 @@
              默认
             <% else %>
                 <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                    <div class="update_status_class"><span  class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
+                    <div class="update_status_class"><span  class="hidden"><%= subfield_list_type(field.status) %></span>
                       <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
                     </div>
                     <%= select( :name,:group_id, subfield_status_option,
@@ -63,7 +63,7 @@
             列表
             <% else %>
             <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
-                <div class="update_status_class"><span class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
+                <div class="update_status_class"><span class="hidden"><%= subfield_list_type(field.status) %></span>
                   <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
                 </div>
                 <%= select( :name,:group_id, subfield_status_option,
diff --git a/app/views/organizations/org_subfield_rightT_default.html.erb b/app/views/organizations/org_subfield_rightT_default.html.erb
new file mode 100644
index 000000000..ecdc7fba0
--- /dev/null
+++ b/app/views/organizations/org_subfield_rightT_default.html.erb
@@ -0,0 +1,7 @@
+<div class="sn-index-active">
+  <div class="sn-index-active">
+    <a href="javascript:void()" target="_blank" class="sn-activeimg"><img src="images/active/img-active01.jpg" width="330" height="210" alt=""/></a>
+    <h3><a href="javascript:void()" target="_blank" class="active-title"></a></h3>
+    <span class="txt-grey "></span>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/_rep_static.html.erb b/app/views/projects/_rep_static.html.erb
index 0522fd34e..9ebf68d0c 100644
--- a/app/views/projects/_rep_static.html.erb
+++ b/app/views/projects/_rep_static.html.erb
@@ -10,14 +10,18 @@
                 type: 'line'
             },
             title: {
-                text: '版本库代码提交量'
+                text: '版本库代码提交行数',
+                style:{
+                    fontSize: '14px'
+                }
+
             },
             subtitle: {
 //                    text: 'Source: WorldClimate.com'
             },
             xAxis: {
 //                   categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-                categories: <%= raw(@static_total_per_user.map{|c| c.uname}) %>
+                categories: <%= raw(@a_uname_code) %>
             },
             yAxis: {
                 title: {
@@ -34,6 +38,12 @@
                 }
             },
             plotOptions: {
+                series: {
+                    marker: {
+                        radius: 3, //曲线点半径，默认是4
+                        symbol: 'circle' //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+                    }
+                },
                 line: {
                     dataLabels: {
                         enabled: true
@@ -41,21 +51,55 @@
                     enableMouseTracking: false
                 }
             },
-            series: [{
-                name: '改动或增加',
-                color: '#fd9e04',
-
-//                    data: [7.0, 6.9, 9.5, 14.5, 18.4, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6]
-                data: <%= @static_total_per_user.map{|c| c.add.to_i} %>
+            series: [
+                {
+                    name: '<b style="font-weight:normal ">总变更</b>',
+                    color: '#d05d5a',
+                    fontWeight: 'normal',
+                    data: <%= @a_commits_changeset %>,
+                    dataLabels: {
+                        enabled: false,
+                        style: {
+                            fontSize: '13px',
+                            color: '#aaa',
+                            fontFamily: 'Arial',
+                            textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                            fontWeight: 'normal'
+                        }
+                    },
+                    lineWidth: 1.5
+                },
+                {
+                name: '<b style="font-weight:normal ">改动或增加</b>',
+                color: '#5b6b76',
+                data: <%= @a_commits_add %>,
+                dataLabels: {
+                    enabled: false,
+                    style: {
+                        fontSize: '13px',
+                        color: '#aaa',
+                        fontFamily: 'Arial',
+                        textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                        fontWeight: 'normal'
+                    }
+                },
+                lineWidth: 1.5
             },
                 {
-                    name: '删除',
-                    color: '#46baed ',
-                    data: <%= @static_total_per_user.map{|c| c.del.to_i} %>
-                },{
-                    name: '总变更',
-                    color: '#d397d5',
-                    data: <%= @static_total_per_user.map{|c| c.changes.to_i} %>
+                    name: '<b style="font-weight:normal ">删除</b>',
+                    color: '#84b5bb',
+                    data: <%= @a_commits_del %>,
+                    dataLabels: {
+                        enabled: false,
+                        style: {
+                            fontSize: '13px',
+                            color: '#aaa',
+                            fontFamily: 'Arial',
+                            textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                            fontWeight: 'normal'
+                        }
+                    },
+                    lineWidth: 1.5
                 }]
         });
 
@@ -68,14 +112,18 @@
                 enabled: false
             },
             title: {
-                text: '版本库代码提交次数'
+                text: '版本库代码提交次数',
+                style:{
+                    fontSize: '14px'
+                }
+
             },
             subtitle: {
 //                    text: 'Source: WorldClimate.com'
             },
             xAxis: {
 //                   categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-                categories: <%= raw(@static_total_per_user.map{|c| c.uname}) %>
+                categories: <%= raw(@a_uname) %>
             },
             yAxis: {
                 title: {
@@ -89,6 +137,12 @@
                 }
             },
             plotOptions: {
+                series: {
+                    marker: {
+                        radius: 3,  //曲线点半径，默认是4
+                        symbol: 'circle' //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+                    }
+                },
                 line: {
                     dataLabels: {
                         enabled: true
@@ -97,9 +151,24 @@
                 }
             },
             series: [{
-                name: '提交次数',
+                name: '<b style="font-weight:normal ">提交次数</b>',
+                fontWeight: 'normal',
+                color: '#d05d5a',
 //                    data: [7.0, 6.9, 9.5, 14.5, 18.4, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6]
-                data: <%= @static_total_per_user.map{|c| c.commits_num.to_i} %>
+                data: <%= @a_commits_num %>,
+                dataLabels: {
+                    enabled: false,
+
+                    style: {
+                        fontSize: '13px',
+                        color: '#aaa',
+                        fontFamily: 'Arial',
+                        textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                        fontWeight: 'normal'
+                    }
+                },
+                lineWidth: 1.5
+
             }
 //                    {
 //                    name: 'London',
@@ -108,4 +177,5 @@
             ]
         });
     });
-</script>
\ No newline at end of file
+</script>
+<div class="button-rep">当前分支：<%= @rev %></div>
\ No newline at end of file
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 63d7d583f..c0bb15ab4 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -29,12 +29,14 @@
     <!--CONTENT LIST-->
 
   </div>
+  <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank? %>
   <div class="resources mt10">
     <div class="homepagePostBrief">
       <%= render :partial => "rep_static" %>
       <div class="cl"></div>
     </div>
   </div>
+  <% end %>
 
   <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
 </div>
\ No newline at end of file
diff --git a/app/views/repositories/_dir_list.html.erb b/app/views/repositories/_dir_list.html.erb
index 771d4d1ec..384ea36b0 100644
--- a/app/views/repositories/_dir_list.html.erb
+++ b/app/views/repositories/_dir_list.html.erb
@@ -1,5 +1,5 @@
 <div class="autoscroll">
-<table class="list entries" id="browser">
+<table class="list entries" id="browser" style="table-layout: fixed;">
 
 <tbody>
 <%= render :partial => 'dir_list_content' %>
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index dda0cddbd..60c4aa3bf 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -1,33 +1,55 @@
 <% @entries.each do |entry| %>
-<% tr_id = Digest::MD5.hexdigest(entry.path)
-   depth = params[:depth].to_i %>
-<%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
-<%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
-<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
-<td style="padding-left: <%=18 * depth%>px;" class="<%=
-           @repository.report_last_commit ? "filename" : "filename_no_report" %>">
-<% if entry.is_dir? %>
+    <% tr_id = Digest::MD5.hexdigest(entry.path)
+       depth = params[:depth].to_i %>
+    <% sub_path = entry.path[0] == "/" ? entry.path.sub("/", "") : entry.path %>
+    <% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(sub_path)   %>
+    <% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
+    <% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_path) %>
+
+    <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
+      <td style="padding-left: <%=18 * depth%>px;" class="filename_no_report hidden">
+        <% if entry.is_dir? %>
 <%# 展开文件目录 %>
-<span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for(
+            <span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for(
                        :action => 'show',
                        :id     => @project,
                        :repository_id => @repository.identifier_param,
                        :path   => to_path_param(ent_path),
                        :rev    => @rev,
+                       :latest_changes => latest_changes,
                        :depth  => (depth + 1),
                        :parent_id => tr_id)) %>');">&nbsp;</span>
-<% end %>
+        <% end %>
+        <!--<a class="<%#= (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}") %>">-->
+          <!--<%#= h(ent_name) %>-->
+        <!--</a>-->
+        <%#= h(ent_name), :class => "(entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
 <%=  link_to h(ent_name),
           {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
-          :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
-</td>
-<!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
-  <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
-<% if @repository.report_last_commit %>
-      <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
-      <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-      <td class="author"><%= entry.author %></td>
-      <td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
-<% end %>
-</tr>
+           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
+      </td>
+      <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
+      <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
+<%# if @repository.report_last_commit %>
+      <div id="children_tree">
+        <td class="tree-comments c_grey hidden">
+          <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
+            <%= (latest_changes.message) if latest_changes && latest_changes.message %>
+          </div>
+        </td>
+        <td class="tree-author c_grey">
+          <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
+            <%= (latest_changes.author) if latest_changes && latest_changes.author %>
+          </div>
+        </td>
+        <td class="tree-age c_grey">
+          <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>">
+            <%# 为了转换UTC时间，时差8小时 %>
+            <%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
+            <%#= latest_changes.time if latest_changes && latest_changes.time %>
+          </div>
+        </td>
+      </div>
+<%# end %>
+    </tr>
 <% end %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 4dfa86538..82e6f871f 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -25,7 +25,7 @@
       <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" ><%= @repository.type.to_s=="Repository::Gitlab" ? @repos_url.to_s.lstrip : @repository.url %></textarea>
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15">
-        <%=link_to "统计", stats_repository_project_path(:id => @project, :repository_id => @repository.identifier_param, :rev => @rev, :creator => @creator ), :class => "fl vl_zip" %>
+        <%=link_to "代码统计", stats_repository_project_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :creator => @creator, :default_branch => @g_default_branch ), :class => "fl vl_zip" %>
       </div>
       <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
       <% if User.current.id != @project.user_id %>
diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb
index 4a8bd9217..4b35e64f6 100644
--- a/app/views/repositories/stats.html.erb
+++ b/app/views/repositories/stats.html.erb
@@ -14,6 +14,7 @@
     </div>
     <div id = "container_code" class="mt30">
     </div>
+
     <script>
         $(function () {
             $('#container_code').highcharts({
@@ -21,7 +22,11 @@
                     type: 'line'
                 },
                 title: {
-                    text: '代码提交量'
+                    text: '版本库代码提交行数',
+                    style:{
+                        fontSize: '14px'
+                    }
+
                 },
                 subtitle: {
 //                    text: 'Source: WorldClimate.com'
@@ -45,6 +50,12 @@
                     }
                 },
                 plotOptions: {
+                    series: {
+                        marker: {
+                            radius: 3, //曲线点半径，默认是4
+                            symbol: 'circle' //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+                        }
+                    },
                     line: {
                         dataLabels: {
                             enabled: true
@@ -52,18 +63,55 @@
                         enableMouseTracking: false
                     }
                 },
-                series: [{
-                    name: '改动或增加',
-
-//                    data: [7.0, 6.9, 9.5, 14.5, 18.4, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6]
-                    data: <%= @static_total_per_user.map{|c| c.add.to_i} %>
-                },
-                   {
-                   name: '删除',
-                       data: <%= @static_total_per_user.map{|c| c.del.to_i} %>
-               },{
-                   name: '总变更',
-                   data: <%= @static_total_per_user.map{|c| c.changes.to_i} %>
+                series: [
+                    {
+                        name: '<b style="font-weight:normal ">总变更</b>',
+                        color: '#d05d5a',
+                        fontWeight: 'normal',
+                        data: <%= @static_total_per_user.map{|c| c.changes.to_i} %>,
+                        dataLabels: {
+                            enabled: true,
+                            style: {
+                                fontSize: '13px',
+                                color: '#aaa',
+                                fontFamily: 'Arial',
+                                textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                                fontWeight: 'normal'
+                            }
+                        },
+                        lineWidth: 1.5
+                    },
+                    {
+                        name: '<b style="font-weight:normal ">改动或增加</b>',
+                        color: '#5b6b76',
+                        data: <%= @static_total_per_user.map{|c| c.add.to_i} %>,
+                        dataLabels: {
+                            enabled: true,
+                            style: {
+                                fontSize: '13px',
+                                color: '#aaa',
+                                fontFamily: 'Arial',
+                                textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                                fontWeight: 'normal'
+                            }
+                        },
+                        lineWidth: 1.5
+                    },
+                    {
+                        name: '<b style="font-weight:normal ">删除</b>',
+                        color: '#84b5bb',
+                        data: <%= @static_total_per_user.map{|c| c.del.to_i} %>,
+                        dataLabels: {
+                            enabled: true,
+                            style: {
+                                fontSize: '13px',
+                                color: '#aaa',
+                                fontFamily: 'Arial',
+                                textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                                fontWeight: 'normal'
+                            }
+                        },
+                        lineWidth: 1.5
                     }]
             });
 
@@ -76,14 +124,18 @@
                     enabled: false
                 },
                 title: {
-                    text: '代码提交次数'
+                    text: '版本库代码提交次数',
+                    style:{
+                        fontSize: '14px'
+                    }
+
                 },
                 subtitle: {
 //                    text: 'Source: WorldClimate.com'
                 },
                 xAxis: {
 //                   categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-                   categories: <%= raw(@static_total_per_user.map{|c| c.uname}) %>
+                    categories: <%= raw(@static_total_per_user.map{|c| c.uname}) %>
                 },
                 yAxis: {
                     title: {
@@ -97,6 +149,12 @@
                     }
                 },
                 plotOptions: {
+                    series: {
+                        marker: {
+                            radius: 3,  //曲线点半径，默认是4
+                            symbol: 'circle' //曲线点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
+                        }
+                    },
                     line: {
                         dataLabels: {
                             enabled: true
@@ -105,9 +163,23 @@
                     }
                 },
                 series: [{
-                    name: '提交次数',
+                    name: '<b style="font-weight:normal ">提交次数</b>',
+                    fontWeight: 'normal',
+                    color: '#d05d5a',
 //                    data: [7.0, 6.9, 9.5, 14.5, 18.4, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6]
-                    data: <%= @static_total_per_user.map{|c| c.commits_num.to_i} %>
+                    data: <%= @static_total_per_user.map{|c| c.commits_num.to_i} %>,
+                    dataLabels: {
+                        enabled: true,
+                        style: {
+                            fontSize: '13px',
+                            color: '#aaa',
+                            fontFamily: 'Arial',
+                            textShadow: '0px 0px 6px rgb(0, 0, 0), 0px 0px 3px rgb(f, f, f)',
+                            fontWeight: 'normal'
+                        }
+                    },
+                    lineWidth: 1.5
+
                 }
 //                    {
 //                    name: 'London',
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index becec239a..048304f74 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -119,6 +119,11 @@
   <div class="cl"></div>
 </div>
 <script type="text/javascript">
+    $(function(){
+        <% if defined?(is_focus) && is_focus.to_i == 1 %>
+        $("#upload_revise_attachment").click();
+        <% end %>
+    });
     function show_upload(){
         $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
         showModal('ajax-modal', '452px');
diff --git a/app/views/student_work/_revise_attachment.html.erb b/app/views/student_work/_revise_attachment.html.erb
index dabf9715a..cd7ddc917 100644
--- a/app/views/student_work/_revise_attachment.html.erb
+++ b/app/views/student_work/_revise_attachment.html.erb
@@ -30,7 +30,7 @@
         <% end %>
         <div class="cl"></div>
         <div class="mb10 mt5">
-          <a href="javascript:void(0);" onclick="show_upload();" class="blueCir ml5" title="请选择文件上传">上传附件</a>
+          <a href="javascript:void(0);" id="upload_revise_attachment" onclick="show_upload();" class="blueCir ml5" title="请选择文件上传">上传附件</a>
         </div>
     <% end %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index dc2fdafb6..fb1b2da4b 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -107,6 +107,9 @@
 <script type="text/javascript">
     $(function(){
         showNormalImage('student_work_img_<%=work.id %>');
+        <% if defined?(is_focus) && is_focus.to_i == 1 %>
+            $("#upload_revise_attachment").click();
+        <% end %>
     });
     function show_upload(){
         $("#ajax-modal").html('<%= escape_javascript( render :partial => 'student_work/upload_attachment' ,:locals => {:work=>work})%>');
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index e0b6def7a..ca76b0f2a 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -7,6 +7,7 @@
     <% my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
     <% if !@is_teacher && my_work.nil? && User.current.member_of_course?(@course) %>
        <span class="f12 c_red">您尚未提交作品</span>
+        <%=link_to "提交作品",  new_student_work_url_without_domain(@homework.id),:class => 'blueCir ml5 f12' %>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
        <span class="f12 c_red">您已提交且不可再修改，因为截止日期已过</span>
     <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
@@ -58,7 +59,7 @@
           <% end %>
           <% unless work.nil? %>
               <% if @homework.homework_type == 2 %>
-                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
 
                   var program_name = "text/x-csrc";
                   var language = <%= @homework.language %>;
@@ -82,11 +83,11 @@
                               value: $("#work-src_<%= work.id%>").text()
                           });
               <% elsif @homework.homework_type == 1 %>
-                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
               <% elsif @homework.homework_type == 3 %>
                   <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
                   <% if pro && pro.student_work_id == work.id %>
-                      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+                      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
                   <% end %>
               <% end %>
             $('#score_<%= work.id%>').peSlider({range: 'min'});
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
new file mode 100644
index 000000000..2d45c0b83
--- /dev/null
+++ b/app/views/users/_course_boardlist.html.erb
@@ -0,0 +1,78 @@
+<div class = "cl"> </div>
+<div id="course-boardlist">
+  <div class="listbox mt10" >
+    <h2 class="list-h2">问答区列表</h2>
+    <div class="category">
+      <span class="grayTxt ">排序：</span>
+      <%= link_to "时间", {:controller => 'boards', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i == 1 %>
+          <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type,  :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+      <%= link_to "人气", {:controller => 'boards', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i  == 2 %>
+          <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type,  :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+      <div class="cl"></div>
+    </div>
+    <div class="bloglistbox">
+      <% topics.each do |activity| %>
+          <div class="list-file">
+            <div><span class="item_list fl"></span>
+              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                  <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
+              <% else %>
+                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
+              <% end %>
+              <% if activity.sticky == 1 %>
+                  <span class="fl ml10 red-cir-btn">顶</span>
+              <% end%>
+              <% if activity.locked %>
+                  <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+              <% end %>
+              <% u = User.where("id=?",activity.author_id).first%>
+              <span class="fr grayTxt">
+                  发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+              </span>
+              <div class="cl"></div>
+            </div>
+            <div class="massages-content ml15">
+              <% if activity.parent_id.nil? %>
+                  <% content = activity.content %>
+              <% else %>
+                  <% content = activity.parent.content %>
+              <% end %>
+              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54} %></p>
+            </div>
+            <div class="ml15 mt10">
+              <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+              <span class="grayTxt">更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+              <% count=0 %>
+              <% if activity.parent %>
+                  <% count=activity.parent.children.count%>
+              <% else %>
+                  <% count=activity.children.count%>
+              <% end %>
+              <p class="list-info fr grayTxt"><span><%= count>0 ? "（#{count}）" : "" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span><span>赞</span></p>
+            </div>
+            <div class="cl"></div>
+          </div>
+      <% end %>
+      <div>
+        <ul class="wlist" id="pages" >
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+    //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
+    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
+    var rightHeight = $(".homepageRight").height();
+    if (rightHeight < leftHeight){
+        var diffHeight = leftHeight - rightHeight;
+        var tmpHeight = $(".listbox").height()+diffHeight;
+        $(".listbox").css("height",tmpHeight);
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 12b93f40d..743090a4d 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -71,7 +71,12 @@
           <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
           <%= user_for_homework_common activity,is_teacher %>
         </div>
-
+        <% work = cur_user_works_for_homework activity %>
+        <% if activity.end_time < Date.today && !is_teacher && !work.nil? %>
+            <div class="homepagePostSubmit">
+                <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+            </div>
+        <% end %>
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
               <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 0ac756f71..3f2b8b5c4 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -89,7 +89,7 @@
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">?</span>
         <span id="praise_count_<%=user_activity_id %>">
           <% if activity.author == User.current %>
             <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
@@ -174,5 +174,4 @@
         </div>
     <% end %>
   </div>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/app/views/users/_intro_content_ex.html.erb b/app/views/users/_intro_content_ex.html.erb
new file mode 100644
index 000000000..d667845d0
--- /dev/null
+++ b/app/views/users/_intro_content_ex.html.erb
@@ -0,0 +1,24 @@
+<div class="homepagePostIntro break_word upload_img list_style table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
+  <div id="intro_content_<%= user_activity_id%>">
+    <%= content.to_s.html_safe%>
+  </div>
+</div>
+<script type="text/javascript">
+    $(function(){
+        var heightType = <%= maxheight %>;
+
+        if (heightType > 0){
+            $("#activity_description_<%= user_activity_id%>").css("max-height",heightType+"px");
+        }
+
+        $("#intro_content_<%= user_activity_id%> p,#intro_content_<%= user_activity_id%> span,#intro_content_<%= user_activity_id%> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
+        description_show_hide(<%=user_activity_id %>);
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
new file mode 100644
index 000000000..9d25b7bd5
--- /dev/null
+++ b/app/views/users/_project_boardlist.html.erb
@@ -0,0 +1,78 @@
+<div class = "cl"> </div>
+<div id="project-boardlist">
+  <div class="listbox mt10" >
+    <h2 class="list-h2">讨论区列表</h2>
+    <div class="category">
+      <span class="grayTxt ">排序：</span>
+      <%= link_to "时间", {:controller => 'boards', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i == 1 %>
+          <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type,  :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+      <%= link_to "人气", {:controller => 'boards', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i  == 2 %>
+          <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type,  :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+      <div class="cl"></div>
+    </div>
+    <div class="bloglistbox">
+      <% topics.each do |activity| %>
+          <div class="list-file">
+            <div><span class="item_list fl"></span>
+              <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                  <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
+              <% else %>
+                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
+              <% end %>
+              <% if activity.sticky == 1 %>
+                  <span class="fl ml10 red-cir-btn">顶</span>
+              <% end%>
+              <% if activity.locked %>
+                  <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+              <% end %>
+              <% u = User.where("id=?",activity.author_id).first%>
+              <span class="fr grayTxt">
+                  发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+              </span>
+              <div class="cl"></div>
+            </div>
+            <div class="massages-content ml15">
+              <% if activity.parent_id.nil? %>
+                  <% content = activity.content %>
+              <% else %>
+                  <% content = activity.parent.content %>
+              <% end %>
+              <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54 } %></p>
+            </div>
+            <div class="ml15 mt10">
+              <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
+              <span class="grayTxt">更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
+              <% count=0 %>
+              <% if activity.parent %>
+                  <% count=activity.parent.children.count%>
+              <% else %>
+                  <% count=activity.children.count%>
+              <% end %>
+              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+            </div>
+            <div class="cl"></div>
+          </div>
+      <% end %>
+      <div>
+        <ul class="wlist" id="pages" >
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+    //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
+    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
+    var rightHeight = $(".homepageRight").height();
+    if (rightHeight < leftHeight){
+        var diffHeight = leftHeight - rightHeight;
+        var tmpHeight = $(".listbox").height()+diffHeight;
+        $(".listbox").css("height",tmpHeight);
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
new file mode 100644
index 000000000..8d45510a1
--- /dev/null
+++ b/app/views/users/_user_course_list.html.erb
@@ -0,0 +1,61 @@
+<div class="listbox" id="course-list">
+  <h2 class="list-h2">课程列表</h2>
+  <div class="category">
+    <span class="grayTxt ">排序：</span>
+    <%= link_to "时间", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+    <% if @type.to_i == 1 %>
+        <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+    <% end %>
+    <%= link_to "人气", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+    <% if @type.to_i  == 2 %>
+        <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+    <% end %>
+    <div class="cl"></div>
+  </div>
+
+  <div class="bloglistbox">
+    <% @courses.each do |course|%>
+        <ul class="list-file">
+          <li>
+            <span class="item_list fl"></span>
+            <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "course-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
+                        :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
+            <% teacher = User.where("id=?",course.tea_id).first%>
+            <span class="fr grayTxt">
+                <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
+            </span>
+          </li>
+          <div class="cl"></div>
+            <li class="ml15">
+              <span class="grayTxt">
+                  开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
+              </span>
+              <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
+                  <% homework_num = course.homework_commons.count %>
+              <% else %>
+                  <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
+              <% end %>
+              <p class="list-info fr grayTxt"><span><%= homework_num %></span><span>作业</span><span>|</span><span> <%= visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
+            </li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+    <div>
+      <ul class="wlist" id="pages" >
+        <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+      </ul>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+    //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
+    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
+    var rightHeight = $(".homepageRight").height();
+    if (rightHeight < leftHeight){
+        var diffHeight = leftHeight - rightHeight;
+        var tmpHeight = $(".listbox").height()+diffHeight;
+        $(".listbox").css("height",tmpHeight);
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index bc73bcfb6..4bab8d98f 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -70,6 +70,12 @@
         <div class="homepagePostSubmit">
           <%= user_for_homework_common homework_common,is_teacher %>
         </div>
+        <% work = cur_user_works_for_homework homework_common %>
+        <% if homework_common.end_time < Date.today && !is_teacher && !work.nil? %>
+            <div class="homepagePostSubmit">
+              <%=link_to "追加附件", student_work_index_url_in_org(homework_common.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+            </div>
+        <% end %>
         <% if homework_common.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
               <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb
new file mode 100644
index 000000000..73bdc900a
--- /dev/null
+++ b/app/views/users/_user_project_list.html.erb
@@ -0,0 +1,53 @@
+<div class="listbox" id="project-list">
+  <h2 class="list-h2">项目列表</h2>
+  <div class="category">
+    <span class="grayTxt ">排序：</span>
+    <%= link_to "时间", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+    <% if @type.to_i == 1 %>
+        <%= link_to "", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+    <% end %>
+    <%= link_to "人气", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+    <% if @type.to_i  == 2 %>
+        <%= link_to "", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+    <% end %>
+    <div class="cl"></div>
+  </div>
+
+  <div class="bloglistbox">
+    <% @projects.each do |project|%>
+        <ul class="list-file">
+          <li>
+            <span class="item_list fl"></span>
+            <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "course-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+            <% projectUser = User.where("id=?",project.user_id).first%>
+            <span class="fr grayTxt">
+                <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %>
+            </span>
+          </li>
+          <div class="cl"></div>
+          <li class="ml15">
+            <span class="grayTxt">创建时间：<%= format_time(project.created_on) %></span>
+            <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
+          </li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+    <div>
+      <ul class="wlist" id="pages" >
+        <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+      </ul>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+    //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
+    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
+    var rightHeight = $(".homepageRight").height();
+    if (rightHeight < leftHeight){
+        var diffHeight = leftHeight - rightHeight;
+        var tmpHeight = $(".listbox").height()+diffHeight;
+        $(".listbox").css("height",tmpHeight);
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/user_courselist.html.erb b/app/views/users/user_courselist.html.erb
new file mode 100644
index 000000000..de0f647e2
--- /dev/null
+++ b/app/views/users/user_courselist.html.erb
@@ -0,0 +1 @@
+<%= render :partial => 'users/user_course_list'%>
diff --git a/app/views/users/user_courselist.js.erb b/app/views/users/user_courselist.js.erb
new file mode 100644
index 000000000..98c92be02
--- /dev/null
+++ b/app/views/users/user_courselist.js.erb
@@ -0,0 +1 @@
+$("#course-list").replaceWith('<%= escape_javascript( render :partial => 'users/user_course_list') %>');
\ No newline at end of file
diff --git a/app/views/users/user_projectlist.html.erb b/app/views/users/user_projectlist.html.erb
new file mode 100644
index 000000000..fb1b5b501
--- /dev/null
+++ b/app/views/users/user_projectlist.html.erb
@@ -0,0 +1 @@
+<%= render :partial => 'users/user_project_list'%>
diff --git a/app/views/users/user_projectlist.js.erb b/app/views/users/user_projectlist.js.erb
new file mode 100644
index 000000000..da7ca6a49
--- /dev/null
+++ b/app/views/users/user_projectlist.js.erb
@@ -0,0 +1 @@
+$("#project-list").replaceWith('<%= escape_javascript( render :partial => 'users/user_project_list') %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index cb916b6e3..40fe687fa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -549,6 +549,11 @@ RedmineApp::Application.routes.draw do
       match 'code_submit_score_index', :to => 'projects#code_submit_score_index', :via => [:get, :post]
       match 'projects_topic_score_index', :to => 'projects#projects_topic_score_index', :via => [:get, :post]
       match 'user_act_issue_assign_to', :to => 'users#user_act_issue_assign_to', :via => [:get, :post]
+
+      #addby yk
+      match 'user_courselist', :to => 'users#user_courselist',  :via => :get, :as => "user_courselist"
+      match 'user_projectlist', :to => 'users#user_projectlist',  :via => :get, :as => "user_projectlist"
+
       get 'edit_brief_introduction'
       get "user_resource"
       get "import_resources"
diff --git a/db/migrate/20160224074034_update_one_student_score.rb b/db/migrate/20160224074034_update_one_student_score.rb
index 6e1930652..454bd8acd 100644
--- a/db/migrate/20160224074034_update_one_student_score.rb
+++ b/db/migrate/20160224074034_update_one_student_score.rb
@@ -1,35 +1,39 @@
 class UpdateOneStudentScore < ActiveRecord::Migration
   def up
-    student_work_score = StudentWorksScore.where("user_id = 11688 AND student_work_id = 34414").first
-    student_work_score.score = 100
-    student_work_score.save
-    student_works = StudentWork.where("user_id = 6456")
-    student_works.each do |work|
-      unless work.student_works_scores.empty?
-        if work.student_works_scores.where(:reviewer_role => 2).empty?
-          work.teaching_asistant_score = nil
-        else
-          work.teaching_asistant_score = work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+    begin
+      student_work_score = StudentWorksScore.where("user_id = 11688 AND student_work_id = 34414").first
+      student_work_score.score = 100
+      student_work_score.save
+      student_works = StudentWork.where("user_id = 6456")
+      student_works.each do |work|
+        unless work.student_works_scores.empty?
+          if work.student_works_scores.where(:reviewer_role => 2).empty?
+            work.teaching_asistant_score = nil
+          else
+            work.teaching_asistant_score = work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+          end
+          if work.student_works_scores.where(:reviewer_role => 3).empty?
+            work.student_score = nil
+          else
+            work.student_score = work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          end
         end
-        if work.student_works_scores.where(:reviewer_role => 3).empty?
-          work.student_score = nil
+        if work.teaching_asistant_score.nil?
+          work.final_score = work.student_score
+        elsif work.student_score.nil?
+          work.final_score = work.teaching_asistant_score
         else
-          work.student_score = work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          homework = HomeworkCommon.find work.homework_common_id
+          ta_proportion = homework.homework_detail_manual.ta_proportion
+          final_ta_score = BigDecimal.new("#{work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+          final_s_score = BigDecimal.new("#{work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+          final_score = final_ta_score + final_s_score
+          work.final_score = format("%.2f",final_score.to_f)
         end
+        work.save
       end
-      if work.teaching_asistant_score.nil?
-        work.final_score = work.student_score
-      elsif work.student_score.nil?
-        work.final_score = work.teaching_asistant_score
-      else
-        homework = HomeworkCommon.find work.homework_common_id
-        ta_proportion = homework.homework_detail_manual.ta_proportion
-        final_ta_score = BigDecimal.new("#{work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
-        final_s_score = BigDecimal.new("#{work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-        final_score = final_ta_score + final_s_score
-        work.final_score = format("%.2f",final_score.to_f)
-      end
-      work.save
+    rescue => e
+      logger.error "[Errno::ENOENT] ===> #{e}"
     end
   end
 
diff --git a/db/migrate/20160329014316_update_one_student_teacher_score.rb b/db/migrate/20160329014316_update_one_student_teacher_score.rb
index cf56db220..cdbc9444f 100644
--- a/db/migrate/20160329014316_update_one_student_teacher_score.rb
+++ b/db/migrate/20160329014316_update_one_student_teacher_score.rb
@@ -1,15 +1,19 @@
 class UpdateOneStudentTeacherScore < ActiveRecord::Migration
   def up
-    work = StudentWork.find 49774
-    score = StudentWorksScore.new
-    score.score = 100
-    score.user_id = 7318
-    score.student_work_id = work.id
-    score.reviewer_role = 1
-    if score.save
-      work.teacher_score = score.score
+    begin
+      work = StudentWork.find 49774
+      score = StudentWorksScore.new
+      score.score = 100
+      score.user_id = 7318
+      score.student_work_id = work.id
+      score.reviewer_role = 1
+      if score.save
+        work.teacher_score = score.score
+      end
+      work.save
+    rescue => e
+      logger.error "[Errno::ENOENT] ===> #{e}"
     end
-    work.save
   end
 
   def down
diff --git a/db/migrate/20160414060838_create_rep_statics.rb b/db/migrate/20160414060838_create_rep_statics.rb
new file mode 100644
index 000000000..125261df1
--- /dev/null
+++ b/db/migrate/20160414060838_create_rep_statics.rb
@@ -0,0 +1,14 @@
+class CreateRepStatics < ActiveRecord::Migration
+  def change
+    create_table :rep_statics do |t|
+      t.integer :project_id
+      t.integer :commits_num
+      t.string :uname
+      t.string :email
+      t.integer :add
+      t.integer :del
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160415025623_add_changeset_to_rep_statics.rb b/db/migrate/20160415025623_add_changeset_to_rep_statics.rb
new file mode 100644
index 000000000..45fdb02d9
--- /dev/null
+++ b/db/migrate/20160415025623_add_changeset_to_rep_statics.rb
@@ -0,0 +1,5 @@
+class AddChangesetToRepStatics < ActiveRecord::Migration
+  def change
+    add_column :rep_statics, :changeset, :integer
+  end
+end
diff --git a/db/migrate/20160415030447_sync_rep_statics.rb b/db/migrate/20160415030447_sync_rep_statics.rb
new file mode 100644
index 000000000..29861aa61
--- /dev/null
+++ b/db/migrate/20160415030447_sync_rep_statics.rb
@@ -0,0 +1,26 @@
+class SyncRepStatics < ActiveRecord::Migration
+  def up
+    g = Gitlab.client
+    # projects = Project.find_by_sql("SELECT p.* FROM projects p, project_scores ps where p.id = ps.project_id and p.gpid is not null and ps.changeset_num > 0")
+    projects = Project.where("gpid is not null")
+    count = projects.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      projects.page(i).per(30).each do |project|
+        begin
+          puts project.id
+          g.rep_stats(project.gpid).each do |static|
+            puts static.uname
+            RepStatics.create(:project_id => project.id, :uname => static.uname, :commits_num => static.commits_num, :email => static.email, :add => static.add, :del => static.del, :changeset => static.changes)
+          end
+        rescue
+          logger.error("Sync rep failed!")
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160421011543_alter_homework_end_time.rb b/db/migrate/20160421011543_alter_homework_end_time.rb
new file mode 100644
index 000000000..4470bd63b
--- /dev/null
+++ b/db/migrate/20160421011543_alter_homework_end_time.rb
@@ -0,0 +1,21 @@
+class AlterHomeworkEndTime < ActiveRecord::Migration
+  def up
+    homeworks = HomeworkCommon.where("id in (3229, 3234, 3235, 3236)");
+    unless homeworks.empty? || homeworks.nil?
+      homeworks.each do |hw|
+        hw.end_time = hw.end_time + 4
+        hm = hw.homework_detail_manual
+        hm.comment_status = 1
+        hw.student_works.each do |stu|
+          stu.late_penalty = 0
+          stu.save
+        end
+        hm.save
+        hw.save
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7267f02f8..0b871cc6f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-
-
-
-ActiveRecord::Schema.define(:version => 20160405021915) do
-ActiveRecord::Schema.define(:version => 20160419074016) do
+ActiveRecord::Schema.define(:version => 20160421011543) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1714,8 +1710,8 @@ ActiveRecord::Schema.define(:version => 20160419074016) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
-    t.integer  "simi_id"
-    t.integer  "simi_value"
+    t.integer  "simi_id",                                       :default => 0
+    t.integer  "simi_value",                                    :default => 0
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
@@ -1948,25 +1944,6 @@ ActiveRecord::Schema.define(:version => 20160419074016) do
   add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
   add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
 
-  create_table "user_wechats", :force => true do |t|
-    t.integer  "subscribe"
-    t.string   "openid"
-    t.string   "nickname"
-    t.integer  "sex"
-    t.string   "language"
-    t.string   "city"
-    t.string   "province"
-    t.string   "country"
-    t.string   "headimgurl"
-    t.string   "subscribe_time"
-    t.string   "unionid"
-    t.string   "remark"
-    t.integer  "groupid"
-    t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "users", :force => true do |t|
     t.string   "login",                           :default => "",    :null => false
     t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
@@ -2043,14 +2020,6 @@ ActiveRecord::Schema.define(:version => 20160419074016) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "wechat_logs", :force => true do |t|
-    t.string   "openid",       :null => false
-    t.text     "request_raw"
-    t.text     "response_raw"
-    t.text     "session_raw"
-    t.datetime "created_at",   :null => false
-  end
-
   create_table "wiki_content_versions", :force => true do |t|
     t.integer  "wiki_content_id",                                       :null => false
     t.integer  "page_id",                                               :null => false
diff --git a/lib/gitlab-cli/lib/gitlab/client/repositories.rb b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
index 98a8ea150..990300b31 100644
--- a/lib/gitlab-cli/lib/gitlab/client/repositories.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
@@ -106,6 +106,23 @@ class Gitlab::Client
     end
     alias_method :repo_rep_stats, :rep_stats
 
+    # Gets a tree activities of project repository.
+    #
+    # @example
+    #   Gitlab.commits('viking')
+    #   Gitlab.repo_commits('gitlab', :ref_name => 'api')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :ref_name The branch or tag name of a project repository.
+    # @option options [String] :creator The user name of a project repository.
+    # @option options [Integer] :period Statistics over time. 1:total 2：one month 3：one week
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def rep_last_changes(project, options={})
+      get("/projects/#{project}/repository/rep_last_changes", :query => options)
+    end
+    alias_method :repo_rep_stats, :rep_stats
+
     # Get the diff of a commit in a project.
     #
     # @example
diff --git a/lib/tasks/gitlab.rake b/lib/tasks/gitlab.rake
index 729c9245f..7893195ac 100644
--- a/lib/tasks/gitlab.rake
+++ b/lib/tasks/gitlab.rake
@@ -11,6 +11,21 @@ namespace :gitlab do
       end
     end
 
+    task :members => :environment do
+      projects = Project.where("gpid is not null")
+      s = Trustie::Gitlab::Sync.new
+      g = Gitlab.client
+      projects.each do |project|
+        begin
+          if project.members.count != g.team_members(project.gpid).count
+            s.only_members(project)
+          end
+        rescue => e
+          puts e
+        end
+      end
+    end
+
     desc "update user password"
     task :password => :environment do
       s = Trustie::Gitlab::Sync.new
diff --git a/lib/tasks/sync_files.rake b/lib/tasks/sync_files.rake
new file mode 100644
index 000000000..5c9326356
--- /dev/null
+++ b/lib/tasks/sync_files.rake
@@ -0,0 +1,38 @@
+require 'trustie/gitlab/sync'
+
+namespace :trustie do
+  namespace :files do
+    desc "sync course'file"
+    task :course => :environment do
+      # Course.all.each do |course|
+      #   unless course.attachments.count.to_i == 0
+      #     attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and container_type ='Course'").count
+      #     project_score = ProjectScore.where("project_id=?", project.id).first
+      #     if project_score.nil?
+      #       ProjectScore.create(:project_id => project.id, :attach_num => 0)
+      #     else
+      #       project_score.attach_num = attachment_count
+      #       project_score.save
+      #     end
+      #   end
+      # end
+    end
+
+    desc "sync project'file"
+    task :project => :environment do
+      Project.all.each do |project|
+        unless project.attachments.count.to_i == 0
+          attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{project.id} and container_type ='Project'").count
+          project_score = ProjectScore.where("project_id=?", project.id).first
+          if project_score.nil?
+            ProjectScore.create(:project_id => project.id, :attach_num => 0)
+          else
+            project_score.attach_num = attachment_count
+            project_score.save
+          end
+        end
+      end
+    end
+
+  end
+end
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index 2f4f77c53..3520098a9 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -122,7 +122,7 @@ module Trustie
           project.members.each do |m|
             begin
               gid = m.user.gid
-              unless gid
+              if gid.nil?
                 gid = sync_user(m.user).id
               end
               self.g.add_team_member(project.gpid, gid, get_gitlab_role(m))
diff --git a/public/images/active/img-active01.jpg b/public/images/active/img-active01.jpg
new file mode 100644
index 000000000..c0969a317
Binary files /dev/null and b/public/images/active/img-active01.jpg differ
diff --git a/public/images/active/img-active02.jpg b/public/images/active/img-active02.jpg
new file mode 100644
index 000000000..049b09385
Binary files /dev/null and b/public/images/active/img-active02.jpg differ
diff --git a/public/images/active/img-active03.jpg b/public/images/active/img-active03.jpg
new file mode 100644
index 000000000..793370c59
Binary files /dev/null and b/public/images/active/img-active03.jpg differ
diff --git a/public/images/banner-small.jpg b/public/images/banner-small.jpg
new file mode 100644
index 000000000..409b161d7
Binary files /dev/null and b/public/images/banner-small.jpg differ
diff --git a/public/images/banner/banner01.jpg b/public/images/banner/banner01.jpg
new file mode 100644
index 000000000..aefee8910
Binary files /dev/null and b/public/images/banner/banner01.jpg differ
diff --git a/public/images/banner/banner02.jpg b/public/images/banner/banner02.jpg
new file mode 100644
index 000000000..23486604b
Binary files /dev/null and b/public/images/banner/banner02.jpg differ
diff --git a/public/images/banner/focus_btn.png b/public/images/banner/focus_btn.png
new file mode 100644
index 000000000..f3caa102e
Binary files /dev/null and b/public/images/banner/focus_btn.png differ
diff --git a/public/images/default_blank/ad-default.jpg b/public/images/default_blank/ad-default.jpg
new file mode 100644
index 000000000..7707775d6
Binary files /dev/null and b/public/images/default_blank/ad-default.jpg differ
diff --git a/public/images/default_blank/banner-default.jpg b/public/images/default_blank/banner-default.jpg
new file mode 100644
index 000000000..1debf41a8
Binary files /dev/null and b/public/images/default_blank/banner-default.jpg differ
diff --git a/public/images/default_blank/default-img2.jpg b/public/images/default_blank/default-img2.jpg
new file mode 100644
index 000000000..8d194d605
Binary files /dev/null and b/public/images/default_blank/default-img2.jpg differ
diff --git a/public/images/default_blank/files-default.jpg b/public/images/default_blank/files-default.jpg
new file mode 100644
index 000000000..5da308927
Binary files /dev/null and b/public/images/default_blank/files-default.jpg differ
diff --git a/public/images/default_blank/left-act.jpg b/public/images/default_blank/left-act.jpg
new file mode 100644
index 000000000..19259035d
Binary files /dev/null and b/public/images/default_blank/left-act.jpg differ
diff --git a/public/images/default_blank/left-act2.jpg b/public/images/default_blank/left-act2.jpg
new file mode 100644
index 000000000..7f105cb1c
Binary files /dev/null and b/public/images/default_blank/left-act2.jpg differ
diff --git a/public/images/default_blank/right-top.jpg b/public/images/default_blank/right-top.jpg
new file mode 100644
index 000000000..591819248
Binary files /dev/null and b/public/images/default_blank/right-top.jpg differ
diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png
index 9f2212ff0..1a928ff33 100644
Binary files a/public/images/homepage_icon.png and b/public/images/homepage_icon.png differ
diff --git a/public/images/img-news-con.jpg b/public/images/img-news-con.jpg
new file mode 100644
index 000000000..bd31c7997
Binary files /dev/null and b/public/images/img-news-con.jpg differ
diff --git a/public/images/liststyle.png b/public/images/liststyle.png
new file mode 100644
index 000000000..e21ae237b
Binary files /dev/null and b/public/images/liststyle.png differ
diff --git a/public/images/news/img-news-big.jpg b/public/images/news/img-news-big.jpg
new file mode 100644
index 000000000..ae919d6ee
Binary files /dev/null and b/public/images/news/img-news-big.jpg differ
diff --git a/public/images/news/img-news-small01.jpg b/public/images/news/img-news-small01.jpg
new file mode 100644
index 000000000..c39334e25
Binary files /dev/null and b/public/images/news/img-news-small01.jpg differ
diff --git a/public/images/news/img-news-small02.jpg b/public/images/news/img-news-small02.jpg
new file mode 100644
index 000000000..c1a47081a
Binary files /dev/null and b/public/images/news/img-news-small02.jpg differ
diff --git a/public/images/news/img-news-small03.jpg b/public/images/news/img-news-small03.jpg
new file mode 100644
index 000000000..93e7b9edf
Binary files /dev/null and b/public/images/news/img-news-small03.jpg differ
diff --git a/public/images/news/img-news-small04.jpg b/public/images/news/img-news-small04.jpg
new file mode 100644
index 000000000..a39a1f61d
Binary files /dev/null and b/public/images/news/img-news-small04.jpg differ
diff --git a/public/images/partner/img-dhyq.jpg b/public/images/partner/img-dhyq.jpg
new file mode 100644
index 000000000..c412cd8ea
Binary files /dev/null and b/public/images/partner/img-dhyq.jpg differ
diff --git a/public/images/partner/img-jzdz.jpg b/public/images/partner/img-jzdz.jpg
new file mode 100644
index 000000000..be9a5c562
Binary files /dev/null and b/public/images/partner/img-jzdz.jpg differ
diff --git a/public/images/partner/img-qhdx.jpg b/public/images/partner/img-qhdx.jpg
new file mode 100644
index 000000000..d09aeb897
Binary files /dev/null and b/public/images/partner/img-qhdx.jpg differ
diff --git a/public/images/partner/img-zgdz.jpg b/public/images/partner/img-zgdz.jpg
new file mode 100644
index 000000000..4b3c1b92f
Binary files /dev/null and b/public/images/partner/img-zgdz.jpg differ
diff --git a/public/images/resources/img-resources01.jpg b/public/images/resources/img-resources01.jpg
new file mode 100644
index 000000000..9c94fa3b0
Binary files /dev/null and b/public/images/resources/img-resources01.jpg differ
diff --git a/public/images/resources/img-resources02.jpg b/public/images/resources/img-resources02.jpg
new file mode 100644
index 000000000..4d45aba7d
Binary files /dev/null and b/public/images/resources/img-resources02.jpg differ
diff --git a/public/images/resources/img-resources03.jpg b/public/images/resources/img-resources03.jpg
new file mode 100644
index 000000000..605abe53e
Binary files /dev/null and b/public/images/resources/img-resources03.jpg differ
diff --git a/public/images/resources/img-resources04.jpg b/public/images/resources/img-resources04.jpg
new file mode 100644
index 000000000..b136d9fa9
Binary files /dev/null and b/public/images/resources/img-resources04.jpg differ
diff --git a/public/images/sn_banner.jpg b/public/images/sn_banner.jpg
new file mode 100644
index 000000000..58c54ec05
Binary files /dev/null and b/public/images/sn_banner.jpg differ
diff --git a/public/images/sn_logo.jpg b/public/images/sn_logo.jpg
new file mode 100644
index 000000000..a53b2a0ca
Binary files /dev/null and b/public/images/sn_logo.jpg differ
diff --git a/public/images/sn_search_icon.jpg b/public/images/sn_search_icon.jpg
new file mode 100644
index 000000000..24be234f2
Binary files /dev/null and b/public/images/sn_search_icon.jpg differ
diff --git a/public/images/wx.gif b/public/images/wx.gif
new file mode 100644
index 000000000..744f5ae7a
Binary files /dev/null and b/public/images/wx.gif differ
diff --git a/public/images/zan.gif b/public/images/zan.gif
new file mode 100644
index 000000000..b2d493226
Binary files /dev/null and b/public/images/zan.gif differ
diff --git a/public/javascripts/jquery-1.8.3.min.js b/public/javascripts/jquery-1.8.3.min.js
new file mode 100644
index 000000000..49d9122d4
--- /dev/null
+++ b/public/javascripts/jquery-1.8.3.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v1.8.3 jquery.com | jquery.org/license */
+(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a=nt.compile=function(e,t){var n,r=[],i=[],s=A[d][e+" "];if(!s){t||(t=ut(e)),n=t.length;while(n--)s=ht(t[n]),s[d]?r.push(s):i.push(s);s=A(e,pt(i,r))}return s},g.querySelectorAll&&function(){var e,t=vt,n=/'|\\/g,r=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,i=[":focus"],s=[":active"],u=y.matchesSelector||y.mozMatchesSelector||y.webkitMatchesSelector||y.oMatchesSelector||y.msMatchesSelector;K(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="<p test=''></p>",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="<input type='hidden'/>",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t<n;t++)if(v.contains(u[t],this))return!0});o=this.pushStack("","find",e);for(t=0,n=this.length;t<n;t++){r=o.length,v.find(e,this[t],o);if(t>0)for(i=r;i<o.length;i++)for(s=0;s<r;s++)if(o[s]===o[i]){o.splice(i--,1);break}}return o},has:function(e){var t,n=v(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(v.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1),"not",e)},filter:function(e){return this.pushStack(ft(this,e,!0),"filter",e)},is:function(e){return!!e&&(typeof e=="string"?st.test(e)?v(e,this.context).index(this[0])>=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r<i;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&n.nodeType!==11){if(o?o.index(n)>-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/<tbody/i,gt=/<|&#?\w+;/,yt=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,wt=new RegExp("<(?:"+ct+")[\\s/>]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,Nt={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X<div>","</div>"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1></$2>");try{for(;r<i;r++)n=this[r]||{},n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),n.innerHTML=e);n=0}catch(s){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){return ut(this[0])?this.length?this.pushStack(v(v.isFunction(e)?e():e),"replaceWith",e):this:v.isFunction(e)?this.each(function(t){var n=v(this),r=n.html();n.replaceWith(e.call(this,t,r))}):(typeof e!="string"&&(e=v(e).detach()),this.each(function(){var t=this.nextSibling,n=this.parentNode;v(this).remove(),t?v(t).before(e):v(n).append(e)}))},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=[].concat.apply([],e);var i,s,o,u,a=0,f=e[0],l=[],c=this.length;if(!v.support.checkClone&&c>1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a<c;a++)r.call(n&&v.nodeName(this[a],"table")?Lt(this[a],"tbody"):this[a],a===u?o:v.clone(o,!0,!0))}o=s=null,l.length&&v.each(l,function(e,t){t.src?v.ajax?v.ajax({url:t.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):v.error("no ajax"):v.globalEval((t.text||t.textContent||t.innerHTML||"").replace(Tt,"")),t.parentNode&&t.parentNode.removeChild(t)})}return this}}),v.buildFragment=function(e,n,r){var s,o,u,a=e[0];return n=n||i,n=!n.nodeType&&n[0]||n,n=n.ownerDocument||n,e.length===1&&typeof a=="string"&&a.length<512&&n===i&&a.charAt(0)==="<"&&!bt.test(a)&&(v.support.checkClone||!St.test(a))&&(v.support.html5Clone||!wt.test(a))&&(o=!0,s=v.fragments[a],u=s!==t),s||(s=n.createDocumentFragment(),v.clean(e,n,s,r),o&&(v.fragments[a]=u&&s)),{fragment:s,cacheable:o}},v.fragments={},v.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){v.fn[e]=function(n){var r,i=0,s=[],o=v(n),u=o.length,a=this.length===1&&this[0].parentNode;if((a==null||a&&a.nodeType===11&&a.childNodes.length===1)&&u===1)return o[t](this[0]),this;for(;i<u;i++)r=(i>0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1></$2>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]==="<table>"&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("<div>").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r<i;r++)n=e[r],Vn[n]=Vn[n]||[],Vn[n].unshift(t)},prefilter:function(e,t){t?Xn.unshift(e):Xn.push(e)}}),v.Tween=Yn,Yn.prototype={constructor:Yn,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(v.cssNumber[n]?"":"px")},cur:function(){var e=Yn.propHooks[this.prop];return e&&e.get?e.get(this):Yn.propHooks._default.get(this)},run:function(e){var t,n=Yn.propHooks[this.prop];return this.options.duration?this.pos=t=v.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yn.propHooks._default.set(this),this}},Yn.prototype.init.prototype=Yn.prototype,Yn.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=v.css(e.elem,e.prop,!1,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){v.fx.step[e.prop]?v.fx.step[e.prop](e):e.elem.style&&(e.elem.style[v.cssProps[e.prop]]!=null||v.cssHooks[e.prop])?v.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yn.propHooks.scrollTop=Yn.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},v.each(["toggle","show","hide"],function(e,t){var n=v.fn[t];v.fn[t]=function(r,i,s){return r==null||typeof r=="boolean"||!e&&v.isFunction(r)&&v.isFunction(i)?n.apply(this,arguments):this.animate(Zn(t,!0),r,i,s)}}),v.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Gt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=v.isEmptyObject(e),s=v.speed(t,n,r),o=function(){var t=Kn(this,v.extend({},e),s);i&&t.stop(!0)};return i||s.queue===!1?this.each(o):this.queue(s.queue,o)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return typeof e!="string"&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=e!=null&&e+"queueHooks",s=v.timers,o=v._data(this);if(n)o[n]&&o[n].stop&&i(o[n]);else for(n in o)o[n]&&o[n].stop&&Wn.test(n)&&i(o[n]);for(n=s.length;n--;)s[n].elem===this&&(e==null||s[n].queue===e)&&(s[n].anim.stop(r),t=!1,s.splice(n,1));(t||!r)&&v.dequeue(this,e)})}}),v.each({slideDown:Zn("show"),slideUp:Zn("hide"),slideToggle:Zn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){v.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),v.speed=function(e,t,n){var r=e&&typeof e=="object"?v.extend({},e):{complete:n||!n&&t||v.isFunction(e)&&e,duration:e,easing:n&&t||t&&!v.isFunction(t)&&t};r.duration=v.fx.off?0:typeof r.duration=="number"?r.duration:r.duration in v.fx.speeds?v.fx.speeds[r.duration]:v.fx.speeds._default;if(r.queue==null||r.queue===!0)r.queue="fx";return r.old=r.complete,r.complete=function(){v.isFunction(r.old)&&r.old.call(this),r.queue&&v.dequeue(this,r.queue)},r},v.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},v.timers=[],v.fx=Yn.prototype.init,v.fx.tick=function(){var e,n=v.timers,r=0;qn=v.now();for(;r<n.length;r++)e=n[r],!e()&&n[r]===e&&n.splice(r--,1);n.length||v.fx.stop(),qn=t},v.fx.timer=function(e){e()&&v.timers.push(e)&&!Rn&&(Rn=setInterval(v.fx.tick,v.fx.interval))},v.fx.interval=13,v.fx.stop=function(){clearInterval(Rn),Rn=null},v.fx.speeds={slow:600,fast:200,_default:400},v.fx.step={},v.expr&&v.expr.filters&&(v.expr.filters.animated=function(e){return v.grep(v.timers,function(t){return e===t.elem}).length});var er=/^(?:body|html)$/i;v.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){v.offset.setOffset(this,e,t)});var n,r,i,s,o,u,a,f={top:0,left:0},l=this[0],c=l&&l.ownerDocument;if(!c)return;return(r=c.body)===l?v.offset.bodyOffset(l):(n=c.documentElement,v.contains(n,l)?(typeof l.getBoundingClientRect!="undefined"&&(f=l.getBoundingClientRect()),i=tr(c),s=n.clientTop||r.clientTop||0,o=n.clientLeft||r.clientLeft||0,u=i.pageYOffset||n.scrollTop,a=i.pageXOffset||n.scrollLeft,{top:f.top+u-s,left:f.left+a-o}):f)},v.offset={bodyOffset:function(e){var t=e.offsetTop,n=e.offsetLeft;return v.support.doesNotIncludeMarginInBodyOffset&&(t+=parseFloat(v.css(e,"marginTop"))||0,n+=parseFloat(v.css(e,"marginLeft"))||0),{top:t,left:n}},setOffset:function(e,t,n){var r=v.css(e,"position");r==="static"&&(e.style.position="relative");var i=v(e),s=i.offset(),o=v.css(e,"top"),u=v.css(e,"left"),a=(r==="absolute"||r==="fixed")&&v.inArray("auto",[o,u])>-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);/*  |xGv00|7bc34cbc4ef65454c6e072f374506f55 */
\ No newline at end of file
diff --git a/public/javascripts/koala.min.1.5.js b/public/javascripts/koala.min.1.5.js
new file mode 100644
index 000000000..17404dee4
--- /dev/null
+++ b/public/javascripts/koala.min.1.5.js
@@ -0,0 +1,2 @@
+
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(15(){17 e=1T.K;1a.2k=1T;1a.1x=1h;1a.24=1V.1i.24;1a.86=1h.29("87")[0];17 g=1a.K=1a.52=1a.1v=15(l){14(g.C.2s(l)){12 l}14(g.C.3o(l)){g.66(l);12}17 m=g.C.1c(1n.1d>0?l:2k);14(m){17 k=1C f(m);k.1N=15(){12"85"};12 k}12 1C h(l)};(15(k){17 m=1a.4C=15(){17 n=l(1n).2Y(", ");12 g.4i.2f(n,1h)};17 l=1a.4t=15(p){14(!p){12[]}14("4b"1G 2P(p)){12 p.4b()}17 o=p.1d||0,n=1C 1V(o);1r(o--){n[o]=p[o]}12 n};m.4h=15(p,q,o){14(1n.1d>1){a=1n}1b{14(g.C.2l(p)){12 p}1b{14(g.C.5Y(p)||g.C.62(p)){a=p}1b{14(g.C.4q(p)){a=/^n:(\\w+)$/.1q(p)?1x.49(2a.$1):1x.29(p)}}}}14(p&&p.1d>0){17 n=1C b(a,q);14(n.3m==1){12 g(n.2H(0))}1b{12 n}}12 1C h(o)};g.1y=15(n){12 1h.2E(n)};g.5N=15(){14(g.1y){1T.K=e}12 52};(15(){17 x=/((?:\\((?:\\([^()]+\\)|[^()]+)+\\)|\\[(?:\\[[^\\[\\]]*\\]|[\'"][^\'"]*[\'"]|[^\\[\\]\'"]+)+\\]|\\\\.|[^ >+~,(\\[\\\\]+)+|[>+~])(\\s*,\\s*)?((?:.|\\r|\\n)*)/g,y=0,B=2P.1i.1N,s=1m,r=1f,z=/\\\\/g,G=/\\W/;[0,0].6S(15(){r=1m;12 0});17 p=15(M,H,P,Q){P=P||[];H=H||1h;17 S=H;14(H.1j!==1&&H.1j!==9){12[]}14(!M||1s M!=="2o"){12 P}17 J,U,X,I,T,W,V,O,L=1f,K=p.3E(H),N=[],R=M;84{x.2m("");J=x.2m(R);14(J){R=J[3];N.1o(J[1]);14(J[2]){I=J[3];1z}}}1r(J);14(N.1d>1&&t.2m(M)){14(N.1d===2&&u.2R[N[0]]){U=C(N[0]+N[1],H)}1b{U=u.2R[N[0]]?[H]:p(N.2d(),H);1r(N.1d){M=N.2d();14(u.2R[M]){M+=N.2d()}U=C(M,U)}}}1b{14(!Q&&N.1d>1&&H.1j===9&&!K&&u.1t.2p.1q(N[0])&&!u.1t.2p.1q(N[N.1d-1])){T=p.1X(N.2d(),H,K);H=T.3f?p.1O(T.3f,T.33)[0]:T.33[0]}14(H){T=Q?{3f:N.4s(),33:v(Q)}:p.1X(N.4s(),N.1d===1&&(N[0]==="~"||N[0]==="+")&&H.1p?H.1p:H,K);U=T.3f?p.1O(T.3f,T.33):T.33;14(N.1d>0){X=v(U)}1b{L=1m}1r(N.1d){W=N.4s();V=W;14(!u.2R[W]){W=""}1b{V=N.4s()}14(V==1g){V=H}u.2R[W](X,V,K)}}1b{X=N=[]}}14(!X){X=U}14(!X){p.2w(W||M)}14(B.1l(X)==="[1Y 1V]"){14(!L){P.1o.1Z(P,X)}1b{14(H&&H.1j===1){1e(O=0;X[O]!=1g;O++){14(X[O]&&(X[O]===1f||X[O].1j===1&&p.2u(H,X[O]))){P.1o(U[O])}}}1b{1e(O=0;X[O]!=1g;O++){14(X[O]&&X[O].1j===1){P.1o(U[O])}}}}}1b{v(X,P)}14(I){p(I,S,P,Q);p.6B(P)}12 P};p.6B=15(I){14(A){s=r;I.6S(A);14(s){1e(17 H=1;H<I.1d;H++){14(I[H]===I[H-1]){I.3t(H--,1)}}}}12 I};p.70=15(H,I){12 p(H,1g,1g,I)};p.4I=15(H,I){12 p(I,1g,1g,[H]).1d>0};p.1X=15(O,H,P){17 N;14(!O){12[]}1e(17 K=0,J=u.3Q.1d;K<J;K++){17 L,M=u.3Q[K];14((L=u.3Z[M].2m(O))){17 I=L[1];L.3t(1,1);14(I.3Y(I.1d-1)!=="\\\\"){L[1]=(L[1]||"").1A(z,"");N=u.1X[M](L,H,P);14(N!=1g){O=O.1A(u.1t[M],"");1z}}}}14(!N){N=1s H.29!=="1B"?H.29("*"):[]}12{33:N,3f:O}};p.1O=15(S,R,V,L){17 N,H,J=S,X=[],P=R,O=R&&R[0]&&p.3E(R[0]);1r(S&&R.1d){1e(17 Q 1G u.1O){14((N=u.3Z[Q].2m(S))!=1g&&N[2]){17 W,U,I=u.1O[Q],K=N[1];H=1m;N.3t(1,1);14(K.3Y(K.1d-1)==="\\\\"){4B}14(P===X){X=[]}14(u.4G[Q]){N=u.4G[Q](N,P,V,X,L,O);14(!N){H=W=1f}1b{14(N===1f){4B}}}14(N){1e(17 M=0;(U=P[M])!=1g;M++){14(U){W=I(U,N,M,P);17 T=L^!!W;14(V&&W!=1g){14(T){H=1f}1b{P[M]=1m}}1b{14(T){X.1o(U);H=1f}}}}}14(W!==1B){14(!V){P=X}S=S.1A(u.1t[Q],"");14(!H){12[]}1z}}}14(S===J){14(H==1g){p.2w(S)}1b{1z}}J=S}12 P};p.2w=15(H){3A"82 2w, 83 88: "+H};17 u=p.89={3Q:["2p","4E","3d"],1t:{2p:/#((?:[\\w\\2J-\\2I\\-]|\\\\.)+)/,3h:/\\.((?:[\\w\\2J-\\2I\\-]|\\\\.)+)/,4E:/\\[1W=[\'"]*((?:[\\w\\2J-\\2I\\-]|\\\\.)+)[\'"]*\\]/,5h:/\\[\\s*((?:[\\w\\2J-\\2I\\-]|\\\\.)+)\\s*(?:(\\S?=)\\s*(?:([\'"])(.*?)\\3|(#?(?:[\\w\\2J-\\2I\\-]|\\\\.)*)|)|)\\s*\\]/,3d:/^((?:[\\w\\2J-\\2I\\*\\-]|\\\\.)+)/,3U:/:(6V|3u|3x|3k)-3n(?:\\(\\s*(3X|3W|(?:[+\\-]?\\d+|(?:[+\\-]?\\d*)?n\\s*(?:[+\\-]\\s*\\d+)?))\\s*\\))?/,3G:/:(3u|6M|6F|6E|3k|3x|3X|3W)(?:\\((\\d*)\\))?(?=[^\\-]|$)/,3b:/:((?:[\\w\\2J-\\2I\\-]|\\\\.)+)(?:\\(([\'"]?)((?:\\([^\\)]+\\)|[^\\(\\)]*)+)\\2\\))?/},3Z:{},50:{"3H":"1D","1e":"8e"},3N:{2z:15(H){12 H.1K("2z")},1E:15(H){12 H.1K("1E")}},2R:{"+":15(N,I){17 K=1s I==="2o",M=K&&!G.1q(I),O=K&&!M;14(M){I=I.1u()}1e(17 J=0,H=N.1d,L;J<H;J++){14((L=N[J])){1r((L=L.3z)&&L.1j!==1){}N[J]=O||L&&L.1H.1u()===I?L||1m:L===I}}14(O){p.1O(I,N,1f)}},">":15(N,I){17 M,L=1s I==="2o",J=0,H=N.1d;14(L&&!G.1q(I)){I=I.1u();1e(;J<H;J++){M=N[J];14(M){17 K=M.1p;N[J]=K.1H.1u()===I?K:1m}}}1b{1e(;J<H;J++){M=N[J];14(M){N[J]=L?M.1p:M.1p===I}}14(L){p.1O(I,N,1f)}}},"":15(K,I,M){17 L,J=y++,H=D;14(1s I==="2o"&&!G.1q(I)){I=I.1u();L=I;H=n}H("1p",I,J,K,L,M)},"~":15(K,I,M){17 L,J=y++,H=D;14(1s I==="2o"&&!G.1q(I)){I=I.1u();L=I;H=n}H("3z",I,J,K,L,M)}},1X:{2p:15(I,J,K){14(1s J.2E!=="1B"&&!K){17 H=J.2E(I[1]);12 H&&H.1p?[H]:[]}},4E:15(J,M){14(1s M.49!=="1B"){17 I=[],L=M.49(J[1]);1e(17 K=0,H=L.1d;K<H;K++){14(L[K].1K("1W")===J[1]){I.1o(L[K])}}12 I.1d===0?1g:I}},3d:15(H,I){14(1s I.29!=="1B"){12 I.29(H[1])}}},4G:{3h:15(K,I,J,H,N,O){K=" "+K[1].1A(z,"")+" ";14(O){12 K}1e(17 L=0,M;(M=I[L])!=1g;L++){14(M){14(N^(M.1D&&(" "+M.1D+" ").1A(/[\\t\\n\\r]/g," ").1U(K)>=0)){14(!J){H.1o(M)}}1b{14(J){I[L]=1m}}}}12 1m},2p:15(H){12 H[1].1A(z,"")},3d:15(I,H){12 I[1].1A(z,"").1u()},3U:15(H){14(H[1]==="3u"){14(!H[2]){p.2w(H[0])}H[2]=H[2].1A(/^\\+|\\s*/g,"");17 I=/(-?)(\\d*)(?:n([+\\-]?\\d*))?/.2m(H[2]==="3X"&&"2n"||H[2]==="3W"&&"2n+1"||!/\\D/.1q(H[2])&&"8f+"+H[2]||H[2]);H[2]=(I[1]+(I[2]||1))-0;H[3]=I[3]-0}1b{14(H[2]){p.2w(H[0])}}H[0]=y++;12 H},5h:15(L,I,J,H,M,N){17 K=L[1]=L[1].1A(z,"");14(!N&&u.50[K]){L[1]=u.50[K]}L[4]=(L[4]||L[5]||"").1A(z,"");14(L[2]==="~="){L[4]=" "+L[4]+" "}12 L},3b:15(L,I,J,H,M){14(L[1]==="5l"){14((x.2m(L[3])||"").1d>1||/^\\w/.1q(L[3])){L[3]=p(L[3],1g,1g,I)}1b{17 K=p.1O(L[3],I,J,1f^M);14(!J){H.1o.1Z(H,K)}12 1m}}1b{14(u.1t.3G.1q(L[0])||u.1t.3U.1q(L[0])){12 1f}}12 L},3G:15(H){H.4g(1f);12 H}},6N:{8d:15(H){12 H.4S===1m&&H.1E!=="4m"},4S:15(H){12 H.4S===1f},7m:15(H){12 H.7m===1f},6k:15(H){14(H.1p){H.1p.8c}12 H.6k===1f},4p:15(H){12 !!H.1F},3q:15(H){12 !H.1F},8a:15(J,I,H){12 !!p(H[3],J).1d},8b:15(H){12(/h\\d/i).1q(H.1H)},3J:15(J){17 H=J.1K("1E"),I=J.1E;12 J.1H.1u()==="21"&&"3J"===I&&(H===I||H===1g)},6Q:15(H){12 H.1H.1u()==="21"&&"6Q"===H.1E},6R:15(H){12 H.1H.1u()==="21"&&"6R"===H.1E},6U:15(H){12 H.1H.1u()==="21"&&"6U"===H.1E},5Z:15(H){12 H.1H.1u()==="21"&&"5Z"===H.1E},77:15(I){17 H=I.1H.1u();12(H==="21"||H==="2N")&&"77"===I.1E},7v:15(H){12 H.1H.1u()==="21"&&"7v"===H.1E},7f:15(I){17 H=I.1H.1u();12(H==="21"||H==="2N")&&"7f"===I.1E},2N:15(I){17 H=I.1H.1u();12 H==="21"&&"2N"===I.1E||H==="2N"},21:15(H){12(/21|2f|81|2N/i).1q(H.1H)},80:15(H){12 H===H.75.7Q}},6O:{3k:15(I,H){12 H===0},3x:15(J,I,H,K){12 I===K.1d-1},3X:15(I,H){12 H%2===0},3W:15(I,H){12 H%2===1},6E:15(J,I,H){12 I<H[3]-0},6F:15(J,I,H){12 I>H[3]-0},3u:15(J,I,H){12 H[3]-0===I},6M:15(J,I,H){12 H[3]-0===I}},1O:{3b:15(J,O,N,P){17 H=O[1],I=u.6N[H];14(I){12 I(J,N,O,P)}1b{14(H==="2u"){12(J.7R||J.7P||p.58([J])||"").1U(O[3])>=0}1b{14(H==="5l"){17 K=O[3];1e(17 M=0,L=K.1d;M<L;M++){14(K[M]===J){12 1m}}12 1f}1b{p.2w(H)}}}},3U:15(H,K){17 N=K[1],I=H;2W(N){1w"6V":1w"3k":1r((I=I.3z)){14(I.1j===1){12 1m}}14(N==="3k"){12 1f}I=H;1w"3x":1r((I=I.2v)){14(I.1j===1){12 1m}}12 1f;1w"3u":17 J=K[2],Q=K[3];14(J===1&&Q===0){12 1f}17 M=K[0],P=H.1p;14(P&&(P.3c!==M||!H.5a)){17 L=0;1e(I=P.1F;I;I=I.2v){14(I.1j===1){I.5a=++L}}P.3c=M}17 O=H.5a-Q;14(J===0){12 O===0}1b{12(O%J===0&&O/J>=0)}}},2p:15(I,H){12 I.1j===1&&I.1K("1y")===H},3d:15(I,H){12(H==="*"&&I.1j===1)||I.1H.1u()===H},3h:15(I,H){12(" "+(I.1D||I.1K("3H"))+" ").1U(H)>-1},5h:15(M,K){17 J=K[1],H=u.3N[J]?u.3N[J](M):M[J]!=1g?M[J]:M.1K(J),N=H+"",L=K[2],I=K[4];12 H==1g?L==="!=":L==="="?N===I:L==="*="?N.1U(I)>=0:L==="~="?(" "+N+" ").1U(I)>=0:!I?N&&H!==1m:L==="!="?N!==I:L==="^="?N.1U(I)===0:L==="$="?N.3Y(N.1d-I.1d)===I:L==="|="?N===I||N.3Y(0,I.1d+1)===I+"-":1m},3G:15(L,I,J,M){17 H=I[2],K=u.6O[H];14(K){12 K(L,J,I,M)}}}};17 t=u.1t.3G,o=15(I,H){12"\\\\"+(H-0+1)};1e(17 q 1G u.1t){u.1t[q]=1C 2a(u.1t[q].43+(/(?![^\\[]*\\])(?![^\\(]*\\))/.43));u.3Z[q]=1C 2a(/(^(?:.|\\r|\\n)*?)/.43+u.1t[q].43.1A(/\\\\(\\d+)/g,o))}17 v=15(I,H){I=1V.1i.24.1l(I,0);14(H){H.1o.1Z(H,I);12 H}12 I};2i{1V.1i.24.1l(1h.1S.2y,0)[0].1j}2j(E){v=15(L,K){17 J=0,I=K||[];14(B.1l(L)==="[1Y 1V]"){1V.1i.1o.1Z(I,L)}1b{14(1s L.1d==="47"){1e(17 H=L.1d;J<H;J++){I.1o(L[J])}}1b{1e(;L[J];J++){I.1o(L[J])}}}12 I}}17 A,w;14(1h.1S.30){A=15(I,H){14(I===H){s=1f;12 0}14(!I.30||!H.30){12 I.30?-1:1}12 I.30(H)&4?-1:1}}1b{A=15(P,O){14(P===O){s=1f;12 0}1b{14(P.41&&O.41){12 P.41-O.41}}17 M,I,J=[],H=[],L=P.1p,N=O.1p,Q=L;14(L===N){12 w(P,O)}1b{14(!L){12 -1}1b{14(!N){12 1}}}1r(Q){J.4g(Q);Q=Q.1p}Q=N;1r(Q){H.4g(Q);Q=Q.1p}M=J.1d;I=H.1d;1e(17 K=0;K<M&&K<I;K++){14(J[K]!==H[K]){12 w(J[K],H[K])}}12 K===M?w(P,H[K],-1):w(J[K],O,1)};w=15(I,H,J){14(I===H){12 J}17 K=I.2v;1r(K){14(K===H){12 -1}K=K.2v}12 1}}p.58=15(H){17 I="",K;1e(17 J=0;H[J];J++){K=H[J];14(K.1j===3||K.1j===4){I+=K.3F}1b{14(K.1j!==8){I+=p.58(K.2y)}}}12 I};(15(){17 I=1h.22("1L"),J="4M"+(1C 59()).7O(),H=1h.1S;I.1Q="<a 1W=\'"+J+"\'/>";H.2T(I,H.1F);14(1h.2E(J)){u.1X.2p=15(L,M,N){14(1s M.2E!=="1B"&&!N){17 K=M.2E(L[1]);12 K?K.1y===L[1]||1s K.3L!=="1B"&&K.3L("1y").3F===L[1]?[K]:1B:[]}};u.1O.2p=15(M,K){17 L=1s M.3L!=="1B"&&M.3L("1y");12 M.1j===1&&L&&L.3F===K}}H.2L(I);H=I=1g})();(15(){17 H=1h.22("1L");H.26(1h.7M(""));14(H.29("*").1d>0){u.1X.3d=15(I,M){17 L=M.29(I[1]);14(I[1]==="*"){17 K=[];1e(17 J=0;L[J];J++){14(L[J].1j===1){K.1o(L[J])}}L=K}12 L}}H.1Q="<a 2z=\'#\'></a>";14(H.1F&&1s H.1F.1K!=="1B"&&H.1F.1K("2z")!=="#"){u.3N.2z=15(I){12 I.1K("2z",2)}}H=1g})();14(1h.3w){(15(){17 H=p,K=1h.22("1L"),J="7N";K.1Q="<p 3H=\'6A\'></p>";14(K.3w&&K.3w(".6A").1d===0){12}p=15(V,M,Q,U){M=M||1h;14(!U&&!p.3E(M)){17 T=/^(\\w+$)|^\\.([\\w\\-]+$)|^#([\\w\\-]+$)/.2m(V);14(T&&(M.1j===1||M.1j===9)){14(T[1]){12 v(M.29(V),Q)}1b{14(T[2]&&u.1X.3h&&M.2X){12 v(M.2X(T[2]),Q)}}}14(M.1j===9){14(V==="1R"&&M.1R){12 v([M.1R],Q)}1b{14(T&&T[3]){17 P=M.2E(T[3]);14(P&&P.1p){14(P.1y===T[3]){12 v([P],Q)}}1b{12 v([],Q)}}}2i{12 v(M.3w(V),Q)}2j(R){}}1b{14(M.1j===1&&M.1H.1u()!=="1Y"){17 N=M,O=M.1K("1y"),L=O||J,X=M.1p,W=/^\\s*[+~]/.1q(V);14(!O){M.2A("1y",L)}1b{L=L.1A(/\'/g,"\\\\$&")}14(W&&X){M=M.1p}2i{14(!W||X){12 v(M.3w("[1y=\'"+L+"\'] "+V),Q)}}2j(S){}7S{14(!O){N.7T("1y")}}}}}12 H(V,M,Q,U)};1e(17 I 1G H){p[I]=H[I]}K=1g})()}(15(){17 H=1h.1S,J=H.4I||H.7Y||H.7Z||H.7X;14(J){17 L=!J.1l(1h.22("1L"),"1L"),I=1m;2i{J.1l(1h.1S,"[1q!=\'\']:7W")}2j(K){I=1f}p.4I=15(N,P){P=P.1A(/\\=\\s*([^\'"\\]]*)\\s*\\]/g,"=\'$1\']");14(!p.3E(N)){2i{14(I||!u.1t.3b.1q(P)&&!/!=/.1q(P)){17 M=J.1l(N,P);14(M||!L||N.1h&&N.1h.1j!==11){12 M}}}2j(O){}}12 p(P,1g,1g,[N]).1d>0}}})();(15(){17 H=1h.22("1L");H.1Q="<1L 3H=\'1q e\'></1L><1L 3H=\'1q\'></1L>";14(!H.2X||H.2X("e").1d===0){12}H.7U.1D="e";14(H.2X("e").1d===1){12}u.3Q.3t(1,0,"3h");u.1X.3h=15(I,J,K){14(1s J.2X!=="1B"&&!K){12 J.2X(I[1])}};H=1g})();15 n(I,N,M,Q,O,P){1e(17 K=0,J=Q.1d;K<J;K++){17 H=Q[K];14(H){17 L=1m;H=H[I];1r(H){14(H.3c===M){L=Q[H.3P];1z}14(H.1j===1&&!P){H.3c=M;H.3P=K}14(H.1H.1u()===N){L=H;1z}H=H[I]}Q[K]=L}}}15 D(I,N,M,Q,O,P){1e(17 K=0,J=Q.1d;K<J;K++){17 H=Q[K];14(H){17 L=1m;H=H[I];1r(H){14(H.3c===M){L=Q[H.3P];1z}14(H.1j===1){14(!P){H.3c=M;H.3P=K}14(1s N!=="2o"){14(H===N){L=1f;1z}}1b{14(p.1O(N,[H]).1d>0){L=H;1z}}}H=H[I]}Q[K]=L}}}14(1h.1S.2u){p.2u=15(I,H){12 I!==H&&(I.2u?I.2u(H):1f)}}1b{14(1h.1S.30){p.2u=15(I,H){12!!(I.30(H)&16)}}1b{p.2u=15(){12 1m}}}p.3E=15(H){17 I=(H?H.75||H:0).1S;12 I?I.1H!=="7V":1m};17 C=15(H,O){17 M,K=[],L="",J=O.1j?[O]:O;1r((M=u.1t.3b.2m(H))){L+=M[0];H=H.1A(u.1t.3b,"")}H=u.2R[H]?H+"*":H;1e(17 N=0,I=J.1d;N<I;N++){p(H,J[N],K)}12 p.1O(L,K)};1T.45=p;12})();g.4W=1a.45;g.4i=(15(p){15 q(w,x,t){t=t||0;17 s=g.4i.1t,v=w.1d,r=0,u;1e(u=0;u<v;u++){14(s(w[u],x)&&t==r++){12 g(w[u])}}}15 n(r,s,t){12 m.4h(p(r,s||1h),t,r)}15 o(s,r){12 p.70(r,[s]).1d==1}12{2f:n,1t:o,1X:q}})(45);1a.45=g.4W;63 g.4W})();(15(){17 s=g.7K=15(w){14(w==1g){12"1g"}14(1s w){14(w.34){12 w.34()}}14(w.1H){14(w.1j==1){12"3e"}14(w.1j==3){12(/\\S/).1q(w.3F)?"8g":"8h"}}1b{14(1s w.1d=="47"){14(w.8C){12"1n"}14("2H"1G w){12"8D"}}}12 1s w};17 m=g.8B=15(y,w){14(y==1g){12 1m}17 x=y.$2Z||y.2Z;1r(x){14(x===w){12 1f}x=x.4p}12 y 4a w};17 l=1a.2D;17 t=1f;1e(17 n 1G{1N:1}){t=1g}14(t){t=["48","35","8A","8y","8z","1N","2Z"]}l.1i.2V=15(x){17 w=1a;12 15(z,y){14(z==1g){12 1a}14(x||1s z!="2o"){1e(17 A 1G z){w.1l(1a,A,z[A])}14(t){1e(17 B=t.1d;B--;){A=t[B];14(z.48(A)){w.1l(1a,A,z[A])}}}}1b{w.1l(1a,z,y)}12 1a}};l.1i.20=15(w,x){1a[w]=x}.2V();l.1i.3g=15(w,x){1a.1i[w]=x}.2V();l.5s=15(w){12(s(w)=="15")?w:15(){12 w}};17 q=1V.1i.24;l.3g({5O:15(){1a.$4m=1f;12 1a},8E:15(){1a.$51=1f;12 1a}});17 o=g.7g=15(z,y){14(z){17 x=z.1u();17 w=15(A){12(s(A)==x)};o["8F"+z]=w;14(y!=1g){y.1i.34=(15(){12 x}).5O();y.1E=w}}14(y==1g){12 1g}y.20(1a);y.$2Z=o;y.1i.$2Z=y;12 y};17 k=2P.1i.1N;o.8K=15(w){12(w!=1g&&1s w.1d=="47"&&k.1l(w)!="[1Y 2D]")};17 u={};17 v=15(w){17 x=s(w.1i);12 u[x]||(u[x]=[])};17 r=15(x,B){14(B&&B.$4m){12}17 w=v(1a);1e(17 y=0;y<w.1d;y++){17 A=w[y];14(s(A)=="1E"){r.1l(A,x,B)}1b{A.1l(1a,x,B)}}17 z=1a.1i[x];14(z==1g||!z.$51){1a.1i[x]=B}14(1a[x]==1g&&s(B)=="15"){p.1l(1a,x,15(C){12 B.1Z(C,q.1l(1n,1))})}};17 p=15(w,y){14(y&&y.$4m){12}17 x=1a[w];14(x==1g||!x.$51){1a[w]=y}};o.3g({3g:r.2V(),3s:p.2V(),8L:15(w,x){r.1l(1a,w,1a.1i[x])}.2V(),8J:15(w){v(1a).1o(w);12 1a}});1C o("8I",o);2a.1i.34=15(){12"8G"};59.1i.34=15(){12"8H"}})();17 d=1a.6a=g.2e=(15(){17 n=(15(){1e(17 o 1G{1N:1}){14(o==="1N"){12 1m}}12 1f})();15 k(){}15 l(){17 r=1g,q=4t(1n);14(g.C.5o(q[0])){r=q.2d()}15 o(){1a.2r.1Z(1a,1n)}o.1i.34=15(){12"6a"};g.C.20(o,d.6d);o.4D=r;o.6f=[];14(r){k.1i=r.1i;o.1i=1C k;r.6f.1o(o)}1e(17 p=0,s=q.1d;p<s;p++){o.5j(q[p])}14(!o.1i.2r){o.1i.2r=15(){}}o.1i.2Z=o;12 o}15 m(u){17 q=1a.4D&&1a.4D.1i,p=g.C.5v(u);14(n){14(u.1N!=2P.1i.1N){p.1o("1N")}14(u.35!=2P.1i.35){p.1o("35")}}1e(17 o=0,r=p.1d;o<r;o++){17 t=p[o],s=u[t];14(q&&g.C.5o(s)&&s.5K()[0]=="8x"){17 v=s;s=(15(w){12 15(){12 q[w].1Z(1a,1n)}})(t).5G(v);s.35=v.35.4d(v);s.1N=v.1N.4d(v)}1a.1i[t]=s}12 1a}12{2b:l,6d:{5j:m}}})();(15(){g.C=g.O={};17 J=2P.1i.1N,L="8w",N="8m",Y="5V",G="5U",E="2K",X="2P",q="[1Y 2D]",l="[1Y 5V]",r="[1Y 5U]",m="[1Y 2K]",k="[1Y 1V]",U="[1Y 59]";15 o(aa,Z){17 ac=1s(aa)=="1Y"&&aa!=1g;14(ac&&V(Z)){1e(17 ab 1G 8n){12!!Z}}12 ac}15 V(Z){12 Z!==1B}15 M(Z){12 Z===1B}15 u(Z){12 o(Z)&&Z.1j===1&&!!Z.1H}15 n(Z){12 u(Z)||Z==2k||Z==1x}15 I(Z){12 o(Z)&&Z.2s===1f}15 D(Z){12 o(Z)&&Z.2l===1f}15 P(Z){12 o(Z)&&V(Z.1d)}15 W(Z){12 o(Z)&&V(Z.1d)&&Z.1d>0&&u(Z[0])}15 K(Z){12 n(Z)?Z:p(Z)?(1x.2E(Z)||1x.49(Z)[0]):1g}15 z(Z){12 A({},Z)}15 R(Z){12!!(Z&&Z.1j==1)}15 C(Z){12 J.1l(Z)===k}15 v(Z){12 J.1l(Z)===q}15 p(Z){12 J.1l(Z)===m}15 w(Z){12 Z&&Z.3C?Z.3C():g.S.57(Z)}15 T(Z){12 J.1l(Z)===r}15 B(Z){12 J.1l(Z)===U}15 x(Z){12 1s Z==="1B"}15 y(Z){12 Z 4a i}15 H(Z){14(Q(Z)!==X){3A 1C 8l()}17 aa=[];1e(17 ab 1G Z){14(Z.48(ab)){aa.1o(ab)}}12 aa}15 t(Z,ab){1e(17 aa 1G Z){14(48.1l(Z,aa)&&Z[aa]===ab){12 aa}}12 1g}15 Q(aa){2W(aa){1w 1g:12 L;1w(8k 0):12 N}17 Z=1s aa;2W(Z){1w"8i":12 Y;1w"47":12 G;1w"2o":12 E}12 X}15 s(Z){2i{14(x(Z)){12"1B"}14(Z===1g){12"1g"}12 Z.4L?Z.4L():2K(Z)}2j(aa){14(aa 4a 8j){12"2w"}3A aa}}15 A(Z,ab){1e(17 aa 1G ab){Z[aa]=ab[aa]}12 Z}15 S(Z){12 p(Z)?1C 2D("a","b","c","12 "+Z):Z}15 O(Z){12(1C g.H(Z)).4Y()}A(g.C,{8o:Q,76:o,4R:V,3O:M,8p:u,8u:n,2s:I,2l:D,8v:P,62:W,1c:K,20:A,3p:z,3C:w,4L:s,3B:R,4r:C,5Y:C,5H:y,5o:v,3o:v,55:p,4q:p,4n:T,8t:T,8s:B,5v:H,69:t,54:x,78:S,4Y:O})})();g.C.20(2D.1i,(15(){17 p=1V.1i.24;15 o(x,w){17 u=p.1l(1n,2);17 v=w;17 t=x;14(g.C.3o(w)){v=x;t=w}1b{14(g.C.4q(w)){v=x;t=v[w]}}12 15(){12 t.1Z(v,u.44([].24.1l(1n)))}}15 s(){17 t=1a.1N().1t(/^[\\s\\(]*15[^(]*\\(([^)]*)\\)/)[1].1A(/\\/\\/.*?[\\r\\n]|\\/\\*(?:.|[\\r\\n])*?\\*\\//g,"").1A(/\\s+/g,"").2U(",");12 t.1d==1&&!t[0]?[]:t}15 l(v){14(1n.1d<2&&g.C.54(1n[0])){12 1a}17 t=1a,u=p.1l(1n,1);12 15(){17 w=r(u,1n);12 t.1Z(v,w)}}15 n(u){17 t=1a;12 15(){17 v=k([t.4d(1a)],1n);12 u.1Z(1a,v)}}15 q(){14(!1n.1d){12 1a}17 t=1a,u=p.1l(1n,0);12 15(){17 v=r(u,1n);12 t.1Z(1a,v)}}15 k(w,t){17 v=w.1d,u=t.1d;1r(u--){w[v+u]=t[u]}12 w}15 r(u,t){u=p.1l(u,0);12 k(u,t)}15 m(v){17 t=1a,u=p.1l(1n,1);v=v*8q;12 1T.6G(15(){12 t.1Z(t,u)},v)}12{4x:o,5K:s,79:s,4d:l,5G:n,5A:q,8r:m}})());(15(){g.S=g.2K=g.2e.2b();g.S.20({57:15(l){12 l==1g?"":2K(l)},2S:15(l){12 2K(l).1A(/^\\s+|\\s+$/g,"")},8M:15(l,m){12 l.1U(m)>-1}});15 k(m,n){17 l=g.S.2S(m).1t(/([^?#]*)(#.*)?$/);14(!l){12{}}12 g.A.1k(l[1].2U(n||"&"),15(r,s,o){14((r=r.2U("="))[0]){17 p=7p(r.2d()),q=r.1d>1?r.2Y("="):r[0];14(q!=1B){q=7p(q)}14(p 1G r){14(!g.C.4r(r[p])){r[p]=[r[p]]}o[p].1o(q)}1b{o[p]=q}}},{})}g.O.20(g.S,{7z:k})})();17 c=(15(){15 s(x,w){17 v=0;2i{1a.4v(15(z){x.1l(w,z,v++)})}2j(y){14(y!={}){3A y}}12 1a}15 p(y,x,w){17 v=-y,z=[],A=1a.4b();14(y<1){12 A}1r((v+=y)<A.1d){z.1o(A.24(v,v+y))}12 z.5W(x,w)}15 q(x,w){x=x||7C.K;17 v=[];1a.1k(15(z,y){v.1o(x.1l(w,z,y))});12 v}15 k(x,w){17 v;1a.1k(15(z,y){14(x.1l(w,z,y)){v=z;3A $1z}});12 v}15 r(x,w){17 v=[];1a.1k(15(z,y){14(x.1l(w,z,y)){v.1o(z)}});12 v}15 o(v,x,w){1a.1k(15(z,y){v=x.1l(w,v,z,y)});12 v}15 m(w){17 v=$A(1n).24(1);12 1a.3y(15(x){12 x[w].1Z(x,v)})}15 n(w){17 v=[];1a.1k(15(x){v.1o(x[w])});12 v}15 u(x,w){17 v=[];1a.1k(15(z,y){14(!x.1l(w,z,y)){v.1o(z)}});12 v}15 l(){12 1a.3y()}15 t(){12 1a.4b().1d}12{1k:s,7F:p,5W:q,3y:q,7E:k,7D:r,2f:r,1O:r,5M:o,7H:m,7I:n,7J:u,7G:t,1X:k}})();17 i=g.H=d.2b(c,(15(){15 p(q){1a.4o=o(q)?q.5C():g.O.3p(q)}15 k(r){1e(17 q 1G 1a.4o){17 s=1a.4o[q],t=[q,s];t.2C=q;t.3S=s;r(t)}}15 o(q){12 q 4a i}15 m(){12 g.O.3p(1a.4o)}15 l(q,r){14(g.O.54(r)){12 q}12 q+"="+5I(g.S.57(r))}15 n(){12 1a.5M([],15(u,x){17 t=5I(x.2C),r=x.3S;14(r&&1s r=="1Y"){14(g.O.4r(r)){17 w=[];1e(17 s=0,q=r.1d,v;s<q;s++){v=r[s];w.1o(l(t,v))}12 u.44(w)}}1b{u.1o(l(t,r))}12 u}).2Y("&")}12{2r:p,4v:k,5H:o,5C:m,4Y:n}})());(15(){17 l=6i.7A.1u(),k=6i.7y.1u(),m=l.1t(/(3V|3D|6t|4j|1P)[\\s\\/:]([\\w\\d\\.]+)?.*?(4k|1P[\\s\\/:]([\\w\\d\\.]+)|$)/)||[1g,"6X",0],p=m[1]=="3D"&&1h.7B;17 o=g.2e.2b({1W:(m[1]=="1P")?m[3]:m[1],1P:p||6W((m[1]=="3V"&&m[4])?m[4]:m[2]),3j:{1W:l.1t(/6y(?:ad|6l|6j)/)?"56":(l.1t(/(?:6T|6L)/)||k.1t(/6K|2B|6J/)||["6D"])[0]},6q:{7a:!!(1h.5X),71:!!(1T.6g),67:!!(1h.5t),7t:!!(1T.5T)},6z:{}});g.B=g.4u=1C o();g.B=g.4u={1W:(m[1]=="1P")?m[3]:m[1],1P:p||6W((m[1]=="3V"&&m[4])?m[4]:m[2]),3j:{1W:l.1t(/6y(?:ad|6l|6j)/)?"56":(l.1t(/(?:6T|6L)/)||k.1t(/6K|2B|6J/)||["6D"])[0]},6q:{7a:!!(1h.5X),71:!!(1T.6g),67:!!(1h.5t),7t:!!(1T.5T)},6z:{}};g.B[g.B.1W]=1f;14(g.B.1P==5){g.B.1P=8}g.B[g.B.1W+6C(g.B.1P,10)]=1f;g.B.3j[g.B.3j.1W]=1f;14(g.B.3j.56){g.B.3j.9m=1f}g.B.2c={};17 n=15(r,q){g.B.2c.1W=r;g.B.2c[r+q]=1f;g.B.2c.1P=q};14(g.B.3D){g.B.2c.3v=1f;2W(g.B.1P){1w 6:n("3v",4);1z;1w 7:n("3v",5);1z;1w 8:n("3v",6);1z;1w 9:n("3v",7)}}14(g.B.6t){g.B.2c.3i=1f;14(g.B.1P>=3){n("3i",19)}1b{n("3i",18)}}14(g.B.4k||g.B.4j){g.B.2c.2M=1f;2W(g.B.1P){1w 2:n("2M",aQ);1z;1w 3:n("2M",aR);1z;1w 4:n("2M",aT)}}14(g.B.3V){g.B.2c.3K=1f;14(g.B.1P>=9.6){n("3K",b1)}1b{14(g.B.1P>=9.5){n("3K",b0)}1b{n("3K",aU)}}}14(g.B.1W=="6X"){2W((l.1t(/(?:2M|6w|3i)/)||[])[0]){1w"2M":1w"6w":g.B.2c.2M=1f;1z;1w"3i":g.B.2c.3i=1f}}})();(15(){g.A=g.1V=g.2e.2b();g.A.20({1k:15(o,q,p){14(g.C.4r(o)){17 p=p||[];1e(17 k=0,m=o.1d;k<m;k++){q(o[k],k,p)}}1b{14(g.C.4n(o)){17 p=p||[];1e(17 k=0,m=o;k<m;k++){q(k,p)}}1b{17 p=p||{};1e(17 n 1G o){q(o[n],n,p)}}}14(p){12 p}},3y:15(n,o){17 l=[],k=n.1d;14(o){o=g.C.78(o);1e(17 m=0;m<k;m++){l[m]=o(n[m],m)}}1b{1e(17 m=0;m<k;m++){l[m]=n[m]}}12 l}})})();(15(){17 l={};17 k=g.7h=g.E=1C g.7g("7h",15(m,q){14(!q){q=1T}m=m||q.2x;14(m.$7i){12 m}1a.2x=m;1a.$7i=1f;1a.2d=m.aY;1a.aV=m.aN;1a.at=m.as;1a.au=m.aO;17 s=1a.1E=m.1E;17 r=m.5w||m.ax;1r(r&&r.1j==3){r=r.1p}1a.5w=g(r).1c;14(s.1U("2C")==0){17 n=1a.4Z=(m.5J||m.aw);1a.2C=l[n]||g.O.69(m.ar,n);14(s=="aq"){14(n>64&&n<al){1a.2C="f"+(n-64)}1b{14(n>95&&n<ak){1a.2C=n-96}}}14(1a.2C==1g){1a.2C=2K.an(n).1u()}}1b{14(s=="5k"||s=="ap"||s=="ao"||s.1U("az")==0){17 t=q.1h;t=(!t.6h||t.6h=="8N")?t.3r:t.1R;1a.4f={x:m.5p,y:m.5c};1a.4e={x:(m.2Q!=1g)?m.2Q-q.aJ:m.5p,y:(m.2O!=1g)?m.2O-q.aI:m.5c};14(s=="aH"||s=="aG"){1a.aB=(m.5F)?m.5F/aA:-(m.aF||0)/3}1a.av=(m.5J==3||m.2N==2);14(s=="42"||s=="6p"){17 u=m.5x||m[(s=="42"?"5s":"aE")+"aD"];1r(u&&u.1j==3){u=u.1p}1a.5x=g(u).1c}}1b{14(s.1U("aC")==0||s.1U("aM")==0){1a.68=m.68;1a.65=m.65;1a.5Q=m.5Q;1a.6e=m.6e;17 p=1a.6c=m.6c;14(p&&p[0]){17 o=p[0];1a.4f={x:o.2Q,y:o.2O};1a.4e={x:o.5p,y:o.5c}}}}}14(!1a.4e){1a.4e={}}14(!1a.4f){1a.4f={}}});k.3g({5r:15(){14(1a.2x.5r){1a.2x.5r()}1b{1a.2x.aL=1f}12 1a},5n:15(){14(1a.2x.5n){1a.2x.5n()}1b{1a.2x.aK=1m}12 1a}});k.60=15(n,m){l[n]=m;12 1a};k.61=k.60.2V(1f);k.61({"38":"ay","40":"am","37":"4w","39":"b2","27":"aW","32":"aP","8":"aX","9":"ai","46":"63","13":"9i"})})();1a.9j=g.E;(15(){g.R=g.9k=g.2e.2b();g.R.20({7r:/^\\-?\\d+(?:\\.\\d+)?$/})})();(15(){17 k=1a.25=g.2e.2b({4p:15(l){12 1v.1k(15(o,n,p){14(!p){p=n}p=p||1;o=o.1c;1e(17 m=0;m<p;m++){o=o.1p}12 g(o)},1a,l)},4J:15(l){12 1v.1k(15(q,m){17 p=2D.1i.4x;14(g.C.4n(m)){17 o=m>0?"2v":"3z";m=9h.9g(m);17 q=q.1c;1r(q=q[o]){14(q.1j==1&&(--m==0)){12 g(q)}}12 1m}17 n=[];(g.C.3O(m)?"<>":m).1A(/./g,p(q,15(s){s=s==">"?"2v":"3z";17 r=1a.1c;1r(r=r[s]){r.1j==1&&n.4g(r)}}));14(!n[0][0]){n=[n]}12 4C.4h(n)},1a,l)},9c:15(){12 1a.4J(-1)},4H:15(){12 1a.4J(1)},3n:15(l){12 1v.1k(15(s,q,m){14(!m){m=q}14(m.1d==0){17 p=[];1e(17 o=s.1c.2y,n=o.1d,q=0;q<n;q++){o[q].1j==1&&p.1o(o[q])}12 4C.4h(p)}17 r=15(y,v){17 w=y.2y;17 u=w.1d;17 t=+v.2d();17 x;14(t<0){1e(x=u-1;x>=0;x--){14(w[x].1j==1&&++t==0){1z}}}1b{1e(x=0;x<u;x++){14(w[x].1j==1&&--t<0){1z}}}14(x<0||x>=u){12 1m}12 v.1d>0?r(w[x],v):g(w[x])};12 g(r(s.1c,g.A.3y(m)))},1a,1n)},3k:15(){12 1a.3n(0)},3x:15(){12 1a.3n(-1)},9d:15(l){14(1a.2s){14(g.C.55(l)){1a.1c.26(g.4T(l))}1b{14(g.C.3B(l.1c)){1a.1c.26(l.1c)}1b{1a.1c.26(l)}}}1b{14(1a.2l){1a.1k(15(o,m,n){14(g.C.55(n)){o.1c.26(g.4T(n))}1b{14(g.C.3B(n)){9e=n.4P(1f);o.1c.26(n)}}},l)}}12 1a},9f:15(){12 1v.1k(15(m,l){m.4p().1c.2L(m.1c)},1a)},3q:15(l){12 1v.1k(15(o){14(g.C.3O(l)){1r(o.1c.1F){o.1c.2L(o.1c.1F)}}1b{1e(17 m=o.1c.2y,n=m.1d-1;n>=0;n--){m[n].1j!=l&&o.1c.2L(m[n])}}12 o},1a)},9l:15(l){17 q=1a.1c.29(l);2i{12[].24.1l(q)}2j(p){17 n,o=0,m=[];1r(n=q[o]){m[o++]=n}12 m}},5y:15(o){3e=1a.1c;14(g.C.4q(o)||g.C.4n(o)||g.C.3B(o)||(o&&(o.4V||o.3C))){o={6H:o}}17 n,p,m,q;1e(17 l 1G o){n=o[l];14(g.C.3o(n)){4B}l=l.1u();p=g.4F[l];14(n&&n.4V){n=n.4V()}14(g.C.3B(n)){1a.5y(3e,n)}n=g.C.3C(n);m=((l=="6I"||l=="5f")?3e.1p:3e).6P.74();q=g.6x(m,n);14(l=="36"||l=="5f"){q.aj()}g.A.1k(q,p.5A(3e))}12 g(1a)},9t:15(){12 1v.1k(15(o){17 n=o.1c;17 m=o.1c.1F;1r(m){17 l=m.2v;14(m.1j==3&&!/\\S/.1q(m.3F)){n.2L(m)}m=l}12 g(o)},1a)}});k.3g({9u:15(){12 1v.1k(15(l){12 l.1c.1D},1a)},4X:15(l){12 1v.1k(15(n){17 m=n.1c.1D;12(m.1d>0&&(m==l||1C 2a("(^|\\\\s)"+l+"(\\\\s|$)").1q(m)))},1a)},5D:15(l){12 1v.1k(15(n,m){14(!n.4X(l)){n.1c.1D+=(n.1c.1D?" ":"")+l}12 g(n)},1a)},5B:15(l){12 1v.1k(15(n){17 m=g.S.2S;n.1c.1D=m(n.1c.1D.1A(1C 2a("(^|\\\\s+)"+l+"(\\\\s+|$)")," "));12 n},1a)},9v:15(l){12 1a[1a.4X(l)?"5B":"5D"](l)},1X:15(l){12 1v.1k(15(o,n,m){14(!m){m=n}17 p=4t([m]).2Y(", ");12 g.4i.2f(p,o.1c)},1a,l)},2q:15(l){12 1v.1k(15(o){14(g.C.4R(l)){14(o.1M=="2B"||o.1M=="1R"){17 n=g().2g("6u",15(){1h.1S.2q=l;1h.1R.2q=l});17 m=g().2g("7d",15(p){14(p.4Z==7c&&g.B.4j||g.B.4k||g.B.7e){1h.1S.2q=l;1h.1R.2q=l}})}1b{o.1c.2q=l}12 o}1b{14(o.1M=="2B"||o.1M=="1R"){12 1h.1S.2q||1h.1R.2q}1b{12 o.1c.2q}}},1a)},2t:15(l){12 1v.1k(15(o){14(g.C.4R(l)){14(o.1M=="2B"||o.1M=="1R"){17 n=g().2g("6u",15(){1h.1S.2t=l;1h.1R.2t=l});17 m=g().2g("7d",15(p){14(p.4Z==7c&&g.B.4j||g.B.4k||g.B.7e){1h.1S.2t=l;1h.1R.2t=l}})}1b{o.1c.2t=l}12 o}1b{14(o.1M=="2B"||o.1M=="1R"){12 1h.1S.2t||1h.1R.2t}1b{12 o.1c.2t}}},1a)},72:15(){12 1a.1J("4U",/^(9s|9r|a|21|b|u|i|9n|9o|9p)$/.1q(1a.1M)===1m?"9q":"9b")},73:15(){12 1a.1J("4U","6Y")},9a:15(){1a.1J("4U")=="6Y"?1a.72():1a.73()},1J:15(m,l){12 1v.1k(15(r,o){17 n=g.S.2S;14(g.C.76(m)){1e(17 p 1G m){r.1J(p,m[p])}12 g(r.1c)}14(m.1U(":")>-1){g.A.1k(m.1A(/;$/,"").2U(";"),2D.1i.4x(15(u){17 t=u.2U(":");r.1J(n(t.2d()),n(t.2Y(":")))},r));12 g(r.1c)}14(/\\-\\w/.1q(m)){m=m.1A(/\\-(\\w)/,15(u,t){12 t.74()})}14(o.1d==1){14(r.1c==1h||r.1c==1T){r.1c=1h.1R}12 r.1c.23[m]||(1x.7j?1x.7j.8U(r.1c,1g)[m]:r.1c.7s?r.1c.7s[m]:"")}2i{14(l=="8V(53,53,53)"){l="8W";r.1c.23[m]=l}r.1c.23[m]=l}2j(q){}12 r},1a,1n)},8T:15(l){12 1a.1J(l)},8S:15(m,l){12 1a.1J(m,l)},31:15(l){12 1v.1k(15(o,m,p){14(!p){p=m}14(p){14(o.1c.23.31!=1B){12 o.1J("31",p)}12 o.1J("1O","7q(31="+p*7w+")")}14(o.1c.23.31!=1B){12 g.R.7r.1q(o.1J("31"))?+2a.6n:1}12/7q\\(31=(\\d+)\\)/.1q(o.1J("1O"))?2a.$1/7w:1},1a,l)},3r:15(l){14(g.C.3O(l)){14(1a.2s){12 1a.1c.1Q}1b{14(1a.2l){12 g.A.1k(1a.2G[0],15(o,n,m){m[n]=o.1Q})}}}12 1v.1k(15(o){2W(o.1M){1w"2f":14(4u.3D){o.3q();17 o=1x.22("1L");o.1Q="<2f>"+l+"</2f>";17 m=o.1F.2y;1r(m.1d>0){o.1c.26(m[0])}}1b{o.1c.1Q=l}14(1n.1d==2){o.1c.3S=1n[1]}1z;1w"28":o.1X("2h").2H(0).3r(l);1z;1w"8O":1w"8P":1w"2h":o.3q();17 p=1x.22("1L");p.1Q="<28><2h>"+l+"</2h></28>";17 n=p.1F.8R[0].8X;1r(n.1d>0){o.1c.26(n[0])}1z;8Y:o.1c.1Q=l;1z}12 o},1a)},4Q:15(m,l){12 1v.1k(15(t,s,p){14(!p){p=s}17 v=p.1d;14(v==2){14(m=="23"){t.1c.23.6s=l}1b{14(t.1c[m]!=1B){t.1c[m]=l}1b{t.1c.2A(m,l)}}12 t}14(v==1){14(1s m=="1Y"){1e(17 s 1G m){t.4Q(s,m[s])}12 t}14(m.1U("=")>-1){F.1k(F.2S(m).2U(/\\s+/),F.99(15(o){17 n=o.2U("=");t.4Q(F.2S(n[0]),/["\'](.+?)["\']/.1q(n[1])?2a.$1:F.2S(n[1]))},t));12 t}14(m=="23"){12 t.1c.23.6s}1b{14(m=="2z"&&t.1M=="a"){12 t.1c.1K(m,2)}1b{14(m=="3R"){12 t.1c.1K(m,2)}1b{14(t.1c[m]!=1B){12 t.1c[m]}}}}12 t.1c.1K(m)}14(v==0){17 u={};1e(17 r=t.1c.93,q=r.1d,s=0;s<q;s++){u[r[s].1W]=r[s].3S}12 u}},1a,1n)},2g:15(n,l,m){12 1v.1k(15(r){n=n.1A(/^6o/,"");17 p=r;17 q=q||r;17 o=15(s){14(!s){s=1T.e}l.1l(q,1C g.E(s),p)};14(r.1c.4y){r.1c.4y(n,o,1m)}1b{14(r.1c.2F){14(r.1M=="2B"){r.1c.2F("5b"+n,o)}1b{r.1c.2F("5b"+n,o)}}}12 2a.6n=="6o"?o:r},1a)},91:15(m,l){12 1v.1k(15(n){14(2k.4z){n.1c.4z(m,l,1m)}1b{14(2k.2F){n.1c.5R("5b"+m,l)}}12 n},1a)},5k:15(l,m){12 1a.2g("5k",l,m)},92:15(l,m){14(1n.1d==1){1a.2g("42",l)}1b{1a.2g("42",l);1a.2g("6p",m)}12 1a}})})();(15(){g.P=25.1i;g.P.2e=15(){};g.P.2e.20({3s:15(k){25.5j(k)}})})();g.P.2e.3s({1I:15(k,l){14(1n.1d==2){1a.1c.23[k]=l+"1I";12 1a}12 6C(1a.1J(k),10)||0},5d:15(k){14(1n.1d==1){12 1a.1I("5d",k)}12 1a.1I("5d")||1a.1c.9w-1a.1I("9x")-1a.1I("a0")-1a.1I("a1")-1a.1I("a2")},5g:15(k){14(1n.1d==1){12 1a.1I("5g",k)}12 1a.1I("5g")||1a.1c.9Z-1a.1I("9Y")-1a.1I("9U")-1a.1I("9V")-1a.1I("9W")},2Q:15(l){17 k;l?k=l:k=1a.1c;12 k.3a?k.5m+25.1i.2Q(k.3a):k.5m},2O:15(l){17 k;l?k=l:k=1a.1c;12 k.3a?k.5q+25.1i.2O(k.3a):k.5q},9X:15(l){17 k;l?k=l:k=1a.1c;12 k.1p==k.3a?k.5m:25.1i.2Q(k)-25.1i.2Q(k.1p)},a4:15(l){17 k;l?k=l:k=1a.1c;12 k.1p==k.3a?k.5q:25.1i.2O(k)-25.1i.2O(k.1p)},af:15(k){14(1n.1d==1){1a.1c.23.4w=k+"1I"}12 1a.1I("4w")},ag:15(k){14(1n.1d==1){1a.1c.23.36=k+"1I"}12 1a.1I("36")}});g.P.3p=15(k){15 m(n,p){1e(17 o 1G p){n[o]=p[o]}12 n}14(!!k){17 l=m({},1a);12 g(l.1c.4P(1f))}1b{12 1a}};g.P.2e.3s({a5:15(k){12 1v.1k(15(n){17 o=n.3p(1f);17 m=1h.22("1L");m.1Q=k;17 l=m.4P(1f);1r(l.1F&&l.1F.1j==1){l=l.1F}l.26(o.1c);n.1c.1p.2T(l);n.1c.1p.2L(n.1c)},1a)},a7:15(l,k){12 1v.1k(15(o){14(k){o=o.3n(k)}17 n=o.3r();o.3q();o.3r(l);17 m=o.1c;1r(m.1F){m=m.1F}m.1Q=n},1a)}});1v.1k=15(n,m,k){17 l=n.79();14(m.2s){14(l[l.1d-1]=="r"){n(m,k);12 g(m.1c)}1b{12 n(m,k)}}1b{14(m.2l){14(l[l.1d-1]=="r"){m.1k(n,k);12 4C(m.5E)}1b{12 m.4v(n,k)}}}};g.4F={6I:15(k,l){k.1p.2T(l,k)},36:15(k,l){k.2T(l,k.1F)},6H:15(k,l){k.26(l)},5f:15(k,l){k.1p.2T(l,k.2v)},7l:{9S:["<28>","</28>",1],9E:["<28><2h>","</2h></28>",2],9F:["<28><2h><4A>","</4A></2h></28>",3],9G:["<28><2h><4A><6r>","</6r></4A></2h></28>",4],9C:["<2f>","</2f>",1]}};g.6x=15(o,n,p){17 q=1h.22("1L");17 m=g.4F.7l[o];17 k=1m;14(m){k=1f}1b{14(p){k=1f;m=["","",0]}}14(k){q.1Q="&9y;"+m[0]+n+m[1];q.2L(q.1F);1e(17 l=m[2];l--;){q=q.1F}}1b{q.1Q=n}12 4t(q.2y)};g.4T=15(o){17 l=[],m=1x.22("1L"),s=1x.9z();m.1Q=o;17 n=m.2y;1e(17 q=0,t=n.1d;q<t;q++){l[l.1d]=n[q]}1e(17 p=0,u=l.1d;p<u;p++){s.26(l[p])}12 s};g.3s=15(k,l){14(!l){g.O.20(g,k)}1b{12 g.O.20(k,l)}};g.66=15(k){14(g.C.3o(k)){12 j(k)}k.2r&&j(2D.1i.4x(k,k.2r));12 k};17 j=15(){17 n=1m,o=[],p,k=15(q){14(n){q()}1b{o.1o(q)}},l=15(){1e(17 r=0,q=o.1d;r<q;r++){o[r]()}o=1g},m=15(q){14(n){12}n=1f;l();14(1x.4z){1x.4z("5S",m,1m)}1b{14(1x.2F){1x.5R("4l",m);14(2k==2k.36){9H(p);p=1g}}}};14(1x.4y){1x.4y("5S",m,1m)}1b{14(1x.2F){1x.2F("4l",15(){14((/7o|7n/).1q(1x.3M)){m()}});14(2k==2k.36){p=9I(15(){2i{n||1x.9P.9Q("4w")}2j(q){12}m()},5)}}}12 k}();17 f=1a.9R=d.2b(25,{2r:15(k){1a.2s=1f;1a.1c=k;1a.5L=1f;1a.1M=1a.1c==2k?"2B":1a.1c==1x?"9N":1a.1c.6P.1u()},5P:"1.4.1",9J:"9K",2H:15(k){12 1a},7b:15(k){12 1a.1c},5N:15(){14(1a.5P){1T.K=e}12 52},1k:15(k){k(1a,0);12 1a}});17 h=d.2b(f,{2r:15(k){14(h.5z){12 1m}14(h.4K){1a.5u=k;5i.5e(\'9L: 9M "\'+1a.5u+\'" 5l 2g\')}}});g.9O=15(k){h.5z=k};g.4K=15(k){h.4K=k;14(g.4u.3D){1T.5i=15(){};5i.5e=5e=15(l){9B(l)}}};17 b=1a.9A=d.2b(25,{2r:15(k,l){1a.2G=k;1a.3m=k[0].1d;1a.1d=k[0].1d;1a.2l=1f;1a.5L=1f;1a.5E=l||"1g";k[1]=k[1]||"1g";12 1a},2H:15(k){14(k<0){k+=1a.3m}12 g(1a.2G[0][k])},7b:15(k){14(k<0){k+=1a.3m}12 1a.2G[0][k]},1k:15(p,m){17 n=1a,l=1a.3m;1e(17 k=0;k<l;k++){14(1a.2G[0][k]==1B){4B}1b{p(g(n.2H(k)),k,m)}}12 1a},4N:15(k){1e(17 m=0;m<k.1d;m++){1e(17 l=m+1;l<k.1d;l++){14(k[l]===k[m]){k.3t(l,1);l--}}}12 k},4v:15(t,u){17 k=1a,p=1a.3m,r=[],n=[],l=[],v=[];1e(17 s=0;s<p;s++){r[s]=t(g(k.2H(s)),s,u);14(r[s].2s){l[s]=r[s].1c}1b{14(r[s].2l){l[s]=r[s].2G[0]}}}14(r[0].2s){1e(17 m=0,p=r.1d;m<p;m++){17 q=r[m].1c;14(!q.1y&&!q.1D){v[m]=r[m].1M}1b{14(q.1y&&!q.1D){v[m]="#"+q.1y}1b{14(q.1D&&!q.1y){v[m]="."+q.1D}1b{14(q.1y&&q.1D){v[m]="."+q.1y}}}}}v=k.4N(v).2Y(", ")}1b{14(r[0].2l){1e(17 m=0,p=r.1d;m<p;m++){17 q=r[m].2G[0];14(!q.1y&&!q.1D){v[m]=r[m].1M}1b{14(q.1y&&!q.1D){v[m]="#"+q.1y}1b{14(q.1D&&!q.1y){v[m]="."+q.1D}1b{14(q.1y&&q.1D){v[m]="."+q.1y}}}}}v=k.4N(v).2Y(", ")}}n.1o(l);12 1C b(n,v)},1N:15(){12"9D"}})})();(15(){17 b=1h,i={},e={},h=15(k){12 k.2Z===1V},g={7u:["9T://a8.a6.a9/ae/1v/1v.ah.1.3.3.4O"],3I:{}},j=b.29("4M")[0],d=15(l,p,r,k,o){14(!l){12}14(i[l]){e[l]=1m;14(k){k(l,o)}12}14(e[l]){6G(15(){d(l,p,r,k,o)},1);12}e[l]=1f;17 q,m=p||l.1u().a3(l.90(".")+1);14(m==="4O"){q=b.22("4M");q.2A("1E","3J/8Z");q.2A("3R",l);q.2A("94",1f)}1b{14(m==="1J"){q=b.22("98");q.2A("1E","3J/1J");q.2A("97","8Q");q.2A("2z",l);i[l]=1f}}14(r){q.6b=r}14(m==="1J"){j.1p.2T(q,j);14(k){k(l,o)}12}q.7k=q.4l=15(){14(!1a.3M||1a.3M==="7o"||1a.3M==="7n"){i[1a.1K("3R")]=1f;14(k){k(1a.1K("3R"),o)}q.7k=q.4l=1g}};j.1p.2T(q,j)},c=15(r){14(!r||!h(r)){12}17 n=0,q,l=[],p=g.3I,k=[],m={},o=15(v){17 u=0,s,t;14(m[v]){12 k}m[v]=1f;14(p[v].4c){t=p[v].4c;1e(;s=t[u++];){14(p[s]){o(s);k.1o(s)}1b{k.1o(s)}}12 k}12 k};1e(;q=r[n++];){14(p[q]&&p[q].4c&&p[q].4c[0]){k=[];m={};l=l.44(o(q))}l.1o(q)}12 l},f=15(k){14(!k||!h(k)){12}1a.6Z=k;1a.3T=1g};f.1i={aZ:10,3l:15(){17 k=1a;1a.3T=1a.4H();14(!1a.3T){1a.aS=1f;12}1a.6v()},6v:15(){17 m=1a,k,l=1a.3T;14(1s l==="15"){l();1a.3l();12}1b{14(1s l==="2o"){14(g.3I[l]){k=g.3I[l];d(k.7x,k.1E,k.6b,15(n){m.3l()},m)}1b{14(/\\.4O|\\.1J/i.1q(l)){d(l,"","",15(n,p){p.3l()},m)}1b{1a.3l()}}}}},4H:15(){12 1a.6Z.2d()}};1a.6m=15(){17 l=1V.1i.24.1l(1n,1),k;14(1n[0]){k=1C f(c(g.7u.44(l)))}1b{k=1C f(c(l))}k.3l()};1a.6m.7L=15(l,k){14(!l||!k||!k.7x){12}g.3I[l]=k}})();',62,685,'||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||return||if|function||var|||this|else|node|length|for|true|null|document|prototype|nodeType|each|call|false|arguments|push|parentNode|test|while|typeof|match|toLowerCase|Koala|case|_doc|id|break|replace|undefined|new|className|type|firstChild|in|nodeName|px|css|getAttribute|div|tag|toString|filter|version|innerHTML|body|documentElement|window|indexOf|Array|name|find|object|apply|Kextend|input|createElement|style|slice|Kwdom|appendChild||table|getElementsByTagName|RegExp|create|Engine|shift|fn|select|bind|tbody|try|catch|_win|isKdoms|exec||string|ID|scrollLeft|init|isKdom|scrollTop|contains|nextSibling|error|event|childNodes|href|setAttribute|win|key|Function|getElementById|attachEvent|data|item|uFFFF|u00c0|String|removeChild|webkit|button|pageY|Object|pageX|relative|trim|insertBefore|split|KoverloadSetter|switch|getElementsByClassName|join|constructor|compareDocumentPosition|opacity||set|Kfamily|valueOf|top||||offsetParent|PSEUDO|sizcache|TAG|element|expr|Kimplement|CLASS|gecko|Platform|first|start|len|child|isfun|clone|empty|html|extend|splice|nth|trident|querySelectorAll|last|map|previousSibling|throw|isElement|toHTML|ie|isXML|nodeValue|POS|class|mods|text|presto|getAttributeNode|readyState|attrHandle|unset|sizset|order|src|value|current|CHILD|opera|odd|even|substr|leftMatch||sourceIndex|mouseover|source|concat|Sizzle||number|hasOwnProperty|getElementsByName|instanceof|toArray|requires|Kbind|client|page|unshift|doms|Selector|chrome|safari|onreadystatechange|hidden|isNumber|_object|parent|isstr|isArray|pop|KA|Browser|_each|left|Kproxy|addEventListener|removeEventListener|tr|continue|KK|superclass|NAME|_insertionTranslations|preFilter|next|matchesSelector|sibling|debug|inspect|script|_check|js|cloneNode|attr|isset|disabled|fragment|display|toElement|_original_property|hasClass|toQueryString|code|attrMap|protected|_K|NaN|isUndefined|isString|ios|interpret|getText|Date|nodeIndex|on|clientY|width|log|after|height|ATTR|console|addMethods|click|not|offsetLeft|preventDefault|isFunction|clientX|offsetTop|stopPropagation|from|querySelector|errorEle|keys|target|relatedTarget|insert|comp|Kcurry|removeClass|toObject|addClass|exp|wheelDelta|Kwrap|isHash|encodeURIComponent|which|KargumentNames|exist|inject|noConflict|Khide|Version|targetTouches|detachEvent|DOMContentLoaded|JSON|Number|Boolean|collect|evaluate|isarr|password|defineKey|defineKeys|isDoms|delete|111|scale|ready|query|rotation|keyOf|KClass|charset|touches|Methods|changedTouches|subclasses|runtime|compatMode|navigator|hone|selected|od|Qfast|lastMatch|_|mouseout|Features|td|cssText|firefox|_load|run|khtml|_getContentFromAnonymousElement|ip|Plugins|TEST|uniqueSort|parseInt|other|lt|gt|setTimeout|bottom|before|linux|mac|android|eq|filters|setFilters|tagName|radio|checkbox|sort|webos|file|only|parseFloat|unknown|none|queue|matches|air|show|hide|toUpperCase|ownerDocument|isObj|submit|lambda|KargNames|xpath|nitem|116|_keydown|Opera|reset|Type|DOMEvent|extended|defaultView|onload|tags|checked|complete|loaded|decodeURIComponent|alpha|num|currentStyle|json|core_lib|image|100|path|platform|toQueryParams|userAgent|documentMode|Prototype|findAll|detect|eachSlice|size|invoke|pluck|reject|typeOf|add|createComment|__sizzle__|getTime|innerText|activeElement|textContent|finally|removeAttribute|lastChild|HTML|sizzle|msMatchesSelector|mozMatchesSelector|webkitMatchesSelector|focus|textarea|Syntax|unrecognized|do|Kdom|_head|head|expression|selectors|has|header|selectedIndex|enabled|htmlFor|0n|textnode|whitespace|boolean|RangeError|void|TypeError|Undefined|obj|_Type|isnode|1000|Kdelay|isDate|isnum|isDom|iscollect|Null|Ksuper|propertyIsEnumerable|toLocaleString|isPrototypeOf|instanceOf|callee|collection|Kprotect|is|regexp|date|KType|mirror|isEnumerable|alias|include|CSS1Compat|thead|tfoot|stylesheet|tBodies|setStyle|getStyle|getComputedStyle|rgb|transparent|rows|default|javascript|lastIndexOf|unbind|hover|attributes|async|||rel|link|proxy|toggle|inline|prev|append|el|remove|abs|Math|enter|KEvent|Regexp|getByTagName|ipod|label|strong|em|block|img|span|cleanWhitespace|classNames|toggleClass|offsetWidth|paddingLeft|nbsp|createDocumentFragment|Knative|alert|SELECT|Kdoms|TBODY|TR|TD|clearInterval|setInterval|author|boqiu|Error|the|doc|compatible|docElement|doScroll|ClassK|TABLE|http|paddingBottom|borderTopWidth|borderBottomWidth|parentX|paddingTop|offsetHeight|paddingRight|borderLeftWidth|borderRightWidth|substring|parentY|parentWrap|gtimg|childWrap|mat1|com|||||joke|Left|Top|min|tab|reverse|106|124|down|fromCharCode|contextmenu|dblclick|keydown|Keys|altKey|alt|meta|rightClick|keyCode|srcElement|up|mouse|120|wheel|touch|Element|to|detail|mousewheel|DOMMouseScroll|pageYOffset|pageXOffset|returnValue|cancelBubble|gesture|ctrlKey|metaKey|space|419|420|end|525|925|control|esc|backspace|shiftKey|_interval|950|960|right'.split('|'),0,{}))/*  |xGv00|b731eb99b3f4d74b49f8e07e57cf4b71 */
\ No newline at end of file
diff --git a/public/javascripts/scrollPic.js b/public/javascripts/scrollPic.js
new file mode 100644
index 000000000..c5301b23d
--- /dev/null
+++ b/public/javascripts/scrollPic.js
@@ -0,0 +1,292 @@
+var sina = {
+	$ : function (objName) {
+		if (document.getElementById) {
+			return eval('document.getElementById("' + objName + '")')
+		} else {
+			return eval('document.all.' + objName)
+		}
+	},
+	isIE : navigator.appVersion.indexOf("MSIE") != -1 ? true : false,
+	addEvent : function (l, i, I) {
+		if (l.attachEvent) {
+			l.attachEvent("on" + i, I)
+		} else {
+			l.addEventListener(i, I, false)
+		}
+	},
+	delEvent : function (l, i, I) {
+		if (l.detachEvent) {
+			l.detachEvent("on" + i, I)
+		} else {
+			l.removeEventListener(i, I, false)
+		}
+	},
+	readCookie : function (O) {
+		var o = "",
+		l = O + "=";
+		if (document.cookie.length > 0) {
+			var i = document.cookie.indexOf(l);
+			if (i != -1) {
+				i += l.length;
+				var I = document.cookie.indexOf(";", i);
+				if (I == -1)
+					I = document.cookie.length;
+				o = unescape(document.cookie.substring(i, I))
+			}
+		};
+		return o
+	},
+	writeCookie : function (i, l, o, c) {
+		var O = "",
+		I = "";
+		if (o != null) {
+			O = new Date((new Date).getTime() + o * 3600000);
+			O = "; expires=" + O.toGMTString()
+		};
+		if (c != null) {
+			I = ";domain=" + c
+		};
+		document.cookie = i + "=" + escape(l) + O + I
+	},
+	readStyle : function (I, l) {
+		if (I.style[l]) {
+			return I.style[l]
+		} else if (I.currentStyle) {
+			return I.currentStyle[l]
+		} else if (document.defaultView && document.defaultView.getComputedStyle) {
+			var i = document.defaultView.getComputedStyle(I, null);
+			return i.getPropertyValue(l)
+		} else {
+			return null
+		}
+	}
+};
+
+//滚动图片构造函数
+//UI&UE Dept. mengjia
+//080623
+function ScrollPic(scrollContId, arrLeftId, arrRightId, dotListId) {
+	this.scrollContId = scrollContId;
+	this.arrLeftId = arrLeftId;
+	this.arrRightId = arrRightId;
+	this.dotListId = dotListId;
+	this.dotClassName = "dotItem";
+	this.dotOnClassName = "dotItemOn";
+	this.dotObjArr = [];
+	this.pageWidth = 0;
+	this.frameWidth = 0;
+	this.speed = 10;
+	this.space = 10;
+	this.pageIndex = 0;
+	this.autoPlay = true;
+	this.autoPlayTime = 5;
+	var _autoTimeObj,
+	_scrollTimeObj,
+	_state = "ready";
+	this.stripDiv = document.createElement("DIV");
+	this.listDiv01 = document.createElement("DIV");
+	this.listDiv02 = document.createElement("DIV");
+	if (!ScrollPic.childs) {
+		ScrollPic.childs = []
+	};
+	this.ID = ScrollPic.childs.length;
+	ScrollPic.childs.push(this);
+	this.initialize = function () {
+		if (!this.scrollContId) {
+			throw new Error("必须指定scrollContId.");
+			return
+		};
+		this.scrollContDiv = sina.$(this.scrollContId);
+		if (!this.scrollContDiv) {
+			throw new Error("scrollContId不是正确的对象.(scrollContId = \"" + this.scrollContId + "\")");
+			return
+		};
+		this.scrollContDiv.style.width = this.frameWidth + "px";
+		this.scrollContDiv.style.overflow = "hidden";
+		this.listDiv01.innerHTML = this.listDiv02.innerHTML = this.scrollContDiv.innerHTML;
+		this.scrollContDiv.innerHTML = "";
+		this.scrollContDiv.appendChild(this.stripDiv);
+		this.stripDiv.appendChild(this.listDiv01);
+		this.stripDiv.appendChild(this.listDiv02);
+		this.stripDiv.style.overflow = "hidden";
+		this.stripDiv.style.zoom = "1";
+		this.stripDiv.style.width = "32766px";
+		if(-[1,]){
+			this.listDiv01.style.cssFloat = "left";
+			this.listDiv02.style.cssFloat = "left";
+		}else{
+			this.listDiv01.style.styleFloat = "left";
+			this.listDiv02.style.styleFloat = "left";
+		}
+		sina.addEvent(this.scrollContDiv, "mouseover", Function("ScrollPic.childs[" + this.ID + "].stop()"));
+		sina.addEvent(this.scrollContDiv, "mouseout", Function("ScrollPic.childs[" + this.ID + "].play()"));
+		if (this.arrLeftId) {
+			this.arrLeftObj = sina.$(this.arrLeftId);
+			if (this.arrLeftObj) {
+				sina.addEvent(this.arrLeftObj, "mousedown", Function("ScrollPic.childs[" + this.ID + "].rightMouseDown()"));
+				sina.addEvent(this.arrLeftObj, "mouseup", Function("ScrollPic.childs[" + this.ID + "].rightEnd()"));
+				sina.addEvent(this.arrLeftObj, "mouseout", Function("ScrollPic.childs[" + this.ID + "].rightEnd()"))
+			}
+		};
+		if (this.arrRightId) {
+			this.arrRightObj = sina.$(this.arrRightId);
+			if (this.arrRightObj) {
+				sina.addEvent(this.arrRightObj, "mousedown", Function("ScrollPic.childs[" + this.ID + "].leftMouseDown()"));
+				sina.addEvent(this.arrRightObj, "mouseup", Function("ScrollPic.childs[" + this.ID + "].leftEnd()"));
+				sina.addEvent(this.arrRightObj, "mouseout", Function("ScrollPic.childs[" + this.ID + "].leftEnd()"))
+			}
+		};
+		if (this.dotListId) {
+			this.dotListObj = sina.$(this.dotListId);
+			if (this.dotListObj) {
+				var pages = Math.round(this.listDiv01.offsetWidth / this.frameWidth + 0.4),
+				i,
+				tempObj;
+				for (i = 0; i < pages; i++) {
+					tempObj = document.createElement("span");
+					this.dotListObj.appendChild(tempObj);
+					this.dotObjArr.push(tempObj);
+					if (i == this.pageIndex) {
+						tempObj.className = this.dotClassName
+					} else {
+						tempObj.className = this.dotOnClassName
+					};
+					tempObj.title = "第" + (i + 1) + "页";
+					sina.addEvent(tempObj, "click", Function("ScrollPic.childs[" + this.ID + "].pageTo(" + i + ")"))
+				}
+			}
+		};
+		if (this.autoPlay) {
+			this.play()
+		}
+	};
+	this.leftMouseDown = function () {
+		if (_state != "ready") {
+			return
+		};
+		_state = "floating";
+		_scrollTimeObj = setInterval("ScrollPic.childs[" + this.ID + "].moveLeft()", this.speed)
+	};
+	this.rightMouseDown = function () {
+		if (_state != "ready") {
+			return
+		};
+		_state = "floating";
+		_scrollTimeObj = setInterval("ScrollPic.childs[" + this.ID + "].moveRight()", this.speed)
+	};
+	this.moveLeft = function () {
+		if (this.scrollContDiv.scrollLeft + this.space >= this.listDiv01.scrollWidth) {
+			this.scrollContDiv.scrollLeft = this.scrollContDiv.scrollLeft + this.space - this.listDiv01.scrollWidth
+		} else {
+			this.scrollContDiv.scrollLeft += this.space
+		};
+		this.accountPageIndex()
+	};
+	this.moveRight = function () {
+		if (this.scrollContDiv.scrollLeft - this.space <= 0) {
+			this.scrollContDiv.scrollLeft = this.listDiv01.scrollWidth + this.scrollContDiv.scrollLeft - this.space
+		} else {
+			this.scrollContDiv.scrollLeft -= this.space
+		};
+		this.accountPageIndex()
+	};
+	this.leftEnd = function () {
+		if (_state != "floating") {
+			return
+		};
+		_state = "stoping";
+		clearInterval(_scrollTimeObj);
+		var fill = this.pageWidth - this.scrollContDiv.scrollLeft % this.pageWidth;
+		this.move(fill)
+	};
+	this.rightEnd = function () {
+		if (_state != "floating") {
+			return
+		};
+		_state = "stoping";
+		clearInterval(_scrollTimeObj);
+		var fill = -this.scrollContDiv.scrollLeft % this.pageWidth;
+		this.move(fill)
+	};
+	this.move = function (num, quick) {
+		var thisMove = num / 5;
+		if (!quick) {
+			if (thisMove > this.space) {
+				thisMove = this.space
+			};
+			if (thisMove < -this.space) {
+				thisMove = -this.space
+			}
+		};
+		if (Math.abs(thisMove) < 1 && thisMove != 0) {
+			thisMove = thisMove >= 0 ? 1 : -1
+		} else {
+			thisMove = Math.round(thisMove)
+		};
+		var temp = this.scrollContDiv.scrollLeft + thisMove;
+		if (thisMove > 0) {
+			if (this.scrollContDiv.scrollLeft + thisMove >= this.listDiv01.scrollWidth) {
+				this.scrollContDiv.scrollLeft = this.scrollContDiv.scrollLeft + thisMove - this.listDiv01.scrollWidth
+			} else {
+				this.scrollContDiv.scrollLeft += thisMove
+			}
+		} else {
+			if (this.scrollContDiv.scrollLeft - thisMove <= 0) {
+				this.scrollContDiv.scrollLeft = this.listDiv01.scrollWidth + this.scrollContDiv.scrollLeft - thisMove
+			} else {
+				this.scrollContDiv.scrollLeft += thisMove
+			}
+		};
+		num -= thisMove;
+		if (Math.abs(num) == 0) {
+			_state = "ready";
+			if (this.autoPlay) {
+				this.play()
+			};
+			this.accountPageIndex();
+			return
+		} else {
+			this.accountPageIndex();
+			setTimeout("ScrollPic.childs[" + this.ID + "].move(" + num + "," + quick + ")", this.speed)
+		}
+	};
+	this.next = function () {
+		if (_state != "ready") {
+			return
+		};
+		_state = "stoping";
+		this.move(this.pageWidth, true)
+	};
+	this.play = function () {
+		if (!this.autoPlay) {
+			return
+		};
+		clearInterval(_autoTimeObj);
+		_autoTimeObj = setInterval("ScrollPic.childs[" + this.ID + "].next()", this.autoPlayTime * 1000)
+	};
+	this.stop = function () {
+		clearInterval(_autoTimeObj)
+	};
+	this.pageTo = function (num) {
+		if (_state != "ready") {
+			return
+		};
+		_state = "stoping";
+		var fill = num * this.frameWidth - this.scrollContDiv.scrollLeft;
+		this.move(fill, true)
+	};
+	this.accountPageIndex = function () {
+		this.pageIndex = Math.round(this.scrollContDiv.scrollLeft / this.frameWidth);
+		if (this.pageIndex > Math.round(this.listDiv01.offsetWidth / this.frameWidth + 0.4) - 1) {
+			this.pageIndex = 0
+		};
+		var i;
+		for (i = 0; i < this.dotObjArr.length; i++) {
+			if (i == this.pageIndex) {
+				this.dotObjArr[i].className = this.dotClassName
+			} else {
+				this.dotObjArr[i].className = this.dotOnClassName
+			}
+		}
+	}
+};
diff --git a/public/javascripts/terminator2.2.min.js b/public/javascripts/terminator2.2.min.js
new file mode 100644
index 000000000..1ea111ac1
--- /dev/null
+++ b/public/javascripts/terminator2.2.min.js
@@ -0,0 +1,3 @@
+
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(9(b){D d=59.55({4Q:9(g){6.8={T:"5u",4w:"4O",4y:"1K",5c:"",W:0,R:0,2s:1,2K:"2y",1m:"W",z:28,1C:4a,11:4K,5v:[],o:"1I",2J:U,3T:U,4e:{},2W:{},3c:{}};b.56(6.8,g);D i=6;D h=6.8;6.W=h.W;6.2O=h.2O;6.4p=h.4p;6.1C=h.4e.2F||3O;6.1Y=h.4e.4t||"";6.5D=h.2W.5E||1;6.5G=h.2W.4t||"";6.4r=h.2W.5n||".5q";6.4X=h.2W.4F||".4F";6.2z=h.3c.2z||4;6.Z=h.3c.Z;6.2M=h.3c.2M;6.5F=h.5C||"";6.4z=50;6.1G=0;6.5m=0;6.26=U;6.1U=0;6.4R=1L;6.1u=h.1u?h.1u:h.T;6.32=h.32?h.32:h.T;6.30=h.30?h.30:h.T;6.3v=b(h.T).V;6.1a=b(h.1u).V;6.3r=0;6.2a=0;6.2I=0;6.19=h.40?b(6.1u).N(h.40):b(6.1u).N(h.4y);6.4Y=b(6.1u).N(6.4r);6.1s=6.19.2Q;6.17=h.4h?b(6.32).N(h.4h):b(6.32).N(h.4w);6.1k=h.4L?b(6.30).N(h.4L):b(6.30).N(h.5c);6.3k=6.17.F(0).V.1S;6.2o=h.1u&&h.o&&6.1v[h.o]?6.1v[h.o]:6.1v.1I;7(i.Z){i.3S=b(i.8.T).N(i.Z).F(0);i.y=i.3S.1z();i.1F=2m.5l(6.1s/6.2M)+1;i.3j=i.1F;i.1B=1}7(h.o=="1o"||h.o=="1w"){6.1a.1f.2r="2n";6.2b=h.S=="K"?"K":"G";6.1N=6.19.F(0).V[h.S=="K"?"29":"1S"]}n{7(h.o=="1r"){6.1a.1f.2r="2n";6.2b=h.S=="K"?"K":"G";6.1N=(6.19.F(0).V[h.S=="K"?"29":"1S"]);b(h.T).N(6.4X).F(0).1n({1i:6.1N+"C",4l:"3C"});b(h.T).1n({1i:6.1N+5+"C"});b(6.1u).3K(6.4Y.F(0).3M(1Z));6.1s=b(6.1u).N(h.40).2Q;6.5o=(6.1s-1)*6.1N}n{7(h.o=="1x"){7(!h.2J){6.19.1n({2r:"2n",K:0});i.17.1P(0.5)}}}}6.5H=h.4M?e(h.4M[1]):1L;7(!6.1v.1r&&6.17.2Q!=6.19.2Q){5B 3R 5A("5M 5k");H}7(h.o!="1r"){6.17.2e(9(k,j){i.4R=k.L("5t"+h.2K,9(){i.5e(j);i.3g(i)})})}7(h.2K=="4d"){b(6.3v).5b(9(){i.3g(i)},9(){i.3X(i)})}n{7(h.2K=="2y"){b(6.3v).L("2y",9(){i.3g(i)});b(6.3v).L("39",9(){i.3X(i)})}n{7(h.o=="3o"){6.17.2e(9(k,j){k.L("39",9(){i.I&&18(i.I);i.2I=1;i.8.R&&(i.I=13(9(){i.1l()},i.8.11))})})}}}D f=b(6.1u);i.42=1L;i.1y=1;i.5I=0;f.L("41",9(){i.45(3a)});b().L("5L",9(){f.1O("41",i.42);i.1y=1});b().L("5K",9(){i.1y=0});f.L("3y",9(){i.42=f.L("41",9(){i.4n(3a)});i.1y=0});6.19.2e(9(m,j){7(!h.4h){D k=m.N("4u").F(0);k.L("3y",9(){i.3x(3a,k);i.1y=1})}n{m.L("3y",9(){i.3x(3a,0);i.1y=1})}});7(h.20&&h.20.2U==2){b(h.T).N(h.20[0]).F(0).2y(9(){7(h.o=="1r"&&!i.Z){i.58()}n{7(h.o&&i.Z){i.5d(i)}n{i.4j()}}});b(h.T).N(h.20[1]).F(0).2y(9(){7(h.o=="1r"&&!i.Z){i.4g()}n{7(h.o&&i.Z){i.3h(i)}n{i.1l()}}})}7(h.o=="1r"){i.35(6.W)}n{i.38(6.W)}7(h.3e){b(h.3e).1T(6.1s)}},3b:9(f){7(6.8.3T){2Y.4Z(f.2T().V.1M,"51")}n{2Y.43.1M=f.2T().V.1M}},4v:9(f){2Y.43.1M=f},45:9(f){f.52();7(!6.1y){f.48()}7(f.4N.2U>1){6.26=U;H}n{6.26=1Z}6.1U=f.2t[0].2u;6.1y=1},4n:9(f){f.48()},3x:9(i,g){D h=i.4s;7(h.1M){D f=h.1M}6.1y=1;7(!6.26){H}7(6.1U<i.2t[0].2u){6.3d();6.4j()}n{7(6.1U>i.2t[0].2u){6.3d();6.1l()}n{7(!g){7(f){6.4v(f)}n{H}}n{H 6.3b(g)}}}},1v:{1I:9(f,g){f.19.1n("2w","3B");f.19.F(g).1n("2w","44");f.8.R&&(f.I=13(9(){f.1l()},f.8.11))},1w:9(f,h,g){7(f.8.S=="K"){b(f.1a).1E({K:g+"C"},f.1C,f.1Y).1X(28)}n{7(f.8.S=="G"){b(f.1a).1E({G:g+"C"},f.1C,f.1Y).1X(10)}}f.8.R&&(f.I=13(9(){f.1l()},f.8.11))},1r:9(f,h,g){7(f.8.S=="K"){b(f.1a).1E({K:g+"C"},f.1C,f.1Y).1X(10)}n{7(f.8.S=="G"){7(h==3){b(f.1a).1E({G:g+"C"},f.1C,f.1Y,9(){b(f.1a).V.1f.G="3N"})}n{b(f.1a).1E({G:g+"C"},f.1C,f.1Y).1X(10)}}}f.8.R&&(f.I=13(9(){f.4g()},f.8.11))},1o:9(f,i,h){D g=O(f.1a.1f[f.2b]?f.1a.1f[f.2b]:"3N");f.2p=(g==h)?1:0;7(!f.2p){7(g<h){g+=2m.2N((h-g)/10)}7(g>h){g-=2m.2N((g-h)/10)}f.1a.1f[f.2b]=g+"C";f.I=13(9(){f.2o(f,i,h)},10)}n{f.8.R&&(f.I=13(9(){f.1l()},f.8.11))}},1x:9(h,i){D g=0;h.19.1n("2w","3B");h.19.F(i).1n("2w","44");D f=h.19.F(i).N("4u").5P(0);(9(){h.4f&&18(h.4f);7(g<28){g+=2m.2N((28-g)/10);c(f,g);h.4f=13(5N.5O,h.4z)}n{H 1Z}})()},3o:9(i,j){7(i.2I){H U}D p=9(f){7(f&&f.3t("#")==-1&&f.3t("(")==-1){H"5J("+l[f].5z()+")"}n{H f}};D y=9(){D f=q.V.4c;H f};D k=9(){w.M("4A","3C").1T("").M({4A:"5p",2r:"2n",G:u.G+"C",K:u.K+"C",Q:0,5y:5r});w.5x=1;b(i.1u).3K(w)};i.19.1n("2w","3B");i.19.F(j).1n("2w","44");D x=i.19.F(j),q=i.19.F(j+1),u,B,z,y;D w=x.3M(1Z);D v={2s:(9(f){5s(f){3J"3E":H"3H";3J"3H":H"3E";3J"4k":H"3P";3J"3P":H"4k";5w:H"3H"}})(i.8.2s),4E:x.1T(),2F:i.2F||3O,3F:i.3F||9(){},3w:i.3w||9(){},3z:i.3z||9(){}};u={1i:x.1i(),1g:x.1g(),4B:x.M("5Y-6i")||"6j",2s:i.8.2s||"3E",2B:p(i.8.6k)||x.M("4D-4o"),2H:p(i.8.2G)||"6h",2F:i.8.2F||4a,K:x.6g(),G:x.6c(),4s:i.8.4E||1L,1q:"1q",4H:i.8.4H||U,3F:i.8.3F||9(){},3w:i.8.3w||9(){},3z:i.8.3z||9(){}};b.B.4m&&(u.1q="#6m");D t=9(){H{6d:u.1q,4B:0+"C",6e:0+"C",2c:0+"C",24:0+"C",27:0+"C",2k:0+"C",2D:u.1q,2E:u.1q,2C:u.1q,2A:u.1q,4D:"3B",6f:"6l",1g:0+"C",1i:0+"C"}};D s=9(){D g=(u.1g/28)*25;D f=t();f.1i=u.1i+"C";H{1t:f,4b:{2c:0+"C",24:g+"C",27:g+"C",2k:0+"C",2D:i.8.2G,2E:i.8.2G,K:(u.K+(u.1g/2))+"C",G:(u.G-g)+"C"},1D:{2c:0+"C",24:0+"C",27:0+"C",2k:0+"C",2D:u.1q,2E:u.1q,K:u.K+"C",G:u.G+"C"}}};D r=9(){D g=(u.1g/28)*25;D f=t();f.1g=u.1g+"C";H{1t:f,4b:{2c:g+"C",24:0+"C",27:0+"C",2k:g+"C",2C:i.8.2G,2A:i.8.2G,K:u.K-g+"C",G:(u.G+(u.1i/2))+"C"},1D:{2c:0+"C",24:0+"C",27:0+"C",2k:0+"C",2C:u.1q,2A:u.1q,K:u.K+"C",G:u.G+"C"}}};z={3E:9(){D f=s();f.1t.2c=u.1g+"C";f.1t.2D=u.2B;f.1D.2k=u.1g+"C";f.1D.2E=u.2H;H f},3H:9(){D f=s();f.1t.2k=u.1g+"C";f.1t.2E=u.2B;f.1D.2c=u.1g+"C";f.1D.2D=u.2H;H f},4k:9(){D f=r();f.1t.24=u.1i+"C";f.1t.2C=u.2B;f.1D.27=u.1i+"C";f.1D.2A=u.2H;H f},3P:9(){D f=r();f.1t.27=u.1i+"C";f.1t.2A=u.2B;f.1D.24=u.1i+"C";f.1D.2C=u.2H;H f}};D A=9(){i.19.F(j).1n("46","-6n");k();B=z[u.2s]();b.B.4m&&(B.1t.4G="6a(4o="+u.1q+")");D f=0;i.2I=1;w.1T("").1n(B.1t);w.1n("46","R");w.1E(B.4b,i.8.11/2);w.1E(B.1D,i.8.11/2,"",9(){i.19.F(j).1n("46","R");w.5X();i.2I=0});i.3r=0};7(i.8.R||i.3r==1){A()}i.8.R&&(i.I=13(9(){i.1l()},i.8.11+3O));H U},1W:9(g,h,f){g.3U&&18(g.3U);g.3G=f;g.4x=(g.y==f)?1:0;7(!g.4x){7(g.y<f){g.y+=2m.2N((f-g.y)/5)}7(g.y>f){g.y-=2m.2N((g.y-f)/5)}g.3S.1z(g.y);g.3U=13(9(){g.1v.1W(g,h,f)},10)}n{H U}}},3V:9(f,h,g){7(f.8.o=="1o"){7(f.8.S=="G"){b(f.1a).1E({G:h+"C"},f.1C/g).1X(10)}n{7(f.8.S=="K"){b(f.1a).1E({K:h+"C"},f.1C/g).1X(10)}}}n{7(f.8.S=="G"){7(!f.2a){H U}f.2a=1;b(f.1a).1E({G:h+"C"},f.1C/g,f.1Y).1X(10);f.2a=0}n{7(f.8.S=="K"){7(!f.2a){H U}f.2a=1;b(f.1a).1E({K:h+"C"},f.1C/g,f.1Y).1X(10);f.2a=0}}}},3W:9(g,f){7(g.8.S=="G"){7(g.Z){g.1v.1W(g,g.W,f)}}n{7(g.8.S=="K"){}}},3g:9(h){7(h.8.o=="1I"){h.I&&18(h.I)}n{7(h.8.o=="1w"||h.8.o=="1o"&&!h.2p){D j=h.1G;D g=h.3G;D i=O(h.1a.1f[h.2b]?h.1a.1f[h.2b]:"3N");D f=(i==j)?1:0;7(!f){7(h.8.o=="1o"){h.3V(h,j,3);h.3W(h,g)}n{7(h.8.o=="1w"){h.3V(h,j,10);h.3W(h,g)}}h.8.2O=6.W;h.I&&18(h.I)}}n{7(h.8.o=="1x"){h.8.2O=6.W;h.I&&18(h.I)}n{7(h.8.o=="3o"){h.3r=1;h.I&&18(h.I);H U}n{h.8.2O=6.W;h.I&&18(h.I)}}}}},3X:9(f){7(f.8.o=="1x"){f.I&&18(f.I);f.8.R&&(f.I=13(9(){f.1l()},f.8.11))}n{7(f.8.o=="3o"){f.I&&18(f.I);f.8.R&&(f.I=13(9(){f.1l()},f.8.11))}n{f.I&&18(f.I);f.8.R&&(f.I=13(9(){f.1l()},f.8.11))}}},2L:9(f,g){7(6.8.o=="1o"||6.8.o=="1w"||6.8.o=="1r"){f.1G="-"+g*6.1N;6.2p=0}n{7(6.8.o=="1x"){7(!6.8.2J){f.17.1P(0.5);f.17.F(g).1P(1)}}}b.A.2e(6.1s,9(h){7(g==h){f.17.F(h).1V(f.8.1m);7(f.1k){f.1k.F(h).1V(f.8.1m)}}n{f.17.F(h).1h(f.8.1m);7(f.1k){f.1k.F(h).1h(f.8.1m)}}});f.W=g;f.2o(f,g,f.1G)},3h:9(g){g.I&&18(g.I);D h=g.W;7(g.Z){D f=g.2M*g.3k*g.1B;7(g.1B<g.1F){7(g.8.o=="1I"){b(g.8.T).N(g.Z).F(0).1z(f)}n{7(g.8.o=="1o"||g.8.o=="1w"||g.8.o=="1x"){g.1v.1W(g,h,f)}n{b(g.8.T).N(g.Z).F(0).1z(f)}}g.2L(g,g.2z);g.1B++;g.1F--}n{7(g.8.o=="1I"){b(g.8.T).N(g.Z).F(0).1z(0)}n{7(g.8.o=="1o"||g.8.o=="1w"||g.8.o=="1x"){g.1v.1W(g,h,0)}n{b(g.8.T).N(g.Z).F(0).1z(0)}}g.2L(g,0);g.1B=1;g.1F=g.3j}}},5d:9(g){g.I&&18(g.I);D h=g.W;7(g.Z){D f=g.3k*(g.1s/2);f=f-g.2M*g.3k*(g.1B-1);7(g.1B<g.1F){7(g.8.o=="1I"){b(g.8.T).N(g.Z).F(0).1z(f)}n{7(g.8.o=="1o"||g.8.o=="1w"||g.8.o=="1x"){g.1v.1W(g,h,f)}n{b(g.8.T).N(g.Z).F(0).1z(f)}}g.2L(g,g.2z);g.1B++;g.1F--}n{7(g.8.o=="1I"){b(g.8.T).N(g.Z).F(0).1z(0)}n{7(g.8.o=="1o"||g.8.o=="1w"||g.8.o=="1x"){g.1v.1W(g,h,0)}n{b(g.8.T).N(g.Z).F(0).1z(0)}}g.2L(g,0);g.1B=1;g.1F=g.3j}}},5e:9(h){D g=6,h,f;g.I&&18(g.I);(h>6.1s-1)&&(h=0);(h<0)&&(h=6.1s-1);7(6.8.o=="1o"||6.8.o=="1w"||6.8.o=="1r"){g.1G="-"+h*6.1N;6.2p=0}n{7(6.8.o=="1x"){7(!g.8.2J){g.17.1P(0.5);g.17.F(h).1P(1)}g.8.R&&(g.I=13(9(){g.1l()},g.8.11))}}b.A.2e(6.1s,9(j){7(h==j){g.17.F(j).1V(g.8.1m);7(g.1k){g.1k.F(j).1V(g.8.1m)}}n{g.17.F(j).1h(g.8.1m);7(g.1k){g.1k.F(j).1h(g.8.1m)}}});6.W=h;7(g.8.37&&g.8.3e){b(g.8.37).1T(6.W+1)}6.2o(6,h,g.1G)},38:9(h){D g=6,h,f;g.I&&18(g.I);(h>6.1s-1)&&(h=0);(h<0)&&(h=6.1s-1);7(g.Z){7(h==g.2z){7(g.1B==g.1F){g.1B=1;g.1F=g.3j;g.y=0;g.3h(g)}n{g.3h(g)}}n{7(h==0){7(g.8.o=="1I"){b(g.8.T).N(g.Z).F(0).1z(0)}n{7(g.8.o=="1o"||g.8.o=="1w"||g.8.o=="1x"){g.1v.1W(g,h,0)}n{b(g.8.T).N(g.Z).F(0).1z(0)}}}}}7(6.8.o=="1o"||6.8.o=="1w"||6.8.o=="1r"){g.1G="-"+h*6.1N;6.2p=0}n{7(6.8.o=="1x"){7(!g.8.2J){g.17.1P(0.5);g.17.F(h).1P(1)}g.8.R&&(g.I=13(9(){g.1l()},g.8.11))}}b.A.2e(6.1s,9(j){7(h==j){g.17.F(j).1V(g.8.1m);7(g.1k){g.1k.F(j).1V(g.8.1m)}}n{g.17.F(j).1h(g.8.1m);7(g.1k){g.1k.F(j).1h(g.8.1m)}}});6.W=h;7(g.8.37&&g.8.3e){b(g.8.37).1T(6.W+1)}6.2o(6,h,g.1G)},35:9(g){D f=6;6.I&&18(6.I);D f=6,g;f.1G="-"+g*6.1N;6.W=g;6.2o(6,g,f.1G)},58:9(){6.35(--6.W)},4g:9(){6.35(++6.W)},4j:9(){6.1y=1;6.38(--6.W)},1l:9(){6.1y=1;6.38(++6.W)},3d:9(){6.49&&18(6.49);6.1y=1;6.5g(6)},5g:9(f){f.49=13(9(){f.3d()},4a)}});b.17=9(f){H 3R d(f)};b.P.47=9(g,f){H 5h.2e(9(j){7(f){j=j.53(f)}D i=j.1T();j.5Q();j.1T(g);D h=j.V;4C(h.5j){h=h.5j}h.4c=i},6)};D a=59.55({4Q:9(f){6.8={T:"1r",2d:10,1p:10,2K:"2y",o:"1r",2P:".6b",3D:"4O",4W:1,3I:4,R:1,S:"G",16:U,11:4K};b.56(6.8,f);D h=6;D g=6.8;6.2d=g.2d;6.1p=-g.1p;6.16=g.16;6.3I=g.3I;6.S=g.S;6.11=g.11;6.3D=g.3D;6.1R=g.5Z;6.3f=g.5W;6.21=g.5V;6.4i=g.5R;h.2P=b(g.T).N(h.8.2P).F(0);7(g.S=="G"){h.2P.47("<1K 3A=\'3Z\' 1f=\'2r:2n;1i:4T\'><1K 3A=\'3Q\' 1f=\'4l:3C;4U:G\'></1K></1K>")}n{h.2P.47("<1K 3A=\'3Z\' 1f=\'2r:2n;1g:4T\'><1K 3A=\'3Q\' 1f=\'4l:3C;4U:G\'></1K></1K>")}h.1J=0;h.1d=0;h.1Q=0;h.31=0;h.2j=0;h.1U=0;h.E=b(g.T).N(".3Z").F(0);h.1e=U;h.2g=1L;h.15=1L;h.2q=1L;h.2v=1L;h.2x=1L;h.2i=h.E.N(".3Q").F(0);h.J=h.2i.53(0);h.3G=h.2i.N(h.3D).2Q;h.54=h.2i.3M(1Z);h.2i.2T(1).3K(h.54);7(b.B.5S){7(h.S=="G"){7(O(h.J.M("Q-23"))&&!O(h.J.M("Q-G"))){6.1A=h.J.V.1S+O(h.J.M("Q-23"))}7(O(h.J.M("Q-G"))&&!O(h.J.M("Q-23"))){6.1A=h.J.V.1S+O(h.J.M("Q-G"))}7(O(h.J.M("Q-23"))&&O(h.J.M("Q-G"))){6.1A=h.J.V.1S+O(h.J.M("Q-G"))+O(h.J.M("Q-23"))}7(!O(h.J.M("Q-23"))&&!O(h.J.M("Q-G"))){6.1A=h.J.V.1S}}n{7(O(h.J.M("Q-2h"))&&!O(h.J.M("Q-K"))){6.1A=h.J.V.29+O(h.J.M("Q-2h"))}7(O(h.J.M("Q-K"))&&!O(h.J.M("Q-2h"))){6.1A=h.J.V.29+O(h.J.M("Q-K"))}7(O(h.J.M("Q-2h"))&&O(h.J.M("Q-K"))){6.1A=h.J.V.29+O(h.J.M("Q-K"))+O(h.J.M("Q-2h"))}7(!O(h.J.M("Q-2h"))&&!O(h.J.M("Q-K"))){6.1A=h.J.V.29}}}n{h.S=="G"?6.1A=h.J.V.1S+O(h.J.M("Q-23"))+O(h.J.M("Q-G")):6.1A=h.J.V.29+O(h.J.M("Q-2h"))+O(h.J.M("Q-K"))}6.1c=6.1A*g.4W;6.2f=6.1A*(h.3G-h.3I);h.3l=h.2i.1i();h.3q=h.2i.1g();h.E.5b(9(){12(h.15)},9(){g.R&&h.1j(h)});7(g.20&&g.20.2U==2){h.14=b(g.T).N(g.20[0]).F(0);h.1b=b(g.T).N(g.20[1]).F(0);h.5T=h.14.4V();h.5U=h.1b.4V();h.2q=h.14.L("2V",9(){h.3n(h)});h.2v=h.14.L("2X",9(){6.1H(h.1R);12(h.15)});h.34=h.14.L("2R",9(){h.3i(h);12(h.15)});h.2x=h.14.L("2Z",9(){6.1H(h.1R);g.R&&h.1j(h)});h.36=h.1b.L("2X",9(){6.1H(h.21);12(h.15)});h.3u=h.1b.L("2V",9(){h.2S(h);h.31=1});h.3p=h.1b.L("2R",9(){h.33(h);12(h.15)});h.3s=h.1b.L("2Z",9(){6.1h(h.21);g.R&&h.1j(h)});!h.16&&h.14.1H(h.3f)}g.R&&h.1j(h)},4P:9(f){f.2q=f.14.L("2V",9(){f.3n(f)});f.2v=f.14.L("2X",9(){6.1H(f.1R);12(f.15)});f.34=f.14.L("2R",9(){f.3i(f);12(f.15)});f.2x=f.14.L("2Z",9(){6.1H(f.1R);8.R&&f.1j(f)})},4S:9(f){f.2S(f);f.31=1;6.1H(f.21);12(f.15);f.3p=f.1b.L("3y",9(){f.33(f);12(f.15)});6.1h(f.21);8.R&&f.1j(f)},3b:9(f){7(6.8.3T){2Y.4Z(f.2T().V.1M,"51")}n{2Y.43.1M=f.2T().V.1M}},45:9(g,f){g.52();g.48();6.I&&18(6.I);7(g.4N.2U>1){6.26=U;H}n{6.26=1Z}6.1U=g.2t[0].2u},3x:9(g,f){7(!6.26){H}7(6.1U<g.2t[0].2u){6.4P(6)}n{7(6.1U>g.2t[0].2u){6.4S(6)}n{H 6.3b(f)}}},3m:9(f){f.14.1O("4d",f.2v);f.14.1O("39",f.2x);f.14.1O("5f",f.34);f.14.1O("5i",f.2q);f.14.1h(f.1R).1V(f.3f)},2l:9(f){f.1b.1O("5i",f.3u);f.1b.1O("5f",f.3p);f.1b.1O("4d",f.36);f.1b.1O("39",f.3s);f.1b.1h(f.21).1V(f.4i)},57:9(f){7(f.2q||f.2v||f.2x){f.3m(f);f.14.1h(f.3f)}f.2q=f.14.L("2V",9(){f.3n(f)});f.2v=f.14.L("2X",9(){6.1H(f.1R);12(f.15)});f.34=f.14.L("2R",9(){f.3i(f);12(f.15)});f.2x=f.14.L("2Z",9(){6.1h(f.1R);f.8.R&&f.1j(f)});f.1e=U},5a:9(f){7(f.3u||f.36||f.3s){f.2l(f);f.1b.1h(f.4i)}f.36=f.1b.L("2X",9(){6.1H(f.21);12(f.15)});f.3u=f.1b.L("2V",9(){f.2S(f)});f.3p=f.1b.L("2R",9(){f.33(f)});f.3s=f.1b.L("2Z",9(){6.1h(f.21);f.8.R&&f.1j(f)});f.1e=U},1j:9(f){12(f.15);7(f.2j&&!f.16){H}f.15=3L(9(){f.2S(f);f.33(f)},f.11)},2S:9(f){!f.16&&f.57(f);12(f.2g);7(f.1e){H}12(f.15);f.3Y(f);f.2g=3L(9(){f.3Y(f)},f.2d);f.1e=1Z},3n:9(f){!f.16&&f.5a(f);12(f.2g);7(f.1e){H}f.15&&12(f.15);f.2g=3L(9(){f.4J(f)},f.2d);f.1e=1Z;f.2j=0},3i:9(f){12(f.2g);7(f.S=="G"){7(f.E.Y()%f.1c-f.1J!=0){f.1d=f.1J-(f.E.Y()%f.1c);f.22(f)}n{f.1e=U}}n{7(f.E.X()%f.1c-f.1J!=0){f.1d=f.1J-(f.E.X()%f.1c);f.22(f)}n{f.1e=U}}f.8.R&&f.1j(f)},4J:9(f){7(f.S=="G"){7(-f.E.Y()<=0){7(!f.16){H}f.E.Y(f.E.Y()-f.3l)}7(-f.E.Y()<=f.1c){!f.16&&f.3m(f);!f.16&&f.8.R&&13(9(){f.1j(f)},f.11)}f.E.Y(f.E.Y()-f.1p)}n{7(-f.E.X()<=0){7(!f.16){H}f.E.X(f.E.X()-f.3q)}7(-f.E.X()<=f.1c){!f.16&&f.3m(f);!f.16&&f.8.R&&13(9(){f.1j(f)},f.11)}f.E.X(f.E.X()-f.1p)}},3Y:9(f){7(f.S=="G"){7(!f.16&&-f.E.Y()>f.2f){f.2l(f);f.1Q=1;H}7(f.E.Y()<=-f.3l){f.E.Y(f.E.Y()+f.3l)}f.E.Y(f.E.Y()+f.1p);7(!f.16&&-f.E.Y()>f.2f-f.1c){f.2l(f);f.1Q=1;f.2j=1}}n{7(!f.16&&-f.E.X()>f.2f){f.2l(f);f.1Q=1;H}7(f.E.X()<=-f.3q){f.E.X(f.E.X()+f.3q)}f.E.X(f.E.X()+f.1p);7(!f.16&&-f.E.X()>f.2f-f.1c){f.2l(f);f.1Q=1;f.2j=1}}},33:9(f){12(f.2g);7(f.S=="G"){7(!f.16&&f.1Q&&-f.E.Y()>f.2f-f.1c){13(9(){12(f.15)},f.11);f.1e=U;f.1Q=0;f.2j=1}7(f.E.Y()%f.1c-f.1J!=0){f.1d=0-f.1c-f.E.Y()%f.1c+f.1J;f.22(f)}n{f.1e=U}}n{7(!f.16&&f.1Q&&-f.E.X()>f.2f-f.1c){13(9(){12(f.15)},f.11);f.1e=U;f.1Q=0;f.2j=1}7(f.E.X()%f.1c-f.1J!=0){f.1d=0-f.1c-f.E.X()%f.1c+f.1J;f.22(f)}n{f.1e=U}}7(f.31){f.31=0;H}n{f.8.R&&f.1j(f)}},22:9(g){D f;7(g.1d==0){g.1e=U;H}7(g.1d>0){7(g.1d>-g.1p){g.1d+=g.1p;f=g.1p}n{f=-g.1d;g.1d=0}7(g.S=="G"){g.E.Y(g.E.Y()-f)}n{g.E.X(g.E.X()-f)}13(9(){g.22(g)},g.2d)}n{7(g.1d<g.1p){g.1d-=g.1p;f=g.1p}n{f=g.1d;g.1d=0}7(g.S=="G"){g.E.Y(g.E.Y()+f)}n{g.E.X(g.E.X()+f)}13(9(){g.22(g)},g.2d)}}});b.1r=9(f){H 3R a(f)};9 e(j){D h=60.61(/<\\w+/.67(j)[0].4I(1)),k=j.4I(0,j.3t(">")+1).68(/\\w+=([\'"])[^>]*?\\1/g);7(k&&k.2U>0){D g=0;4C(k[g]){D f=k[g].69("=");7(f[1]=f[1].4q(/[\'"]/g,"")){h.66(f[0],f[1])}g++}}h.4c=j.65(j.3t(">")+1,j.62("<")).4q(/^\\s+|\\s+$/g,"");H h}9 c(f,g){7(f.63){f.1f.4G="64(1P="+g+")"}n{f.1f.1P=g/28}}})(5h);',62,396,'||||||this|if|opt|function||||||||||||||else|effect||||||||||||||px|var|scrObj|item|left|return|runId|Wrapchild|top|bind|css|find|parseInt||margin|auto|vertical|id|false|node|current|Top|Left|tabwr||interval|clearInterval|setTimeout|btleft|AutoPlayObj|loop|tabs|clearTimeout|cons|cont|btright|PageWidth|Comp|MoveLock|style|height|removeClass|width|AutoPlay|texts|next|curCn|setStyle|slide|Space|transparent|scroll|levels|start|conId|effects|fxslide|fade|th2|scrollLeft|elemLength|sn|fxspeed|second|go|tn|to|toggleClass|def|fill|div|null|href|ml|unbind|opacity|Stop|prevMouseImg|offsetWidth|html|fMoveX|addClass|tabscroll|delay|fxeffect|true|bns|nextMouseImg|CompScr|right|borderLeftWidth||oneFinger|borderRightWidth|100|offsetHeight|lock2|Tol|borderTopWidth|Speed|each|finalMovePos|MoveTimeObj|bottom|scrWrap|finish|borderBottomWidth|disbtright|Math|absolute|effectFn|end|scrEvent1|position|direction|changedTouches|pageX|btMouse1|display|ptMouse1|click|shownum|borderRightColor|bgColor|borderLeftColor|borderTopColor|borderBottomColor|speed|tocolor|toColor|flipscrolling|pageBt|eType|tabMoveFix|tabnum|ceil|mousecurrent|scWr|len|_mouseup|ISL_GoDown|parent|length|_mousedown|scrOption|_mouseover|window|_mouseout|textId|test|tabId|ISL_StopDown|mouseup1|scrTo|btMouse2|numId|moveTo|mouseout|event|linkTo|tabOption|tcTime|totalId|prevStopImg|timeManger1|tabnext|ISL_StopUp|temptn|tabitemlen|scrWrapWidth|disbtleft|ISL_GoUp|flip|mouseup2|scrWrapHeight|lock|ptMouse2|indexOf|scrEvent2|mbox|onEnd|tochEnd|touchend|onAnimation|class|none|hidden|scrElem|tb|onBefore|scrlen|bt|showNum|case|append|setInterval|clone|0px|500|rl|count|new|tabobj|ipNewPage|runssId|consFix|tabsFix|timeManger2|ISL_ScrDown|cols|conCn|_touchstart|th1|location|block|tochStart|marginLeft|childWrap|preventDefault|simuId|1000|first|innerHTML|mouseover|fxOption|runffId|scrnext|tabCn|nextStopImg|prev|lr|overflow|ie6|tochSE|color|slidecurrent|replace|scrcol|target|magic|img|linkBl|tabTn|end1|conTn|fadetime|visibility|fontSize|while|background|content|showcolumn|filter|dontChangeColor|substr|ISL_ScrUp|2000|textCn|extra|targetTouches|li|leftEvent|init|tevent|rightEvent|9999px|float|classNames|scrNum|showcolclass|scrcont|open||_blank|stopImmediatePropagation|child|scrWrap2|create|extend|enabbtleft|scrprev|KClass|enabbtright|hover|textTn|tabprev|fixMoveTo|mouseup|simulate|Koala|mousedown|firstChild|Failed|floor|cur|scrcolumn|total|visible|row1|9999|switch|_|focus|tempCn|default|ready|zIndex|toString|Error|throw|otherTn|scrstep|step|othertabTn|screffect|nd|th3|rgb|gestureend|gesturestart|Match|arguments|callee|nitem|empty|nextStopClass|ie|btnLeftImg|btnRightImg|nextMouseClass|prevStopClass|remove|font|prevMouseClass|document|createElement|lastIndexOf|filters|alpha|substring|setAttribute|exec|match|split|chroma|scwr|parentY|backgroundColor|lineHeight|borderStyle|parentX|red|size|12px|fromcolor|solid|123456|999px'.split('|'),0,{}))
+/*  |xGv00|74c854a77feac9496409ff15886f9bef */
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index d58d951d0..3ec30ae51 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1306,3 +1306,31 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;}
 .box-con{ width:450px; margin:0 auto; text-align:center;}
 .box-con-a{ width:170px; margin:0 auto; margin-top:10px;}
 /*--------------------------------------*/
+
+/*博客列表界面样式*/
+a{text-decoration:none}
+.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
+/*.bloglistbox{ min-height:690px;}*/
+.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;}
+.category{ padding:10px 0; border-bottom:1px solid #ddd;}
+.category a,.category span{ float:left; margin-right:5px;}
+.grayTxt{ color:#9093a6;}
+.category a.sortTxt{ color:#9093a6;}
+.category .sortTxt:hover{ color:#28be6c;}
+a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
+a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; }
+.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
+.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;}
+a:hover.list-title{ color:#269ac9;}
+.c_red{ font-weight:normal; font-size:12px;}
+.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
+.list-file li{ line-height:1.9;}
+.list-info span{ margin-left:5px;}
+.pages a{ display:block; border:1px solid #d1d1d1; color:#000; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; }
+.pages a:hover{  background-color:#269ac9; color:#fff;}
+a.pages-big{ width:50px;}
+.pages .active{  background-color:#269ac9; color:#fff;}
+.pages{width:330px; margin:20px auto 10px;}
+
+.red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 6bd386f9f..eece88a23 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -591,9 +591,12 @@ a.homepageImageNumber:hover {color:#269ac9;}
 .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;}
 a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
 a.coursesLineGrey:hover {color:#ffffff;}
+a.projectsLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
+a.projectsLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
+.homepageLeftMenuHideIcon {background:url(../images/homepage_icon.png) -74px -220px no-repeat;display:block; height:18px;}
 .homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
 .homepageMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
@@ -1497,3 +1500,47 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;}
 .box-con h4{ font-size:14px; font-weight: bold; width:450px; text-align:center;}
 .box-con{ width:450px; margin:0 auto; text-align:center;}
 .box-con-a{ width:170px; margin:0 auto; margin-top:10px;}
+
+/*博客列表界面样式*/
+a{text-decoration:none}
+.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
+/*.bloglistbox{ min-height:690px;}*/
+.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;}
+.category{ padding:10px 0; border-bottom:1px solid #ddd;}
+.category a,.category span{ float:left; margin-right:5px;}
+.grayTxt{ color:#9093a6;}
+.category a.sortTxt{ color:#9093a6;}
+.category .sortTxt:hover{ color:#28be6c;}
+a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
+a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; }
+.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
+.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;}
+a:hover.list-title{ color:#269ac9;}
+.c_red{ font-weight:normal; font-size:12px;}
+.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
+.list-file li{ line-height:1.9;}
+.list-info span{ margin-left:5px;}
+.pages a{ display:block; border:1px solid #d1d1d1; color:#000; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; }
+.pages a:hover{  background-color:#269ac9; color:#fff;}
+a.pages-big{ width:50px;}
+.pages .active{  background-color:#269ac9; color:#fff;}
+.pages{width:330px; margin:20px auto 10px;}
+
+/*课程列表界面样式*/
+a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}
+a:hover.course-title{ color:#269ac9;}
+
+/*通知列表界面样式*/
+a.messages-title{font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:630px;}
+a:hover.messages-title{ color:#269ac9;}
+.massages-content{ width:710px; color:#424242; max-height:65px; overflow:hidden;  margin:10px 0;margin-left:15px; line-height:1.9;}
+.red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+
+/****翻页***/
+ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
+ul.wlist li{float: left;}
+ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;}
+ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
+/*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/
+.wlist_select a{background-color: #64bdd9;cursor: default;}
\ No newline at end of file
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
new file mode 100644
index 000000000..7c0b9f84a
--- /dev/null
+++ b/public/stylesheets/org2.css
@@ -0,0 +1,220 @@
+/* CSS Document */
+/* 样式重置 */
+body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.9; background:#f2f2f2;}
+div,img,tr,td,table{ border:0;}
+table,tr,td{border:0;cellspacing:0; cellpadding:0;}
+ol,ul,li{ list-style-type:none}
+a:link,a:visited{color:#000;text-decoration:none;}
+a:hover,a:active{color:#24366e;}
+
+.sn-fl {float:left;}
+.sn-fr {float:right;}
+.sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
+.sn-container {width:100%; background-color:#fff;}
+.sn-p-absolute {position:absolute;}
+.sn-grey-opacity {background:rgba(230, 230, 230, 0.9)!important; filter:Alpha(opacity=90); background:#e6e6e6;}
+.sn-border {border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;}
+/* 公共 */
+.cl {clear:both;}
+.fl {float:left;}
+.fr {float:right;}
+.mb18 {margin-bottom:18px;}
+.mt10 {margin-top:10px;}
+.mr20 {margin-right:20px;}
+.mr10 {margin-right:10px;}
+
+/*字体，链接颜色*/
+.sn-font-black {color:#000;}
+.sn-font-grey {color:#b4bbbf;}
+.sn-font-grey2 {color:#5e5e5e;}
+.sn-font-grey3 {color:#999;}
+a.sn-link-blue {color:#24366e;}
+a.sn-link-white {color:#fff;}
+a.sn-link-grey {color:#999;}
+a.sn-link-grey:hover {color:#24366e;}
+a.sn-link-grey2 {color:#888;}
+a.sn-link-select {color:#809df9;}
+/*字体大小*/
+.sn-f12 {font-size:12px;}
+.sn-f14 {font-size:14px;}
+.sn-f18 {font-size:18px;}
+/*padding&margin&width*/
+.sn-mt-10 {margin-left:-10px;}
+.sn-mt4 {margin-top:4px;}
+.sn-mt10 {margin-top:10px;}
+.sn-mt13 {margin-top:13px;}
+.sn-mt15 {margin-top:15px;}
+.sn-mt28 {margin-top:28px;}
+.sn-mb40 {margin-bottom:40px;}
+.sn-ml15 {margin-left:15px;}
+.sn-ml55 {margin-left:55px;}
+.sn-mr0 {margin-right:0px !important;}
+.sn-mr50 {margin-right:50px;}
+.sn-w229 {width:229px;}
+/*头部样式*/
+.sn-header {}
+.sn-row {width:100%;}
+.sn-bg-grey {background-color:#f4f4f4;}
+.sn-bg-grey2 {background-color:#a5a5a5;}
+.sn-bg-white {background-color:#fff;}
+.sn-bg-blue {background-color:#24366e;}
+.sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
+.sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
+.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;}
+.sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
+a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}
+.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;}
+.sn-nav li {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
+.sn-nav li a {display:inline-block; padding:8px 6px; border-radius:5px;}
+.sn-nav li a:hover {background-color:#809df9;}
+.sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;}
+.sn-sub-nav li {color:#999; float:left;}
+.sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;}
+.sn-sub-nav li a:hover {border-bottom:3px solid #ffbd18; height:37px;}
+.sn-subnav-slice {margin:12px 5px;}
+.sn-banner {width:1200px; height:210px; margin:0 auto;}
+.sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;}
+/*footer样式*/
+.sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;}
+.sn-footer-link {padding:40px 0 30px 0;}
+.sn-footer-link li {display:inline-block;}
+.sn-contact {margin-bottom:30px;}
+/* 首页内容 */
+.sn-content{ width:1200px; margin:0 auto;}
+.sn-content-left{ width:820px; margin-right:12px; margin-bottom:100px;}
+.sn-content-right{ width:368px; margin-bottom:74px; }
+/* index-banner */
+.sn-index-banner{ width:820px; height:435px; margin-bottom:20px;}
+.focus{ position:relative; width:820px; height:435px; background-color: #000; float: left;}
+.focus img{  width:820px; height:435px;}
+.focus .shadow .title{width: 260px; height: 65px;padding-left: 30px;padding-top: 20px;}
+.focus .shadow .title a{ text-decoration:none; color:#fff; font-size:14px; font-weight:bolder; overflow:hidden; }
+.focus .btn{ position:absolute; bottom:34px; left:510px; overflow:hidden; zoom:1;}
+.focus .btn a{position:relative; display:inline; width:13px; height:13px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; }
+.focus .btn a:hover,.focus .btn a.current{  cursor:pointer;background:#fc114a;}
+.focus .fPic{ position:absolute; left:0px; top:0px; }
+.focus .D1fBt{ overflow:hidden; zoom:1;  height:16px; z-index:10;  }
+.focus .shadow{ width:100%; position:absolute; bottom:0; left:0px; z-index:10; height:80px; line-height: 80px; background:rgba(0,0,0,0.6);
+    filter:progid:DXImageTransform.Microsoft.gradient( GradientType = 0,startColorstr = '#80000000',endColorstr = '#80000000')\9;  display:block;  text-align:left; }
+.focus .shadow a{ text-decoration:none; color:#fff; font-size:20px; overflow:hidden; margin-left:10px; }
+.focus .fcon{ position:relative; width:100%; float:left;  display:none; background:#000  }
+.focus .fcon-default{ position:relative; width:100%; float:left; background:#fff  }
+.focus .fcon img{ display:block; }
+.focus .fbg{bottom:25px; right:40px; position:absolute; height:21px; text-align:center; z-index: 200; }
+.focus .fbg div{margin:4px auto 0;overflow:hidden;zoom:1;height:14px}
+.focus .D1fBt a{position:relative; display:inline; width:12px; height:12px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; }
+.focus .D1fBt .current,.focus .D1fBt a:hover{background:#fc114a;}
+.focus .D1fBt img{display:none}
+.focus .D1fBt i{display:none; font-style:normal; }
+.focus .prev,.focus .next{position:absolute;width:40px;height:74px;background: url(../images/banner/focus_btn.png) no-repeat;}
+.focus .prev{top: 50%;margin-top: -37px; left: 0;background-position:0 -74px; cursor:pointer; }
+.focus .next{top: 50%;margin-top: -37px; right: 0;  background-position:-40px -74px;  cursor:pointer;}
+.focus .prev:hover{  background-position:0 0; }
+.focus .next:hover{  background-position:-40px 0;}
+/* index-news */
+.sn-index-leftbox{ width:820px; background:#fff; margin-bottom:20px;}
+.h2-title{   padding:5px 0 3px; border-bottom:1px solid #ebebeb; font-size:18px; color:#777; font-weight:normal; padding-left:17px;}
+.h2-title a.more{ font-size:12px; color:#777; float:right; margin-right:17px; line-height:2.8;}
+.h2-title a:hover.more{ color:#24366e;}
+.sn-news-bigbox{ padding:0px 26px 0px 18px; margin:18px 0 26px; border-right:1px solid #ebebeb;}
+.sn-news-bigbox a.h3-title{ font-size:18px; width:380px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
+.sn-news-bigbox .sn-news-txt{ width:380px; color:#666;}
+.sn-news-bigbox .sn-news-bigimg{ width:380px; height:165px;}
+.txt-grey{ color:#999;}
+.sn-news-smallbox{padding:0px 18px 0px 26px; margin:18px 0 26px; width:350px; }
+.sn-news-smallbox .sn-news-smallimg{ width:85px; height:85px; margin-right:10px;}
+.sn-news-smallbox a.h4-title{ font-size:14px; width:255px; float:left;}
+/* index-resources */
+.sn-index-resourcescon{ padding-top:12px;background:#f2f2f2;}
+.sn-index-resourcesbox{ padding:10px; background:#f2f2f2; width:185px; float:left;}
+.sn-index-resourcesbox:hover{ background:#fff;}
+.sn-index-resourcesbox a.resources-title{ font-size:18px; font-weight:normal; line-height:2.0;width:185px; display:block; border-bottom:1px solid #ccc; margin-bottom:5px;}
+.sn-hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
+.sn-index-resourcesbox a.resources-tag{ font-size:14px; color:#999; margin-right:5px; line-height:1.5;}
+.resources-tagbox {width:185px; height: 46px; overflow:hidden;}
+.resources-tagbox img {max-width: 100%;}
+a.more-btn{ display:block; width:185px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;}
+/* index-partner */
+.sn-index-partnerbox{ padding:25px 30px; }
+.sn-index-partnerbox{ width:775px;}
+.sn-index-partnerbox ul li{ height:55px;}
+.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;}
+.partner-btnbox{ width:90px; margin:0 auto;}
+.partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;}
+.partner-btn:hover{ background-color:#172b65;}
+/* index-active */
+.sn-index-activebox{ margin-bottom:20px; background:#fff; padding-bottom:10px;}
+.active-title{width:330px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
+.sn-index-active{ margin:0px 20px 5px 20px;}
+.sn-index-active a.sn-activeimg{width:330px; height:210px;}
+/* index-wx*/
+.sn-index-wxbox{margin-bottom:20px; background:#fff;}
+.sn-index-wximg{ margin:15px; margin-right:5px;}
+.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;}
+.sn-index-smallbanner img{ display:block; width:369px; height:169px; }
+
+/* 内页新闻列表 */
+.sn-inner-body{ width:100%; background-color:#fff;}
+.sn-innner-content{ width:1200px; margin:0 auto;}
+.sn-inner-newsh2{ font-size:20px; font-weight:normal; padding-bottom:5px; border-bottom:1px dashed #eee;}
+.sn-circle{ margin:18px 5px 0 5px ;border:1px solid #24366e; width:5px; height:5px; -webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px; }
+.sn-inner-newslist ul li{ line-height:42px; font-size:15px; border-bottom:1px solid #eee;}
+.sn-inner-newslist a{font-size:15px; color:#888;}
+.sn-inner-newslist a:hover{ color:#24366e;}
+a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
+a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;}
+.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; }
+.sn-inner-pages a:hover{  background-color:#24366e; color:#fff;}
+a.sn-inner-pages-big{ width:50px;}
+a.sn-pages-active{  background-color:#24366e; color:#fff;}
+.sn-inner-pages{width:330px; margin:40px auto 100px;}
+/* 内页新闻展示 */
+.sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; }
+.sn-inner-pcon{text-indent:2em;}
+.sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;}
+.sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;}
+.sn-inner-imgp{ color:#000;   text-align:center; margin-bottom:30px;}
+a.sn-newslist-zan{ display:block; background:url(../images/zan.gif) 0 15px no-repeat; width:54px; height:28px; padding-left:12px; color:#999; }
+a:hover.sn-newslist-zan{ background:url(../images/zan.gif) 0 -21px no-repeat; }
+/* 留言 */
+.sn-replybox{ margin-bottom:100px;}
+.sn-reply-h2{ font-size:18px; font-weight:normal; color:#24366e; margin-bottom:6px;}
+.sn-reply-form{ width:1200px;height:180px; border:1px solid #e8e8e8; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#fff; margin-bottom:20px; }
+.sn-reply-text{ width:1200px; height:130px; background:#fff; border:none; resize:none;}
+.sn-reply-btnbox{border-top:1px solid #e8e8e8; height:48px;}
+a.submit-btn{ display:block; color:#fff; text-align:center; font-size:14px; line-height:27px; width:79px; height:27px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#24366e; margin:8px 0 0 10px;}
+a:hover.submit-btn{ color:#16275c; color:#fff;}
+.sn-comment-h2{ color:#999; font-size:16px; font-weight:normal; border-bottom:1px solid #e8e8e8; padding-bottom:5px;}
+.sn-reply-userpic{ height:65px; margin-right:15px;}
+.sn-reply-userpic img{ width:40px; height:40px;-webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px;}
+a.sn-reply-zan{ display:block; background:url(../images/zan.gif) 0 4px no-repeat; width:54px; height:16px; padding-left:12px; color:#999;  }
+a:hover.sn-reply-zan{ background:url(../images/zan.gif) 0 -32px no-repeat; }
+.sn-comment-listbox{ padding:23px 0; width:1200px;border-bottom:1px solid #e8e8e8;}
+a.sn-reply-username { color:#24366e; margin-right:15px; }
+.sn-reply-usertxt{ width:1145px; font-size:14px; }
+.sn-reply-more{ width:1200px; height:25px; background:#ddd; text-align:center; line-height:25px;}
+
+/*用户图像*/
+.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{ }
+.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;}
+.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
+.none {display: none;}
+.user-img,.user-img img{ margin-right:10px; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:40px; height:40px;}
+.ml60{ margin-left:60px;}
+.user-img img{border:2px solid #e6473b; }
+.user-img img:hover{border:2px solid #29156f;}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index f711c25e2..ebedb1c30 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -593,6 +593,9 @@ img.ui-datepicker-trigger {
 .repos_files ul:hover{ background:#ffffdd;}
 .repos_t_c li{ text-align:center;}
 .pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
+.tree-age{width:10%; text-align:right;}
+.tree-author{width:10%; text-align:left;}
+.tree-comments{width:40%; text-align:left;}
 
 
 /* 里程碑 */
@@ -816,7 +819,7 @@ div.changeset { border-bottom: 1px solid #ddd; }
 tr.entry { border: 1px solid #DDD; }
 tr.entry td { white-space: nowrap; }
 tr.entry td.filename { width: 30%; }
-tr.entry td.filename_no_report { width: 70%; }
+tr.entry td.filename_no_report { width: 40%; }
 tr.entry td.size { text-align: right; font-size: 90%; }
 tr.entry td.revision, tr.entry td.author { text-align: center; }
 tr.entry td.age { text-align: right; }
@@ -1200,3 +1203,31 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
 .subjectType {width:70px; text-align:center;}
 .subjectCount {width:65px; text-align:center;}
+.button-rep { color: #888;display: inline-block;background: #eee;padding: 2px 5px;}
+
+/*博客列表界面样式*/
+a{text-decoration:none}
+.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
+/*.bloglistbox{ min-height:690px;}*/
+.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;}
+.category{ padding:10px 0; border-bottom:1px solid #ddd;}
+.category a,.category span{ float:left; margin-right:5px;}
+.grayTxt{ color:#9093a6;}
+.category a.sortTxt{ color:#9093a6;}
+.category .sortTxt:hover{ color:#28be6c;}
+a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
+a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; }
+.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
+.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;}
+a:hover.list-title{ color:#269ac9;}
+.c_red{ font-weight:normal; font-size:12px;}
+.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
+.list-file li{ line-height:1.9;}
+.list-info span{ margin-left:5px;}
+.pages a{ display:block; border:1px solid #d1d1d1; color:#000; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; }
+.pages a:hover{  background-color:#269ac9; color:#fff;}
+a.pages-big{ width:50px;}
+.pages .active{  background-color:#269ac9; color:#fff;}
+.pages{width:330px; margin:20px auto 10px;}
+
+.red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
\ No newline at end of file
diff --git a/spec/factories/rep_statics.rb b/spec/factories/rep_statics.rb
new file mode 100644
index 000000000..5222e8ec7
--- /dev/null
+++ b/spec/factories/rep_statics.rb
@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :rep_static, :class => 'RepStatics' do
+    project_id 1
+commits_num 1
+uname "MyString"
+email "MyString"
+add 1
+del 1
+  end
+
+end
diff --git a/spec/models/rep_statics_spec.rb b/spec/models/rep_statics_spec.rb
new file mode 100644
index 000000000..da4870b17
--- /dev/null
+++ b/spec/models/rep_statics_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe RepStatics, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end