处理冲突

修改浏览器兼容问题

app/models/poll.rb

@@ -36,9 +36,10 @@ class Poll < ActiveRecord::Base
   def act_as_course_activity
     if self.polls_type == "Course"
       if self.polls_status == 2 #问卷是发布状态
-      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
+        self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
       elsif self.polls_status == 1 #问卷是新建状态
         self.course_acts.destroy_all
+      end
     end
   end
 

public/stylesheets/public_new.css

@@ -7,7 +7,7 @@ table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
 a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#15bccf;}
-img{max-width: 100%;}
+/*img{max-width: 100%;}*/
 
 /*常用*/
 select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }