diff --git a/app/models/course_group.rb b/app/models/course_group.rb
index 680fa6497..c6aa1299d 100644
--- a/app/models/course_group.rb
+++ b/app/models/course_group.rb
@@ -21,5 +21,5 @@ class CourseGroup < ActiveRecord::Base
        self.members.update_all("course_group_id = 0")
     end
   end
-  
+
 end
diff --git a/app/views/enterprises/index.html.erb b/app/views/enterprises/index.html.erb
index 9db8d99ab..6124f5c7f 100644
--- a/app/views/enterprises/index.html.erb
+++ b/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)) -%>
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index fdf534405..644b678b8 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -22,9 +22,9 @@
 <% end %>
 
 <%if @is_teacher%>
-    <% if poll.polls_status == 1 || poll.polls_status == 3 %>
+    <% if poll.polls_status == 1%>
         <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
-    <% elsif poll.polls_status == 2%>
+    <% elsif poll.polls_status == 2 || poll.polls_status == 3 %>
         <li>
           <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
         </li>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 343ad2432..524494f45 100644
--- a/config/locales/zh.yml
+++ b/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: 软件众包
diff --git a/config/routes.rb b/config/routes.rb
index aad7adcb3..0692103bd 100644
--- a/config/routes.rb
+++ b/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'
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index d53b6ec02..ffb9da644 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -1,5 +1,6 @@
 /* CSS Document */
 #content{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;}
+#popbox{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;}
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea{ margin:0; padding:0;}
 div,img,tr,td,textarea{ border:0;}
 table,tr,td{border:0; cellspacing:0; cellpadding:0;}
@@ -79,7 +80,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .ping_con h2{ font-size:14px; color:#444443; margin-bottom:10px; }
 .ping_con p{ color:#777777; font-size:12px; border-bottom:1px dashed #CCC; padding-bottom:5px;}
 .ping_con p span a{ color:#777777;}
-.ping_star{ width:160px; color:#333; font-weight:bold; margin-bottom:5px;}
+.ping_star{ width:165px; color:#333; font-weight:bold; margin-bottom:5px;}
 .ping_star span a{ float:right; width:20px; height:20px; background:url(images/star.png);background-repeat: no-repeat; margin-right:3px;}
 .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
 a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px;  background:#15bccf; color:#fff; text-align:center;}