Merge branch 'hjq_beidou' into yuanke_1

Conflicts:
	db/schema.rb
	public/stylesheets/project.css

app/controllers/organizations_controller.rb

@@ -84,9 +84,6 @@ class OrganizationsController < ApplicationController
 
         @subfield_content = @organization.org_subfields.order("priority")
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
-
           # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
           # @org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
@@ -116,15 +113,13 @@ class OrganizationsController < ApplicationController
         #@project_acts_issues = get_project_activities_org @organization
         #@course_acts = get_course_activities_org @organization
 
-        render :layout => 'base_org_newstyle'
+        render :layout => 'base_org2'
       else
         render_403
       end
     else
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
         if params[:org_subfield_id]
           @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0

app/controllers/projects_controller.rb

@@ -319,9 +319,25 @@ class ProjectsController < ApplicationController
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
     end
-    g = Gitlab.client
-    unless @project.gpid.nil?
-      @static_total_per_user = g.rep_stats(@project.gpid)
+    # g = Gitlab.client
+    unless @project.gpid.nil? || @project.project_score.changeset_num == 0
+      # rep_statics_commit = @project.rep_statics.order("commits_num desc")
+      rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")
+      rep_statics_code = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by changeset desc limit 10")
+      # rep_statics_code = @project.rep_statics.sort_by {|u| u.changeset}.reverse
+      @a_uname = rep_statics_commit.map {|s| s.uname }
+      @a_uname_code = rep_statics_code.map {|s| s.uname }
+      @a_commits_num = rep_statics_commit.map {|s| s.commits_num.to_i }
+      @a_commits_add = rep_statics_code.map {|s| s.add.to_i }
+      @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
+      @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
+      g = Gitlab.client
+      begin
+        g_branch = g.project(@project.gpid).default_branch.to_s
+      rescue
+        logger.error("get gitlab project failed!")
+      end
+      @rev = g_branch.nil? ? "master" : g_branch
     end
     # 根据对应的请求，返回对应的数据
     respond_to do |format|

app/controllers/repositories_controller.rb

@@ -325,31 +325,17 @@ update
       end
     end
 
-    # unless @repository.gitlab?
-    #   # redirect_to to_gitlab_project_repository_path(@project, @repository)
-    #   render :to_gitlab
-    #   return
-    # end
-
-    #if( !User.current.member_of?(@project) || @project.hidden_repo)
-    # @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
-
-    # :name, :path, :kind, :size, :lastrev, :changeset
     @entries = @repository.entries(@path, @rev)
-    # @trees = g.trees(project, @path)
     @changeset = @repository.find_changeset_by_name(@rev)
-    #@project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-    #@ip               = RepositoriesHelper::REPO_IP_ADDRESS
-
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      #Modified by young
-      #  (show_error_not_found; return) unless @entries
       g = Gitlab.client
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
+      g_project = g.project(@project.gpid)
       # 总的提交数
-      @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count
+      @changesets_all_count = @project.gpid.nil? ? 0 : g_project.commit_count
+      @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
       # 访问该页面的是会后则刷新
       if @project.project_score.nil?
         ProjectScore.create(:project_id => @project.id, :score => false)
@@ -358,17 +344,16 @@ update
       if @changesets_all_count != @project.project_score.changeset_num && @changesets_all_count != 0
         update_commits_count(@project, @changesets_all_count)
       end
-      # end
       # 最近一次提交
       @changesets_latest_coimmit = @changesets[0]
       unless @changesets[0].blank?
         update_commits_date(@project, @changesets_latest_coimmit)
       end
       @creator = User.where("id =?", @project.user_id).first.try(:login)
-      @properties = @repository.properties(@path, @rev)
-      @repositories = @project.repositories
-      project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-      ip = RepositoriesHelper::REPO_IP_ADDRESS
+      # @properties = @repository.properties(@path, @rev)
+      # @repositories = @project.repositories
+      # project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
+      # ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
       if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
@@ -573,9 +558,17 @@ update
     g = Gitlab.client
     begin
     @static_total_per_user = g.rep_stats(project_id, :rev => rev)
-    @static_total_per_user
-    # @static_month__per_user = g.rep_stats(project_id, :rev => rev, :creator => creator, :period => 2)
-    # @static_week_per_user = g.rep_stats(project_id, :rev => rev, :creator => creator, :period => 3)
+    # 更新rep_statics统计数
+    @static_total_per_user.each do |static|
+      rep_static = RepStatics.where("project_id =? and email =?", @project.id, static.email.to_s).first
+      if rep_static.nil?
+        RepStatics.create(:project_id => @project.id, :uname => static.uname, :commits_num => static.commits_num, :email => static.email, :add => static.add, :del => static.del, :changeset => static.changes)
+      else
+        if @rev == params[:default_branch]
+          rep_static.update_attributes(:uname => static.uname, :commits_num => static.commits_num, :email => static.email, :add => static.add, :del => static.del, :changeset => static.changes)
+        end
+      end
+    end
     rescue
       render_404
       return

app/helpers/application_helper.rb

@@ -120,60 +120,53 @@ module ApplicationHelper
     case type
       when "HomeworkCommon"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :homework_journal_num => 1)
         else
-          score = course_contributor_score.homework_journal_num + 1
-          course_contributor_score.update_attributes(:homework_journal_num => score)
+          score = course_contributor_score.homework_journal_num.to_i + 1
+          course_contributor_score.update_column(:homework_journal_num, score)
         end
       # 课程留言
       when "Course"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :journal_num => 1)
         else
-          score = course_contributor_score.journal_num + 1
-          course_contributor_score.update_attributes(:journal_num => score)
+          score = course_contributor_score.journal_num.to_i + 1
+          course_contributor_score.update_column(:journal_num, score)
         end
       when  "Message"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1)
         else
-          score = course_contributor_score.message_num + 1
-          course_contributor_score.update_attributes(:message_num => score)
+          score = course_contributor_score.message_num.to_i + 1
+          course_contributor_score.update_column(:message_num, score)
         end
       when "MessageReply"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_reply_num => 1)
         else
-          score = course_contributor_score.message_reply_num + 1
-          course_contributor_score.update_attributes(:message_reply_num => score)
+          score = course_contributor_score.message_reply_num.to_i + 1
+          course_contributor_score.update_column(:message_reply_num, score)
         end
       when "NewReply"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_reply_num => 1)
         else
-          score = course_contributor_score.news_reply_num + 1
-          course_contributor_score.update_attributes(:news_reply_num => score)
+          score = course_contributor_score.news_reply_num.to_i + 1
+          course_contributor_score.update_column(:news_reply_num, score)
         end
       when "News"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_num => 1)
         else
-          score = course_contributor_score.news_num + 1
-          course_contributor_score.update_attributes(:news_num => score)
+          score = course_contributor_score.news_num.to_i + 1
+          course_contributor_score.update_column(:news_num, score)
         end
       when "Attachment"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :news_num => 0, :resource_num => 1, :journal_num => 0, :journal_reply_num => 0)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :resource_num => 1)
         else
-          score = course_contributor_score.resource_num + 1
-          course_contributor_score.update_attributes(:resource_num => score)
+          score = course_contributor_score.resource_num.to_i + 1
+          course_contributor_score.update_column(:resource_num, score)
         end
     end
   end
@@ -184,39 +177,39 @@ module ApplicationHelper
     case type
       when "HomeworkCommon"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.homework_journal_num - 1
-          course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score)
+          score = course_contributor_score.homework_journal_num.to_i - 1
+          course_contributor_score.update_column(:homework_journal_num, score < 0 ? 0 : score)
         end
       # 课程留言
       when "Course"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.journal_num - 1
-          course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score)
+          score = course_contributor_score.journal_num.to_i - 1
+          course_contributor_score.update_column(:journal_num, score < 0 ? 0 : score)
         end
       when  "Message"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.message_num - 1
-          course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score)
+          score = course_contributor_score.message_num.to_i - 1
+          course_contributor_score.update_column(:message_num, score < 0 ? 0 : score)
         end
       when "MessageReply"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.message_reply_num - 1
-          course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score)
+          score = course_contributor_score.message_reply_num.to_i - 1
+          course_contributor_score.update_column(:message_reply_num, score < 0 ? 0 : score)
         end
       when "NewReply"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.news_reply_num - 1
-          course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score)
+          score = course_contributor_score.news_reply_num.to_i - 1
+          course_contributor_score.update_column(:news_reply_num, score < 0 ? 0 : score)
         end
       when "News"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.news_num - 1
-          course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score)
+          score = course_contributor_score.news_num.to_i - 1
+          course_contributor_score.update_column(:news_num, score < 0 ? 0 : score)
         end
       when "Attachment"
         unless  course_contributor_score.nil?
-          score = course_contributor_score.resource_num - 1
-          course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score)
+          score = course_contributor_score.resource_num.to_i - 1
+          course_contributor_score.update_column(:resource_num, score < 0 ? 0 : score)
         end
     end
   end

app/helpers/organizations_helper.rb

@@ -63,14 +63,67 @@ module OrganizationsHelper
   def subfield_status_option
     type = []
     option1 = []
-    option1 << "列表"
+    option1 << "左上"
     option1 << "1"
     type << option1
     option2 = []
-    option2 << "图片"
-    option2 << "0"
+    option2 << "中一"
+    option2 << "2"
     type << option2
+    option3 = []
+    option3 << "中二"
+    option3 << "3"
+    type << option3
+    option4 = []
+    option4 << "中下"
+    option4 << "4"
+    type << option4
+    option5 = []
+    option5 << "左下"
+    option5 << "5"
+    type << option5
+    option6 = []
+    option6 << "右上"
+    option6 << "6"
+    type << option6
+    option7 = []
+    option7 << "右中"
+    option7 << "7"
+    type << option7
+    option8 = []
+    option8 << "右下"
+    option8 << "8"
+    type << option8
     type
   end
 
+  def subfield_list_type subfield
+    case subfield.to_i
+      when 1
+        resulet = "左上"
+      when 2
+        resulet = "中一"
+      when 3
+        resulet = "中二"
+      when 4
+        resulet = "中下"
+      when 5
+        resulet = "左下"
+      when 6
+        resulet = "右上"
+      when 7
+        resulet = "右中"
+      when 8
+        resulet = "右下"
+    end
+  end
+
+
+  def get_subfield_acts field
+    org_subfield = OrgSubfield.find(field.id)
+    org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0
+    org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc')
+    org_acts
+  end
+
 end

app/helpers/repositories_helper.rb

@@ -41,6 +41,23 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取文件目录的最新动态
+  def get_trees_last_changes(project_id, rev, ent_name)
+    g = Gitlab.client
+    begin
+      tree_changes = g.rep_last_changes(project_id, :rev => rev, :path => ent_name)
+      tree_changes
+    rescue
+      logger.error("faile to get tress activities!")
+    end
+  end
+
+  def translate_time time
+    case time
+      when time.include("")
+    end
+  end
+
   # 获取diff内容行号
   def diff_line_num content
     content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i

app/models/message.rb

@@ -77,12 +77,10 @@ class Message < ActiveRecord::Base
   validates_length_of :subject, :maximum => 255
   validate :cannot_reply_to_locked_topic, :on => :create
 
-  after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
+  # after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
   after_update :update_messages_board, :update_activity
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score
-  
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity,
-               :act_as_system_message, :send_mail, :act_as_student_score, act_as_at_message(:content, :author_id)
+  after_create :act_as_course_activity, :act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -134,11 +132,11 @@ class Message < ActiveRecord::Base
     if self.project && !project.project_score.nil?
       # 讨论区
       if self.parent_id.nil?
-        count = self.project.project_score.board_num + 1
-        self.project.project_score.update_attribute(:board_num, count)
+        count = self.project.project_score.board_num.to_i + 1
+        self.project.project_score.update_column(:board_num, count)
       else # 回复
-        count = self.project.project_score.board_message_num + 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        count = self.project.project_score.board_message_num.to_i + 1
+        self.project.project_score.update_column(:board_message_num, count)
       end
     end
   end
@@ -259,13 +257,13 @@ class Message < ActiveRecord::Base
   def act_as_system_message
     if self.course
       if self.parent_id.nil?   # 主贴
-        self.course.members.each do |m|
+        self.course.members.includes(:user).each do |m|
           if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
         end
       else    # 回帖
-        self.course.members.each do |m|
+        self.course.members.includes(:user).each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
@@ -273,13 +271,13 @@ class Message < ActiveRecord::Base
       end
     elsif self.project  # 项目相关
       if self.parent_id.nil?   # 主贴
-        self.project.members.each do |m|
+        self.project.members.includes(:user).each do |m|
           if  m.user_id != self.author_id
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
           end
         end
       else    # 回帖
-        self.project.members.each do |m|
+        self.project.members.includes(:user).each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
           end

app/models/project.rb

@@ -115,6 +115,7 @@ class Project < ActiveRecord::Base
 
   has_many :org_projects,:dependent => :destroy
   has_many :organization,:through => :org_projects
+  has_many :rep_statics, :class_name => 'RepStatics'
 
   # has_many :journals
 

app/models/rep_statics.rb

@@ -0,0 +1,4 @@
+class RepStatics < ActiveRecord::Base
+  belongs_to :project
+  attr_accessible :add, :commits_num, :del, :email, :project_id, :uname, :changeset
+end

app/models/repository.rb

@@ -44,7 +44,7 @@ class Repository < ActiveRecord::Base
   # validates_uniqueness_of :identifier, :allow_blank => true
   validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
   # donwcase letters, digits, dashes, underscores but not digits only
-  validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true
+  validates_format_of :identifier, :with => /^[a-zA-Z0-9_\-]*[a-zA-Z_\-]+[a-zA-Z0-9_\-]*$/, :allow_blank => true
   # Checks if the SCM is enabled when creating a repository
   validate :repo_create_validation, :on => :create
 

app/views/layouts/_logined_header.html.erb

@@ -5,17 +5,18 @@
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl">
-        <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db p10", :title => "回到个人首页"%>
+        <%= link_to "首页",user_activities_path(User.current), :class => "c_white f16 db p10", :title => "回到个人首页"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource', :id => User.current.id, :type => 6) %>" class="c_white f16 db p10">资源库</a></li>
+        <%= link_to "资源库", user_resource_user_path(User.current, :type => 6), :class => "c_white f16 db p10" %>
+      </li>
       <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
       <li class="navHomepageMenu fl">
-            <%= link_to "题库",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
+            <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
       </li>
       <% else %>
           <li class="navHomepageMenu fl">
-            <%= link_to "我的作业",  student_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
+            <%= link_to "我的作业",  student_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
           </li>
       <% end %>
       <li class="navHomepageMenu fl mr30">

app/views/layouts/base_org.html.erb

@@ -113,6 +113,9 @@
         <!--<span class="img_private"><%#= l(:label_private)%></span>-->
         <!--<%# end %>-->
         <!--</div>-->
+        <%# 更新访问数,刷新的时候更新访问次数 %>
+        <%  update_visiti_count @organization %>
+        <%# over %>
 
         <div class="cl"></div>
         <div class="f12 fontGrey3">

app/views/layouts/base_org2.html.erb

@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= stylesheet_link_tag  'org2','jquery/jquery-ui-1.9.2' %>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'attachments' %>
+  <%#= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%#= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+  </script>
+  <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script><!--焦点图-->
+  <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
+
+  <script src="/javascripts/scrollPic.js"></script><!--滚动-->
+  <script>
+      window.onload = function(){
+          scrollPic();
+      }
+      function scrollPic() {
+          var scrollPic = new ScrollPic();
+          scrollPic.scrollContId   = "scrollPic"; //内容容器ID
+          scrollPic.arrLeftId      = "LeftArr";//左箭头ID
+          scrollPic.arrRightId     = "RightArr"; //右箭头ID
+
+          scrollPic.frameWidth     = 760;//显示框宽度
+          scrollPic.pageWidth      = 760; //翻页宽度
+
+          scrollPic.speed          = 10; //移动速度(单位毫秒，越小越快)
+          scrollPic.space          = 10; //每次移动像素(单位px，越大越快)
+          scrollPic.autoPlay       = true; //自动播放
+          scrollPic.autoPlayTime   = 3; //自动播放间隔时间(秒)
+
+          scrollPic.initialize(); //初始化
+      }
+  </script>
+
+</head>
+
+<!--add by huang-->
+<script type="text/javascript">
+    function org_new_files_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function org_new_files_banner_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
+<body onload="prettyPrint();">
+<!--内容开始-->
+<header>
+  <div class="sn-header">
+    <%= render :partial => 'organizations/org_logined_header' %>
+    <div class="sn-row sn-bg-white">
+      <div class="sn-logo"> <img src="/images/sn_logo.jpg" width="367" height="63" alt="logo" class="sn-mt13" /> <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
+        <input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
+      </div>
+    </div>
+    <!--导航-->
+    <div class="sn-row sn-bg-blue">
+      <ul class="sn-nav">
+        <% @subfield_content.each do |field| %>
+            <% if is_default_field?(field) %>
+                <% case field.name %>
+            <% when 'activity' %>
+                    <li class="nav-element">
+                      <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
+                    </li>
+                <% when 'course' %>
+                    <li class="nav-element">
+                      <a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
+                    </li>
+                <% when 'project' %>
+                    <li class="nav-element">
+                      <a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
+                    </li>
+                <% end %>
+            <% else %>
+                <% if field.field_type == "Post" && field.hide == 0 %>
+                    <li class="nav-element">
+                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                    </li>
+                <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                    <li class="nav-element">
+                      <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                    </li>
+                <% end %>
+            <% end %>
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <li class="nav-element">
+              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+            </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</header>
+<%# 更新访问数,刷新的时候更新访问次数 %>
+<%  update_visiti_count @organization %>
+<%# over %>
+<!--内容开始-->
+<div class="sn-content">
+<div class="sn-content-left fl sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 1 %>
+          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 2 %>
+          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
+            <div class="cl"></div>
+          </div>
+      <% elsif field.status.to_i == 4 %>
+          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 5 %>
+          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<!--右侧-->
+<div class="sn-content-right fr sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 6 %>
+          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 7 %>
+          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 8 %>
+          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<div class="cl"></div>
+</div>
+<!--内容结束-->
+<footer>
+  <!--footer-->
+  <div class="sn-row sn-bg-grey2">
+    <div class="sn-footer">
+      <ul class="sn-footer-link">
+        <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
+        <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+        <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
+      </ul>
+      <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
+      <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
+        卫星导航仿真与测试开放实验室</div>
+    </div>
+  </div>
+</footer>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
+<%#= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>
+

app/views/layouts/base_org_newstyle.html.erb

@@ -62,9 +62,9 @@
 
 <!--add by huang-->
 <script type="text/javascript">
-    function orge_new_files_upload()
+    function org_new_files_upload()
     {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
@@ -72,7 +72,7 @@
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 
-    function orge_new_files_banner_upload()
+    function org_new_files_banner_upload()
     {
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
         showModal('ajax-modal', '513px');
@@ -89,12 +89,20 @@
     <div class="header-con">
       <% if User.current.admin_of_org?(@organization) %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
-            <a href="" class="logo-add" title="点击替换LOGO" onclick="orge_new_files_upload();"></a>
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
+            <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
           </div>
        <% else %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
           </div>
        <% end %>
       <%= render :partial => 'organizations/org_logined_header' %>
@@ -140,7 +148,7 @@
           <% else %>
               <img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
           <% end %>
-          <a href="#" class="banner-add" title="点击替换图片" onclick="orge_new_files_banner_upload();"></a>
+          <a href="#" class="banner-add" title="点击替换图片" onclick="org_new_files_banner_upload();"></a>
           <div class="banner-txt">
             <p ><%= @organization.name  %></p>
           </div>
@@ -389,6 +397,9 @@
       <% end %>
   <% end %>
 
+  <%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+  <%# over %>
 
   <div class="footer">
     <div class="footer-con">

app/views/organizations/_org_logined_header.html.erb

@@ -1,48 +1,54 @@
-<% if User.current.logged? %>
-    <div class="navHomepageProfile" id="navHomepageProfile">
-      <ul>
-        <li class="homepageProfileMenuIcon fr" id="homepageProfileMenuIcon">
-          <%= link_to "<div class='mt5 mb8 user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
-          <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
-          <ul class="topnav_login_list none" id="topnav_login_list">
-            <li>
-              <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
-            </li>
-            <li>
-              <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
-            </li>
-            <li>
-              <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
-            </li>
-            <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
-            <li>
-              <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
-            </li>
-          </ul>
-        </li>
-      </ul>
-    </div>
-<% else %>
-    <div class="login fr" >
-      <a href="<%= signin_url_without_domain %>" class=" " >登录&nbsp;&nbsp;|&nbsp;</a>
-      <a href="<%= register_url_without_domain %>" class=" " >退出</a>
-    </div>
-<% end %>
-
-<script type="text/javascript">
-    $("#navHomepageProfile").mouseenter(function(){
-        $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
-        $("#topnav_login_list").show();
-    });
-    $("#navHomepageProfile").mouseleave(function(){
-        $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
-        $("#topnav_login_list").hide();
-    });
-
-    function signout(){
-        $.post(
-                '<%= signout_path%>',
-                {}
-        );
-    }
+<% if User.current.logged? %>
+    <div class="sn-row sn-bg-grey">
+      <div class="sn-login2">
+        <div class="navHomepageProfile sn-mt4" id="navHomepageProfile">
+          <ul>
+            <li class="homepageProfileMenuIcon fr" id="homepageProfileMenuIcon">
+              <%= link_to "<div class='mt5 mb8 user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
+              <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %>
+              <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
+                <li>
+                  <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
+                </li>
+                <li>
+                  <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
+                </li>
+                <li>
+                  <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
+                </li>
+                <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
+                <li>
+                  <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+<% else %>
+    <div class="sn-row sn-bg-grey">
+      <div class="sn-login">
+        <a href="<%= signin_url_without_domain %>" class="sn-link-blue">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp;
+        <a href="<%= register_url_without_domain %>" class="sn-link-blue">注册</a>
+      </div>
+    </div>
+<% end %>
+
+<script type="text/javascript">
+    $("#navHomepageProfile").mouseenter(function(){
+        $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").show();
+    });
+    $("#navHomepageProfile").mouseleave(function(){
+        $("#homepageProfileMenuIcon").removeClass("homepageProfileMenuIconhover");
+        $("#topnav_login_list").hide();
+    });
+
+    function signout(){
+        $.post(
+                '<%= signout_path%>',
+                {}
+        );
+    }
 </script>

app/views/organizations/_org_subfield_leftD.html.erb

@@ -0,0 +1,117 @@
+<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+  <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+  <div class="sn-index-partnerbox " >
+    <ul id="scrollPic" >
+      <li>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
+      </li>
+      <li>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
+        <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
+      </li>
+    </ul>
+    <div class="cl"></div>
+    <div class="partner-btnbox">
+      <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
+      <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <p>暂无内容！</p>
+    <% when 'project' %>
+        <p>暂无内容！</p>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %> <%# 讨论类型 %>
+        <% org_acts = get_subfield_acts field %>
+        <% unless org_acts.blank? %>
+           <% org_acts.each do |activity| %>
+                <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+                  <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+                  <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+                    <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                        <% document = activity.org_act %>
+                        <% org_subfield_id = params[:org_subfield_id] %>
+                        <% flag = 2 %>
+                        <% iamge_path = get_image_path_from_content(document.content) %>
+                        <% if iamge_path.nil? %>
+                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                        <% else %>
+                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                        <% end %>
+                    <% elsif activity.container_type == 'OrgSubfield' %>
+                        <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                            <% message = Message.find(activity.org_act_id) %>
+                            <% if message.board.org_subfield_id %>
+                                <% iamge_path = get_image_path_from_content(message.content) %>
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                                <% end %>
+                            <% else %>
+                                <% iamge_path = get_image_path_from_content(message.content) %>
+                                <% if iamge_path.nil? %>
+                                    <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                                <% else %>
+                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %>
+                                <% end %>
+                            <% end %>
+                        <% end %>
+                        <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                            <% news = News.find(activity.org_act_id) %>
+                            <% iamge_path = get_image_path_from_content(news.description) %>
+                            <% if iamge_path.nil? %>
+                                <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                            <% else %>
+                                <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %>
+                            <% end %>
+                        <% end %>
+                    <% end %>
+                  </div>
+                </div>
+           <% end %>
+        <% else %>
+            <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+              <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
+              <div class="sn-index-partnerbox " >
+                <ul id="scrollPic" >
+                  <li>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt=""/></a>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt=""/></a>
+                  </li>
+                  <li>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt=""/></a>
+                    <a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt=""/></a>
+                  </li>
+                </ul>
+                <div class="cl"></div>
+                <div class="partner-btnbox">
+                  <div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
+                  <div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
+                  <div class="cl"></div>
+                </div>
+              </div>
+            </div>
+        <% end %>
+    <% elsif field.field_type == "Resource" %>
+        <% org_attachs = get_attach_org2(field) %>
+        <div class="sn-index-smallbanner" style="display:<%= field.hide == 0?'block':'none' %>;">
+          <% if !field.subfield_subdomain_dir.nil? %>
+              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>
+              <% else %>
+                  <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank"  %>
+              <% end %>
+          <% else %>
+              <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+          <% end %>
+        </div>
+    <% end %>
+<% end %>

app/views/organizations/_org_subfield_leftM1_default.html.erb

@@ -0,0 +1,8 @@
+<div class="sn-news-bigbox fl">
+  <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/news/img-news-big.jpg" width="380" height="165" alt=""/></a>
+  <h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3>
+  <span class="txt-grey"></span>
+  <div class="sn-news-txt">
+    <p></p>
+  </div>
+</div>

app/views/organizations/_org_subfield_leftM2.html.erb

@@ -0,0 +1,233 @@
+<div class="sn-news-smallbox fl" style="display:<%= field.hide == 0?'block':'none' %>;">
+<% if is_default_field?(field) %>
+    <% case field.name %>
+    <% when 'course' %>
+        <% if @course_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
+        <% else %>
+            <% @course_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "HomeworkCommon" %>
+                    <% activity = HomeworkCommon.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_at %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.created_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "Poll" %>
+                    <% activity = Poll.find(act.org_act_id) %>
+                    <% has_commit = has_commit_poll?(activity.id ,User.current)%>
+                    <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
+                    <% iamge_path = get_image_path_from_content(activity.polls_description) %>
+                    <% if ( activity.polls_status==2) %>
+                        <div class="sn-news-small mb18">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% end %>
+                          <h3>
+                            <% if has_commit %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                            <% else %>
+                                <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10"  %>
+                            <% end %>
+                          </h3>
+                          <span class="txt-grey fl "><%= format_date activity.published_at %></span>
+                          <div class="cl"></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% when 'project' %>
+        <% if @project_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
+        <% else %>
+            <% @project_acts.first(4).each do |act| %>
+                <% if act.org_act_type == "Issue" %>
+                    <% activity = Issue.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "Message" %>
+                    <% activity = Message.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.content) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                            <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% else %>
+                            <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                        <% end %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.updated_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% elsif act.org_act_type == "News" %>
+                    <% activity = News.find(act.org_act_id) %>
+                    <% iamge_path = get_image_path_from_content(activity.description) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date activity.created_on %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% else %>
+    <% if field.field_type == "Post" %>
+        <% org_acts = get_subfield_acts field %>
+        <% if org_acts.blank? %>
+            <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %>
+        <% else %>
+            <% org_acts.first(4).each do |activity| %>
+                <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                    <% document = activity.org_act %>
+                    <% org_subfield_id = params[:org_subfield_id] %>
+                    <% flag = 2 %>
+                    <% iamge_path = get_image_path_from_content(document.content) %>
+                    <div class="sn-news-small mb18">
+                      <% if iamge_path.nil? %>
+                          <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% else %>
+                          <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                      <% end %>
+                      <h3>
+                        <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                      </h3>
+                      <span class="txt-grey fl "><%= format_date document.created_at %></span>
+                      <div class="cl"></div>
+                    </div>
+                <% else activity.container_type == 'OrgSubfield' %>
+                    <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                        <% message = Message.find(activity.org_act_id) %>
+                        <% if message.parent_id.nil? %>
+                            <% content = message.content%>
+                        <% else %>
+                            <% content = message.parent.content%>
+                        <% end %>
+                        <% iamge_path = get_image_path_from_content(content) %>
+                        <% if message.board.org_subfield_id %>
+                            <div class="sn-news-small mb18">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey fl "><%= format_date message.created_on %></span>
+                              <div class="cl"></div>
+                            </div>
+                        <% else %>
+                            <div class="sn-news-small mb18">
+                              <% if iamge_path.nil? %>
+                                  <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% else %>
+                                  <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                              <% end %>
+                              <h3>
+                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
+                                    <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% else %>
+                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %>
+                                <% end %>
+                              </h3>
+                              <span class="txt-grey fl "><%= format_date message.created_on %></span>
+                              <div class="cl"></div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                    <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                        <% news = News.find(activity.org_act_id) %>
+                        <% iamge_path = get_image_path_from_content(news.description) %>
+                        <div class="sn-news-small mb18">
+                          <% if iamge_path.nil? %>
+                              <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% else %>
+                              <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %>
+                          <% end %>
+                          <h3>
+                            <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %>
+                          </h3>
+                          <span class="txt-grey fl "><%= format_date news.created_on %></span>
+                          <div class="cl"></div>
+                        </div>
+                    <% end %>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+<div class="cl"></div>
+</div>

app/views/organizations/_org_subfield_leftM2_default.html.erb

@@ -0,0 +1,26 @@
+<div class="sn-news-smallbox fl">
+  <div class="sn-news-small mb18">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small01.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small mb18">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small02.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small mb18">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small03.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+  <div class="sn-news-small ">
+    <a href="javascript:void()" target="_blank" class="sn-news-smallimg fl"><img src="/images/news/img-news-small04.jpg" width="85" height="85" alt=""/></a>
+    <h4><a href="javascript:void()" target="_blank" class="h4-title fl mt10">北斗开放实验室迎湖南省省直机关领导调研参观</a></h4>
+    <span class="txt-grey fl">2016-04-08</span>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/organizations/_org_subfield_leftMD_default.html.erb

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

app/views/organizations/_org_subfield_leftT_default.html

@@ -0,0 +1,10 @@
+<div class="sn-index-banner" style="display:<%= field.hide == 0?'block':'none' %>;">
+    <!-- 代码 开始 -->
+    <div id="fsD1" class="focus">
+        <div  class="fPic">
+            <div class="fcon-default">
+                <a target="_blank" href="javascript:void(0);"><img src="/images/default_blank/banner-default.jpg" alt="" ></a>
+            </div>
+        </div>
+    </div>
+</div>