Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/models/course_group.rb

@@ -21,5 +21,5 @@ class CourseGroup < ActiveRecord::Base
        self.members.update_all("course_group_id = 0")
     end
   end
-  
+
 end

app/views/enterprises/index.html.erb

@@ -22,4 +22,4 @@
 <div class="school-index">
 	<ul id="schoollist" style="line-height: 25px"></ul>
 </div>
-<% html_title(l(:label_school_all)) -%>
+<% html_title(l(:label_enterprise_all)) -%>

config/locales/zh.yml

@@ -2204,7 +2204,8 @@ zh:
   label_project_deposit: 项目托管
   label_course_practice: 课程实践
   label_forum_all: 公共贴吧 
-  label_school_all: 中国高校 
+  label_school_all: 中国高校
+  :label_enterprise_all: 名企
   label_contest_innovate: 创新竞赛  
   label_software_user: 软件创客
   label_requirement_enterprise: 软件众包

config/routes.rb

@@ -731,7 +731,7 @@ RedmineApp::Application.routes.draw do
   match 'delete_avatar', :to => 'avatar#delete_image',:via => :post
   # Endof Tao's code
   get 'robots.txt', :to => 'welcome#robots'
-  match 'welcome/course', :to => 'welcome#course'
+  #match 'welcome/course', :to => 'welcome#course'
   ##############测试留言功能    fq
   post 'words/new', :to => 'words#new'
   post 'words/create', :to => 'words#create'