Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

1234567

@@ -1 +1 @@
-{"access_token":"yFUfEXFu0_Pl_jdojoRv6eA8pmGjyRkRIL1VCB2HZ4kVJhEq6crriyCRCI-_u5QbWgtepiIOvqTHtXpKgzMuaB7Eo7MjlMcXeecqhzTjnvpivK5HUzGhZXBG1dk_BxicJAFlCAARIN","expires_in":7200,"got_token_at":1461934858}
+{"access_token":"bFlabz0uBcoIBfWL7nBJkgpl26aOWDy-dyCOvH_MjUo_hMOOKG83WV1cCL1MG6H-AE-6eMI0iyLoOoAMv9Y3pFFsLYD-GAGr3UH9fT8OqeHMDlFhXyRTvHv9l2QPHGpcARUcCGANEH","expires_in":7200,"got_token_at":1462934760}

Gemfile

@@ -1,11 +1,13 @@
 source 'https://rubygems.org/'
-### 这里执行bundle config mirror.https://rubygems.org https://gems.ruby-china.org 切换到ruby-china源
+### 这里执行bundle config mirror.https://rubygems.org https://gems.ruby-china.org 切换到ruby-china源
 
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
 end
 
+gem 'certified'
+
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
 gem 'gitlab', path: 'lib/gitlab-cli'

app/api/mobile/entities/blog_comment.rb

@@ -47,6 +47,7 @@ module Mobile
       blog_comment_expose :created_at
       blog_comment_expose :lasted_comment
       blog_comment_expose :id
+      blog_comment_expose :locked
       blog_comment_expose :praise_count
       expose :blog_comment_children, using:Mobile::Entities::BlogComment do |c,opt|
         if c.is_a? (::BlogComment)

app/api/mobile/entities/message.rb

@@ -51,6 +51,7 @@ module Mobile
       message_expose :replies_count
       message_expose :praise_count
       message_expose :created_on
+      message_expose :locked
       message_expose :id
       message_expose :lasted_comment
       expose :message_children,using:Mobile::Entities::Message do |c,opt|

app/assets/javascripts/sub_document_comments.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/sub_domains.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/sub_document_comments.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the sub_document_comments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/sub_domains.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the sub_domains controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/admin_controller.rb

@@ -644,4 +644,13 @@ class AdminController < ApplicationController
       format.html
     end
   end
+  #分享作业申请
+  def apply_for_homework
+    homeworks = ApplyHomework.where("user_id != 0")
+    @homework = paginateHelper homeworks,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
 end

app/controllers/boards_controller.rb

@@ -125,7 +125,7 @@ class BoardsController < ApplicationController
     if @order.to_i == 2
       @type = 2
       @topics.each do |topic|
-        topic[:infocount] = get_praise_num(topic) + (topic.parent ? x.parent.children.count : topic.children.count)
+        topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
         if topic[:infocount] < 0
           topic[:infocount] = 0
         end

app/controllers/homework_common_controller.rb

@@ -11,6 +11,9 @@ class HomeworkCommonController < ApplicationController
   before_filter :member_of_course, :only => [:index]
 
   def index
+    #unless params[:page]
+    #  update_homework_time(@course.homework_commons)
+    #end
     @new_homework = HomeworkCommon.new
     @new_homework.homework_detail_manual = HomeworkDetailManual.new
     @new_homework.course = @course
@@ -400,4 +403,47 @@ class HomeworkCommonController < ApplicationController
     student_works += student_works
     student_works[index + 1 .. index + n]
   end
+
+  def update_homework_time homeworks
+    unless homeworks.nil?
+      homeworks.each do |h|
+        if h.homework_type == 3
+          student_works = h.student_work_projects.where("is_leader = 1")
+          time = h.updated_at
+          unless student_works.nil?
+            student_works.each do |s|
+              project = Project.find s.project_id
+              unless project.nil? && project.gpid.nil?
+                project_time=project.updated_on
+                project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last
+                if format_time(time) < format_time(project_time)
+                  time = project_time
+                end
+                begin
+                  # gitlab端获取默认分支
+                  g = Gitlab.client
+                  default_branch = g.project(project.gpid).default_branch
+                  changesets = g.commits(project.gpid, :ref_name => default_branch)
+                  changesets_latest_coimmit = changesets[0]
+                  unless changesets[0].blank?
+                    if format_time(time) < format_time(changesets_latest_coimmit.created_at)
+                      time = changesets_latest_coimmit.created_at
+                    end
+                  end
+                rescue
+                  logger.error("############## ==> update homework project time")
+                end
+              end
+            end
+          end
+          puts h.updated_at
+          puts time
+          s_time = time
+          if format_time(time) > format_time(h.updated_at)
+            h.update_attribute(:updated_at, s_time)
+          end
+        end
+      end
+    end
+  end
 end

app/controllers/news_controller.rb

@@ -83,6 +83,8 @@ class NewsController < ApplicationController
 
         sort_type = @b_sort == 1 ? "asc" : "desc"
 
+        #scope = News.find_by_sql("select a.*,b.updated_at from news a, course_activities b where a.course_id = 532 and a.course_id = b.course_id and b.course_act_id = a.id ) ")
+
         scope = @course ? @course.news.course_visible : News.course_visible
         news_arr = scope.map{|news| news.id}
 
@@ -101,7 +103,8 @@ class NewsController < ApplicationController
         end
 
         scope_order.each do |topic|
-          topic[:updated_at] = CourseActivity.where("course_act_type='#{topic.class}' and course_act_id =#{topic.id}").first.updated_at
+          topic[:updated_at] = topic.course_acts.first.updated_at
+          #topic[:updated_at] = CourseActivity.where("course_act_type='#{topic.class}' and course_act_id =#{topic.id}").first.updated_at
         end
 
         #根据 赞+回复数排序

app/controllers/org_document_comments_controller.rb

@@ -79,7 +79,7 @@ class OrgDocumentCommentsController < ApplicationController
 
   def add_reply
     @document = OrgDocumentComment.find(params[:id]).root
-    @act = OrgActivity.find(params[:id])
+    @act = OrgActivity.find(params[:act_id])
     @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
     @comment.content = params[:org_content]
     @document.children << @comment

app/controllers/org_subfields_controller.rb

@@ -15,6 +15,12 @@ class OrgSubfieldsController < ApplicationController
         end
       end
       @subfield.update_attributes(:field_type => params[:field_type])
+      # 如果栏目是教师，不参入类型的配置，定义为右三模式
+      # 新增模块命名规则，左边1开头，右边2开头，以前的不变
+      # eg：23 右三
+      if params[:field_type] == "Comptec"
+        @subfield.update_attributes(:status => 23)
+      end
     else
       @res = false
     end

app/controllers/organizations_controller.rb

@@ -28,7 +28,7 @@ class OrganizationsController < ApplicationController
   helper :project_score
   helper :issues
   include UsersHelper
-  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout]
+  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers]
   layout 'base_org'
   def index
 
@@ -76,7 +76,7 @@ class OrganizationsController < ApplicationController
 
   def show
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
-    if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
+    if @organization.show_mode.to_i == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         # REDO:时间紧，暂时先这样
         @org_logo_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 0 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
@@ -84,10 +84,6 @@ class OrganizationsController < ApplicationController
 
         @subfield_content = @organization.org_subfields.order("priority")
         @organization = Organization.find(params[:id])
-          # @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)
-
           shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
           project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
@@ -95,35 +91,33 @@ class OrganizationsController < ApplicationController
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           @project_acts = get_project_activities_org @organization, project_ids
           @course_acts = get_course_activities_org @organization, course_ids
-          #@org_acts = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc')
-          #@project_acts = OrgActivity.where("(container_id =? and container_type =?) " +
-                                                # "or (container_type ='Project' and org_act_type in ('Issue','Message') and container_id in (#{project_ids.join(',')})) ",
-                                                # @organization.id, 'Organization').order('updated_at desc').limit(8)
-
-          #@course_acts  = OrgActivity.where("(container_id =? and container_type =?) " +
-                                               # "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
-                                              # @organization.id, 'Organization').order('updated_at desc').limit(8)
-
-
-
-        # 项目两种动态
-        #@project_acts = get_project_activities_org @organization
-
-        # 课程动态
-        #@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])
+        # params[:org_subfield_id] 存在即对应的栏目，否则进入组织动态
         if params[:org_subfield_id]
           @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+          if @org_subfield.field_type == "Comptec" || @org_subfield.field_type == "Compstu"
+
+            # @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,( SELECT `courses`.* FROM `courses` INNER JOIN `members` ON `courses`.`id` = `members`.`course_id` WHERE `members`.`user_id` = u.id AND (courses.status<>9)) as course_count
+            #                               from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 order by course_count desc")
+            @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 order by course_count desc")
+            # @org_count = @org_teachers.count
+            # @limit = 25
+            # @is_remote = true
+            # @atta_count = @attachments.count
+            # @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+            # @offset ||= @atta_pages.offset
+            # #@curse_attachments_all = @all_attachments[@offset, @limit]
+            # @attachments = paginateHelper @attachments,25
+          else
             @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
             @org_activities = 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)
+          end
         else
           shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
@@ -164,6 +158,57 @@ class OrganizationsController < ApplicationController
 
   end
 
+  def teachers
+    unless @organization.allow_set_teachers
+      render_403
+      return
+    end
+    q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @field = OrgSubfield.find(params[:org_subfield_id])
+    @type = params[:type]
+    if @type == "courses" || @type.nil?
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "students"
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "resources"
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from attachments where attachments.author_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    elsif @type == "famous"
+      @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
+    end
+    limit = 10
+    # @is_remote = true
+    @teachers_count = @org_teachers.count
+    @atta_pages = Paginator.new @teachers_count, limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @org_teachers = paginateHelper @org_teachers, limit
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def searchmember_by_name  members, name
+    #searchPeopleByRoles(project, StudentRoles)
+    mems = []
+    if name != ""
+      name = name.to_s.downcase
+      members.each do |m|
+        username = m.user[:lastname].to_s.downcase + m.user[:firstname].to_s.downcase
+        if(m.user[:login].to_s.downcase.include?(name) ||  m.user.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name))
+          mems << m
+        end
+      end
+    else
+      mems = members
+    end
+    mems
+  end
+
   def get_project_message_activities_org org
     project_ids = org.projects.map{|project| project.id}.join(",")
     unless project_ids.blank?
@@ -187,7 +232,7 @@ class OrganizationsController < ApplicationController
   def get_project_activities_org org, project_ids
     unless project_ids.blank?
       project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids.join(',')}) and container_type = 'project'
-                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 8;")
+                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 5;")
     else
       project_acts = nil
     end
@@ -198,7 +243,7 @@ class OrganizationsController < ApplicationController
   def get_course_activities_org org, course_ids
     unless course_ids.blank?
       project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids.join(',')}) and container_type = 'course'
-                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 8;")
+                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 5;")
     else
       project_acts = nil
     end
@@ -243,6 +288,7 @@ class OrganizationsController < ApplicationController
     # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == 'on' ? 1 : 0
+    @organization.allow_teacher = params[:organization][:allow_teacher] == 'on' ? 1 : 0
     @organization.show_mode = params[:show_mode]
     #@organization.name = params[:organization][:name]
     @organization.save
@@ -425,6 +471,18 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  # 设置为名师
+  def set_excellent_teacher
+    @ex_teacher = User.find(params[:user])
+    @ex_teacher.update_column(:excellent_teacher, 1)
+  end
+
+  # 取消名师
+  def reset_excellent_teacher
+    @ex_teacher = User.find(params[:user])
+    @ex_teacher.update_column(:excellent_teacher, 0)
+  end
+
   def hide_org_subfield
     @org_subfield = OrgSubfield.find(params[:org_subfield_id])
     @org_subfield.update_attribute(:hide, 1)

app/controllers/repositories_controller.rb

@@ -32,9 +32,9 @@ class RepositoriesController < ApplicationController
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats]
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
-  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
+  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked, :project_archive]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -95,6 +95,13 @@ class RepositoriesController < ApplicationController
 
   end
 
+  # 一键ZIP下载
+  def project_archive
+    g = Gitlab.client
+    g.get()
+    # g.project_archive(params[:gpid].to_i, params[:rev])
+  end
+
   # 判断用户是否已经fork过该项目
   def has_forked?(project, user)
     projects = Project.where("user_id =?", user)

app/controllers/student_work_controller.rb

@@ -123,6 +123,7 @@ class StudentWorkController < ApplicationController
         #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
         resultObj[:status] = -1
         resultObj[:results] = result["results"].first  #本次测试结果
+        result["error_msg"] = result["error_msg"][0..2047]
         resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
 
         #该状态用于存入CodeTests
@@ -499,6 +500,7 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
 
     end
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -760,49 +762,64 @@ class StudentWorkController < ApplicationController
     #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分
     render_403 and return unless @is_teacher || @homework.homework_detail_manual.comment_status == 2
     @score = student_work_score @work,User.current
-    if @score
-      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
-      @score.score = params[:score] if params[:score]
+    #@score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+    #@score.score = params[:score] if params[:score]
+    #if User.current.admin?
+    #  @score.reviewer_role = 1
+    #else
+    #  role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+    #  @score.reviewer_role = get_role_by_name(role)
+    #end
+    #@is_new = false
+    @is_last_a = @work.student_works_scores.empty?
+    @new_score = StudentWorksScore.new
+    if @score && params[:score]
+      @new_score.score = params[:score].to_i == -1 ? @score.score : params[:score]
+    elsif @score.nil? && params[:score]
+      @new_score.score = params[:score].to_i == -1 ? nil : params[:score]
+    end
+    @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+    @new_score.user_id = User.current.id
+    @new_score.student_work_id = @work.id
     if User.current.admin?
-        @score.reviewer_role = 1
+      @new_score.reviewer_role = 1
     else
       role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
-        @score.reviewer_role = get_role_by_name(role)
+      @new_score.reviewer_role = get_role_by_name(role)
     end
-      @is_new = false
-    else
-      @is_last_a = @work.student_works_scores.empty?
-      @score = StudentWorksScore.new
-      @score.score = params[:score] if params[:score]
-      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
-      @score.user_id = User.current.id
-      @score.student_work_id = @work.id
-      if User.current.admin?
-        @score.reviewer_role = 1
+    if @score
+      if @is_teacher
+        @is_new = true
+        @is_last_a = false
       else
-        role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
-        @score.reviewer_role = get_role_by_name(role)
+        @is_new = false
       end
+    else
       @is_new = true
     end
 
-    @score.save_attachments(params[:attachments])
-    render_attachment_warning_if_needed(@score)
+    @new_score.save_attachments(params[:attachments])
+    render_attachment_warning_if_needed(@new_score)
 
-    if @score.save
-      case @score.reviewer_role
+    if @new_score.save
+      case @new_score.reviewer_role
         when 1 #教师评分：最后一个教师评分为最终评分
-          @work.teacher_score = @score.score
+          @work.teacher_score = @new_score.score
         when 2 #教辅评分 教辅评分显示平均分
-          @work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+          #@work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+          ts_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 2 AND score IS NOT NULL ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
+          @work.teaching_asistant_score = ts_score.first.score.nil? ? nil : ts_score.first.score.try(:round, 2).to_f
         when 3 #学生评分 学生评分显示平均分
-          @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          #@work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          stu_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 3 ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
+          @work.student_score = stu_score.first.score.try(:round, 2).to_f
       end
       @homework.update_attributes(:updated_at => Time.now)
       update_course_activity(@homework.class,@homework.id)
       update_user_activity(@homework.class,@homework.id)
       update_org_activity(@homework.class,@homework.id)
       if @work.save
+        @work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => @work.id).first
         respond_to do |format|
           format.js
         end
@@ -835,6 +852,14 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  #提交未评分的评语
+  def add_comments_to_work
+    @work = StudentWork.find params[:id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #为作品点赞
   def praise_student_work
     pt = PraiseTread.new
@@ -990,6 +1015,10 @@ class StudentWorkController < ApplicationController
     end
     attachment = @work.attachments.where("attachtype = 7").first
     attachment.update_attributes(:description => params[:description])
+    if attachment.attachtype == 7
+      student_work = StudentWork.find attachment.container_id
+      CourseMessage.create(:user_id => student_work.homework_common.user_id, :course_id => student_work.homework_common.course_id, :viewed => false,:course_message_id=>attachment.container_id,:course_message_type=>'StudentWork',:status=>2)
+    end
     respond_to do |format|
       format.js
     end
@@ -1147,7 +1176,7 @@ class StudentWorkController < ApplicationController
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
     if @homework.homework_type == 1 #匿评作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
+      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
                             l(:excel_t_score),l(:excel_ta_score), l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
       count_row = 1
       items.each do |homework|
@@ -1157,15 +1186,16 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
         sheet1[count_row,5] = homework.name
-        sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
-        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
-        sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
-        sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-        sheet1[count_row,10] = format_time(homework.created_at)
+        sheet1[count_row,6] = strip_html homework.description
+        sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
+        sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
+        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+        sheet1[count_row,11] = format_time(homework.created_at)
         count_row += 1
       end
     elsif @homework.homework_type == 2 #编程作业
-      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
+      sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),l(:excel_homework_des),
                             l(:excel_t_score),l(:excel_ta_score), l(:excel_s_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
       count_row = 1
       items.each do |homework|
@@ -1175,12 +1205,13 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
         sheet1[count_row,5] = homework.name
-        sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
-        sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
-        sheet1[count_row,8] = homework.system_score.nil? ? l(:label_without_score) : format("%.2f",homework.system_score)
-        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
-        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-        sheet1[count_row,11] = format_time(homework.created_at)
+        sheet1[count_row,6] = homework.description
+        sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
+        sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
+        sheet1[count_row,9] = homework.system_score.nil? ? l(:label_without_score) : homework.system_score.round(2)
+        sheet1[count_row,10] = homework.student_score.nil? ? l(:label_without_score) : homework.student_score.round(2)
+        sheet1[count_row,11] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : homework.score.round(2) : l(:label_without_score)
+        sheet1[count_row,12] = format_time(homework.created_at)
         count_row += 1
       end
     end

app/controllers/sub_document_comments_controller.rb

@@ -0,0 +1,208 @@
+class SubDocumentCommentsController < ApplicationController
+  before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
+  before_filter :find_subfield_content, :only => [:show, :index]
+  helper :attachments,:organizations
+  layout 'base_sub_domain'
+
+  def new
+    @sub_document_comment = SubDocumentComment.new
+  end
+
+
+  def create
+    @sub_document_comment = SubDocumentComment.new(:sub_domain_id => params[:sub_domain_id], :creator_id => User.current.id, :org_subfield_id => params[:org_subfield_id])
+    @sub_document_comment.title = params[:sub_document_comment][:title]
+    @sub_document_comment.content = params[:sub_document_comment][:content]
+    # @sub_document_comment.save_attachments(params[:attachments])
+    if params[:field_id]
+      @sub_document_comment.org_subfield_id = params[:field_id].to_i
+    end
+    if @sub_document_comment.save
+      flash.keep[:notice] = l(:notice_successful_create)
+      redirect_to org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)
+      # EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @sub_document_comment.id, :created_at => @sub_document_comment.updated_at)
+      # if params[:field_id]
+      #   @org_subfield = OrgSubfield.find(params[:field_id])
+      #   if @org_subfield.subfield_subdomain_dir.nil?
+      #     redirect_to organization_path(@organization, :org_subfield_id => params[:field_id])
+      #   else
+      #     redirect_to show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => @org_subfield.subfield_subdomain_dir.name)
+      #   end
+      # else
+      #   redirect_to organization_org_document_comments_path(@organization)
+      # end
+    else
+      redirect_to new_org_document_comment_path(:organization_id => @organization.id)
+    end
+  end
+
+  def show
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @document = SubDocumentComment.find(params[:id])
+      respond_to do |format|
+        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+      end
+    else
+      render_403
+    end
+  end
+
+  def index
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @documents = @subdomain.sub_document_comments.where("parent_id is null").order("created_at desc")
+      @is_remote = true
+      @limit = 20
+      @atta_count = @documents.count
+      @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+      @offset ||= @atta_pages.offset
+      @documents = paginateHelper @documents,20
+      respond_to do |format|
+        format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
+      end
+    else
+      render_403
+    end
+  end
+
+  def update
+    @sub_document =  SubDocumentComment.find(params[:id])
+    @sub_document.update_attributes(:title => params[:sub_document_comment][:title], :content => params[:sub_document_comment][:content])
+    @organization = OrgSubfield.find(params[:org_subfield_id]).organization
+    # Attachment.attach_files(@org_document, params[:attachments])
+    # @org_document.save_attachments(params[:attachments])
+    if @sub_document.parent.nil?
+      act  = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", @sub_document.id).first
+      act.update_attributes(:updated_at => @sub_document.updated_at)
+      # EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document.id, :created_at => Time.now)
+    end
+    respond_to do |format|
+      format.html {
+        if params[:flag].to_i == 0
+
+          # render :action => 'index', :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'
+          redirect_to org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => params[:org_subfield_id], :sub_domain_id => params[:sub_domain_id])
+          # render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'
+          # redirect_to organization_path(@organization)
+        else
+          redirect_to org_subfield_sub_domain_sub_document_comment_path(:org_subfield_id => params[:org_subfield_id], :sub_domain_id => params[:sub_domain_id])
+        end
+      }
+    end
+  end
+
+  def edit
+    @sub_document = SubDocumentComment.find(params[:id])
+    @flag = params[:flag]
+    render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'
+  end
+
+  def add_reply
+    @document = SubDocumentComment.find(params[:id]).root
+    @subdomain = @document.sub_domain
+    @org_subfield = @subdomain.org_subfield
+    @organization = @org_subfield.organization
+    @act = OrgActivity.find(params[:id])
+    @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:sub_content]
+    @document.children << @comment
+    @document.save
+  end
+
+  def add_reply_in_doc
+    @document = SubDocumentComment.find(params[:id]).root
+    @subdomain = @document.sub_domain
+    @org_subfield = @subdomain.org_subfield
+    @organization = @org_subfield.organization
+    @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain_id, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:flag] ? params[:sub_content] : params[:org_comment][:sub_content]
+    @document.children << @comment
+    @document.save
+    respond_to do |format|
+      format.html {redirect_to org_subfield_sub_domain_sub_document_comment_path(:id => @document.id, :org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)}
+    end
+  end
+
+  def destroy
+    @sub_document_comment = SubDocumentComment.find(params[:id])
+    @sub_document_comment.destroy
+  rescue ActiveRecord::RecordNotFound
+    respond_to do |format|
+      # format.html{
+      #   redirect_to org_subfield_sub_domain_sub_document_comments_path(:id => params[:sub_domain_id], :org_subfield_id => params[:org_subfield_id])
+      # }
+      format.js
+    end
+  end
+
+  def delete_reply
+    @sub_document_comment = OrgDocumentComment.find(params[:id])
+    @document = @sub_document_comment.root
+    org = @sub_document_comment.organization
+    @sub_document_comment.destroy
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+  def quote
+    @org_comment = OrgDocumentComment.find(params[:id])
+    @subject = @org_comment.content
+    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+
+    @content = "> #{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)}\n> "
+    @temp = OrgDocumentComment.new
+    #@course_id = params[:course_id]
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)} <br/>#{@org_comment.content.html_safe}</blockquote>".html_safe
+    respond_to do | format|
+      format.js
+    end
+  end
+
+  def reply
+    @document = OrgDocumentComment.find(params[:id]).root
+    @quote = params[:quote][:quote]
+    @org_document = OrgDocumentComment.new(:creator_id => User.current.id, :reply_id => params[:id])
+
+    # params[:blog_comment][:sticky] = params[:blog_comment][:sticky] || 0
+    # params[:blog_comment][:locked] =  params[:blog_comment][:locked] || 0
+    @org_document.title = params[:org_document_comment][:title]
+    @org_document.content = params[:org_document_comment][:content]
+    @org_document.content = @quote + @org_document.content
+    #@org_document.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
+    @document.children << @org_document
+    # @user_activity_id = params[:user_activity_id]
+    # user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    # if user_activity
+    #   user_activity.updated_at = Time.now
+    #   user_activity.save
+    # end
+    # attachments = Attachment.attach_files(@org_document, params[:attachments])
+    # render_attachment_warning_if_needed(@org_document)
+    #@article.save
+    # redirect_to user_blogs_path(:user_id=>params[:user_id])
+    respond_to do |format|
+      format.html {
+        # if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+        #   redirect_to syllabus_course_path(:id=>params[:course_id])
+        # else
+        redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)
+        # end
+
+      }
+      format.js
+    end
+  end
+
+  private
+  def find_subdomain_and_subfield
+    @subdomain = SubDomain.find(params[:sub_domain_id])
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @org_subfield.organization
+  rescue ActiveRecord::RecordNotFound
+    # source_subdomain_subfield not found
+    render_404
+  end
+
+  def find_subfield_content
+    @subfield_content = @organization.org_subfields.order("priority")
+  end
+end

app/controllers/sub_domains_controller.rb

@@ -0,0 +1,63 @@
+class SubDomainsController < ApplicationController
+  layout 'base_org'
+  before_filter :find_org_subfield_and_subdomain, :only => [:show, :index, :domain_update_priority, :destroy, :update, :hide_sub_domain, :show_sub_domain]
+
+  def new
+    @subdomain = SubDomain.new
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @organization = @org_subfield.organization
+  end
+
+  def create
+    if SubDomain.where("org_subfield_id=#{params[:org_subfield_id]} and name=?",params[:name]).count == 0
+      @res = true
+      @subfield = OrgSubfield.find(params[:org_subfield_id])
+      @organization = @subfield.organization
+      @subdomain = SubDomain.create(:name => params[:name], :org_subfield_id => params[:org_subfield_id], :priority => @subfield.sub_domains.blank? ? 1 : @subfield.sub_domains.order("priority").last.priority + 1)
+      @subdomain.update_column(:field_type, params[:field_type])
+    else
+      @res = false
+    end
+  end
+
+  def update
+    @subdomain.update_column(:name, params[:name])
+  end
+
+  def domain_update_priority
+    @subdomain.update_attribute(:priority, params[:priority].to_i)
+  end
+
+  def destroy
+    @subdomain.destroy
+  end
+
+  def show
+    render_404
+    # @subfield_content = @organization.org_subfields.order("priority")
+    # render layout: @organization.switch_type ? 'base_sub_domain' : 'base_org'
+  end
+
+  def index
+
+  end
+
+  def hide_sub_domain
+    @subdomain.update_attribute(:hide, 1)
+  end
+
+  def show_sub_domain
+    @subdomain.update_attribute(:hide, 0)
+  end
+
+
+  private
+  def find_org_subfield_and_subdomain
+    @subfield = OrgSubfield.find(params[:org_subfield_id])
+    @subdomain = SubDomain.find(params[:id])
+    @organization = @subfield.organization
+  rescue ActiveRecord::RecordNotFound
+    # source_subdomain not found
+    render_404
+  end
+end

app/controllers/users_controller.rb

@@ -85,6 +85,29 @@ class UsersController < ApplicationController
   helper :issues
   include UsersHelper
 
+  #展开所有回复
+  def show_all_replies
+    @comment = JournalsForMessage.find params[:comment].to_i
+  end
+
+  #二级回复
+  def reply_to
+    case params[:type]
+      when 'HomeworkCommon'
+        @reply = JournalsForMessage.find params[:reply_id]
+        if params[:user_activity_id]
+          @user_activity_id = params[:user_activity_id]
+        else
+          @user_activity_id = -1
+        end
+        @is_in_course = params[:is_in_course]
+        @course_activity = params[:course_activity].to_i
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def refresh_changests
     if !(@user.nil?) && !(@user.memberships.nil?)
       @user.memberships.each do |member|
@@ -396,6 +419,19 @@ class UsersController < ApplicationController
   end
   # end
 
+  #引用作业请求弹框
+  def apply_homework
+    if User.current.logged?
+      @homework = HomeworkCommon.find params[:homework_id]
+      @state = 2
+    else
+      @state = 1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #申请引用非公开作业
   def apply_for_homework
     if User.current.logged?
@@ -405,7 +441,7 @@ class UsersController < ApplicationController
         if ah.empty?
           ApplyHomework.create(:user_id => params[:id].to_i, :homework_common_id => params[:homework_id].to_i, :status => 1)
           Mailer.run.apply_for_homework_request(homework, User.current)
-          CourseMessage.create(:user_id => homework.user_id, :course_id => homework.course.id, :viewed => false,:course_message_id=>params[:homework_id].to_i,:course_message_type=>'HomeworkCommon',:status=>5,:apply_user_id=>params[:id].to_i)
+          CourseMessage.create(:user_id => homework.user_id, :course_id => homework.course.id, :viewed => false,:course_message_id=>params[:homework_id].to_i,:course_message_type=>'HomeworkCommon',:status=>5,:apply_user_id=>params[:id].to_i,:content=>params[:content])
           @state = 2
           @ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", params[:id].to_i, params[:homework_id].to_i).first
           @homework = homework
@@ -452,7 +488,7 @@ class UsersController < ApplicationController
         user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
 
         #判断当前用户在当前课程的身份
-        visibleCourse = @user.courses.empty? ? [] : @user.courses.visible
+        visibleCourse = @user.courses.empty? ? [] : @user.courses.where("is_delete = 0").visible
         homework_ids = []
         visibleCourse.each do |course|
             homeworks = HomeworkCommon.where("course_id = #{course.id} and publish_time <= '#{Date.today}'")
@@ -473,7 +509,7 @@ class UsersController < ApplicationController
 
   def choose_user_course
     homework = HomeworkCommon.find params[:send_id].to_i
-    if homework.course.is_public == 0 && homework.user_id != User.current.id
+    if homework.user != User.current && homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)
       ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:send_id].to_i)
       if ah.empty?
         @status = 2
@@ -586,26 +622,39 @@ class UsersController < ApplicationController
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     if(params[:type].blank? || params[:type] == "1") #题库
+      if params[:is_import].to_i == 1
+        visible_course = Course.where("is_public = 1 && is_delete = 0")
+      elsif params[:is_import].to_i == 0
         visible_course = Course.where("is_delete = 0")
+      end
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 0")
+      courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id in #{course_ids}").order("#{@order} #{@b_sort}")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     elsif params[:type] == "3" #申请题库
-      #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
+      none_visible_course = Course.where("is_delete = 1")
+      none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
+      #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id).order('created_at desc')
       #homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
-      #@homeworks = HomeworkCommon.where("id in #{homework_ids}")
-      sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} order by ah.created_at desc"
+      #@homeworks = HomeworkCommon.where("id in #{homework_ids} and course_id not in #{none_visible_course_ids}")
+
+      sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} and homework_commons.course_id not in #{none_visible_course_ids} order by ah.created_at desc"
       @homeworks = HomeworkCommon.find_by_sql(sql)
     end
-    if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
-    elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
-    elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
+    if params[:property]
+      all_homework_ids = @homeworks.empty? ? "(-1)" : "(" + @homeworks.map{|h| h.id}.join(",") + ")"
+      if params[:property] == "1"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1")
+        #@homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
+      elsif params[:property] == "2"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2")
+        #@homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
+      elsif params[:property] == "3"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3")
+        #@homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
+      end
     end
     @type = params[:type]
     @property = params[:property]
@@ -622,7 +671,21 @@ class UsersController < ApplicationController
   end
 
   def show_homework_detail
-    @homework = HomeworkCommon.find params[:homework].to_i
+    homework = HomeworkCommon.find params[:homework].to_i
+    if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user
+      ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i)
+      if ah.empty?
+        @status = 2
+        @homework = nil
+      elsif ah.first.status != 2
+        @status = ah.first.status
+        @homework = nil
+      elsif ah.first.status == 2
+        @homework = homework
+      end
+    else
+      @homework = homework
+    end
     @is_import = params[:is_import]
     respond_to do |format|
       format.js
@@ -637,7 +700,11 @@ class UsersController < ApplicationController
     search = params[:name].to_s.strip.downcase
     type_ids = params[:property]=="" || params[:property].nil? ? "(1, 2, 3)" : "(" + params[:property] + ")"
     if(params[:type].blank? || params[:type] == "1") #全部
+      if params[:is_import].to_i == 1
+        visible_course = Course.where("is_public = 1 && is_delete = 0")
+      elsif params[:is_import].to_i == 0
         visible_course = Course.where("is_delete = 0")
+      end
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       all_homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'")
       all_user_ids = all_homeworks.map{|hw| hw.user_id}
@@ -652,26 +719,28 @@ class UsersController < ApplicationController
         @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and homework_type in #{type_ids} and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
       end
     elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 0")
+      courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
       if @order == "course_name"
-        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
         @homeworks = HomeworkCommon.find_by_sql(sql)
       elsif @order == "user_name"
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
       else
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
       end
     elsif params[:type] == "3" #申请题库
       apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
       homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
+      none_visible_course = Course.where("is_delete = 1")
+      none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
       if @order == "course_name"
-        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where courses.is_delete = 0 and homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
         @homeworks = HomeworkCommon.find_by_sql(sql)
       elsif @order == "user_name"
-        @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+        @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and course_id not in #{none_visible_course_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
       else
-        @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+        @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and course_id not in #{none_visible_course_ids} and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
       end
     end
 =begin
@@ -1208,13 +1277,13 @@ class UsersController < ApplicationController
   #显示更多用户课程
   def user_courses4show
     @page = params[:page].to_i + 1
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
+    @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).offset(@page * 5)
   end
 
   #显示更多用户项目
   def user_projects4show
     @page = params[:page].to_i + 1
-    @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).offset(@page * 5)
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   def user_course_activities
@@ -1302,7 +1371,7 @@ class UsersController < ApplicationController
     shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
-    user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
+    user_course_ids = (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
     project_types = "('Message','Issue','ProjectCreateInfo')"
     principal_types = "JournalsForMessage"
@@ -2549,6 +2618,9 @@ class UsersController < ApplicationController
 
   # 获取我的资源
   def get_my_resources author_id, user_course_ids, user_project_ids, order, score
+    unless author_id.to_i.to_s == author_id
+      author_id = User.find_by_login(author_id).id
+    end
     attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('OrgSubfield','Principal','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
                                        "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
@@ -2556,6 +2628,7 @@ class UsersController < ApplicationController
 
   # 获取我的资源查询结果
   def get_my_resources_search (author_id, user_course_ids, user_project_ids, order, score, search)
+    author_id = User.find_by_login(author_id).id
     @attachments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
                                         "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
@@ -2563,6 +2636,7 @@ class UsersController < ApplicationController
 
   # 获取我的课程资源
   def get_course_resources author_id, user_course_ids, order, score
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
                                    "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
@@ -2570,6 +2644,7 @@ class UsersController < ApplicationController
 
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
                                       "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
                                and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
@@ -2587,6 +2662,7 @@ class UsersController < ApplicationController
 
   # 获取我的项目资源
   def get_project_resources author_id, user_project_ids, order, score
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
                                    "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
                               and is_publish = 1 and container_id is not null)").order("#{order.nil? ? 'created_on' : order} #{score}")
@@ -2594,6 +2670,7 @@ class UsersController < ApplicationController
 
   # 获取我的项目资源搜索
   def get_project_resources_search author_id, user_project_ids, order, score, search
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
                               and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
@@ -2611,12 +2688,14 @@ class UsersController < ApplicationController
 
   # 获取我上传的附件
   def get_attch_resources author_id, order, score
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
                                'Document','Message','News','StudentWorkScore','HomewCommon'))").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我上传的附件搜索结果
   def get_attch_resources_search author_id, order, score, search
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
                                'Document','Message','News','StudentWorkScore','HomewCommon')) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
@@ -2635,11 +2714,13 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources author_id, order, score
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal'").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源搜索
   def get_principal_resources_search author_id, order, score, search
+    author_id = User.find_by_login(author_id).id
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal') and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
@@ -2656,7 +2737,7 @@ class UsersController < ApplicationController
   # 资源库 分为全部  课程资源 项目资源 附件
   def user_resource
     # 别人的资源库是没有权限去看的
-    if User.current.id.to_i != params[:id].to_i
+    if User.current.id.to_i != @user.id.to_i
       render_403
       return
     end
@@ -2711,13 +2792,13 @@ class UsersController < ApplicationController
   # 导入资源
   def import_resources
     # 别人的资源库是没有权限去看的
-    if User.current.id.to_i != params[:id].to_i
+    @user = User.find_by_login(params[:id])
+    if User.current != @user
       render_403
       return
     end
     @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id]
     @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"
-    @user = User.find(params[:id])
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
     @score = @b_sort == "desc" ? "asc" : "desc"
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
@@ -2945,10 +3026,11 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "created_at"
+    sort_name = "updated_on"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a #{sort_type}")
+    # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
+    @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 #{sort_name}").order("#{sort_name} #{sort_type}")
 
     #根据 作业+资源数排序
     if @order.to_i == 2
@@ -2989,10 +3071,11 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "created_on"
+    sort_name = "updated_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}")
+    #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}")
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}")
 
     #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
     if @order.to_i == 2

app/controllers/wechats_controller.rb

@@ -166,7 +166,7 @@ class WechatsController < ActionController::Base
        raise "非法操作, code不存在" unless params[:code]
        openid = get_openid_from_code(params[:code])
        raise "无法获取到openid" unless openid
-       raise "此微信号已绑定用户, 不能得复绑定" if user_binded?(openid)
+       raise "此微信号已绑定用户, 不能重复绑定" if user_binded?(openid)
 
        user, last_login_on = User.try_to_login(params[:username], params[:password])
        raise "用户名或密码错误,请重新登录" unless user

app/controllers/words_controller.rb

@@ -276,7 +276,7 @@ class WordsController < ApplicationController
             ids = params[:asset_id].split(',')
             update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
           end
-          @homework_common.update_column(:updated_at, Time.now)
+          @homework_common.update_column('updated_at', Time.now)
           update_course_activity(@homework_common.class,@homework_common.id)
           update_user_activity(@homework_common.class,@homework_common.id)
           update_org_activity(@homework_common.class,@homework_common.id)
@@ -297,6 +297,40 @@ class WordsController < ApplicationController
     end
   end
 
+  #作业的二级回复
+  def reply_to_homework
+    if User.current.logged?
+      @user = User.current
+      reply = JournalsForMessage.find params[:id].to_i
+      @homework_common = HomeworkCommon.find reply.jour_id
+      if params[:reply_message].size>0 && User.current.logged? && @user
+        options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i}
+        feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, options)
+        if (feedback.errors.empty?)
+          if params[:asset_id]
+            ids = params[:asset_id].split(',')
+            update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
+          end
+          @homework_common.update_column('updated_at', Time.now)
+          update_course_activity(@homework_common.class,@homework_common.id)
+          update_user_activity(@homework_common.class,@homework_common.id)
+          update_org_activity(@homework_common.class,@homework_common.id)
+          respond_to do |format|
+            format.js{
+              @user_activity_id = params[:user_activity_id].to_i
+              @is_in_course = params[:is_in_course].to_i
+              @course_activity = params[:course_activity].to_i
+            }
+          end
+        else
+          flash[:error] = feedback.errors.full_messages[0]
+        end
+      end
+    else
+      render_403
+    end
+  end
+  
   def add_brief_introdution
     user = User.current
     message = params[:new_form][:user_introduction]

app/helpers/application_helper.rb

@@ -33,10 +33,29 @@ module ApplicationHelper
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
+
+  def user_path(resource, parameters = {})
+    if Fixnum ===  resource
+      resource = User.find(resource)
+    end
+    super
+  end
+
+  # def user_blogs_path(resource,parameters={})
+  #   super
+  # end
+
+
   def update_visiti_count container
     container.update_column(:visits, container.visits + 1)
   end
 
+  def if_hidden_subdomain  field
+    domains = field.sub_domains.select{|domain| domain.hide.to_i == 0}
+    result = domains.length > 0 ? true : false
+    return result
+  end
+
   # Time 2015-03-24 15:27:29
   # Author lizanle
   # Description 从硬盘上删除对应的资源文件
@@ -2953,6 +2972,14 @@ int main(int argc, char** argv){
       return sort_projects
     end
   end
+
+  def project_sort_first projects
+    unless projects.empty?
+      project_ids = '('+projects.map{|pro|pro.project_id}.join(',')+')'
+      sort_projects = ForgeActivity.find_by_sql("SELECT updated_at,user_id, project_id FROM forge_activities WHERE project_id IN #{project_ids} ORDER BY updated_at DESC limit 1")
+      return sort_projects
+    end
+  end
 end
 
 def user_url_in_org(user_id)
@@ -2983,9 +3010,11 @@ 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, is_focus = '')
+def student_work_index_url_in_org(homework_id, is_focus = '', show_work_id = '')
   if is_focus != ''
     Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&is_focus=" + is_focus.to_s
+  elsif show_work_id != ''
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&show_work_id=" + show_work_id.to_s
   else
     Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
   end
@@ -3065,6 +3094,16 @@ def host_with_protocol
   return Setting.protocol + "://" + Setting.host_name
 end
 
+
+#获取回复的所有父节点
+def get_reply_parents parents_rely, comment
+  unless comment.parent.nil?
+    parents_rely << comment.parent
+    get_reply_parents parents_rely, comment.parent
+  end
+  parents_rely
+end
+
 #将有置顶属性的提到数组前面
 def sort_by_sticky topics
   tmpTopics = []

app/helpers/organizations_helper.rb

@@ -63,14 +63,128 @@ module OrganizationsHelper
   def subfield_status_option
     type = []
     option1 = []
-    option1 << "列表"
+    option1 << "左一"
     option1 << "1"
     type << option1
-    option2 = []
-    option2 << "图片"
-    option2 << "0"
-    type << option2
+    # option2 = []
+    # 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_status_option_default
+    type = []
+    option1 = []
+    option1 << "左一"
+    option1 << "1"
+    type << option1
+    option3 = []
+    option3 << "左二"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "左三"
+    option4 << "4"
+    type << option4
+    option6 = []
+    option6 << "右一"
+    option6 << "6"
+    type << option6
+    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
+
+  def org_subfield_had_created?(org, type)
+    sub_field = org.org_subfields.select{|subfield| subfield.field_type == type}
+    result = sub_field.length > 0 ? true : false
+    result
+  end
+
+  def org_subfield_type(field)
+    case field.field_type
+      when "Post"
+        result = "帖子"
+      when "Resource"
+        result = "资源"
+      when "Compstu"
+        result = "学生"
+      when "Comptec"
+        result = "教师"
+      when "Complex"
+        result = "综合"
+    end
+  end
+
+  def org_teacher_resource_count user
+    results = Attachment.find_by_sql("SELECT * FROM attachments where author_id = #{user.id};").count
+  end
+
+  def org_teacher_course_count user
+    results = Course.find_by_sql("select * from courses where courses.tea_id = #{user.id}").count
+  end
+
+  def org_student_course_count user
+    course_ids = user.courses.map { |c| c.is_delete == 0 && c.id}
+    results = Member.find_by_sql("select id from courses where courses.tea_id = #{user.id}").count
+  end
+
+  def excellent_teachers
+    User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
+                                   from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 order by course_count desc").first(5)
+  end
+
 end

app/helpers/student_work_helper.rb

@@ -23,7 +23,7 @@ module StudentWorkHelper
 
   #获取指定用户对某一作业的评分结果
   def student_work_score work,user
-    StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).first
+    StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).last
   end
 
   #获取指定评分的角色

app/helpers/sub_document_comments_helper.rb

@@ -0,0 +1,2 @@
+module SubDocumentCommentsHelper
+end

app/helpers/sub_domains_helper.rb

@@ -0,0 +1,5 @@
+module SubDomainsHelper
+  include OrganizationsHelper
+
+
+end

app/models/apply_homework.rb

@@ -1,5 +1,5 @@
 class ApplyHomework < ActiveRecord::Base
-  #status：1. 待审核 2.审核通过 3.已拒绝
+  #status：1. 等待回复 2.审核通过 3.已拒绝
   belongs_to :user
   belongs_to :homework_common
   attr_accessible :status, :user_id, :homework_common_id

app/models/course_message.rb

@@ -15,7 +15,7 @@ class CourseMessage < ActiveRecord::Base
   validates :course_id,presence: true
   validates :course_message_id,presence: true
   validates :course_message_type, presence: true
-  validates_length_of :content, :maximum => 100
+  #validates_length_of :content, :maximum => 100
   after_create :add_user_message
 
   def add_user_message

app/models/homework_common.rb

@@ -18,6 +18,7 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+  has_many :apply_homeworks, :dependent => :destroy
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy

app/models/issue.rb

@@ -262,7 +262,7 @@ class Issue < ActiveRecord::Base
       # set default values for new records only
       self.status ||= IssueStatus.default
       self.priority ||= IssuePriority.default
-      self.watcher_user_ids = []
+      # self.watcher_user_ids = []
     end
   end
 

app/models/journals_for_message.rb

@@ -256,6 +256,11 @@ class JournalsForMessage < ActiveRecord::Base
       end
     end
     if self.jour_type == 'HomeworkCommon'
+      if self.m_parent_id.nil?
+        if self.user_id != self.jour.user_id
+          self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.course.id, :viewed => false)
+        end
+      end
       count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
       if count == 0
         ws = WechatService.new

app/models/news.rb

@@ -62,7 +62,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 

app/models/org_subfield.rb

@@ -7,6 +7,7 @@ class OrgSubfield < ActiveRecord::Base
   has_many :messages, :through => :org_subfield_messages
   has_many :boards, :dependent => :destroy
   has_many :news, :dependent => :destroy
+  has_many :sub_domains, :dependent => :destroy
   acts_as_attachable
   after_create :create_board_sync
   after_destroy :update_priority

app/models/organization.rb

@@ -22,4 +22,12 @@ class Organization < ActiveRecord::Base
     OrgSubfield.create(:organization_id => self.id, :name => 'course', :field_type => 'default', :priority => 2)
     OrgSubfield.create(:organization_id => self.id, :name => 'project', :field_type => 'default', :priority => 3)
   end
+
+  def switch_type
+    self.show_mode.to_i == 1 ? true : false
+  end
+
+  def allow_set_teachers
+    self.allow_teacher.to_i == 1 ? true : false
+  end
 end

app/models/school.rb

@@ -5,4 +5,5 @@ class School < ActiveRecord::Base
   def to_s
   	self.name.to_s
   end
+
 end

app/models/student_works_score.rb

@@ -18,17 +18,29 @@ class StudentWorksScore < ActiveRecord::Base
       receiver = self.student_work.user
       # 判断是第一次评阅还是更新 status:0 新建；1 更新
       if self.created_at == self.updated_at
-        if self.comment.nil?
+        if self.comment.nil? && self.score
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                        :viewed => false, :content => "作业评分：#{self.score}", :status=> false)
+        elsif self.score.nil? && self.comment
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "评语：#{self.comment}", :status=> false)
+        elsif self.comment.nil? && self.score.nil?
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "上传了批阅附件", :status=> false)
         else
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                     :viewed => false, :content => "作业评分：#{self.score}&nbsp;&nbsp;&nbsp; 评语：#{self.comment}", :status=> false)
         end
       else # 更新
-        if self.comment.nil?
+        if self.comment.nil? && self.score
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                        :viewed => false, :content => "作业评分：#{self.score}", :status=> true)
+        elsif self.score.nil? && self.comment
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "评语：#{self.comment}", :status=> true)
+        elsif self.comment.nil? && self.score.nil?
+          self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
+                                                    :viewed => false, :content => "上传了批阅附件", :status=> true)
         else
           self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id,
                                                        :viewed => false, :content => "作业评分：#{self.score}&nbsp;&nbsp;&nbsp; 评语：#{self.comment}", :status=> true)

app/models/sub_document_comment.rb

@@ -0,0 +1,33 @@
+class SubDocumentComment < ActiveRecord::Base
+  attr_accessible :content, :creator_id, :locked, :org_subfield_id, :parent_id, :reply_id, :sticky, :sub_domain_id, :title
+
+  include Redmine::SafeAttributes
+  include ApplicationHelper
+  belongs_to :sub_domain
+  belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
+  acts_as_tree :order => "#{SubDocumentComment.table_name}.sticky asc, #{SubDocumentComment.table_name}.created_at desc"
+  acts_as_attachable
+  has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy
+  after_create :document_save_as_sub_activity
+  after_update :update_activity
+  validates_presence_of :content
+
+  #动态的更新
+  private
+  def update_activity
+    org_activity = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", id).first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
+  end
+
+  def document_save_as_sub_activity
+    if(self.parent().nil?)
+      self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.sub_domain.id, :container_type => 'SubDomain')
+    else
+      act = OrgActivity.where("org_act_type='SubDocumentComment' and org_act_id =?", self.root.id).first
+      act.update_attributes(:updated_at => self.updated_at)
+    end
+  end
+end

app/models/sub_domain.rb

@@ -0,0 +1,5 @@
+class SubDomain < ActiveRecord::Base
+  attr_accessible :field_type, :hide, :name, :org_subfield_id, :priority, :status
+  belongs_to :org_subfield, :foreign_key => :org_subfield_id
+  has_many :sub_document_comments, :dependent => :destroy
+end

app/models/user.rb

@@ -108,6 +108,7 @@ class User < Principal
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   has_many :student_work_projects, :dependent => :destroy
+  has_many :apply_homeworks, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
@@ -308,6 +309,20 @@ class User < Principal
   end
 
   # ======================================================================
+  def my_workplace
+    self.user_extensions.try(:occupation).to_s
+  end
+
+  def my_blogs_count
+    self.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count
+  end
+
+  def my_students
+    my_students=StudentsForCourse.find_by_sql("SELECT SUM(student_count) as students_count, c.tea_id FROM courses c, (SELECT course_id , COUNT(id) AS student_count FROM students_for_courses GROUP BY course_id) AS ct
+                                 WHERE c.id= ct.course_id and c.tea_id = #{self.id} GROUP BY c.tea_id").first
+    results = my_students.blank? ? 0 : my_students.students_count
+    results
+  end
 
   # 查询用户未读过的记录
   # 用户留言记录
@@ -1072,16 +1087,25 @@ class User < Principal
     anonymous_user
   end
 
+  def self.is_id?(id)
+    Fixnum===id || id.to_i.to_s == id
+  end
+
   # refactor User model find function,
   # return anonymous user when can not find user id = user_id
   def self.find (*args, &block)
     begin
+      return find_by_login(args.first) if args.size==1 && !is_id?(args.first)
       super
     rescue
       self.anonymous
     end
     # super
   end
+
+  def to_param
+    login
+  end
   # Salts all existing unsalted passwords
   # It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
   # This method is used in the SaltPasswords migration and is to be kept as is

app/views/admin/apply_for_homework.html.erb

@@ -0,0 +1,89 @@
+<h3>
+  <%=l(:label_apply_homework)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 120px;">
+        作业名称
+      </th>
+      <th style="width: 120px;">
+        课程名称
+      </th>
+      <th style="width: 50px;">
+        作者
+      </th>
+      <th style="width: 50px;">
+        申请者
+      </th>
+      <th style="width: 50px;">
+        申请状态
+      </th>
+      <th style="width: 70px;">
+        申请日期
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <%@count=@page*30 %>
+    <% for homework in @homework do %>
+        <% unless homework.nil? %>
+            <% @count+=1 %>
+            <tr>
+              <td align="center">
+                <%=@count %>
+              </td>
+              <% c_h = HomeworkCommon.find homework.homework_common_id %>
+              <% if c_h %>
+                  <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=c_h.name%>'>
+                    <%=link_to(c_h.try(:name), student_work_index_path(:homework => c_h.id))%>
+                  </td>
+                  <% if c_h.course %>
+                      <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=c_h.course.name%>'>
+                        <%= link_to(c_h.course.name, course_path(c_h.course.id)) %>
+                      </td>
+                  <% end %>
+                  <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if c_h.try(:user).try(:realname) == ' '%><%= c_h.try(:user)%><% else %><%=c_h.try(:user).try(:realname) %><% end %>'>
+                    <% if c_h.try(:user).try(:realname) == ' '%>
+                        <%= link_to(c_h.try(:user), user_path(c_h.user_id)) %>
+                    <% else %>
+                        <%= link_to(c_h.try(:user).try(:realname), user_path(c_h.user_id)) %>
+                    <% end %>
+                  </td>
+              <% end %>
+              <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
+                <% if homework.try(:user).try(:realname) == ' '%>
+                    <%= link_to(homework.try(:user), user_path(homework.user_id)) %>
+                <% else %>
+                    <%= link_to(homework.try(:user).try(:realname), user_path(homework.user_id)) %>
+                <% end %>
+              </td>
+              <td align="center">
+                <% if homework.status == 1 %>
+                    等待回复
+                <% elsif homework.status == 2 %>
+                    已通过
+                <% else %>
+                    已拒绝
+                <% end %>
+              </td>
+              <td align="center">
+                <%=format_date( homework.created_at ) %>
+              </td>
+            </tr>
+        <% end %>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_apply_homework)) -%>

app/views/blogs/_article.html.erb

@@ -16,6 +16,7 @@
         <div class="cl"></div>
       </div>
       <div class="bloglistbox">
+        <% if topics.any? %>
         <% topics.each do |activity| %>
             <ul class="list-file">
               <li><span class="item_list fl"></span>
@@ -61,6 +62,9 @@
           </ul>
           <div class="cl"></div>
         </div>
+        <% else %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
+        <% end %>
       </div>
     </div>
 </div>

app/views/boards/_course_new.html.erb

@@ -2,6 +2,7 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 <script type="text/javascript">
+    var first_click = true;
     function nh_check_field(params){
         var result=true;
         if(!regexTopicSubject()) {
@@ -49,10 +50,12 @@
              contentmsg:params.contentmsg,
              textarea:params.textarea
              });
-            if(is_checked){
+            if(first_click && is_checked){
                 if(flag){
+                    first_click = false;
                     return true;
                 }else{
+                    first_click = false;
                     $(this)[0].submit();
                     return false;
                 }

app/views/courses/_course_outlines_list.html.erb

@@ -18,7 +18,7 @@
               <li class="fl">
                 <input name="outline_id" type="radio" value="<%= article.id%>" class="courseSendCheckbox"/>
               </li>
-              <li class="blogTitle fl"><%= article.title%></li>
+              <li class="blogTitle fl mw220"><%= article.title%></li>
             </ul>
             <div class="homeworkPublishTime">发布时间：<%= format_date(article.created_at)%></div>
         <% end %>

app/views/courses/new.html.erb

@@ -9,7 +9,7 @@
           <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
           <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();">
-          <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>
+          <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
         </li>
         <div class="cl"></div>
         <li  class="ml45">

app/views/exercise/_exercise_form.html.erb

@@ -87,10 +87,19 @@
         var standard_ans = $.trim($("#question_standard_ans").val());
         if(title.length == 0 || score.length == 0){
             alert("题目标题/分数不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else if(!/^[1-9][0-9]*$/.test(score)) {
             alert("分数必须是非零开头的数字");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else if(quest_type !=3 && standard_ans.length == 0) {
             alert("标准答案不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else{
             doc.parent().parent().parent().submit();}
     }

app/views/exercise/_new_MC.html.erb

@@ -54,9 +54,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
 <% end %>
+<script type="text/javascript">
+  $(function(){
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this),1);
+      });
+  });
+</script>

app/views/exercise/_new_MCQ.html.erb

@@ -54,9 +54,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
 <% end %>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question").one('click', function(){
+            add_poll_question($(this),2);
+        });
+    });
+</script>

app/views/exercise/_new_single.html.erb

@@ -42,9 +42,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
 <% end %>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question").one('click', function(){
+            add_poll_question($(this),3);
+        });
+    });
+</script>

app/views/exercise/_show_MC.html.erb

@@ -90,7 +90,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -102,6 +102,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),1);
+                });
                 }
        }
         else {

app/views/exercise/_show_MCQ.html.erb

@@ -89,7 +89,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -101,6 +101,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),2);
+                });
         }
         }else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");

app/views/exercise/_show_single.html.erb

@@ -65,7 +65,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -77,6 +77,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),3);
+                });
             }
         } else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");

app/views/exercise/_student_exercise.html.erb

@@ -50,29 +50,19 @@
         }*/
     </script>
     <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
-      <li class="hworkList340 width530">
-        <ul>
+      <li class="ml5 mr5" style="width:28px; text-align:center;">1</li>
       <li class="hworkPortrait mt15 mr10">
-            <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %>
+        <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %>
       </li>
-          <div id="show_student_result_div_<%= exercise.id%>" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
-            <li>
-              <ul class="mt10 fl">
-                <li class="hworkStName mr15 mt16" title="姓名" id="student_name_<%= exercise.id%>">
+      <li class="hworkStName" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
         <%=exercise.user.show_name %>
-                </li>
-                <li class="hworkStID mr10 mt16" title="学号" id="student_id_<%= exercise.id%>">
+      </li><li class="hworkStID pl15 pr10" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
       <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
     </li>
-                <li class="hworkStID mt16" title="班级"  id="student_class_<%= exercise.id%>">
+      <li class="hworkStID" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
         --
       </li>
-              </ul>
-            </li>
-          </div>
-        </ul>
-      </li>
-      <li class="hworkList130 c_grey student_work_<%= exercise.id%>">
+      <li class="hworkList130 ml200 c_grey student_work_<%= exercise.id%>">
         <% if exercise.created_at%>
             <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
             <% if @exercise.end_time <= exercise.created_at %>

app/views/exercise/_student_table.html.erb

@@ -1,5 +1,6 @@
 <ul class="hworkUl">
   <li class="hworkList340 hworkH30 width530">
+    <span class="c_dark f14 fb fl mr5">序号</span>
     <span class="c_dark f14 fb fl mr55">&nbsp;&nbsp;</span>
     <span class="c_dark f14 fb fl mr60">姓名</span>
     <span class="c_dark f14 fb fl mr60">学号</span>

app/views/forums/_show_topics.html.erb

@@ -29,7 +29,9 @@
             <div class="cl"></div>
           </div>
       <% end %>
-
+      <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+        <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
+      </ul>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>

app/views/forums/show.html.erb

@@ -41,9 +41,6 @@
   <div id="topics_list">
     <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
   </div>
-  <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
-    <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
-  </ul>
 
   <!--<div class="pageRoll">-->
     <!--<div class="pageCell"><a href="javascript:void(0);" class="linkBlue">上一页</a></div>-->
@@ -112,11 +109,13 @@
         <% end %>
     });
 
+    var first_click = true;
     function check_and_submit(){
         if(!check_memo_name()){
             return;
         }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
+        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){
+            first_click = false;
             memo_content.sync();
             $.ajax({
                 url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',

app/views/forums/show.js.erb

@@ -1,2 +1 @@
 $("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>")
-$("#pages").html('<%= pagination_links_full @topic_pages, @topic_count,:per_page_links => false,:remote =>true%>');

app/views/layouts/_user_courses.html.erb

@@ -84,10 +84,10 @@
 <% end%>
 
 <script type="text/javascript">
-    var coursecount = <%= @user.courses.visible.where("is_delete =?", 0).select("courses.* FROM `course_activities` WHERE course_activities.course_id = courses.id) ").count %>;
+    var coursecount = <%= @user.courses.visible.where("is_delete =?", 0).count %>;
     var courseshowcount = document.getElementsByClassName("coursesLineGrey").length;
 
-    if((coursecount == courseshowcount)&&(coursecount > 5) ){
+    if((coursecount <= courseshowcount)&&(coursecount > 5) ){
         $("#user_show_more_course").hide();
         $('#user_hide_course').show();
     }

app/views/layouts/_user_projects.html.erb

@@ -64,10 +64,10 @@
 <% end%>
 
 <script type="text/javascript">
-    var projectcount = <%= @user.projects.visible.select("projects.* FROM `forge_activities` WHERE forge_activities.project_id = projects.id) ").count %>;
+    var projectcount = <%= @user.projects.visible.count %>;
     var projectshowcount = document.getElementsByClassName("projectsLineGrey").length;
 
-    if((projectcount == projectshowcount)&&(projectcount > 5)){
+    if((projectcount <= projectshowcount)&&(projectcount > 5)){
         $("#user_show_more_project").hide();
         $('#user_hide_project').show();
     }

app/views/layouts/base_org.html.erb

@@ -134,6 +134,7 @@
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+
       </div>
       <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %></div>
     </div>

app/views/layouts/base_org2.html.erb

@@ -27,14 +27,14 @@
           tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
         });
   </script>
-  <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></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(){
+    $(document).ready(function(){
         scrollPic();
-      }
+    });
       function scrollPic() {
           var scrollPic = new ScrollPic();
           scrollPic.scrollContId   = "scrollPic"; //内容容器ID
@@ -50,59 +50,48 @@
           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 class="sn-logo">
+        <% if @org_logo_attchment.blank? %>
+            <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13" alt=""/>
+        <% else %>
+            <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+        <% end %>
+        <!--<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">
+    <div class="sn-row sn-bg-blue sn-p-relative">
       <ul class="sn-nav">
         <% @subfield_content.each do |field| %>
             <% if is_default_field?(field) %>
                 <% case field.name %>
                 <% when 'activity' %>
-                    <li class="nav-element">
+                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
                       <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
                     </li>
                 <% when 'course' %>
-                    <li class="nav-element">
+                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
                       <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
                     </li>
                 <% when 'project' %>
-                    <li class="nav-element">
+                    <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
                       <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
                     </li>
                 <% end %>
@@ -111,6 +100,15 @@
                     <li class="nav-element">
                       <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
                     </li>
+                    <!--二级目录-->
+                    <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                      <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                        <% field.sub_domains.each do |subdomain| %>
+                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                            <li class="sn-subnav-slice">|</li>
+                        <% end %>
+                      </ul>
+                    </div>
                 <% elsif field.field_type == "Resource" && field.hide == 0 %>
                     <li class="nav-element">
                       <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
@@ -136,11 +134,10 @@
   <% @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 %>
+      <% elsif field.status.to_i == 3 %>
           <%#= 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>
@@ -160,6 +157,8 @@
           <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
       <% elsif field.status.to_i == 8 %>
           <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 23 %>
+          <%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
       <% end %>
   <% end %>
 </div>
@@ -183,10 +182,55 @@
   </div>
 </footer>
 
+<!--页面底部-->
+<div class="cl"></div>
+<div id="ajax-modal" style="display:none;"></div>
+
 <div id="ajax-indicator" style="display:none;">
   <span><%= l(:label_loading) %></span>
 </div>
 <%#= call_hook :view_layouts_base_body_bottom %>
 </body>
+<script>
+    $(".nav-element").mouseover(function(){
+        $(this).next(".sn-grey-opacity").show(0);
+    });
+    $(".sn-grey-opacity").mouseover(function(){
+        $(this).show(0);
+    });
+    $(".nav-element").mouseout(function(){
+        $(this).next(".sn-grey-opacity").delay(150).hide(0);
+    });
+    $(".sn-grey-opacity").mouseout(function(){
+        $(this).delay(150).hide(0);
+    });
+    $(".sn-sub-nav").each(function(){
+        $(this).children(".sn-subnav-slice:last").hide();
+    });
+</script>
+
+<!--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>
+
 </html>
 

app/views/layouts/base_sub_domain.html.erb

@@ -0,0 +1,191 @@
+<!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  'org_new_style','jquery/jquery-ui-1.9.2', 'org2' %>
+  <%= 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>
+      $(document).ready(function(){
+        $(".nav-element").mouseover(function(){
+            $(this).next(".sn-grey-opacity").show(0);
+      });
+        $(".sn-grey-opacity").mouseover(function(){
+            $(this).show(0);
+        });
+        $(".nav-element").mouseout(function(){
+            $(this).next(".sn-grey-opacity").delay(150).hide(0);
+        });
+        $(".sn-grey-opacity").mouseout(function(){
+            $(this).delay(150).hide(0);
+        });
+        $(".sn-sub-nav").each(function(){
+            $(this).children(".sn-subnav-slice:last").hide();
+        });
+    });
+  </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();">
+<!--内容开始-->
+<div class="sn-inner-body">
+  <header>
+    <div class="sn-header">
+      <%= render :partial => 'organizations/org_logined_header' %>
+      <div class="sn-row sn-bg-white">
+        <div class="sn-logo">
+          <% if @org_logo_attchment.blank? %>
+              <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13" alt=""/>
+          <% else %>
+              <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
+          <% end %>
+          <% if User.current.admin_of_org?(@organization) %>
+                <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+          <% end %>
+
+        </div>
+      </div>
+      <!--导航-->
+      <div class="sn-row sn-bg-blue sn-p-relative">
+        <ul class="sn-nav">
+          <% @subfield_content.each do |field| %>
+              <% if is_default_field?(field) %>
+                  <% case field.name %>
+                  <% when 'activity' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+                      </li>
+                  <% when 'course' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+                      </li>
+                  <% when 'project' %>
+                      <li class="nav-element-default"  style="display:<%= field.hide == 0?'block':'none' %>;">
+                        <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>
+                      <!--二级目录-->
+                      <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
+                        <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
+                          <% field.sub_domains.each do |subdomain| %>
+                              <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey" %></li>
+                              <li class="sn-subnav-slice">|</li>
+                          <% end %>
+                        </ul>
+                      </div>
+                  <% 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 class="sn-row">
+        <div class="sn-banner">
+          <img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" />
+          <!--<a href="#" class="sn-banner-add" title="点击替换图片" ></a>-->
+        </div>
+      </div>
+    </div>
+  </header>
+<%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+<%# over %>
+  <!--内容开始-->
+
+  <!--内容结束-->
+  <%= render_flash_messages %>
+  <%= yield %>
+  <%= call_hook :view_layouts_base_content %>
+  <div style="clear:both;"></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>
+
+<!--页面底部-->
+<div class="cl"></div>
+<div id="ajax-modal" style="display:none;"></div>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+</body>
+</html>
+
+
+

app/views/layouts/new_base_user.html.erb

@@ -226,8 +226,7 @@
 
            end
         %>
-        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
-
+        <% 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' : ''%>" >
           <div class = "leftCoursesList" id="homepageLeftMenuCourses">
               <ul>
@@ -258,7 +257,7 @@
            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)%>
+        <% projects = @user.projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
         <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" >
           <div class = "leftProjecsList" id="homepageLeftMenuForge">
               <ul>
@@ -347,28 +346,30 @@
   </div><!--floatbox end-->
 </div>
 <script type="text/javascript">
+    $(function(){
+        $('#user_hide_course').hide();
+        $('#user_hide_project').hide();
+    });
+
     $("#courseMenu").mouseenter(function(){
         $("#topnav_course_menu").show();
     });
     $("#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>

app/views/news/_course_show.html.erb

@@ -186,7 +186,7 @@
                   <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
                     <%= l(:label_cancel_with_space) %>
                   </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
                     <%= l(:label_comment_with_space) %>
                   </a>
                 </p>
@@ -199,6 +199,9 @@
 </div>
 <script type="text/javascript">
     $(function(){
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
             var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");

app/views/news/_organization_show.html.erb

@@ -161,7 +161,7 @@
                   <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
                     <%= l(:label_cancel_with_space) %>
                   </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
                     <%= l(:label_comment_with_space) %>
                   </a>
                 </p>
@@ -174,6 +174,9 @@
 </div>
 <script type="text/javascript">
     $(function(){
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
             var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");

app/views/news/_project_show.html.erb

@@ -171,7 +171,7 @@
                   <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
                     <%= l(:label_cancel_with_space) %>
                   </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                  <a href="javascript:void(0)" class="blue_btn fr" id="news_submit_comment">
                     <%= l(:label_comment_with_space) %>
                   </a>
                 </p>
@@ -184,6 +184,9 @@
 </div>
 <script type="text/javascript">
     $(function(){
+        $("#news_submit_comment").one('click',function(){
+            submitComment();
+        });
         $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
             var postContent = $(this).html();
             postContent = postContent.replace(/&nbsp;/g," ");

app/views/org_document_comments/add_reply.js.erb

@@ -1,2 +1,2 @@
-$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
+$("#organization_document_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
 sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");

app/views/org_subfields/create.js.erb

@@ -4,6 +4,7 @@
         :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+    $("#org_excellent_teachers").html("<%= escape_javascript(render :partial => 'organizations/setting_excellent_teachers') %>");
 <% end %>
 $("#subfield_name").val("");
 $("#sub_dir").val("");

app/views/org_subfields/destroy.js.erb

@@ -3,3 +3,4 @@ $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organiza
     :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#org_excellent_teachers").html("<%= escape_javascript(render :partial => 'organizations/setting_excellent_teachers') %>");

app/views/organizations/_link_subfield_more.html.erb

@@ -0,0 +1,9 @@
+<% 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 "更多", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+    <% else %>
+        <%= link_to "更多", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more" , :target => "_blank"  %>
+    <% end %>
+<% else %>
+    <%= link_to "更多", organization_path(@organization, :org_subfield_id => field.id), :class => "more" , :target => "_blank"  %>
+<% end %>

app/views/organizations/_org_course_homework.html.erb

@@ -140,8 +140,8 @@
       <div class="cl"></div>
       <% if activity.student_works.count != 0 %>
         <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %>
-        <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
-        <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %>
+        <%# student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %>
+        <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %>
         <% unless student_work_scores.empty?  %>
             <% last_score = student_work_scores.first %>
             <div>
@@ -159,8 +159,18 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_url_in_org(activity.id), :alt => "学生头像" %>
-                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_url_in_org(activity.id)%></p>
+                <a href="javascript:void(0);" class="linkBlue">
+                  <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_url_in_org(activity.id, '', sw.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_url_in_org(activity.id, '', sw.id)%>
+                      </p>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+                      <p class="w100 hidden">
+                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
+                      </p>
+                  <% end %>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>
@@ -182,7 +192,8 @@
             <% sort_projects = project_sort_update projects %>
             <div class="mt10 relatePWrap" id="relatePWrap_<%=user_activity_id %>">
               <div class="mr5 fontGrey2">
-                #&nbsp;<%=time_from_now sort_projects.first.updated_at %><%= link_to User.find(sort_projects.first.user_id).show_name, user_activities_url_in_org(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
+                <% first_pro = project_sort_first(projects).first %>
+                #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_url_in_org(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
               </div>
               <div class="cl"></div>
               <% sort_projects.each_with_index do |pro, i| %>
@@ -275,7 +286,8 @@
   <% count=activity.journals_for_messages.count %>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
+      <div class="homepagePostReplyBannerCount"><span>回复</span>
+        <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=user_activity_id %>">
           <% if activity.user == User.current %>
@@ -317,7 +329,34 @@
                       <% else %>
                           <%= link_to comment.try(:user).try(:realname), user_url_in_org(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_time(comment.created_on) %>
+                      <%= time_from_now(comment.created_on) %>
+                    </div>
+                    <% unless comment.m_parent_id.nil? %>
+                        <% parents_rely = [] %>
+                        <% parents_rely = get_reply_parents parents_rely, comment %>
+                        <% length = parents_rely.length %>
+                        <div id="comment_reply_<%=comment.id %>">
+                          <% if length <= 3 %>
+                              <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+                          <% else %>
+                              <div class="orig_cont clearfix">
+                                <div class="orig_cont clearfix">
+                                  <div id="comment_reply_<%=parents_rely[length - 1].id %>">
+                                    <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+                                  </div>
+                                  <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+                                </div>
+                                <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
+                                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                              </div>
+                          <% end %>
+                        </div>
+                    <% end %>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                      <%= comment.notes.html_safe %></div>
+                    <div class="orig_reply mb10 mt-10">
+                      <div class="reply">
+                                <span class="reply-right">
                                     <span id="reply_praise_count_<%=comment.id %>">
                                       <% if comment.user == User.current %>
                                           <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
@@ -325,15 +364,25 @@
                                           <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                                       <% end %>
                                     </span>
-                      <div id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
+                                    <span style="position: relative" class="fr mr20">
+                                        <%= link_to(
+                                                    l(:button_reply),
+                                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
+                                                    :remote => true,
+                                                    :method => 'get',
+                                                    :title => l(:button_reply)) %>
+                                      <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                                    </span>
+                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
                                   <% if User.current.admin? ||is_teacher || comment.user == User.current%>
-                            <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity},
-                                        :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
+                                        <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity},
+                                                    :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
                                     <% end %>
+                                </span>
+                        <div class="cl"></div>
                       </div>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
+                    <p id="reply_message_<%= comment.id%>"></p>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -43,6 +43,13 @@
             $(this).prev().css("color","#808080");
             $(this).css("z-index", "1");
         })
+
+        //二级菜单滑动时箭头方向控制
+        $(".homepageLeftMenuMoreIcon").toggle(function(){
+            $(this).css("background","url(/images/homepage_icon.png) 100px -624px no-repeat");
+        },function(){
+            $(this).css("background","url(/images/homepage_icon.png) -74px -240px no-repeat");
+        });
     })
 </script>
 
@@ -83,35 +90,55 @@
             </div>
         <% end %>
     <% else %>
-        <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
-          <% if field.field_type == "Post" %> <!--讨论帖子-->
+        <div style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
+          <% if field.field_type == "Post" || field.field_type == "Complex" || field.field_type == "Compstu" || field.field_type == "Comptec" %> <!--讨论帖子-->
+              <div class="homepageLeftMenuBlock">
+                <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
                 <% 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 "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                        <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% else %>
-                      <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
                 <% else %>
-                  <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+                    <% if field.field_type == "Comptec" %>
+                        <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% else %>
+                        <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
-              <% if User.current.member_of_org?organization %>
+                <% end %>
+                <% if User.current.logged? and User.current.admin_of_org?(organization) && field.field_type != "Comptec"  %>
                     <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
                 <% end %>
+              </div>
+              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
+                <ul>
+                  <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq.limit(5), :org_subfield_id => field.id} %>
+                </ul>
+              </div>
+
+              <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
+                  <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
+                    <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
+                  </li>
+              <% end %>
           <% else %>
+              <div class="homepageLeftMenuBlock">
                   <% 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 "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                          <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %>
                       <% else %>
-                      <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+                          <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %>
                       <% end %>
                   <% else %>
-                  <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
+                      <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText homepageMenuControl hidden" %>
                   <% end %>
                   <% if User.current.member_of_org?organization %>
                       <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
                       <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
                   <% end %>
                   <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
+              </div>
           <% end %>
         </div>
         <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">

app/views/organizations/_org_subdomain.html.erb

@@ -0,0 +1,11 @@
+<% subdomains.each do |subdomain|%>
+    <li class="homepageLeftMenuCoursesLine" style="display:<%= subdomain.hide.to_i == 0?'block':'none' %>;position:relative;" id="sub_domain_hide_<%= subdomain.id %>">
+      <%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %>
+    </li>
+<% end %>
+<%# if subdomains.size == 5 %>
+    <!--<li class="homepageLeftMenuMore" id="show_more_org_project">-->
+      <!--<input type="hidden" value="<%#= page %>" id="org_project_page_num">-->
+      <!--<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%#=  more_org_projects_organization_path(org_id) %>');"></a>-->
+    <!--</li>-->
+<%# end%>

app/views/organizations/_org_subfield_leftD.html.erb

@@ -1,25 +1,3 @@
-<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' %>
@@ -31,19 +9,24 @@
     <% 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' %>;">
+              <h2 class="h2-title"><%= field.name %>
+                <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+              </h2>
+              <div class="sn-index-partnerbox " >
+                <ul id="scrollPic" >
+                  <div class="scroll-control">
+                      <div class="scroll-container">
+                        <% org_acts.first(8).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) %>
                                 <% 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" %>
+                                    <li class="sn-fl"><%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg" %></li>
                                 <% 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" %>
+                                    <li class="sn-fl"><%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg"  %></li>
                                 <% 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 %>
@@ -51,16 +34,16 @@
                                     <% 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" %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
                                         <% 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" %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
                                         <% 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" %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
                                         <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
                                         <% end %>
                                     <% end %>
                                 <% end %>
@@ -68,28 +51,15 @@
                                     <% 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" %>
+                                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
                                     <% else %>
-                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
+                                    <% end %>
                                 <% 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">
@@ -99,19 +69,36 @@
                 </div>
               </div>
             </div>
+        <% else %>
+            <%= render :partial => 'organizations/org_subfield_leftD_default', :locals => {:field => field} %>
         <% 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" %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), 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"  %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), 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"  %>
+              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>
 <% end %>
+
+<script>
+  $(document).ready(function(){
+      var num = $(".scroll-container").children().size();
+      var num = Math.round(num/4);
+      var divWidth = 380*num;
+      $(".scroll-container").css("width",divWidth).css("height",110);
+      if(num%2 != 0) {
+          var controlWidth = 380*num + 380;
+      }else{
+          var controlWidth = 380*num;
+      }
+      $(".scroll-control").css("width",controlWidth);
+  });
+</script>

app/views/organizations/_org_subfield_leftD_default.html.erb

@@ -0,0 +1,19 @@
+<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+  <h2 class="h2-title">栏目名称</h2>
+  <div class="sn-index-partnerbox " >
+    <ul id="scrollPic" >
+      <div style="width: 760px;">
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+        <li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="/images/default_blank/left-05.jpg" width="368" height="43" alt="" /></a></li>
+      </div>
+    </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>

app/views/organizations/_org_subfield_leftM1.html.erb

@@ -1,66 +1,69 @@
-<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? %>
+            <h2 class="h2-title">课程动态</h2>
+            <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
+            <h2 class="h2-title">课程动态</h2>
+            <div class="cl"></div>
             <% @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" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% 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" %>
+                          <%= 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",:style=>"display:block;" %>
                       <% 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 class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
                       </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.name.to_s, student_work_index_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></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" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% 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" %>
+                          <%= 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",:style=>"display:block;" %>
                       <% 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 %>
+                        <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, 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.content.to_s.html_safe %></p>
+                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
                       </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></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" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% 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" %>
+                          <%= 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",:style=>"display:block;" %>
                       <% 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 class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
                       </div>
+
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.title.to_s, news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                     </div>
                 <% elsif act.org_act_type == "Poll" %>
                     <% activity = Poll.find(act.org_act_id) %>
@@ -70,9 +73,9 @@
                     <% 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" %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                           <% 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" %>
+                              <%= 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",:style=>"display:block;" %>
                           <% end %>
                           <h3>
                             <% if has_commit %>
@@ -83,8 +86,9 @@
                           </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 class="sn-news-wrap"><%= activity.polls_description.to_s.html_safe %></div>
                           </div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                         </div>
                     <% end %>
                 <% end %>
@@ -92,63 +96,66 @@
         <% end %>
     <% when 'project' %>
         <% if @project_acts.blank? %>
+            <h2 class="h2-title">项目动态</h2>
+            <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <% @project_acts.first(4).each do |act| %>
+            <h2 class="h2-title">项目动态</h2>
+            <div class="cl"></div>
+            <% @project_acts.first(1).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" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% 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" %>
+                          <%= 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",:style=>"display:block;" %>
                       <% 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 class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
                       </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.subject.to_s, issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></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" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% 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" %>
+                          <%= 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",:style=>"display:block;" %>
                       <% end %>
+                      <h3> <!--+"(帖子标题)"-->
+                            <%= link_to activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, 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.content.to_s.html_safe %></p>
+                        <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
                       </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></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" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% 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" %>
+                          <%= 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",:style=>"display:block;" %>
                       <% 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 class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
                       </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                     </div>
                 <% end %>
             <% end %>
@@ -158,9 +165,15 @@
     <% if field.field_type == "Post" %>
         <% org_acts = get_subfield_acts field %>
         <% if org_acts.blank? %>
+            <h2 class="h2-title"><%= field.name %></h2>
+            <div class="cl"></div>
             <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
         <% else %>
-            <% org_acts.first(4).each do |activity| %>
+            <h2 class="h2-title"><%= field.name %>
+              <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+            </h2>
+            <div class="cl"></div>
+            <% org_acts.first(1).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] %>
@@ -168,17 +181,18 @@
                     <% 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" %>
+                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                       <% 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" %>
+                          <%= 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",:style=>"display:block;" %>
                       <% 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 class="sn-news-wrap"><%= document.content.to_s.html_safe %></div>
                       </div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></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 %>
@@ -192,28 +206,25 @@
                         <% 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" %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                               <% 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" %>
+                                  <%= 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",:style=>"display:block;" %>
                               <% end %>
+                              <h3> <!--+"(帖子标题)"-->
+                                    <%= link_to message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
                               </h3>
                               <span class="txt-grey"><%= format_date message.created_on %></span>
                               <div class="sn-news-txt">
-                                <p><%= content.to_s.html_safe %></p>
+                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
                               </div>
+                              <div class="sn-read-more"><%=link_to "查看全文>>", message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></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" %>
+                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                               <% 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" %>
+                                  <%= 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",:style=>"display:block;" %>
                               <% end %>
                               <h3>
                                 <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
@@ -224,7 +235,14 @@
                               </h3>
                               <span class="txt-grey"><%= format_date message.created_on %></span>
                               <div class="sn-news-txt">
-                                <p><%= content.to_s.html_safe %></p>
+                                <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
+                              </div>
+                              <div class="sn-read-more">
+                                <% if message.parent_id.nil? %>
+                                    <%=link_to "查看全文>>", message.subject.to_s.html_safe, board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                <% else %>
+                                    <%=link_to "查看全文>>", message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                <% end %>
                               </div>
                             </div>
                         <% end %>
@@ -234,17 +252,18 @@
                         <% 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" %>
+                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                           <% else %>
-                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
                           <% 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 class="sn-news-wrap"><%= news.description.to_s.html_safe %></div>
                           </div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", news.title.to_s, news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                         </div>
                     <% end %>
                 <% end %>
@@ -253,4 +272,14 @@
     <% end %>
 <% end %>
 
+<script>
+  $(".sn-read-more").hide();
+  $(".sn-news-txt").each(function(){
+      var txtHeight = $(this).children().height();
+      if (txtHeight > 180){
+          $(this).next().show();
+      }
+  });
+</script>
+
 

app/views/organizations/_org_subfield_leftM1_default.html.erb

@@ -1,5 +1,5 @@
 <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>
+  <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/default_blank/left-02.jpg" width="380" height="165" alt="" style="display:block;" /></a>
   <h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3>
   <span class="txt-grey"></span>
   <div class="sn-news-txt">

app/views/organizations/_org_subfield_leftM2.html.erb

@@ -5,18 +5,19 @@
         <% if @course_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% @course_acts.first(4).each do |act| %>
+            <% @course_acts[1..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" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                        <div class="sn-title-wrap"><%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
+           
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_at %></span>
                       <div class="cl"></div>
@@ -26,15 +27,15 @@
                     <% 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" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                            <div class="sn-title-wrap"><%= 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" %><span class="title-ellipsis">...</span></div>
                         <% 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" %>
+                            <div class="sn-title-wrap"><%= 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" %><span class="title-ellipsis">...</span></div>
                         <% end %>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
@@ -45,12 +46,12 @@
                     <% 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" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                        <div class="sn-title-wrap"><%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.created_on %></span>
                       <div class="cl"></div>
@@ -63,15 +64,15 @@
                     <% 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" %>
+                              <%= link_to image_tag("/images/default_blank/left-03.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"  %>
+                                <div class="sn-title-wrap"><%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %><span class="title-ellipsis">...</span></div>
                             <% else %>
-                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                                <div class="sn-title-wrap"><%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %><span class="title-ellipsis">...</span></div>
                             <% end %>
                           </h3>
                           <span class="txt-grey fl "><%= format_date activity.published_at %></span>
@@ -85,18 +86,18 @@
         <% if @project_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% @project_acts.first(4).each do |act| %>
+            <% @project_acts[1..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" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                        <div class="sn-title-wrap"><%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
                       <div class="cl"></div>
@@ -106,15 +107,15 @@
                     <% 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" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                            <div class="sn-title-wrap"><%= 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" %><span class="title-ellipsis">...</span></div>
                         <% 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" %>
+                            <div class="sn-title-wrap"><%= 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" %><span class="title-ellipsis">...</span></div>
                         <% end %>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
@@ -125,12 +126,12 @@
                     <% 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" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                        <div class="sn-title-wrap"><%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date activity.created_on %></span>
                       <div class="cl"></div>
@@ -145,7 +146,7 @@
         <% if org_acts.blank? %>
             <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
         <% else %>
-            <% org_acts.first(4).each do |activity| %>
+            <% org_acts[1..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] %>
@@ -153,12 +154,12 @@
                     <% 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" %>
+                          <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                        <div class="sn-title-wrap"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                       </h3>
                       <span class="txt-grey fl "><%= format_date document.created_at %></span>
                       <div class="cl"></div>
@@ -175,15 +176,15 @@
                         <% 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" %>
+                                  <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                                    <div class="sn-title-wrap"><%= 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" %><span class="title-ellipsis">...</span></div>
                                 <% 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" %>
+                                    <div class="sn-title-wrap"><%= 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" %><span class="title-ellipsis">...</span></div>
                                 <% end %>
                               </h3>
                               <span class="txt-grey fl "><%= format_date message.created_on %></span>
@@ -192,15 +193,15 @@
                         <% 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" %>
+                                  <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                                    <div class="sn-title-wrap"><%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %>
+                                    <div class="sn-title-wrap"><%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                                 <% end %>
                               </h3>
                               <span class="txt-grey fl "><%= format_date message.created_on %></span>
@@ -213,12 +214,12 @@
                         <% 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" %>
+                              <%= link_to image_tag("/images/default_blank/left-03.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" %>
+                            <div class="sn-title-wrap"><%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %><span class="title-ellipsis">...</span></div>
                           </h3>
                           <span class="txt-grey fl "><%= format_date news.created_on %></span>
                           <div class="cl"></div>
@@ -231,3 +232,14 @@
 <% end %>
 <div class="cl"></div>
 </div>
+<script>
+      $(".h4-title").each(function(){
+          var titleHeight = $(this).height();
+          if (titleHeight > 52){
+              $(this).next().show();
+          }
+          else {
+              $(this).next().hide();
+          }
+      });
+</script>

app/views/organizations/_org_subfield_leftM2_default.html.erb

@@ -1,26 +1,38 @@
-<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>
+  <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+  <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+  <span class="txt-grey fl">时间</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>
+  <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+  <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+  <span class="txt-grey fl">时间</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>
+    <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+    <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+    <span class="txt-grey fl">时间</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>
+    <a href="javascript:void(0);" target="_blank" class="sn-news-smallimg fl"><img src="/images/default_blank/left-03.jpg" width="85" height="85" alt=""/></a>
+    <h4><div class="sn-title-wrap"><a href="javascript:void(0);" target="_blank" class="h4-title fl mt10">帖子标题</a><span class="title-ellipsis"></span></div></h4>
+    <span class="txt-grey fl">时间</span>
     <div class="cl"></div>
 </div>
-</div>
+
+<script>
+    $(document).ready(function(){
+        $(".h4-title").each(function(){
+            var titleHeight = $(this).height();
+            if (titleHeight > 52){
+                $(this).next().show();
+            }
+            else {
+                $(this).next().hide();
+            }
+        });
+    });
+</script>

app/views/organizations/_org_subfield_leftMD.html.erb

@@ -1,67 +1,76 @@
-<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? %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">课程动态</h2>
+                <div class="sn-index-resourcescon">
                     <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                    <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">课程动态</h2>
+                <div class="sn-index-resourcescon">
                   <% @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" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                              <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </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" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= 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>
+                            <%#= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
                           </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" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% 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" %>
+                                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% 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" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= 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" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                              <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                          <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= 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>
+                            <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
                           </div>
                       <% elsif act.org_act_type == "Poll" %>
                           <% activity = Poll.find(act.org_act_id) %>
@@ -71,96 +80,124 @@
                           <% 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" %>
+                                    <%= link_to image_tag("/images/default_blank/left-04.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"  %>
+                                      <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title sn-hidden"  %>
                                   <% else %>
-                                  <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title"  %>
+                                      <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title sn-hidden"  %>
                                   <% 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" %>
+                                  <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.polls_description, :maxheight=>54, :maxwordsnum => 28} %>
+                                  <%#= 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 %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% end %>
       <% when 'project' %>
           <% if @project_acts.blank? %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">项目动态</h2>
+                <div class="sn-index-resourcescon">
                   <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title">项目动态</h2>
+                <div class="sn-index-resourcescon">
                   <% @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" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                              <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                          <%= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= 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" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                                  <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% 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" %>
+                                  <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                               <% 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" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= 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" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                              <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                          <%= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= 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>
+                            <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank"  %>
                           </div>
                       <% end %>
                   <% end %>
+                  <div class="cl"></div>
+                </div>
+              </div>
+
           <% end %>
       <% end %>
   <% else %>
       <% if field.field_type == "Post" %>
           <% org_acts = get_subfield_acts field %>
           <% if org_acts.blank? %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                  <h2 class="h2-title"><%= field.name %></h2>
+                  <div class="sn-index-resourcescon">
                   <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+                  <div class="cl"></div>
+                </div>
+              </div>
           <% else %>
+              <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                <h2 class="h2-title"><%= field.name %>
+                  <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+                </h2>
+                <div class="sn-index-resourcescon">
                   <% 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 %>
@@ -169,17 +206,19 @@
                           <% 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" %>
+                                <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                              <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </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" %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%#= 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>
+                            <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank"  %>
+
                           </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 %>
@@ -193,40 +232,42 @@
                               <% 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" %>
+                                        <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                                          <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% 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" %>
+                                          <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% 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" %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%#= 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>
+                                    <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
                                   </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" %>
+                                        <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                                          <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% else %>
-                                      <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title" %>
+                                          <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title sn-hidden" %>
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
-                                  <%= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%#= 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>
+                                    <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
                                   </div>
                               <% end %>
                           <% end %>
@@ -235,24 +276,25 @@
                               <% 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" %>
+                                    <%= link_to image_tag("/images/default_blank/left-04.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" %>
+                                  <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title sn-hidden" %>
                                 </h3>
                                 <div class="resources-tagbox">
-                              <%= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
+                                  <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
+                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
                                 </div>
-                            <a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
+                                <%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
                               </div>
                           <% end %>
                       <% end %>
                   <% end %>
-          <% end %>
-      <% end %>
-  <% end %>
                   <div class="cl"></div>
                 </div>
               </div>
+          <% end %>
+      <% end %>
+  <% end %>

app/views/organizations/_org_subfield_leftMD_default.html.erb

@@ -1,11 +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>
+  <a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/left-04.jpg" width="185" height="125" alt=""/></a>
+  <!--<h3><a href="javascript:void(0);" target="_blank" class="resources-title sn-hidden">仪器资源</a></h3>-->
+  <!--<div class="resources-tagbox">-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">测试服务</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">开放日</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">仪器共享</a>-->
+    <!--<a href="javascript:void(0);" target="_blank" class="resources-tag">定制测试</a>-->
+  <!--</div>-->
+  <!--<a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>-->
 </div>

app/views/organizations/_org_subfield_leftT.html.erb

@@ -14,7 +14,7 @@
                           <% 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; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -25,7 +25,7 @@
                           <% 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; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -42,7 +42,7 @@
                           <% 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; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -58,7 +58,7 @@
                           <% 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; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -101,7 +101,7 @@
                           <% 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; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -112,7 +112,7 @@
                           <% 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; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -129,7 +129,7 @@
                           <% 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; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -172,7 +172,7 @@
                           <% 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; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -190,7 +190,7 @@
                                   <% 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; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -211,7 +211,7 @@
                                   <% 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; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.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 %>
@@ -230,7 +230,7 @@
                               <% 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; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.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 %>

app/views/organizations/_org_subfield_leftT_default.html.erb

@@ -3,7 +3,7 @@
     <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>
+                <a><img src="/images/default_blank/left_01.jpg" alt="" ></a>
             </div>
         </div>
     </div>

app/views/organizations/_org_subfield_rightD.html.erb

@@ -10,14 +10,14 @@
         <% 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' %>;">
+            <div class="sn-index-smallbanner sn-mb20" 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" %>
+                      <%= link_to image_tag("/images/default_blank/right-03.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 %>
@@ -27,14 +27,14 @@
                       <% 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" %>
+                              <%= link_to image_tag("/images/default_blank/right-03.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" %>
+                              <%= link_to image_tag("/images/default_blank/right-03.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 %>
@@ -44,7 +44,7 @@
                       <% 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" %>
+                          <%= link_to image_tag("/images/default_blank/right-03.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 %>
@@ -52,21 +52,21 @@
               <% 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 class="sn-index-smallbanner sn-mb20" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <a href="javascript:void(0);" target="_blank" ><img  src="/images/default_blank/right-03.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' %>;">
+        <div class="sn-index-smallbanner sn-mb20" 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" %>
+                  <%= link_to image_tag("/images/default_blank/right-03.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"  %>
+                  <%= link_to image_tag("/images/default_blank/right-03.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"  %>
+              <%= link_to image_tag("/images/default_blank/right-03.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>

app/views/organizations/_org_subfield_rightM.html.erb

@@ -19,11 +19,12 @@
                   <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" %>
+                        <%= link_to image_tag("/images/default_blank/right-02.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>
+                    <p class="fl sn-index-txt sn-w229"><%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %></p>
+                    <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                     <div class="cl"></div>
                   </div>
               <% else activity.container_type == 'OrgSubfield' %>
@@ -34,11 +35,12 @@
                           <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" %>
+                                <%= link_to image_tag("/images/default_blank/right-02.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>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
+                            <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                             <div class="cl"></div>
                           </div>
                       <% else %>
@@ -46,11 +48,12 @@
                           <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" %>
+                                <%= link_to image_tag("/images/default_blank/right-02.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>
+                            <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
+                            <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                             <div class="cl"></div>
                           </div>
                       <% end %>
@@ -61,11 +64,12 @@
                       <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" %>
+                            <%= link_to image_tag("/images/default_blank/right-02.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>
+                        <p class="fl sn-index-txt sn-w229"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
+                        <p class="fl sn-f12 sn-read-all" style="display:none;"><%=link_to "查看全文>>", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "sn-link-grey2" %></p>
                         <div class="cl"></div>
                       </div>
                   <% end %>
@@ -75,8 +79,8 @@
             <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>
+                <img class="fl sn-index-wximg" src="/images/default_blank/right-02.jpg" width="104" height="104" alt=""/>
+                <p class="fl sn-index-txt sn-w229"></p>
                 <div class="cl"></div>
               </div>
             </div>
@@ -86,13 +90,22 @@
         <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" %>
+                  <%= link_to image_tag("/images/default_blank/right-02.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"  %>
+                  <%= link_to image_tag("/images/default_blank/right-02.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"  %>
+              <%= link_to image_tag("/images/default_blank/right-02.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
           <% end %>
         </div>
     <% end %>
 <% end %>
+
+<script>
+  $(".sn-index-txt").each(function(){
+      var wholeHeight = $(this).children().height();
+      if (wholeHeight > 54){
+          $(this).next().show();
+      }
+  });
+</script>

app/views/organizations/_org_subfield_rightM2.html.erb

@@ -0,0 +1,33 @@
+<% unless excellent_teachers.count == 0 %>
+    <div class="sn-teacher-wrap" style="display:<%= field.hide == 0?'block':'none' %>;">
+      <h2 class="h2-title sn-mb5"><%= field.name %>
+        <%= link_to "更多", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => field.id), :target => "_blank", :class => "more" %>
+      </h2>
+      <% excellent_teachers.each do |teacher| %>
+          <div class="sn-teacher-list">
+        <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sn-fl sn-avatar-circle", :style => "display:block;"), user_path(teacher), :alt => "用户头像", :target => '_blank'  %>
+            <!--<a href="javascript:void(0);" target="_blank"><img src="images/avatar_default.png" width="60" height="60" style="display:block;" class="sn-fl" /></a>-->
+            <div class="sn-teacher-info">
+              <%=link_to teacher.try(:realname) ? teacher.try(:realname) :teacher.try(:login), user_path(teacher), :class => "sn-teacher-name sn-hidden", :title => '', :target => '_blank' %></a>
+              <span class="sn-teacher-unit sn-hidden" title="<%= teacher.my_workplace %>"><%= teacher.my_workplace %></span> </div>
+            <div class="sn-teacher-social">
+              <% unless teacher.my_blogs_count == 0 %>
+                  <span class="sn-mr20">博客 <%= teacher.my_blogs_count %></span>
+              <% end %>
+              <% unless teacher.courses.count == 0 %>
+                  <span class="sn-mr20">课程 <%= teacher.courses.count %></span>
+              <% end %>
+              <% unless teacher.my_students == 0 %>
+                  <span>学生 <%= teacher.my_students %></span>
+              <% end %>
+            </div>
+            <div class="sn-cl"></div>
+          </div>
+      <% end %>
+    </div>
+
+    <script>
+        $(".sn-teacher-list:last").addClass("sn-border-none");
+    </script>
+<% end  %>
+

app/views/organizations/_org_subfield_rightT.html.erb

@@ -1,18 +1,22 @@
-<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? %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">课程动态</h2>
               <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
         <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">课程动态</h2>
               <% @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" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -26,7 +30,7 @@
                       <% 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" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -44,7 +48,7 @@
                       <% 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" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -61,7 +65,7 @@
                       <% 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" %>
+                                <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -77,18 +81,27 @@
                       <% end %>
                   <% end %>
               <% end %>
+              <div class="cl"></div>
+            </div>
+
         <% end %>
     <% when 'project' %>
         <% if @project_acts.blank? %>
-            <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">项目动态</h2>
+              <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
         <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18">项目动态</h2>
               <% @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" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -102,7 +115,7 @@
                       <% 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" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -120,7 +133,7 @@
                       <% 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" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -131,14 +144,25 @@
                       </div>
                   <% end %>
               <% end %>
+              <div class="cl"></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_leftMD_default', :locals => {:field => field} %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %></h2>
+              <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
+              <div class="cl"></div>
+            </div>
         <% else %>
+            <div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title mb18"><%= field.name %>
+                <%= render :partial => 'organizations/link_subfield_more', :locals => {:field => field} %>
+                <!--<a href="javascript:void(0);" target="_blank" class="more">更多</a>-->
+              </h2>
               <% 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 %>
@@ -147,7 +171,7 @@
                       <% 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" %>
+                            <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -168,7 +192,7 @@
                           <% 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" %>
+                                    <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -184,7 +208,7 @@
                           <% 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" %>
+                                    <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -204,7 +228,7 @@
                           <% 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" %>
+                                <%= link_to image_tag("/images/default_blank/right-01.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 %>
@@ -216,8 +240,8 @@
                       <% end %>
                   <% end %>
               <% end %>
+              <div class="cl"></div>
+            </div>
         <% end %>
     <% end %>
 <% end %>
-<div class="cl"></div>
-</div>

app/views/organizations/_org_subfield_rightT_default.html.erb

@@ -0,0 +1,5 @@
+<div class="sn-index-active">
+  <a href="javascript:void()" target="_blank" class="sn-activeimg"><img src="/images/default_blank/right-01.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>

app/views/organizations/_org_teachers_list.html.erb

@@ -0,0 +1,59 @@
+<% org_teachers.each do |org_teacher| %>
+    <% school = School.where("id =?", org_teacher.school_id).first %>
+    <div class="teacher-list-row">
+      <div>
+        <div class="teacher-avatar">
+          <%= link_to image_tag(url_to_avatar(org_teacher), :width => "90", :height => "90"), user_url_in_org(org_teacher), :alt => "用户头像" %>
+        </div>
+        <div class="fl">
+          <div class="ml25 mb20"><span class="teacher-name"><%=link_to org_teacher.try(:realname).nil? ? org_teacher.try(:login) : org_teacher.try(:realname), user_url_in_org(org_teacher) %></span>
+            <% unless school.nil? %>
+                <span class="f12 fontGrey2 mr15"><%= school.name %></span>
+            <% end %>
+            <% unless org_teacher.nil? %>
+                <span class="f12 fontGrey2"><%= org_teacher.technical_title %></span></div>
+            <% end %>
+            <div class="teacher-social-block">
+              <div class="block-num"><%= org_teacher.courses.count %></div>
+              <div class="block-title">课程数</div>
+            </div>
+            <div class="block-slice"></div>
+            <div class="teacher-social-block">
+              <div class="block-num"><%= org_teacher.my_students %></div>
+              <div class="block-title">学生数</div>
+            </div>
+            <div class="block-slice"></div>
+            <div class="teacher-social-block">
+              <div class="block-num"><%= org_teacher_resource_count(org_teacher) %></div>
+              <div class="block-title">资源数</div>
+            </div>
+            </div>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="javascript:void(0);" class="fr teacher-select" onclick="hide($(this),'<%= org_teacher.id %>');" id="hide_<%= org_teacher.id %>"><%= org_teacher.excellent_teacher==0?"设为名师":"取消设置" %></a>
+            <!--<a href="javascript:void(0);" class="fr teacher-select">设为名师</a>-->
+        <% else %>
+            <!--<%# if(org_teacher.watched_by?(User.current)) %>-->
+                <!--<%#= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "delete",:remote => "true", :title => "取消关注"%>-->
+            <!--<%# else %>-->
+                <!--<%#= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>org_teacher.id,:target_id=>org_teacher.id),:class => "fr teacher-select", :method => "post",:remote => "true", :title => "添加关注"%>-->
+            <!--<%# end %>-->
+        <% end %>
+      </div>
+      <div class="cl"></div>
+    </div>
+<% end %>
+
+<script>
+    function hide(content, id){
+        if (content.text() == '设为名师')
+            $.ajax({
+                url: "/organizations/set_excellent_teacher?user=" + id,
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/organizations/reset_excellent_teacher?user=" + id,
+                type: "post"
+            });
+    }
+</script>

app/views/organizations/_setting_excellent_teachers.html.erb

@@ -0,0 +1,6 @@
+<% if @organization.allow_set_teachers && !org_subfield_had_created?(@organization, "Comptec") %>
+    <li class="fl mr15">
+      <input type="radio" id="orgTec" value="Comptec" name="field_type" />
+      <label for="Comptec">教师</label>
+    </li>
+<% end %>

app/views/organizations/_show_students.html.erb

@@ -0,0 +1,36 @@
+<div class="resources mt10">
+  <div class="function-row">
+    <input type="text" placeholder="搜索" class="teacher-list-search fl" />
+    <a href="javascript:void(0);" class="teacher-search-icon fl"></a>
+    <select class="teacher-search-type fr">
+      <option>课程数</option>
+      <option>学生数</option>
+      <option>资源数</option>
+    </select>
+    <div class="cl"></div>
+  </div>
+  <div class="teacher-list-row">
+    <div>
+      <div class="teacher-avatar"><img src="images/homepageImage.jpg" width="90" height="90" /></div>
+      <div class="fl">
+        <div class="ml25 mb20"><span class="teacher-name">尹刚</span><span class="f12 fontGrey2 mr15">国防科学技术大学</span><span class="f12 fontGrey2">教授</span></div>
+        <div class="teacher-social-block">
+          <div class="block-num">6000</div>
+          <div class="block-title">课程数</div>
+        </div>
+        <div class="block-slice"></div>
+        <div class="teacher-social-block">
+          <div class="block-num">500</div>
+          <div class="block-title">学生数</div>
+        </div>
+        <div class="block-slice"></div>
+        <div class="teacher-social-block">
+          <div class="block-num">8000</div>
+          <div class="block-title">资源数</div>
+        </div>
+      </div>
+      <a href="javascript:void(0);" class="fr teacher-select">添加</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/organizations/_show_teachers.html.erb

@@ -0,0 +1,22 @@
+<div class="resources mt10">
+  <div class="function-row">
+    <%= form_tag( url_for(:controller => 'organizations', :action => 'teacher_search'),
+                        :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+        <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none', :class => "teacher-search-icon fl" %>
+        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+    <% end %>
+    <!--<a href="javascript:" class="f_l" onclick="$('#search_student').submit();">搜索</a>-->
+    <!--<input type="text" placeholder="搜索" class="teacher-list-search fl" />-->
+    <!--<a href="javascript:void(0);" class="teacher-search-icon fl"></a>-->
+    <select class="teacher-search-type fr" onclick="chooseTeacherType();">
+      <option value="1">课程数</option>
+      <option value="2">学生数</option>
+      <option value="3">资源数</option>
+    </select>
+    <div class="cl"></div>
+  </div>
+  <div id="org_teachers_list">
+    <%=render 'organizations/org_teachers_list' %>
+  </div>
+</div>

app/views/organizations/_subfield_list.html.erb

@@ -1,82 +1,79 @@
-<ul class="orgListRow">
+<ul class="orgListRow borderBottomNone orgListBg">
   <li class="orgOrder fb">顺序</li>
   <li class="orgListUser fb">已有栏目</li>
   <li class="orgListStatus fb">状态</li>
   <li class="orgListStatusList fb fb">排列</li>
-  <li class="orgListStatus fb">类型</li>
-  <li class="orgListUser fb">域名目录</li>
+  <li class="orgListType fb">类型</li>
+  <li class="orgListCatalog fb">域名目录</li>
+  <li class="orgListOperation fb"><span class="mr10">操作</span></li>
   <div class="cl"></div>
 </ul>
-
 <% subfields.each do |field| %>
     <% if is_default_field?(field) %>
         <% name = get_default_name(field) %>
         <ul class="orgListRow">
           <li class="orgOrder">
-            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
             </div>
           </li>
-          <li class="orgListUser"><%= name %></li>
+          <li class="orgListUser" title="<%= name %>"><%= name %></li>
           <li class="orgListStatus">默认</li>
           <li class="orgListStatusList">
             <% if field.name == "activity" %>
                 默认
             <% 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,
-                                { :include_blank => false,:selected => field.status},
+                    <%= select( :name,:group_id, subfield_status_option_default, { :include_blank => false,:selected => field.status},
                            { :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
                 <% end %>
             <% end %>
-
           </li>
-          <li class="orgListStatus">默认</li>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+          <li class="orgListType">默认</li>
+          <a href="javascript:void(0);" class="linkGrey fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
           <div class="cl"></div>
         </ul>
     <% else %>
         <ul class="orgListRow">
           <li class="orgOrder">
-            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+            <div id="show_priority_<%= field.id %>" ondblclick="edit_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; margin-left:20px;" title="双击可编辑">
               <%= field.priority %>
             </div>
-            <div id="edit_priority_<%= field.id %>" style="display:none;width:30px;">
+            <div id="edit_priority_<%= field.id %>" style="display:none; width:30px; margin-left:20px;">
               <input type="text" onblur="update_priority('#show_priority_<%= field.id %>','#edit_priority_<%= field.id %>','<%= field.id %>',$(this).val());" style="width:20px;" value="<%= field.priority %>"/>
             </div>
           </li>
           <li class="orgListUser">
-            <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
+            <div id="subfield_show_<%= field.id %>" class="hidden" title="<%= field.name %>"><%= field.name %></div>
             <div id="subfield_edit_<%= field.id %>" style="display:none;">
               <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
             </div>
           </li>
           <li class="orgListStatus">新增</li>
           <li class="orgListStatusList">
-            <% if field.field_type == "Resource" %>
-                列表
+            <% if field.field_type == "Resource" || field.field_type == "Comptec" %>
+                默认
             <% 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,
                            { :include_blank => false,:selected => field.status},
                            { :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
                 <% end %>
-
             <% end %>
           </li>
-          <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-          <li class="orgListUser hidden">
+          <li class="orgListType"><%= org_subfield_type field %></li>
+          <li class="orgListCatalog hidden">
             <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
-                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+                <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; margin-left:20px;" title="双击可编辑">
                   <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
                 </div>
             <% else %>
@@ -89,16 +86,41 @@
             </div>
           </li>
           <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
-          <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
-          <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
-
+          <li class="orgListOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+            <% unless field.field_type == "Resource" || field.field_type == "Comptec" %>
+                <span class="fr">|</span>
+                <!--escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)-->
+                <!--<a href="javascript:void(0);" class="linkGrey fr mr5" onclick="org_submain_new('<%#= escape_javascript new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field) %>');">添加二级目录</a>-->
+                <%= link_to("添加二级目录", new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field), :class => "linkGrey fr mr5", :remote => true) %>
+            <% end%>
+          </li>
           <div class="cl"></div>
+          <%= render :partial => 'organizations/subfield_sub_domains_list', :locals => {:field => field} %>
         </ul>
     <% end %>
 <% end %>
 
 <script>
+    function org_submain_new(url) {
+        alert(url);
+        $.post(
+                url,
+                function (data) {
+                }
+        );
+    }
+    //二级子目录样式处理
+    $(".orgListRow").each(function(){
+        $(this).children(".orgSubList:first").css({"border-top":"1px solid #e4e4e4","marginTop":"5px"});
+        $(this).children(".orgSubList:last").css("marginBottom","-5px");
+        $(this).children(".orgSubList:last").children("li:first").addClass("orgSubTree2");
+    });
+
     $(document).ready(function(){
         $(".pic_edit2").click(function(){
             $(this).parent().hide();

app/views/organizations/_subfield_sub_domains_list.html.erb

@@ -0,0 +1,84 @@
+<% sub_domains = field.sub_domains.order("priority") %>
+<% if sub_domains %>
+    <% sub_domains.each do |subdomain| %>
+        <ul class="orgSubList">
+          <li class="orgSubTree"></li>
+          <li class="orgSubNum ml5 mr5">
+            <div id="show_domain_priority_<%= subdomain.id %>" ondblclick="edit_priority('#show_domain_priority_<%= subdomain.id %>','#edit_domain_priority_<%= subdomain.id %>');"  class="subNumBlock" title="双击可编辑">
+              <%= subdomain.priority %>
+            </div>
+            <div id="edit_domain_priority_<%= subdomain.id %>" style="display:none; width:30px;">
+              <input type="text" onblur="domain_update_priority('#show_domain_priority_<%= subdomain.id %>','#edit_domain_priority_<%= subdomain.id %>','<%= subdomain.org_subfield.id %>','<%= subdomain.id %>',$(this).val());" style="width:20px;" value="<%= subdomain.priority %>"/>
+            </div>
+          </li>
+          <li class="orgSubColumn">
+            <div id="subsubdomain_show_<%= subdomain.id %>" class="subColumnControl" title="<%= subdomain.name %>"><%= subdomain.name %></div>
+            <div id="subsubdomain_edit_<%= subdomain.id %>" style="display:none;">
+              <input type="text" name="name" onblur="update_subfield_subdomain('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>','<%= subdomain.org_subfield.id %>','<%= subdomain.id %>',$(this).val());" value="<%= subdomain.name %>" style="width:70px;"/>
+            </div>
+          </li>
+          <li class="orgSubStatus">新增</li>
+          <li class="orgSubOrder">
+            默认
+          </li>
+          <li class="orgSubType"><%= subdomain.field_type == "Post" ? "帖子" : "资源" %></li>
+          <li class="orgListCatalog hidden"> -- </li>
+          <%#= link_to "隐藏", hide_org_subsubdomain_organizations_path(subdomain), :method => 'post', :remote => true, :id => "hide_#{subdomain.id}", :class => "linkBlue fr mr5" %>
+          <li class="orgSubOperation">
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr10" onclick="hide_domain($(this),'<%= subdomain.org_subfield.id %>','<%= subdomain.id %>');" id="hide_<%= subdomain.id %>"><%= subdomain.hide==0?"隐藏":"可见" %></a>
+            <span class="fr">|</span>
+            <%= link_to "删除", org_subfield_sub_domain_path(subdomain, :org_subfield_id => subdomain.org_subfield.id), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %>
+            <span class="fr">|</span>
+            <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>');">编辑</a>
+          </li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+<% end %>
+
+<script>
+    function update_subfield_subdomain(show_id, edit_id, field_id, domain_id, input_value) {
+        if ($(show_id).html().trim() != input_value.trim()) {
+            if (confirm('确定修改为' + input_value + "?"))
+                $.ajax({
+                    url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "?name=" + input_value,
+                    type: 'put'
+                });
+            else{
+                $(edit_id).children("input").val($(show_id).html().trim());
+            }
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+//       $(edit_id).focus();
+    }
+
+
+    function domain_update_priority(show_id, edit_id, field_id, domain_id, input_value){
+        var re = /^[0-9]*[1-9]*[0-9]$/
+        if(re.test(input_value) && $(show_id).html().trim() != input_value.trim() && input_value.trim() != ''){
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/domain_update_priority?priority=" + input_value,
+                type: 'put'
+            });
+        }
+        else{
+            $(edit_id).children("input").val($(show_id).html().trim());
+        }
+        $(show_id).show();
+        $(edit_id).hide();
+    }
+
+    function hide_domain(content, field_id, domain_id){
+        if (content.text() == '隐藏')
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/hide_sub_domain",
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/sub_domains/"  + domain_id + "/show_sub_domain",
+                type: "post"
+            });
+    }
+</script>

app/views/organizations/reset_excellent_teacher.js.erb

@@ -0,0 +1 @@
+$("#hide_<%= @ex_teacher.id %>").text("设为名师");

app/views/organizations/set_excellent_teacher.js.erb

@@ -0,0 +1 @@
+$("#hide_<%= @ex_teacher.id %>").text("取消设置");

app/views/organizations/setting.html.erb

@@ -87,6 +87,11 @@
           &nbsp;<span>允许游客下载</span>
           <span class="c_green f12" id="allow_down_hint"><%= @organization.is_public? ? "" : "（私有组织不允许游客下载资源）" %></span>
         </div>
+        <% if User.current.admin? %>
+                <div class="orgRow mb10 mt5"><span style="margin-left:10px;">允许设置名师榜&nbsp;: </span>
+                  <input id="allow_set_excellent_teachers" type="checkbox" style="margin-top:5px;" name="organization[allow_teacher]" <%= @organization.allow_teacher==1 ? 'checked': ''%> class="ml3" />
+                </div>
+        <% end %>
         <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org('<%=@organization.id %>','<%= @organization.name %>', $('#organization_name'));">保存</a>
         <% end %>
       </div>
@@ -128,41 +133,42 @@
         <div class="cl"></div>
       </div>
       <div class="undis ml15 mr15" id="orgContent_3">
-        <div class="orgMemberList" id="org_subfield_list">
-          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
-        </div>
-        <div class="fr orgMemContainer">
-          <div class="fr">
-            <p class="fontBlue fb mb5">新增栏目</p>
+<!--新增二级栏目-->
+      <div>
         <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
+            <span class="fontGrey3 fb mb5 mr10" >新增一级栏目</span>
             <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
-                <div class="mb5">
-                  <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
+            <div class="mb10">
+              <span class="fontGrey3 fb mr10 ml24">域名目录</span>
               <% if domain %>
-                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
+                  <span><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
               <% else %>
-                      <span class="fl" style="width:195px;">您还没有子域名，请先在左侧信息栏申请子域名</span>
+                  <span class="fontGrey2">(用户自定义url，可选) 您还没有子域名，请先在左侧信息栏申请子域名</span>
               <% end %>
               <div class="cl"></div>
             </div>
-                <ul class="orgAddRole">
-                  <li class="fontGrey3 fb mb10">栏目类型</li>
+            <ul class="orgAddRole mb10">
+              <li class="fontGrey3 fb ml24 mr10 fl">栏目类型</li>
               <li class="fl mr15">
                 <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
                 <label for="orgMng">帖子</label>
               </li>
-                  <li class="fl">
+              <li class="fl mr15">
                 <input type="radio" id="orgMeb" value="Resource" name="field_type" />
                 <label for="orgMeb">资源</label>
               </li>
+              <div id="org_excellent_teachers">
+                <%= render :partial => 'organizations/setting_excellent_teachers' %>
+              </div>
+              <li class="fr"><a href="javascript:void(0);" class="saveBtn db" onclick="add_org_subfield();">新增</a></li>
               <li class="cl"></li>
             </ul>
-                <div class="cl"></div>
-                <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
         <% end %>
       </div>
+<!--over-->
+        <div class="orgColumnList" id="org_subfield_list">
+          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")} %>
         </div>
-        <div class="cl"></div>
     </div>
 </div>
 <script>
@@ -170,6 +176,11 @@
       if ($("#subfield_name").val().trim() != "")
         $("#add_subfield_form").submit();
   }
+  function add_org_subfield_subdomain(){
+      if ($("#subfield_name_subdomain").val().trim() != "")
+      $("#add_subfield_form_subdomain").submit();
+      $("#org_subfield_list").html('<%= escape_javascript(render(:partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields.order("priority")}  )) %>');
+  }
   var $is_exist = false;
   function apply_subdomain(id, domain){
       var reg = new RegExp("^[a-zA-Z0-9_]{1,}$");

app/views/organizations/show.html.erb

@@ -67,3 +67,6 @@
 
 
 
+
+
+

app/views/organizations/teacher_search.js.erb

@@ -0,0 +1 @@
+$("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list')%>');

app/views/organizations/teachers.html.erb

@@ -0,0 +1,39 @@
+<div class="homepageRightBanner">
+  <div class="f16 fontGrey3">
+    <% if @type == "famous" %>
+      名师列表
+    <% else %>
+      <%= @field.name %>
+    <% end %>
+  </div>
+</div>
+<div class="resources mt10">
+  <div class="function-row" id="org_teacher_search">
+    <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers', :type => @type),
+                  :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+        <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
+        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
+        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+    <% end %>
+    <!--<a href="javascript:" class="f_l" onclick="$('#search_student').submit();">搜索</a>-->
+    <!--<input type="text" placeholder="搜索" class="teacher-list-search fl" />-->
+    <!--<a href="javascript:void(0);" class="teacher-search-icon fl"></a>-->
+    <!--<select id="teacher_type_select" class="teacher-search-type fr" onclick="chooseTeacherType('<%#= @organization.id %>');">-->
+      <!--<option value="1">课程数</option>-->
+      <!--<option value="2">学生数</option>-->
+      <!--<option value="3">资源数</option>-->
+    <!--</select>-->
+    <div class="sn-font-grey fr">
+      <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey2" %>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div id="org_teachers_list">
+    <%=render 'organizations/org_teachers_list', :org_teachers => @org_teachers %>
+  </div>
+  <div>
+    <ul class="wlist" id="pages" style="margin-top: 15px;">
+      <%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :flag => true %>
+    </ul>
+  </div>
+</div>