修改《网页标题显示为“中国高校”不合适》bug

Signed-off-by: alan <547533434@qq.com>

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

@@ -2205,6 +2205,7 @@ zh:
   label_course_practice: 课程实践
   label_forum_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'

db/schema.rb

@@ -1070,14 +1070,6 @@ ActiveRecord::Schema.define(:version => 20150128032421) do
     t.string   "description"
   end
 
-  create_table "social_groups", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "user_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1293,36 +1285,6 @@ ActiveRecord::Schema.define(:version => 20150128032421) do
   add_index "versions", ["project_id"], :name => "versions_project_id"
   add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
 
-  create_table "voting_choices", :force => true do |t|
-    t.integer  "poll_id",                   :null => false
-    t.string   "text",                      :null => false
-    t.datetime "created_on",                :null => false
-    t.integer  "position",   :default => 1
-  end
-
-  add_index "voting_choices", ["poll_id"], :name => "choices_poll_id"
-
-  create_table "voting_polls", :force => true do |t|
-    t.integer  "project_id", :null => false
-    t.string   "question",   :null => false
-    t.datetime "created_on", :null => false
-    t.boolean  "revote"
-  end
-
-  add_index "voting_polls", ["project_id"], :name => "polls_project_id"
-
-  create_table "voting_votes", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.integer  "poll_id",    :null => false
-    t.integer  "choice_id",  :null => false
-    t.datetime "created_on", :null => false
-  end
-
-  add_index "voting_votes", ["choice_id"], :name => "votes_choice_id"
-  add_index "voting_votes", ["poll_id"], :name => "votes_poll_id"
-  add_index "voting_votes", ["user_id", "poll_id"], :name => "votes_user_poll_unique", :unique => true
-  add_index "voting_votes", ["user_id"], :name => "votes_user_id"
-
   create_table "watchers", :force => true do |t|
     t.string  "watchable_type", :default => "", :null => false
     t.integer "watchable_id",   :default => 0,  :null => false