新的课程

修改了一些bug

app/controllers/bids_controller.rb

@@ -15,10 +15,16 @@ class BidsController < ApplicationController
   helper :projects
   
   def index
+    @project_type = params[:project_type]
     # Modified by nie
     # @requirement_title = "4"
     @offset, @limit = api_offset_and_limit({:limit => 10})
-    @bids = Bid.visible
+    if @project_type == '1'
+      @bids = Bid.visible.where('reward_type = ?', 3)
+    else
+      @bids = Bid.visible.where('reward_type = ? or reward_type = ?', 1, 2)
+    end
+    
     @bids = @bids.like(params[:name]) if params[:name].present?
     @bid_count = @bids.count
     @bid_pages = Paginator.new @bid_count, @limit, params['page']

app/controllers/courses_controller.rb

@@ -6,7 +6,7 @@ class CoursesController < ApplicationController
   def join
     if User.current.logged?
       course = Project.find(params[:object_id])
-      if params[:course_password].to_i == Course.find_by_extra(course.identifier).state
+      if params[:course_password] == Course.find_by_extra(course.identifier).password
       members = []
       members << Member.new(:role_ids => [5], :user_id => User.current.id)
       course.members << members

app/controllers/files_controller.rb

@@ -45,7 +45,7 @@ class FilesController < ApplicationController
   def new
     @versions = @project.versions.sort
     @course_tag = @project.project_type
-    if @course_tag
+    if @project.project_type == 1
       render :layout => 'base_courses'
     end
   end

app/controllers/projects_controller.rb

@@ -41,8 +41,9 @@ class ProjectsController < ApplicationController
   # menu_item l(:label_course_file), :only => files  
   # menu_item l(:label_settings), :only => settings
 
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join]
-  before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, :statistics, :feedback]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course]
+  before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
+                :statistics, :feedback, :course]
   before_filter :authorize_global, :only => [:new, :create]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   #by young
@@ -110,8 +111,132 @@ class ProjectsController < ApplicationController
     # @offset ||= @project_pages.offset
     # @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
     @project_type = params[:project_type]
+    @project_type = params[:project_type]
+    
+    @offset, @limit = api_offset_and_limit({:limit => 10})
+    @projects_status = ProjectStatus.visible.where("project_type <> ? or project_type is null", 1)
+    # @projects_status = ProjectStatus.visible
+    # @projects_status.each do |project|
+      # if Project.visible.find_by_id("#{project.project_id}")
+        # project.project_type = Project.visible.find_by_id("#{project.project_id}").project_type
+        # project.save
+      # end
+    # end
+    # @projects.each do |project|
+    # @admin = project.users_by_role[Role.find(3)]
+    # unless @admin.nil?
+    # @admin.each do |user|
+    # ProjectInfo.create(:user_id => user.id, :project_id => project.id)
+    # end
+    #
+    # end
+    # end
+    # @projects.each do |project|
+    # ProjectStatus.create(:changesets_count => project.changesets.count, :project_id => project.id, :watchers_count => project.watcher_users.count)
+    # end
+    # @projects_status = Project.visible.like(params[:name]) if params[:name].present?
+    @project_count = @projects_status.count
+    @project_pages = Paginator.new @project_count, @limit, params['page']
+
+    @offset ||= @project_pages.reverse_offset
+
+    # @projects = @projects.offset(@offset).limit(@limit).order('created_on DESC').all
+    if params[:project_sort_type].present?
+      case params[:project_sort_type]
+      when '0'
+        @offset ||= @project_pages.reverse_offset
+        unless @offset == 0
+          @projects_status = @projects_status.offset(@offset).limit(@limit).all.reverse
+        else
+          limit = @project_count % @limit
+          if limit == 0
+            limit = @limit
+          end
+          @projects_status = @projects_status.offset(@offset).limit(limit).all.reverse
+        end
+        @s_type = 0
+      # @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }
+      # @projects = @projects[@offset, @limit]
+      when '1'
+        @offset ||= @project_pages.reverse_offset
+        unless @offset == 0
+          @projects_status = @projects_status.reorder('changesets_count').offset(@offset).limit(@limit).all.reverse
+        else
+          limit = @project_count % @limit
+          if limit == 0
+            limit = @limit
+          end
+          @projects_status = @projects_status.reorder('changesets_count').offset(@offset).limit(limit).all.reverse
+        end
+        @s_type = 1
+
+      #@projects = @projects[@offset, @limit]
+      when '2'
+        @offset ||= @project_pages.reverse_offset
+        unless @offset == 0
+          @projects_status = @projects_status.reorder('watchers_count').offset(@offset).limit(@limit).all.reverse
+        else
+          limit = @project_count % @limit
+          if limit == 0
+            limit = @limit
+          end
+          @projects_status = @projects_status.reorder('watchers_count').offset(@offset).limit(limit).all.reverse
+        end
+        @s_type = 2
+      end
+    else
+        @offset ||= @project_pages.reverse_offset
+        unless @offset == 0
+          @projects_status = @projects_status.reorder('changesets_count').offset(@offset).limit(@limit).all.reverse
+        else
+          limit = @project_count % @limit
+          if limit == 0
+            limit = @limit
+          end
+          @projects_status = @projects_status.reorder('changesets_count').offset(@offset).limit(limit).all.reverse
+        end
+        @s_type = 1
+    # @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }
+    # @projects = @projects[@offset, @limit]
+    end
+    
+    @projects = []
+    @projects_status.each do |obj|
+    @projects << Project.visible.find_by_id("#{obj.project_id}") unless Project.visible.find_by_id("#{obj.project_id}").nil?
+    end
+    #end
+    respond_to do |format|
+      format.html {
+        render :layout => 'base'
+        scope = Project
+        unless params[:closed]
+        scope = scope.active
+        end
+      }
+      format.api  {
+      #        @offset, @limit = api_offset_and_limit
+      #        @project_count = Project.visible.count
+      #        @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
+      }
+      format.atom {
+        projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
+        render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
+      }
+    end
+  end
+  
+  def course
+    #Modified by nie
+    # @offset, @limit = api_offset_and_limit({:limit => 10})
+    # @project_count = Project.visible.count
+    # @project_pages = Paginator.new @project_count, @limit, params['page']
+    # @offset ||= @project_pages.offset
+    # @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
+
+    @project_type = params[:project_type]
+    
     @offset, @limit = api_offset_and_limit({:limit => 10})
-    @projects_status = ProjectStatus.visible
+    @projects_status = ProjectStatus.visible.where("project_type = ?", 1)
     # @projects.each do |project|
     # @admin = project.users_by_role[Role.find(3)]
     # unless @admin.nil?
@@ -328,6 +453,7 @@ class ProjectsController < ApplicationController
   end
 
   def new
+    @project_type = params[:project_type]
     @course_tag = params[:course]
     @issue_custom_fields = IssueCustomField.sorted.all
     @trackers = Tracker.sorted.all
@@ -341,6 +467,7 @@ class ProjectsController < ApplicationController
   end
 
   def create  
+       
     @course_tag = params[:project][:project_type]
     if(@course_tag=="1")
       @course = Course.new
@@ -385,7 +512,7 @@ class ProjectsController < ApplicationController
                 redirect_to new_project_path(:course => '1')
               #Ended by young
               else
-                redirect_to settings_project_path(@project)
+                redirect_to settings_project_path(@project,:project_type => 1)
               end
             }
             format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
@@ -482,6 +609,9 @@ class ProjectsController < ApplicationController
 
   # Show @project
   def show
+    
+    @project_type = params[:project_type]
+    
     # try to redirect to the requested menu item
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
     return
@@ -614,9 +744,11 @@ class ProjectsController < ApplicationController
     @project.safe_attributes = params[:project]
     if validate_parent_id && @project.save
       @course = Course.find_by_extra(@project.identifier)
-      @course.state = params[:project][:course][:state]
+      unless @course.nil?
+      @course.password = params[:project][:course][:password]
       @course.term = params[:project][:course][:term]
       @course.save
+      end           
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
             
       if params[:project][:is_public] == '0'

app/controllers/users_controller.rb

@@ -203,6 +203,9 @@ class UsersController < ApplicationController
 
   #end
   def index
+    
+    @project_type = params[:project_type]
+    
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)
 

app/controllers/welcome_controller.rb

@@ -72,4 +72,6 @@ class WelcomeController < ApplicationController
     @projects = Project.all_public.active
     render :layout => false, :content_type => 'text/plain'
   end
+  
+  
 end

app/helpers/bids_helper.rb

@@ -39,16 +39,33 @@ module BidsHelper
     Bid.tagged_with(tag_name).order('updated_on desc')
   end
   
-  def sort_bid(state)
+  #added by huang
+  def sort_bid_enterprise(state, project_type)
     content = ''.html_safe
     case state
     when 0
-      content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:bid_sort_type => '1')))
-      content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:bid_sort_type => '0'), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:bid_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:bid_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
       
     when 1
-      content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:bid_sort_type => '1'), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:bid_sort_type => '0')))
+      content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:bid_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:bid_sort_type => '0', :project_type => project_type)))
+    end
+    content = content_tag('ul', content)
+    content_tag('div', content, :class => "tabs_enterprise")
+  end
+  #end
+  
+  def sort_bid(state, project_type)
+    content = ''.html_safe
+    case state
+    when 0
+      content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:bid_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:bid_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      
+    when 1
+      content << content_tag('li', link_to(l(:label_sort_by_active), calls_path(:bid_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), calls_path(:bid_sort_type => '0', :project_type => project_type)))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")

app/helpers/projects_helper.rb

@@ -38,23 +38,91 @@ module ProjectsHelper
     
   end
   
-    def sort_project(state)
+  # added bu huang
+  def sort_project_enterprise(state, project_type)
     content = ''.html_safe
     case state
     when 0
       
-      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1')))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2')))
-      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0'), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
     when 1
 
-      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1'), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2')))
-      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0')))
+      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0', :project_type => project_type)))
     when 2
-      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1')))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2'), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0')))
+      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0', :project_type => project_type)))
+    end
+    content = content_tag('ul', content)    
+    content_tag('div', content, :class => "tabs_enterprise")   
+  end
+  
+   def sort_course(state, project_type)
+    content = ''.html_safe
+    case state
+    when 0
+      
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
+    when 1
+
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
+    when 2
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
+    end
+    content = content_tag('ul', content)
+    content_tag('div', content, :class => "tabs_enterprise")
+  end
+  # end
+  
+  def sort_project(state, project_type)
+    content = ''.html_safe
+    case state
+    when 0
+      
+      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
+    when 1
+
+      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0', :project_type => project_type)))
+    when 2
+      content << content_tag('li', link_to(l(:label_sort_by_active), projects_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), projects_path(:project_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), projects_path(:project_sort_type => '0', :project_type => project_type)))
+    end
+    content = content_tag('ul', content)    
+    content_tag('div', content, :class => "tabs")   
+  end
+  
+   def sort_course(state, project_type)
+    content = ''.html_safe
+    case state
+    when 0
+      
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
+    when 1
+
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
+    when 2
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")
@@ -95,7 +163,7 @@ module ProjectsHelper
     render_project_nested_lists(projects) do |project|
       #Modified by young
         if (project.project_type==1)
-          s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")+"<span style='color:#F00;'>(#{l(:label_course)})</span>".html_safe
+          s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe
         else
           s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
         end

app/helpers/users_helper.rb

@@ -113,24 +113,44 @@ module UsersHelper
   end
 
 # added by huang 
-def sort_user(state)
+def sort_user(state, project_type)
     content = ''.html_safe
     case state
     when 0
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1')))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2')))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0'), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
     when 1
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1'), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2')))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0')))
+      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
     when 2
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1')))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2'), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0')))
+      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")
   end  
+  
+  def sort_user_enterprise(state, project_type)
+    content = ''.html_safe
+    case state
+    when 0
+      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
+    when 1
+      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
+    when 2
+      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
+    end
+    content = content_tag('ul', content)
+    content_tag('div', content, :class => "tabs_enterprise")
+  end  
 #end
 end

app/models/course.rb

@@ -14,7 +14,8 @@ class Course < ActiveRecord::Base
   'location',
   'tea_id',
   'password',
-  'term'
+  'term',
+  'password'
  
 
 end

app/models/project_status.rb

@@ -1,5 +1,5 @@
 class ProjectStatus < ActiveRecord::Base
-  attr_accessible :changesets_count, :watchers_count, :project_id
+  attr_accessible :changesets_count, :watchers_count, :project_id, :project_type
   belongs_to :projects
   belongs_to :watchers
   belongs_to :changesets

app/views/bids/_bid_show.html.erb

@@ -29,7 +29,7 @@
 			</tr>
 			<tr>
 				<td>
-				<div class="bid-description" style="border-left:  1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
+				<div class="bid-description" style="border-left:  1px solid #ceadb4; border-bottom: 1px solid #ceadb4; padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
 					<table width="100%">
 						<tr>
 							<td> <%= bid.description%> </td>

app/views/bids/_homework_list.html.erb

@@ -6,7 +6,11 @@
 		
 		<table width="660px" border="0" align="center">
 	<tr>		
+		<% if User.current.member_of?(@bid.courses.first) %>
+		<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %><%= l(:label_bidding_user_studentcode) %><%= homework.user.user_extensions.student_id%></td>
+		<% else %>
 		<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %></td>		
+		<% end %>
 		<td>
 		<table width="580px" border="0">
 			<tr>

app/views/bids/_list_projects.html.erb

@@ -78,7 +78,7 @@
 					<table width="100%">
 						<tr>
 							<td><%= l(:label_bidding_user) %>
-								<%= link_to(b_project.user.name, user_path(b_project.user)) %>
+								<%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %>
 							</td>
 						</tr>
 						<tr>

app/views/bids/_project_list.html.erb

@@ -4,12 +4,16 @@
 <% if  @bid.deadline > Date.today %>
 
  <table width="1000px" border="0" style="padding-left: 15px">
-	<td class="font_lighter" style="font-size: 18px;"><%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)</td>
+ 	<%if @bid.reward_type == 3 %>
  	<td class="font_lighter" style="font-size: 15px;"><%= l(:label_homework_project) %>(<%= @bidding_project.count%>)</td>
+ 	<% else %>
+	<td class="font_lighter" style="font-size: 18px;"><%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)</td>
+	<% end %>
 	<% if User.current.logged? %>
 	<td>
 	<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %>
 	<div class='icon icon-add'>
+		 
 		<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
 	</div>	
 	<% end %>
@@ -44,7 +48,10 @@
 				<div class="bid-user-message" style="border-left:  1px solid rgb(225, 225, 225); margin-left: 20px; padding-left: 20px;">
 					<table width="100%">
 						<tr>
-							<td><%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.name, user_path(b_project.user)) %></td>
+							<td><%= l(:label_bidding_user_studentcode) %> : <%= (b_project.user.user_extensions.student_id) %></td>
+						</tr>
+						<tr>
+							<td><%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %></td>
 						</tr>
 						<tr>
 							<td style=" word-wrap: break-word; word-break: break-all"><%= l(:label_bidding_reason_homewrok) %> : <%= b_project.description %></td>
@@ -65,12 +72,14 @@
 	<td>
 		
 		<div class='icon icon-add'>
-		<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
+			<%= toggle_link l(:label_bid_me), 'put-bid-form' %>
 		</div>	
 	
+	
 	</td>
 	<% end %>
 </table>
 <% end %>
+<% unless @bid.reward_type == 3%>
 <%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%>
-
+<% end %>

app/views/bids/index.html.erb

@@ -3,11 +3,20 @@
 <div class="project-search-block">
 	<table width="100%" valign="center">
 		<tr>
-			<td width="16%"><span style="margin-left:0px"><%= l(:label_call_list)%></span></td>
+			<td width="16%"><span style="margin-left:0px">
+				<% if @project_type == '1' %>
+				作业列表
+				<% else %>
+				<%= l(:label_call_list)%>
+				<% end %></span></td>
 			<td valign="center"><% if User.current.logged? %>
 	
 		<!-- <div class='icon icon-add'> -->
+			<% if @project_type == '0' %>
+			<%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon_enterprise icon_enterprise-add') %>
+			<% else %>
 			<%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %>
+			<% end %>
 			<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> -->
 		<!-- </div> -->
 	<% end %></td>
@@ -15,7 +24,11 @@
 	<td align="right">
 	<div class="project-search">
 		<%= text_field_tag 'name', params[:name], :size => 30 %>
+		<% if @project_type == '0'%>
+		<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+		<% else %>
 		<%= submit_tag l(:label_search), :class => "small", :name => nil %>
+		<% end %>
 	</div></td>
 	</tr></table>
 </div>
@@ -26,8 +39,11 @@
 	<%= render :partial => 'new_bid' %>
 </div>
 <% end %>
-
-<%= sort_bid(@s_state)%>
+<% if @project_type == '0'%>
+<%= sort_bid_enterprise(@s_state, @project_type)%>
+<% else %>
+<%= sort_bid(@s_state, @project_type)%>
+<% end %>
 <!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 15px" >
 <ul style="margin-right:0px">
 	<li>

app/views/layouts/_base_college_header.html.erb

@@ -0,0 +1,14 @@
+<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">	
+	<div class="welcome_logo">
+		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px"), home_path %>
+	</div>
+	<div id="account">
+		<%= render_menu :account_menu -%>
+	</div>
+		<%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
+		<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
+		<%= content_tag('div', "#{link_to(l(:lable_college_enterprise), :controller => 'projects', :action =>'index', :project_type => 0)}".html_safe, :id=> 'account-college') %>				
+		<%= render_menu :top_college_menu if User.current.logged? || !Setting.login_required? -%>
+</div>
+<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;margin-top: -10px;"></div>
+

app/views/layouts/_base_enterprise_header.html.erb

@@ -0,0 +1,45 @@
+<!-- <table id="top-menu" style="background-color: #ac344f;margin-top: 10px;margin-bottom: 0px; padding-top: 3px; ">			
+		<tr><td ><%=link_to image_tag("/images/logo_ent.png",weight:"38px", height: "38px"), home_path %></td>
+			<td valign="top" width="300px"><%= render_menu :top_enterprise_menu if User.current.logged? || !Setting.login_required? -%></td>
+			<td><%=link_to "企业入口"%></td>
+			<td valign="top" style=" padding-left: 380px">				
+					  <%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
+		  			  <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>		
+			</td>
+			<td valign="top">		
+					  <%= render_menu :account_menu -%>		
+		    </td>		
+		</tr>
+</table>	 -->						
+<div id="top-menu" style="background-color: #ac344f;height:40px;margin-top: 10px;margin-bottom: 10px;">	
+	<div class="welcome_logo">
+		<%=link_to image_tag("/images/logo_ent.png",weight:"36px", height: "36px"), home_path %>
+	</div>
+	<div id="account">
+		<%= render_menu :account_menu -%>
+	</div>
+		
+		<%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
+		
+		<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>				
+		<%= content_tag('div', "#{link_to(l(:label_enterprise_college), :controller =>'projects', :action => 'course', :project_type => 1 )}".html_safe, :id=> 'account-enterprise') %>
+		<%= render_menu :top_enterprise_menu if User.current.logged? || !Setting.login_required? -%>
+</div>
+
+	
+	
+	
+	
+		
+		<!-- <div style="float: right; margin-top: 13px;">
+		<%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
+		</div> -->
+		<!-- <div  align="center" style="float: right; margin-right: -25px; margin-top: 6px; background: #ea7125;  width: 12px;border-radius:7px; font-size: 8px; color: #fff; font-weight: bold">
+		<%= User.current.count_new_jour if User.current.logged? && User.current.count_new_jour != 0 %>
+		</div> -->
+		<!-- <%= content_tag('div', "#{}".html_safe, :id => 'loggedas')%> -->
+		<!-- 消息#{link_to((User.current.count_new_jour), feedback_path(User.current))} -->
+		<!-- <%= content_tag('div', "消息（#{User.current.journals_for_messages.count}）".html_safe, :id => 'loggedas')%> -->
+		
+
+<!-- <div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;margin-top: -10px;"></div> -->

app/views/layouts/_base_home_menu.html.erb

@@ -0,0 +1,23 @@
+<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">	
+	<div class="welcome_logo">
+		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px"), home_path %>
+	</div>
+	<div id="account">
+		<%= render_menu :account_menu -%>
+	</div>
+		<%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
+		<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
+		
+		<!-- <div style="float: right; margin-top: 13px;">
+		<%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
+		</div> -->
+		<!-- <div  align="center" style="float: right; margin-right: -25px; margin-top: 6px; background: #ea7125;  width: 12px;border-radius:7px; font-size: 8px; color: #fff; font-weight: bold">
+		<%= User.current.count_new_jour if User.current.logged? && User.current.count_new_jour != 0 %>
+		</div> -->
+		<!-- <%= content_tag('div', "#{}".html_safe, :id => 'loggedas')%> -->
+		<!-- 消息#{link_to((User.current.count_new_jour), feedback_path(User.current))} -->
+		<!-- <%= content_tag('div', "消息（#{User.current.journals_for_messages.count}）".html_safe, :id => 'loggedas')%> -->
+		<%= render_menu :top_home_menu if User.current.logged? || !Setting.login_required? -%>
+</div>
+<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;margin-top: -10px;"></div>
+

app/views/layouts/base.html.erb

@@ -19,9 +19,13 @@
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
-	
+<% if @project_type == '0' %>
+<%=render :partial => 'layouts/base_enterprise_header'%>
+<% elsif @project_type == '1' %>
+<%=render :partial => 'layouts/base_college_header'%>
+<% else %>
 <%=render :partial => 'layouts/base_header'%>
-
+<% end %>
 <div id="main" class="nosidebar">
     <div id="content_">
         <%= render_flash_messages %>

app/views/layouts/base_bids.html.erb

@@ -20,7 +20,7 @@
 			<div id="wrapper2">
 				<div id="wrapper3">
 					
-					<%=render :partial => 'layouts/base_header'%>
+					<%=render :partial => 'layouts/base_enterprise_header'%>
 					
 					<div id="main" class="">
 						<div id="sidebar">
@@ -49,7 +49,7 @@
 											</tr>
 											<tr>
 												<% if @bid.reward_type.nil? or @bid.reward_type == 1%>
-				<td><%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= @bid.budget%></td>
+				<td><%= l(:label_bids_reward_method) %><span style="color: #ed8924; font-weight: bold"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= @bid.budget%></span></td>
 				<% elsif @bid.reward_type == 2%>
 				<td><%= l(:label_bids_reward_method) %><%= @bid.budget%></td>
 				<% else %>
@@ -67,10 +67,12 @@
 										  <%= link_to l(:label_x_bids_responses, :count => @bid.commit)+"("+@bid.commit.to_s+")", respond_path(@bid)%>
 										</div>
 									</div>
+									<!--tags-->
 									<div class="user_fans">
 										<div class="font_title_left">
 											<strong><%= l(:label_tag) %></strong>
-										</div><div class="user_underline"></div>
+										</div>
+										<div class="user_enterprise_underline"></div>
 										<table style="font-family:微软雅黑">												
 											<tr>
 												<td><!-- added by william -for tag -->					
@@ -84,7 +86,7 @@
 										<div class="font_title_left">
 											<strong><%= l(:label_x_followers, :count => @bid.watcher_users.count) %></strong>
 										</div>
-										<div class="user_underline"></div>
+										<div class="user_enterprise_underline"></div>
 										<div class="left_wf">
 											<table>
 												<tr>
@@ -102,12 +104,12 @@
 											</table>
 										</div>
 									</div>
-									<!--粉丝-->
+									<!--fans-->
 									<div class="user_fans">
 										<div class="font_title_left">
 											<strong><%= l(:label_bidding_project) %></strong>
 										</div>
-										<div class="user_underline"></div>
+										<div class="user_enterprise_underline"></div>
 										<div class="left_wf">
 											<table>
 												<tr>
@@ -124,7 +126,7 @@
 											</table>
 										</div>
 									</div>
-									<!--扩充-->
+									
 									
 								</div>
 
@@ -133,7 +135,7 @@
 						</div>
 						<div id="content">
 							<% if display_main_menu?(@bid) %>
-							<div class="tabs_new">
+							<div class="tabs_new_enterprise">
 								<%= render_menu :bid_menu %>
 							</div>
 							<% end %>

app/views/layouts/base_courses.html.erb

@@ -20,7 +20,7 @@
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">
-					<%= render :partial => 'layouts/base_header'%>
+					<%= render :partial => 'layouts/base_college_header'%>
 
 					<div id="main">
 						<!--project page-->
@@ -68,9 +68,7 @@
 													
 							<div class="inf_user_context">
 										<table style="font-family:微软雅黑" >
-											<!-- <tr>
-												<td valign="top" style="padding-left: 8px;">课程口令：</td><td class="font_lighter_sidebar"><%= @course.state%></td>
-											</tr> -->
+											
 											                                      
 											<tr>
 												<td valign="top" style="padding-left: 8px;">主讲老师：</td><td class="font_lighter_sidebar"><%= @course.teacher.lastname+@course.teacher.firstname %></td>

app/views/layouts/base_homework.html.erb

@@ -20,7 +20,7 @@
 			<div id="wrapper2">
 				<div id="wrapper3">
 
-					<%= render :partial => 'layouts/base_header'%>
+					<%= render :partial => 'layouts/base_college_header'%>
 
 					<div id="main" class="">
 						<div id="sidebar">

app/views/layouts/base_projects.html.erb

@@ -20,7 +20,7 @@
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">
-					<%= render :partial => 'layouts/base_header'%>
+					<%= render :partial => 'layouts/base_enterprise_header'%>
 
 					<div id="main">
 						<!--project page-->
@@ -68,7 +68,7 @@
 											
 										</tr>
 									</table>
-									<div class="user_underline"></div>
+									<div class="user_enterprise_underline"></div>
 								</div>
 
 								<!--description-->
@@ -83,10 +83,10 @@
 											<%= textilizable @project.description %>
 										</div>
 										<div class="created_on_project">
-											<strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= format_time(@project.created_on) %>
+											<strong style="color: #AC344F"><%= l(:label_create_time) %>：</strong><%= format_time(@project.created_on) %>
 										</div>
 									</div>
-									<div class="user_underline"></div>
+									<div class="user_enterprise_underline"></div>
 								</div>
 															<!--tags-->																
 									
@@ -100,7 +100,7 @@
 
 
 								<!--tool-->
-								<div class="user_underline"></div>
+								<div class="user_enterprise_underline"></div>
 								<div class="tool">
 									<div class="font_title_left">
 										<%= l(:label_project_tool)%>
@@ -108,25 +108,25 @@
 									
 									<table class="font_tool">
 										<tr>
-											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag_enterprise.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
-											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
+											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag_enterprise.png", weight:"15px", height:"15px") %>
 												<%= link_to l(:project_module_wiki),project_wiki_path(@project) %></td>
 										</tr>
 										<tr>
-											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag_enterprise.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
 											</td>
-											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag_enterprise.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
 											</td>
 										</tr>
 										<tr>
-											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag_enterprise.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
 											</td>
 											<% if @project.identifier == 'trustie' %>
-											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag_enterprise.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %>
 											</td>
 											<% else %>
@@ -134,11 +134,11 @@
 										</tr>
 									</table>
 								</div>
-								<div class="user_underline"></div>
+								<div class="user_enterprise_underline"></div>
 							</div>
 						</div>
 						<div id="content">
-							<div class="tabs_new">
+							<div class="tabs_new_enterprise">
 								<%= render_main_menu(@project) %>
 							</div>
 							<%= yield %>

app/views/projects/_project.html.erb

@@ -8,6 +8,22 @@
 			<%= textilizable(project.short_description, :project => project) %>
 		</p>
 	</div>
+	 <% if @project_type == '0' %>
+	<div class="information">
+		<p class="stats2">
+			<%= content_tag('span',  @project.watcher_users.count, :class => "info") %><%= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
+		</p>
+		<p class="stats2">
+			<%= content_tag('span',  "#{@project.users.count}", :class => "info") %><%= content_tag('span',  l(:label_x_current_contributors, :count => @project.users.count)) %>
+		</p>
+		<p class="stats2">
+			<%= content_tag('span',  "#{(@project.repository.nil? || @project.repository.changesets[0].nil?) ? '0' : distance_of_time_in_words(Time.now, @project.repository.changesets[0].committed_on)}", :class => "info") %><%= content_tag('span',  l(:label_since_last_commits)) %>
+		</p>
+		<p class="stats2">
+			<%= content_tag('span',  "#{@project.repository.nil? ? '0' : @project.project_status.changesets_count }", :class => "info") %><%= content_tag('span',  l(:label_commit_on)) %>
+		</p>
+	</div>
+	<% else %>
 	<div class="information">
 		<p class="stats">
 			<%= content_tag('span',  @project.watcher_users.count, :class => "info") %><%= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
@@ -22,6 +38,7 @@
 			<%= content_tag('span',  "#{@project.repository.nil? ? '0' : @project.project_status.changesets_count }", :class => "info") %><%= content_tag('span',  l(:label_commit_on)) %>
 		</p>
 	</div>
+	<% end %>
 </div>
 <div class="add-info">
 	<div class="main-language">
@@ -50,7 +67,12 @@
 <div class="tags">
 	<!-- added by william -for tag -->
 	<div id="tags">
+		 <% if @project_type == '0' %>
+		 <%= image_tag( "/images/sidebar/tags_enterprise.png") %>
+		
+		<% else %>
 		<%= image_tag( "/images/sidebar/tags.png") %>
+		<% end %>
 		<%= render :partial => 'tags/tag_name', :locals => {:obj => @project,:object_flag => "2",:non_list_all => true }%>
 		
 	</div>