Merge branch 'master' into budget

db/dev_seeds.rb

@@ -370,3 +370,21 @@ puts "Confirming hiding in debates, comments & proposals"
 Comment.only_hidden.flagged.reorder("RANDOM()").limit(10).each(&:confirm_hide)
 Debate.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
 Proposal.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
+
+puts "Creating banners"
+
+Proposal.last(3).each do |proposal|
+  title = Faker::Lorem.sentence(word_count = 3)
+  description = Faker::Lorem.sentence(word_count = 12)
+  banner = Banner.create!(title: title,
+                          description: description,
+                          style: ["banner-style banner-style-one", "banner-style banner-style-two",
+                                  "banner-style banner-style-three"].sample,
+                          image: ["banner-img banner-img-one", "banner-img banner-img-two",
+                                  "banner-img banner-img-three"].sample,
+                          target_url: Rails.application.routes.url_helpers.proposal_path(proposal),
+                          post_started_at: rand((Time.now - 1.week) .. (Time.now - 1.day)),
+                          post_ended_at:   rand((Time.now  - 1.day) .. (Time.now + 1.week)),
+                          created_at: rand((Time.now - 1.week) .. Time.now))
+  puts "    #{banner.title}"
+end

db/migrate/20160518141543_create_banners.rb

@@ -0,0 +1,19 @@
+class CreateBanners < ActiveRecord::Migration
+  def change
+    create_table :banners do |t|
+        t.string   :title,  limit: 80
+        t.string   :description
+        t.string   :target_url
+        t.string   :style
+        t.string   :image
+        t.date     :post_started_at
+        t.date     :post_ended_at
+        t.datetime :hidden_at
+
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+    end
+
+    add_index :banners, :hidden_at
+  end
+end

db/schema.rb

@@ -144,6 +144,21 @@ ActiveRecord::Schema.define(version: 20160531102008) do
     t.integer  "price"
   end
 
+  create_table "banners", force: :cascade do |t|
+    t.string   "title",           limit: 80
+    t.string   "description"
+    t.string   "target_url"
+    t.string   "style"
+    t.string   "image"
+    t.date     "post_started_at"
+    t.date     "post_ended_at"
+    t.datetime "hidden_at"
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
+  end
+
+  add_index "banners", ["hidden_at"], name: "index_banners_on_hidden_at", using: :btree
+
   create_table "campaigns", force: :cascade do |t|
     t.string   "name"
     t.string   "track_id"

db/seeds.rb

@@ -64,3 +64,13 @@ Setting['feature.public_stats'] = true
 
 # Spending proposals feature flags
 Setting['feature.spending_proposal_features.voting_allowed'] = true
+
+# Banner styles
+Setting['banner-style.banner-style-one']   = "Banner style 1"
+Setting['banner-style.banner-style-two']   = "Banner style 2"
+Setting['banner-style.banner-style-three'] = "Banner style 3"
+
+# Banner images
+Setting['banner-img.banner-img-one']   = "Banner image 1"
+Setting['banner-img.banner-img-two']   = "Banner image 2"
+Setting['banner-img.banner-img-three'] = "Banner image 3"