diff --git a/app/views/courses/_course_ad.html.erb b/app/views/courses/_course_ad.html.erb new file mode 100644 index 000000000..8df3c3c31 --- /dev/null +++ b/app/views/courses/_course_ad.html.erb @@ -0,0 +1,104 @@ + +
+ + + + + + + + + + +
+ 联系我们 +
+ QQ:1234566
+
+ Email:1234566@qq.com
+
+
+ + \ No newline at end of file diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index ee7d995e7..629cac072 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -1,3 +1,4 @@ + <% if @events_by_day != nil && @events_by_day.size >0 %>

@@ -98,8 +99,6 @@

<% end %> - - <%else%>
diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb index 063c24cdf..4050de3b7 100644 --- a/app/views/layouts/_base_footer.html.erb +++ b/app/views/layouts/_base_footer.html.erb @@ -38,7 +38,6 @@
-
<%= debug(params) if Rails.env.development? %>
- - -<% cache "footer" do %> -
- - - - -<% end %> - diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index eef30e55d..f089d24c4 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -24,6 +24,7 @@ +<%= render 'course_ad' %>
diff --git a/db/schema.rb b/db/schema.rb index c257fa97a..f6fc138af 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20141103065703) do +ActiveRecord::Schema.define(:version => 20141105012624) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -95,19 +95,21 @@ ActiveRecord::Schema.define(:version => 20141103065703) do create_table "bids", :force => true do |t| t.string "name" - t.string "budget", :null => false + t.string "budget", :null => false t.integer "author_id" t.date "deadline" t.text "description" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false t.integer "commit" t.integer "reward_type" t.integer "homework_type" t.integer "parent_id" t.string "password" t.integer "is_evaluation" - t.integer "proportion", :default => 60 + t.integer "proportion", :default => 60 + t.integer "comment_status", :default => 0 + t.integer "evaluation_num", :default => 3 end create_table "boards", :force => true do |t| @@ -480,6 +482,13 @@ ActiveRecord::Schema.define(:version => 20141103065703) do t.integer "project_id", :default => 0 end + create_table "homework_evaluations", :force => true do |t| + t.string "user_id" + t.string "homework_attach_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "homework_for_courses", :force => true do |t| t.integer "course_id" t.integer "bid_id"