Merge branch 'hjq_beidou' into develop

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

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
 
@@ -98,10 +98,26 @@ class OrganizationsController < ApplicationController
     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])
-          @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)
+          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)
@@ -142,6 +158,56 @@ class OrganizationsController < ApplicationController
 
   end
 
+  def teachers
+    unless @organization.allow_set_teachers
+      render_403
+      return
+    end
+    q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @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?
@@ -221,6 +287,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
@@ -403,6 +470,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/users_controller.rb

@@ -2725,7 +2725,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

app/helpers/application_helper.rb

@@ -33,6 +33,19 @@ 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

app/helpers/organizations_helper.rb

@@ -148,4 +148,42 @@ module OrganizationsHelper
     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.where("excellent_teacher =?",true)
+  end
+
 end

app/models/organization.rb

@@ -26,4 +26,8 @@ class Organization < ActiveRecord::Base
   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/user.rb

@@ -309,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
 
   # 查询用户未读过的记录
   # 用户留言记录
@@ -1073,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/layouts/base_org2.html.erb

@@ -77,7 +77,7 @@
       </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) %>
@@ -105,6 +105,7 @@
                       <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>
@@ -156,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>
@@ -190,16 +193,19 @@
 </body>
 <script>
     $(".nav-element").mouseover(function(){
-        $(this).next(".sn-grey-opacity").show();
+        $(this).next(".sn-grey-opacity").show(0);
     });
     $(".sn-grey-opacity").mouseover(function(){
-        $(this).show();
+        $(this).show(0);
     });
     $(".nav-element").mouseout(function(){
-        $(this).next(".sn-grey-opacity").hide();
+        $(this).next(".sn-grey-opacity").delay(150).hide(0);
     });
     $(".sn-grey-opacity").mouseout(function(){
-        $(this).hide();
+        $(this).delay(150).hide(0);
+    });
+    $(".sn-sub-nav").each(function(){
+        $(this).children(".sn-subnav-slice:last").hide();
     });
 </script>
 

app/views/layouts/base_sub_domain.html.erb

@@ -33,16 +33,19 @@
   <script>
       $(document).ready(function(){
         $(".nav-element").mouseover(function(){
-            $(this).next(".sn-grey-opacity").show();
+            $(this).next(".sn-grey-opacity").show(0);
       });
         $(".sn-grey-opacity").mouseover(function(){
-              $(this).show();
+            $(this).show(0);
         });
         $(".nav-element").mouseout(function(){
-            $(this).next(".sn-grey-opacity").hide();
-    });
+            $(this).next(".sn-grey-opacity").delay(150).hide(0);
+        });
         $(".sn-grey-opacity").mouseout(function(){
-              $(this).hide();
+            $(this).delay(150).hide(0);
+        });
+        $(".sn-sub-nav").each(function(){
+            $(this).children(".sn-subnav-slice:last").hide();
         });
     });
   </script>
@@ -91,7 +94,7 @@
         </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) %>
@@ -119,6 +122,7 @@
                         <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>

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/_org_left_subfield_list.html.erb

@@ -91,7 +91,7 @@
         <% end %>
     <% else %>
         <div style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
-          <% if field.field_type == "Post" %> <!--讨论帖子-->
+          <% 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? %> <!--讨论帖子-->
@@ -101,9 +101,13 @@
                         <%= 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 homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <% if field.field_type == "Comptec" %>
+                        <%= link_to "#{field.name}", teachers_organization_path(organization), :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 %>
                 <% end %>
-                <% if User.current.logged? and User.current.admin_of_org?(organization) %>
+                <% 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>
@@ -118,7 +122,6 @@
                     <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? %>

app/views/organizations/_org_subfield_leftM1.html.erb

@@ -24,8 +24,9 @@
                       </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) %>
@@ -37,16 +38,13 @@
                           <%= 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) %>
@@ -62,8 +60,10 @@
                       </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) %>
@@ -86,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 %>
@@ -116,8 +117,9 @@
                       </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) %>
@@ -128,17 +130,14 @@
                       <% 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",: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 %>
+                      <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) %>
@@ -154,8 +153,9 @@
                       </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 %>
@@ -190,8 +190,9 @@
                       </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 %>
@@ -209,17 +210,14 @@
                               <% 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",:style=>"display:block;" %>
                               <% end %>
-                              <h3>
-                                <% if message.parent_id.nil? %> <!--+"(帖子标题)"-->
-                                    <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
-                                <% else %>
-                                    <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %>
-                                <% end %>
+                              <h3> <!--+"(帖子标题)"-->
+                                    <%= 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">
@@ -237,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 %>
@@ -256,8 +261,9 @@
                           </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 %>
@@ -266,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_rightD.html.erb

@@ -10,7 +10,7 @@
         <% 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] %>
@@ -52,13 +52,13 @@
               <% end %>
             </div>
         <% else %>
-            <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' %>;">
               <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/right-03.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %>

app/views/organizations/_org_subfield_rightM.html.erb

@@ -23,7 +23,8 @@
                     <% 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' %>
@@ -39,6 +40,7 @@
                                 <%= 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 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 %>
@@ -51,6 +53,7 @@
                                 <%= 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 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 %>
@@ -66,6 +69,7 @@
                             <%= 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 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 %>
@@ -96,3 +100,12 @@
         </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,30 @@
+<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"), :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", :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>

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

@@ -8,7 +8,6 @@
   <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) %>
@@ -32,10 +31,9 @@
                       <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
                     </div>
                     <%= 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;"}) %>
+                           { :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="orgListType">默认</li>
           <a href="javascript:void(0);" class="linkGrey fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"隐藏":"可见" %></a>
@@ -59,21 +57,20 @@
           </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"><%= 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;"}) %>
+                           { :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="orgListType"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
+          <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;  width:30px; margin-left:20px;" title="双击可编辑">

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>
@@ -152,10 +157,9 @@
                 <input type="radio" id="orgMeb" value="Resource" name="field_type" />
                 <label for="orgMeb">资源</label>
               </li>
-              <!--<li class="fl">-->
-                <!--<input type="radio" id="orgCom" value="Complex" 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>

app/views/organizations/show.html.erb

@@ -5,46 +5,46 @@
 <% end %>
 
 <% if params[:show_homepage].nil? and User.current.logged? %>
-<div class="homepageRightBanner">
-  <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
-  <% if params[:org_subfield_id].nil? %>
-      <ul class="resourcesSelect">
-        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-          <ul class="homepagePostType">
-            <li>
-              <ul class="homepagePostTypeHomework fl">
-                <li class="f14">课程动态</li>
-                <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-                  <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-                <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-                <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-              </ul>
-            </li>
-            <li>
-              <ul class="homepagePostTypeProject fl">
-                <li class="f14">项目动态</li>
-                <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-                <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-                  <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-              </ul>
-            </li>
-            <li>
-              <ul class="homepagePostTypeProject fl">
-                <li class="f14">更多</li>
-                <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-                <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
+      <% if params[:org_subfield_id].nil? %>
+          <ul class="resourcesSelect">
+            <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+              <ul class="homepagePostType">
+                <li>
+                  <ul class="homepagePostTypeHomework fl">
+                    <li class="f14">课程动态</li>
+                    <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                      <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+                    <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                    <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+                  </ul>
+                </li>
+                <li>
+                  <ul class="homepagePostTypeProject fl">
+                    <li class="f14">项目动态</li>
+                    <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+                      <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                  </ul>
+                </li>
+                <li>
+                  <ul class="homepagePostTypeProject fl">
+                    <li class="f14">更多</li>
+                    <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+                    <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+                  </ul>
+                </li>
               </ul>
             </li>
           </ul>
-        </li>
-      </ul>
-  <% end %>
-</div>
+      <% end %>
+    </div>
 <% end %>
 <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
     <script>
@@ -53,7 +53,7 @@
         });
     </script>
     <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
-        <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
+    <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
 <% end  %>
 <% if @org_activities %>
     <%= render :partial =>  'organizations/org_activities',
@@ -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,30 @@
+<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"), :class => "fontGrey" %>
+    </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>

app/views/organizations/teachers.js.erb

@@ -0,0 +1,3 @@
+$("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list', :locals => {:org_teachers => @org_teachers})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#org_teacher_search").attr('href','<%= teachers_organization_path(@organization, :type =>  @type) %>');

app/views/projects/_rep_static.html.erb

@@ -20,6 +20,11 @@
 //                    text: 'Source: WorldClimate.com'
             },
             xAxis: {
+                title: {
+                    text: '作者',
+                    x: -23, //center设置标题的位置
+                    y: 6
+                },
 //                   categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
                 categories: <%= raw(@a_uname_code) %>
             },
@@ -70,7 +75,7 @@
                     lineWidth: 1.5
                 },
                 {
-                name: '<b style="font-weight:normal ">改动或增加</b>',
+                name: '<b style="font-weight:normal;text-align: center ">改动或增加</b>',
                 color: '#5b6b76',
                 data: <%= @a_commits_add %>,
                 dataLabels: {
@@ -122,6 +127,11 @@
 //                    text: 'Source: WorldClimate.com'
             },
             xAxis: {
+                title: {
+                    text: '作者',
+                    x: -20, //center设置标题的位置
+                    y: 6
+                },
 //                   categories: ["Jan", "Jan", "Jan", 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
                 categories: <%= raw(@a_uname) %>
             },

app/views/repositories/_dir_list_content.html.erb

@@ -43,7 +43,7 @@
           </div>
         </td>
         <td class="tree-age c_grey">
-          <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>">
+          <div class="hidden" title="<%= format_time(latest_changes.time) %>">
             <%# 为了转换UTC时间，时差8小时 %>
             <%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
             <%#= latest_changes.time if latest_changes && latest_changes.time %>

app/views/repositories/show.html.erb

@@ -1,6 +1,8 @@
 <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+  <a href="javascript:void(0);" class="btn_zipdown fr" >ZIP下载</a>
+
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>

app/views/sub_document_comments/_show_sub_document_newstyle.html.erb

@@ -14,7 +14,7 @@
             <li>
               <div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
               <span class=" txt-grey fr"><%= format_date(document.created_at) %></span>
-              <a href="javascript:void(0)" target="_blank" class="sn-newslist-reply fr mr10">回复（<%= document.children.count %>）</a>
+              <span class="sn-newslist-reply fr mr10 txt-grey">回复（<%= document.children.count %>）</span>
               <!--<a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>-->
               <div class="cl"></div>
             </li>

app/views/users/_project_boardlist.html.erb

@@ -44,7 +44,7 @@
                   <% end %>
                   <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
                 </div>
-                <div class="ml15 mt10">
+                <div class="ml15 mt10 f12">
                   <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
                   <span class="grayTxt">更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
                   <% count=0 %>

app/views/users/_user_resource_info.html.erb

@@ -28,7 +28,7 @@
 
 </form>
 <div>
-  <ul class="wlist" id="pages" style="margin-top: 5px;">
+  <ul class="wlist" id="pages" style="margin-top: 15px;">
     <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
   </ul>
 </div>
@@ -37,7 +37,7 @@
 <!--<div id="upload_box" style="display: none">-->
 <!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
 <!--</div>-->
-<ul class="resource-list">
+<ul>
   <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
@@ -228,4 +228,22 @@
             alert('您无法修改此资源！')
         }
     }
+
+        //发送至按钮控制
+    $("input[name='checkbox1[]']").click(function(){
+        if($("input[name='checkbox1[]']:checked").length >= 1){
+            $(".resourcesSelectSendButton").removeClass("inactive-border");
+            $(".resourcesSelectSendButton").mouseover(function(){
+                $(this).css("backgroundColor","#297fb8");
+            });
+            $(".resourcesSelectSendButton").mouseout(function(){
+                $(this).css("backgroundColor","#fff");
+            });
+            $(".sendButtonBlue").removeClass("inactive-text");
+        }else{
+            $(".resourcesSelectSendButton").addClass("inactive-border");
+            $(".sendButtonBlue").addClass("inactive-text");
+            $(".resourcesSelectSendButton").unbind("mouseover").unbind("mouseout");
+        }
+    });
 </script>

app/views/users/user_homeworks.html.erb

@@ -5,13 +5,16 @@
             $(".resource-switch").children().removeClass("resource-tab-active");
             $(this).children().addClass("resource-tab-active");
         });
-        $("input[name='subject-list-name']").click(function(){
-            if($("input[name='subject-list-name']:checked").length >= 1){
+        $("input[name='checkMenu']").click(function(){
+            if($("input[name='checkMenu']:checked").length >= 1){
                 $(".resourcesSelectSendButton").removeClass("inactive-border");
+                $(".resourcesSelectSendButton").mouseover(function(){
+                    $(this).css("backgroundColor","#297fb8");
+                });
+                $(".resourcesSelectSendButton").mouseout(function(){
+                    $(this).css("backgroundColor","#fff");
+                });
                 $(".sendButtonBlue").removeClass("inactive-text");
-            }else {
-                $(".resourcesSelectSendButton").addClass("inactive-border");
-                $(".sendButtonBlue").addClass("inactive-text");
             }
         });
     });
@@ -33,7 +36,7 @@
 
 <div class="homepageContentContainer">
   <div class="homepageContent">
-    <div class="resource-wrapper">
+    <div class="resource-wrapper mb10">
         <ul class="resource-banner">
           <li class="fl resource-switch">
             <a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">题库</a>

config/routes.rb

@@ -76,6 +76,7 @@ RedmineApp::Application.routes.draw do
       get 'more_org_projects'
       get 'more_org_courses'
       get 'search_courses'
+      get 'teachers'
       post 'join_course_menu'
       post 'join_courses'
       get 'search_projects'
@@ -92,6 +93,8 @@ RedmineApp::Application.routes.draw do
       get 'autocomplete_search'
       post 'hide_org_subfield'
       post 'show_org_subfield'
+      post 'set_excellent_teacher'
+      post 'reset_excellent_teacher'
       post 'agree_apply_subdomain'
     end
   end
@@ -523,6 +526,10 @@ RedmineApp::Application.routes.draw do
   match 'courses/:course_id/news/index', :to => 'news#index', :via => [:get, :post], :as => 'new_course_news'
   match 'courses/:course_id/news/new', :to => 'news#new', :via => [:get, :post]
 
+  scope ":username" do
+    resources :posts
+  end
+
   #added by young
   resources :users do
     collection do
@@ -905,6 +912,7 @@ RedmineApp::Application.routes.draw do
   get 'projects/:id/repository/changes(/*path(.:ext))', :to => 'repositories#changes'
 
   get 'projects/:id/repository/forked', :to => 'repositories#forked'
+  get 'projects/:id/repository/project_archive', :to => 'repositories#project_archive', :as => 'project_archive'
   get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
   get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
   get 'projects/:id/repository/revision', :to => 'repositories#revision'

db/migrate/20160513012705_add_excellent_teacher_to_user.rb

@@ -0,0 +1,5 @@
+class AddExcellentTeacherToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :excellent_teacher, :integer, :default => false
+  end
+end

db/migrate/20160513021204_add_allow_teacher_to_organization.rb

@@ -0,0 +1,5 @@
+class AddAllowTeacherToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :allow_teacher, :integer, :default => false
+  end
+end

lib/gitlab-cli/lib/gitlab/client/repositories.rb

@@ -137,11 +137,20 @@ class Gitlab::Client
     end
     alias_method :repo_commit_diff, :commit_diff
 
-    #Get the commits count of each contributor in a project
-    #@param [Integer] project the ID fo a project.
+    # Get the commits count of each contributor in a project
+    # @param [Integer] project the ID fo a project.
     # @return [Gitlab::ObjectifiedHash]
     def contributors(project)
       get("/projects/#{project}/repository/contributors")
     end
+
+    # Get an archive of the repository
+    # @param [Integer] project the ID fo a project.
+    # sha (optional) - The commit SHA to download defaults to the tip of the default branch
+    # @return [Gitlab::ObjectifiedHash]
+    def project_archive(project, sha)
+      get("/projects/#{project}/repository/archive?sha=#{sha}")
+    end
+    alias_method :repo_project_archive, :project_archive
   end
 end

public/javascripts/org.js

@@ -75,3 +75,37 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
     }
 
 }
+
+// 教师选项
+var sendType = '1';
+var lastSendType ;//初始为发送到我的课程
+function chooseTeacherType(org_id){
+    sendType = $("#teacher_type_select").val();
+    if (sendType === lastSendType) {
+        alert("666");
+        return;
+    } else if(lastSendType != null) { //不是第一次点击的时候
+        if (sendType == '1') {
+            alert("te");
+            $.ajax({
+                type: 'get',
+                url: '/organizations/' + org_id + '/teachers',
+                data:{type:"teachers"}
+            });
+        } else if(sendType == '2') {
+            alert(org_id);
+            $.ajax({
+                type: 'get',
+                url: '/organizations/' + org_id + '/teachers',
+                data:{type:"students"}
+            });
+        }else if(sendType == '3'){
+            $.ajax({
+                type: 'get',
+                url: '/organizations/' + org_id + '/teachers',
+                data:{type:"resources"}
+            });
+        }
+    }
+    lastSendType = sendType;
+}

public/stylesheets/new_user.css

@@ -76,6 +76,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
 .ml24{margin-left:24px;}
+.ml25{margin-left:25px;}
 .ml36{ margin-left:36px; }
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
@@ -426,7 +427,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; }
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#297fb8;}
 .db {display:block !important;}
 
 .dropdown-menu {

public/stylesheets/org.css

@@ -160,3 +160,21 @@ a.blue-btn {
     cursor: pointer;
     text-align: center;
 }
+
+/*名师榜20160505*/
+.function-row {border-bottom:1px dashed #b2b2b2; padding-bottom:16px;}
+.teacher-list-search {width:310px; height:23px; border:1px solid #ccc; border-right:none; outline:none;}
+.teacher-search-icon {background:url(../images/search.png) 0 3px no-repeat; width:25px; height:25px; border:1px solid #ccc; border-left:none; cursor:pointer;}
+.teacher-search-type {width:84px; height:23px; border:1px solid #ccc; outline:none;}
+.teacher-list-row {border-bottom:1px dashed #b2b2b2; padding:18px 0;}
+.teacher-avatar {float:left;}
+.teacher-name {font-size:18px; color:#333; margin-right:15px;}
+.teacher-social-block {width:90px; float:left; text-align:center;}
+.block-num {font-size:16px; color:#000;}
+.block-title {font-size:12px; color:#999;}
+.block-slice {width:1px; height:40px; background-color:#e0e0e0; float:left; margin-top:3px;}
+.teacher-intro {font-size:13px; color:#999; line-height:24px; height:72px; overflow:hidden;}
+a.teacher-select {font-size:13px; color:#fff; padding:3px 18px; background-color:#269ac9;}
+a.teacher-select:hover {background-color:#297fb8;}
+a.follow-button {font-size:13px; color:#272727; padding:3px 5px; background-color:#f2efef;}
+a.follow-button:hover {background-color:#c1c1c1;}

public/stylesheets/org2.css

@@ -14,6 +14,7 @@ a:hover,a:active{color:#24366e;}
 .sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
 .sn-container {width:100%; background-color:#fff;}
 .sn-p-absolute {position:absolute;}
+.sn-p-relative {position:relative;}
 .sn-grey-opacity {background:rgba(230, 230, 230, 0.9)!important; filter:Alpha(opacity=90); background:#e6e6e6;}
 .sn-border {border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;}
 /* 公共 */
@@ -32,7 +33,7 @@ a:hover,a:active{color:#24366e;}
 .sn-font-grey3 {color:#999;}
 a.sn-link-blue {color:#24366e;}
 a.sn-link-white {color:#fff;}
-a.sn-link-grey {color:#999;}
+a.sn-link-grey {color:#666;}
 a.sn-link-grey:hover {color:#24366e;}
 a.sn-link-grey2 {color:#888;}
 a.sn-link-select {color:#809df9;}
@@ -47,11 +48,13 @@ a.sn-link-select {color:#809df9;}
 .sn-mt13 {margin-top:13px;}
 .sn-mt15 {margin-top:15px;}
 .sn-mt28 {margin-top:28px;}
+.sn-mb20 {margin-bottom:20px;}
 .sn-mb40 {margin-bottom:40px;}
 .sn-ml15 {margin-left:15px;}
 .sn-ml20 {margin-left:20px;}
 .sn-ml55 {margin-left:55px;}
 .sn-mr0 {margin-right:0px !important;}
+.sn-mr20 {margin-right:20px;}
 .sn-mr50 {margin-right:50px;}
 .sn-w229 {width:229px;}
 /*头部样式*/
@@ -66,11 +69,11 @@ a.sn-link-select {color:#809df9;}
 .sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
 .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
 a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}
-.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1; overflow:hidden;}
+.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; line-height:1; overflow:hidden;}
 .nav-element-default, .nav-element {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
 .nav-element-default a, .nav-element a  {display:inline-block; padding:8px 6px; border-radius:5px;}
 .nav-element-default a:hover, .nav-element a:hover {background-color:#809df9;}
-.sn-subnav-position {position:fixed; left:0; top:203px; z-index:99;}
+.sn-subnav-position {position:absolute; left:0; top:55px; z-index:99;}
 .sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;}
 .sn-sub-nav li {color:#999; float:left;}
 .sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;}
@@ -243,6 +246,10 @@ a.sn-teacher-name {width:75px; font-size:18px; color:#777; float:left;}
 .sn-teacher-info {height:30px; line-height:30px; vertical-align:middle; float:left; margin-left:15px;}
 .sn-teacher-social {height:30px; line-height:30px; vertical-align:middle; float:left; color:#999; font-size:12px; margin-left:15px;}
 .sn-border-none {border:none;}
+.sn-teacher-block {width:163px; height:222px; border-right:1px solid #e5e7ec; margin:40px 0 24px 0; float:left;}
+.sn-teacher-avatar2 {margin:0 18px; padding:18px 0;}
+.sn-teacher-info2 {color:#666; text-align:center; font-size:16px;}
+.sn-info2-hidden {width:153px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; margin:0 auto;}
 
 /*弹框*/
 .upload_con h2 {

public/stylesheets/public.css

@@ -930,7 +930,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; border-radius:5px; }
 a.sendButtonBlue {color:#269ac9;}
 a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#297fb8;}
 .db {display:block !important;}
 
 .dropdown-menu {

public/stylesheets/public_new.css

@@ -495,7 +495,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}
 a.sendButtonBlue {color:#15bccf;}
 a.sendButtonBlue:hover {color:#ffffff;}
-.resourcesSelectSendButton:hover {background-color:#15bccf;}
 .db {display:block !important;}
 
 .dropdown-menu {

public/stylesheets/repository.css

@@ -288,3 +288,6 @@ li.commit .commit-row-info .committed_ago {
     color: #7F7F7F;
 }
 .rep_mail_name{max-width: 150px; overflow: hidden; text-overflow: ellipsis;}
+a.btn_zipdown{ display:block; height:25px; width:80px; text-align: center; line-height: 25px;  border: 1px solid #dddddd;   background-image: linear-gradient(#FCFCFC, #EEE);
+    color: #7f7f7f; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; margin-top: 7px; margin-right: 5px;}
+a:hover.btn_zipdown{color:#269ac9;}