diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 17173dfd..fab8d6ea 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -6,7 +6,7 @@ class BidsController < ApplicationController
   menu_item :homework_respond, :only => :homework_respond
   menu_item :homework_statistics, :only => :homework_statistics
   #Ended by young
-  before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:new,:show_results,:set_reward, :add_homework]
+  before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:new,:show_results,:set_reward, :add_homework, :fork, :create_fork]
   before_filter :require_login,:only => [:set_reward]                                                   
   
   helper :watchers
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f94c5e7d..22245ab0 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -41,9 +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, :course]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise]
   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]
+                :statistics, :feedback, :course, :enterprise_course, :course_enterprise]
   before_filter :authorize_global, :only => [:new, :create]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   #by young
@@ -102,6 +102,21 @@ class ProjectsController < ApplicationController
   #      }
   #    end
   #  end
+  def enterprise_course
+    session[:enterprise_college] = 2
+    respond_to do |format|
+      format.html { redirect_to :back }
+    #format.api { render_api_ok }
+    end
+  end
+  
+  def course_enterprise
+    session[:enterprise_college] = 1
+    respond_to do |format|
+      format.html { redirect_to :back }
+    #format.api { render_api_ok }
+    end
+  end
 
   def index
     #Modified by nie
@@ -111,7 +126,13 @@ 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]
+    if @project_type == '1'
+      session[:enterprise_college] = 1
+    elsif @project_type == '0'
+      session[:enterprise_college] = 2
+    else
+      session[:enterprise_college] = 0
+    end
     
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @projects_status = ProjectStatus.visible.where("project_type <> ? or project_type is null", 1)
@@ -232,7 +253,7 @@ class ProjectsController < ApplicationController
     # @project_pages = Paginator.new @project_count, @limit, params['page']
     # @offset ||= @project_pages.offset
     # @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
-
+    session[:enterprise_college] = 1
     @project_type = params[:project_type]
     
     @offset, @limit = api_offset_and_limit({:limit => 10})
diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb
index 03640dc1..37946ed6 100644
--- a/app/views/bids/_bid_show.html.erb
+++ b/app/views/bids/_bid_show.html.erb
@@ -29,7 +29,7 @@
 			</tr>
 			<tr>
 				<td>
-				<div class="bid-description" style="border-left:  1px solid #ceadb4; border-bottom: 1px solid #ceadb4; padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
+				<div class="bid-description" style="border-left:  1px solid #d9d8d8; border-bottom: 1px solid #d9d8d8; padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
 					<table width="100%">
 						<tr>
 							<td> <%= bid.description%> </td>
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb
index d29326e6..4c0f6484 100644
--- a/app/views/bids/_project_list.html.erb
+++ b/app/views/bids/_project_list.html.erb
@@ -3,7 +3,7 @@
 
 <% if @bid.reward_type == 3 %>
 <table width="1000px" border="0" style="padding-left: 15px">
-	<% 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) %>
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb
index 937b1b6d..d7bb4c6a 100644
--- a/app/views/bids/index.html.erb
+++ b/app/views/bids/index.html.erb
@@ -12,11 +12,9 @@
 			<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>
@@ -24,11 +22,9 @@
 	<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>
@@ -39,11 +35,9 @@
 	<%= render :partial => 'new_bid' %>
 </div>
 <% end %>
-<% 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>
diff --git a/app/views/bids/show_project.html.erb b/app/views/bids/show_project.html.erb
index 77f634e4..20e03d70 100644
--- a/app/views/bids/show_project.html.erb
+++ b/app/views/bids/show_project.html.erb
@@ -1,7 +1,7 @@
 <!-- fq -->
 
 <% if @bid.homework_type == 1%>
-<%= render :partial => 'homework' %>
+	<%= render :partial => 'homework' %>
  
 <% else %>
 <style>
@@ -61,43 +61,43 @@
 	}
 </script>
 
-<% if User.current.logged? %>
+	<% if User.current.logged? %>
 <!--  点击我要参加 参加竞标   -->
-<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
-<div id="put-bid-form" style="display: none">
-	<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
-	:update => "bidding_project_list",
-	:complete => '$("#put-bid-form").hide();' do |f| %>
-	<table id="bidding_table" border="0" width="400" style="margin-left: 40px;">
-		<tr>
-			<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
-		</tr>
-		<% if @bid.reward_type == 3 %>
-		<tr>
-			<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
-		</tr>
-		<% else %>
-		<tr>
-			<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
-		</tr>
-		<% end %>			
-		<tr>
-			<td align="right">
-			<%= submit_tag l(:button_add), :name => nil , :class => "bid_btn",
-			 :onmouseout => "this.style.backgroundPosition = 'left top'",
-			  :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
-			<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", 
-			:type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
-			:onmouseover => "this.style.backgroundPosition = 'left -30px'" %> 
-			</td>
-		</tr>
-	</table>
+	<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
+	<div id="put-bid-form" style="display: none">
+		<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
+		:update => "bidding_project_list",
+		:complete => '$("#put-bid-form").hide();' do |f| %>
+		<table id="bidding_table" border="0" width="400" style="margin-left: 40px;">
+			<tr>
+				<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
+			</tr>
+			<% if @bid.reward_type == 3 %>
+			<tr>
+				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
+			</tr>
+			<% else %>
+			<tr>
+				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
+			</tr>
+			<% end %>			
+			<tr>
+				<td align="right">
+				<%= submit_tag l(:button_add), :name => nil , :class => "bid_btn",
+				 :onmouseout => "this.style.backgroundPosition = 'left top'",
+				  :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
+				<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", 
+				:type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
+				:onmouseover => "this.style.backgroundPosition = 'left -30px'" %> 
+				</td>
+			</tr>
+		</table>
+		<% end %>
+	</div>
 	<% end %>
-</div>
-<% end %>
 
-<div id='bidding_project_list'>
+	<div id='bidding_project_list'>
 	<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project,:bid => @bid} %>
-</div>
+	</div>
 <% end %>
 
diff --git a/app/views/layouts/_base_college_header.html.erb b/app/views/layouts/_base_college_header.html.erb
index 5723f7a7..da9a5804 100644
--- a/app/views/layouts/_base_college_header.html.erb
+++ b/app/views/layouts/_base_college_header.html.erb
@@ -7,7 +7,7 @@
 	</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>
diff --git a/app/views/layouts/_base_enterprise_header.html.erb b/app/views/layouts/_base_enterprise_header.html.erb
index dd859e53..32fc8c7f 100644
--- a/app/views/layouts/_base_enterprise_header.html.erb
+++ b/app/views/layouts/_base_enterprise_header.html.erb
@@ -11,9 +11,9 @@
 		    </td>		
 		</tr>
 </table>	 -->						
-<div id="top-menu" style="background-color: #ac344f;height:40px;margin-top: 10px;margin-bottom: 10px;">	
+<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_ent.png",weight:"36px", height: "36px"), home_path %>
+		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px"), home_path %>
 	</div>
 	<div id="account">
 		<%= render_menu :account_menu -%>
@@ -22,7 +22,7 @@
 		<%= 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>
 
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 5ee9c807..53acaed7 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -1,4 +1,4 @@
-<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">	
+<div id="top-menu" style="background-color: #2a6ebb;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>
@@ -7,7 +7,8 @@
 	</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('li', "#{link_to(l(:label_enterprise_college), :controller =>'projects', :action => 'course', :project_type => 1 )}".html_safe, :id=> 'account-enterprise') %>
+		<%= content_tag('li', "#{link_to(l(:lable_college_enterprise), :controller => 'projects', :action =>'index', :project_type => 0)}".html_safe, :id=> 'account-college') %>
 		<!-- <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> -->
@@ -17,7 +18,7 @@
 		<!-- <%= 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_menu if User.current.logged? || !Setting.login_required? -%>
+		<!-- <%= render_menu :top_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>
 
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 3168c4df..411cb9f9 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -19,9 +19,9 @@
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
-<% if @project_type == '0' %>
+<% if session[:enterprise_college] == 2 %>
 <%=render :partial => 'layouts/base_enterprise_header'%>
-<% elsif @project_type == '1' %>
+<% elsif session[:enterprise_college] == 1 %>
 <%=render :partial => 'layouts/base_college_header'%>
 <% else %>
 <%=render :partial => 'layouts/base_header'%>
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index 77b1edce..c5c41a06 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -20,7 +20,13 @@
 			<div id="wrapper2">
 				<div id="wrapper3">
 					
+					<% if session[:enterprise_college] == 2 %>
 					<%=render :partial => 'layouts/base_enterprise_header'%>
+					<% elsif session[:enterprise_college] == 1 %>
+					<%=render :partial => 'layouts/base_college_header'%>
+					<% else %>
+					<%=render :partial => 'layouts/base_header'%>
+					<% end %>
 					
 					<div id="main" class="">
 						<div id="sidebar">
@@ -72,7 +78,7 @@
 										<div class="font_title_left">
 											<strong><%= l(:label_tag) %></strong>
 										</div>
-										<div class="user_enterprise_underline"></div>
+										<div class="user_underline"></div>
 										<table style="font-family:微软雅黑">												
 											<tr>
 												<td><!-- added by william -for tag -->					
@@ -86,7 +92,7 @@
 										<div class="font_title_left">
 											<strong><%= l(:label_x_followers, :count => @bid.watcher_users.count) %></strong>
 										</div>
-										<div class="user_enterprise_underline"></div>
+										<div class="user_underline"></div>
 										<div class="left_wf">
 											<table>
 												<tr>
@@ -109,7 +115,7 @@
 										<div class="font_title_left">
 											<strong><%= l(:label_bidding_project) %></strong>
 										</div>
-										<div class="user_enterprise_underline"></div>
+										<div class="user_underline"></div>
 										<div class="left_wf">
 											<table>
 												<tr>
@@ -135,7 +141,7 @@
 						</div>
 						<div id="content">
 							<% if display_main_menu?(@bid) %>
-							<div class="tabs_new_enterprise">
+							<div class="tabs_new">
 								<%= render_menu :bid_menu %>
 							</div>
 							<% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 126c845b..33f0a653 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -20,7 +20,13 @@
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">
-					<%= render :partial => 'layouts/base_college_header'%>
+					<% if session[:enterprise_college] == 2 %>
+					<%=render :partial => 'layouts/base_enterprise_header'%>
+					<% elsif session[:enterprise_college] == 1 %>
+					<%=render :partial => 'layouts/base_college_header'%>
+					<% else %>
+					<%=render :partial => 'layouts/base_header'%>
+					<% end %>
 
 					<div id="main">
 						<!--project page-->
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index 1ace06c1..e3e47eaf 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -20,7 +20,13 @@
 			<div id="wrapper2">
 				<div id="wrapper3">
 
-					<%= render :partial => 'layouts/base_college_header'%>
+					<% if session[:enterprise_college] == 2 %>
+					<%=render :partial => 'layouts/base_enterprise_header'%>
+					<% elsif session[:enterprise_college] == 1 %>
+					<%=render :partial => 'layouts/base_college_header'%>
+					<% else %>
+					<%=render :partial => 'layouts/base_header'%>
+					<% end %>
 
 					<div id="main" class="">
 						<div id="sidebar">
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 5ec937d8..3cf89325 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -20,7 +20,13 @@
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">
-					<%= render :partial => 'layouts/base_enterprise_header'%>
+					<% if session[:enterprise_college] == 2 %>
+					<%=render :partial => 'layouts/base_enterprise_header'%>
+					<% elsif session[:enterprise_college] == 1 %>
+					<%=render :partial => 'layouts/base_college_header'%>
+					<% else %>
+					<%=render :partial => 'layouts/base_header'%>
+					<% end %>
 
 					<div id="main">
 						<!--project page-->
@@ -68,7 +74,7 @@
 											
 										</tr>
 									</table>
-									<div class="user_enterprise_underline"></div>
+									<div class="user_underline"></div>
 								</div>
 
 								<!--description-->
@@ -83,10 +89,10 @@
 											<%= textilizable @project.description %>
 										</div>
 										<div class="created_on_project">
-											<strong style="color: #AC344F"><%= l(:label_create_time) %>：</strong><%= format_time(@project.created_on) %>
+											<strong style="color: #15bccf"><%= l(:label_create_time) %>：</strong><%= format_time(@project.created_on) %>
 										</div>
 									</div>
-									<div class="user_enterprise_underline"></div>
+									<div class="user_underline"></div>
 								</div>
 															<!--tags-->																
 									
@@ -100,7 +106,7 @@
 
 
 								<!--tool-->
-								<div class="user_enterprise_underline"></div>
+								<div class="user_underline"></div>
 								<div class="tool">
 									<div class="font_title_left">
 										<%= l(:label_project_tool)%>
@@ -108,25 +114,25 @@
 									
 									<table class="font_tool">
 										<tr>
-											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag_enterprise.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag.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_tag_enterprise.png", weight:"15px", height:"15px") %>
+											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag.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_tag_enterprise.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.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_tag_enterprise.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.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_tag_enterprise.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.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_tag_enterprise.png", weight:"15px", height:"15px") %> 
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> 
 												<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %>
 											</td>
 											<% else %>
@@ -134,11 +140,11 @@
 										</tr>
 									</table>
 								</div>
-								<div class="user_enterprise_underline"></div>
+								<div class="user_underline"></div>
 							</div>
 						</div>
 						<div id="content">
-							<div class="tabs_new_enterprise">
+							<div class="tabs_new">
 								<%= render_main_menu(@project) %>
 							</div>
 							<%= yield %>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index ca05c401..fd99c9ea 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -20,7 +20,13 @@
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">
-					<%= render :partial => 'layouts/base_header'%>
+					<% if session[:enterprise_college] == 2 %>
+					<%=render :partial => 'layouts/base_enterprise_header'%>
+					<% elsif session[:enterprise_college] == 1 %>
+					<%=render :partial => 'layouts/base_college_header'%>
+					<% else %>
+					<%=render :partial => 'layouts/base_header'%>
+					<% end %>
 					<div id="main">
 						<!--user page, add by huang-->
 						<div id="sidebar">
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index 2c01ea97..fbb0c5ca 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -8,22 +8,7 @@
 			<%= 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)) %>
@@ -38,7 +23,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">
@@ -67,12 +52,9 @@
 <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>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 0399524a..95a8219f 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -7,30 +7,23 @@
 	<table width="100%" valign="center">
 		<tr>
 			<td width="16%"><span style="margin-left:0px"><%= l(:label_project_plural)%></span></td>
-			<% if @project_type == '0' %>
-			<td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon_enterprise icon_enterprise-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
-            <% else %>
+			
             <td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>          
-            <% end %>
+           
             <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>
 <% end %>
-<% if @project_type == '0' %>
-<%= sort_project_enterprise(@s_type, @project_type) %>
-<% else %>
+
 <%= sort_project(@s_type, @project_type) %>
-<% end %>
+
 <!--end-->
 <!-- <div class="pagination_list">
 <ul>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 8e5b16c5..357db4a4 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -79,20 +79,17 @@
 	</legend> -->
 	<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 %><!--Modified by young-->
-	<% else %>
+	
 	<%= submit_tag l(:label_search), :class => "small", :name => nil %><!--Modified by young-->
-	<% end %>
+	
 <!-- </fieldset> -->
 <% end %>
 </div>
 </div>
-<% if @project_type == '0' %>
-<%= sort_user_enterprise(@s_type, @project_type)%>
-<% else %>
+
+
 <%= sort_user(@s_type, @project_type)%>
-<% end %>
+
 
 <!-- <div class="pagination" style="border-bottom: 1px solid rgb(223,223,223); width: 95%; margin-left: 2%; margin-top: 0px">
 <ul style="margin-right:0px">
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 9be75b88..7bc42011 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -289,7 +289,7 @@ software development and software crowdsourcing.</td></tr>
 			<td width="65"></td>
 			<td width="190"><%= l(:label_create_course_description) %></td>
 		</tr>  -->
-		<tr align="center" >
+		<!-- <tr align="center" >
 			<td style="width: 300px;height:200px; background-color: #AC344F; font-size: 24px;"><%=link_to l(:label_enterprise), :controller=>'projects', :action=>'index', :project_type => 0 %></td>
 		
 			<td></td>
@@ -316,10 +316,10 @@ software development and software crowdsourcing.</td></tr>
 			<td width="65"></td>
 			<td width="190"><%= l(:label_news_description) %></td>
 			<td width="65"></td>
-			<td width="190"><%= l(:label_milestone_description) %></td>
+			<td width="190"><%= l(:label_milestone_description) %></td> -->
 		</tr>
 			
-	</table>
+	</table> 
 </div>
 
 <div style="padding-top: 40px"></div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index be1219fb..abc6f46d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -507,6 +507,8 @@ zh:
   label_new_homework: 作业
   label_requirement_focus: 关注需求
   label_developer: 用户
+  label_enterprise_into: 进入企业
+  label_college_into: 进入高校
   label_investor: 投资人：
   label_theme: 主题
   label_logged_as_new: 当前用户
diff --git a/config/routes.rb b/config/routes.rb
index b36686ca..be47ebba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -449,6 +449,8 @@ RedmineApp::Application.routes.draw do
   match 'calls/:id/homework_statistics', :to => 'bids#homework_statistics'
   match 'calls/:id/fork', :to => 'bids#fork', :as => 'fork'
   match 'calls/:id/create_fork', :to => 'bids#create_fork'
+  match 'project/enterprise_course', :to => 'projects#enterprise_course'
+  match 'project/course_enterprise', :to => 'projects#course_enterprise'
   
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 788c2d87..84f24e87 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -226,6 +226,7 @@ Redmine::MenuManager.map :top_enterprise_menu do |menu|
   menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural
   menu.push :requirement, {:controller => 'bids', :action => 'index', :project_type => 0 }
   menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 0 }
+  menu.push :college_into, {:controller=>'projects', :action=>'course_enterprise', :project_type => 1 }
   # menu.push :investor, :home_path
   # menu.push :theme, :home_path
   # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
@@ -239,7 +240,7 @@ Redmine::MenuManager.map :top_college_menu do |menu|
   menu.push :new_homework, {:controller => 'bids', :action => 'index', :project_type => 1 }
   menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 1 }, :caption => :label_project_plural  
   menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 1 }
-  
+  menu.push :enterprise_into, {:controller=>'projects', :action=>'enterprise_course', :project_type => 0 }
   # menu.push :investor, :home_path
   # menu.push :theme, :home_path
   # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }