diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb
new file mode 100644
index 000000000..6776e24a5
--- /dev/null
+++ b/app/views/shared/_banner.html.erb
@@ -0,0 +1,9 @@
+<% banner = @banners.sample%>
+
+
+ <%= link_to banner.target_url do %>
+
<%=banner.title%>
+ <%=banner.description%>
+ <% end %>
+
+
\ No newline at end of file
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index b81c73ddd..c849b469e 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -107,6 +107,7 @@ ignore_unused:
- 'unauthorized.*'
- 'admin.officials.level_*'
- 'admin.comments.index.filter*'
+ - 'admin.banners.index.filters.*'
- 'admin.debates.index.filter*'
- 'admin.proposals.index.filter*'
- 'admin.spending_proposals.index.filter*'
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 282e72d27..7d4648c11 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -9,6 +9,39 @@ en:
restore: Restore
mark_featured: Featured
unmark_featured: Unmark featured
+ banners:
+ index:
+ title: Banners
+ create: Create banner
+ edit: Edit banner
+ delete: Delete banner
+ filters:
+ all: All
+ with_active: Active
+ with_inactive: Inactive
+ banner:
+ title: Title
+ description: Description
+ target_url: Link
+ style: Style
+ image: Image
+ post_started_at: Post started at
+ post_ended_at: Post ended at
+ edit:
+ back: Back
+ editing: Edit banner
+ form:
+ submit_button: Save changes
+ errors:
+ form:
+ errors:
+ form:
+ error:
+ one: "prevented this banner from being saved"
+ other: 'prevented this banner from being saved'
+ new:
+ back: Back
+ creating: Create banner
activity:
show:
action: Action
@@ -59,6 +92,7 @@ en:
user_not_found: User not found
menu:
activity: Moderator activity
+ banner: Manage banners
debate_topics: Debate topics
hidden_comments: Hidden comments
hidden_debates: Hidden debates
@@ -155,6 +189,8 @@ en:
flash:
updated: Value updated
index:
+ banners: Estilos de banners
+ banner_imgs: Imágenes para los banners
title: Configuration settings
update_setting: Update
feature_flags: Features
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 66b419d26..13bee8ccc 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -9,6 +9,37 @@ es:
restore: Volver a mostrar
mark_featured: Destacar
unmark_featured: Quitar destacado
+ banners:
+ index:
+ title: Anuncios
+ create: Crear un banner
+ edit: Editar banner
+ delete: Eliminar banner
+ filters:
+ all: Todos
+ with_active: Activos
+ with_inactive: Inactivos
+ banner:
+ title: Título
+ description: Descripción
+ target_url: Enlace
+ style: Estilo
+ image: Imagen
+ post_started_at: Inicio de publicación
+ post_ended_at: Fin de publicación
+ edit:
+ back: Volver
+ editing: Editar el banner
+ form:
+ submit_button: Guardar Cambios
+ errors:
+ form:
+ error:
+ one: "error impidió guardar el banner"
+ other: "errores impidieron guardar el banner."
+ new:
+ back: Volver
+ creating: Crear banner
activity:
show:
action: Acción
@@ -59,6 +90,7 @@ es:
user_not_found: Usuario no encontrado
menu:
activity: Actividad de moderadores
+ banner: Gestionar banners
debate_topics: Temas de debate
hidden_comments: Comentarios ocultos
hidden_debates: Debates ocultos
@@ -155,6 +187,8 @@ es:
flash:
updated: Valor actualizado
index:
+ banners: Banner style
+ banner_imgs: Banner images
title: Configuración global
update_setting: Actualizar
feature_flags: Funcionalidades
diff --git a/config/routes.rb b/config/routes.rb
index a2035a0b7..7d0a3a996 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -143,6 +143,10 @@ Rails.application.routes.draw do
get :summary, on: :collection
end
+ resources :banners, only: [:index, :new, :create, :edit, :update, :destroy] do
+ collection { get :search}
+ end
+
resources :comments, only: :index do
member do
put :restore
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index a4352c9d6..c25bf426c 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -318,3 +318,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
diff --git a/db/migrate/20160518141543_create_banners.rb b/db/migrate/20160518141543_create_banners.rb
new file mode 100644
index 000000000..efa8870a1
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 78a3ffd45..10f10c7a8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160510161858) do
+ActiveRecord::Schema.define(version: 20160518141543) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -63,6 +63,21 @@ ActiveRecord::Schema.define(version: 20160510161858) do
add_index "annotations", ["legislation_id"], name: "index_annotations_on_legislation_id", using: :btree
add_index "annotations", ["user_id"], name: "index_annotations_on_user_id", using: :btree
+ 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"
diff --git a/db/seeds.rb b/db/seeds.rb
index 067349837..7555f6999 100644
--- a/db/seeds.rb
+++ b/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"
diff --git a/spec/factories.rb b/spec/factories.rb
index 67c2e2c07..62bea738f 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -316,4 +316,14 @@ FactoryGirl.define do
sequence(:name) { |n| "District #{n}" }
census_code { '01' }
end
+
+ factory :banner do
+ sequence(:title) { |n| "Banner title #{n}" }
+ sequence(:description) { |n| "This is the text of Banner #{n}" }
+ style {["banner-style-one", "banner-style-two", "banner-style-three"].sample}
+ image {["banner.banner-img-one", "banner.banner-img-two", "banner.banner-img-three"].sample}
+ target_url {["/proposals", "/debates" ].sample}
+ post_started_at Time.now - 7.days
+ post_ended_at Time.now + 7.days
+ end
end
diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb
new file mode 100644
index 000000000..9d329ceff
--- /dev/null
+++ b/spec/features/admin/banners_spec.rb
@@ -0,0 +1,154 @@
+require 'rails_helper'
+
+feature 'Admin banners magement' do
+ background do
+ login_as(create(:administrator).user)
+ end
+
+ context "Index" do
+ background do
+ @banner1 = create(:banner, title: "Banner number one",
+ description: "This is the text of banner number one and is not active yet",
+ target_url: "http://www.url.com",
+ style: "banner-style.banner-one",
+ image: "banner-img.banner-one",
+ post_started_at: (Time.now + 4.days),
+ post_ended_at: (Time.now + 10.days))
+
+ @banner2 = create(:banner, title: "Banner number two",
+ description: "This is the text of banner number two and is not longer active",
+ target_url: "http://www.url.com",
+ style: "banner-style.banner-two",
+ image: "banner-img.banner-two",
+ post_started_at: (Time.now - 10.days),
+ post_ended_at: (Time.now - 3.days))
+
+ @banner3 = create(:banner, title: "Banner number three",
+ description: "This is the text of banner number three and has style banner-three",
+ target_url: "http://www.url.com",
+ style: "banner-style.banner-three",
+ image: "banner-img.banner-three",
+ post_started_at: (Time.now - 1.days),
+ post_ended_at: (Time.now + 10.days))
+
+ @banner4 = create(:banner, title: "Banner number four",
+ description: "This is the text of banner number four and has style banner-one",
+ target_url: "http://www.url.com",
+ style: "banner-style.banner-one",
+ image: "banner-img.banner-one",
+ post_started_at: (DateTime.now - 10.days),
+ post_ended_at: (DateTime.now + 10.days))
+
+ @banner5 = create(:banner, title: "Banner number five",
+ description: "This is the text of banner number five and has style banner-two",
+ target_url: "http://www.url.com",
+ style: "banner-style.banner-one",
+ image: "banner-img.banner-one",
+ post_started_at: (DateTime.now - 10.days),
+ post_ended_at: (DateTime.now + 10.days))
+ end
+
+ scenario 'Index show active banners' do
+ visit admin_banners_path(filter: 'with_active')
+ expect(page).to have_content("There are 3 banners")
+ end
+
+ scenario 'Index show inactive banners' do
+ visit admin_banners_path(filter: 'with_inactive')
+ expect(page).to have_content("There are 2 banners")
+ end
+
+ scenario 'Index show all banners' do
+ visit admin_banners_path
+ expect(page).to have_content("There are 5 banners")
+ end
+ end
+
+ scenario 'Banners publication is listed on admin menu' do
+ visit admin_root_path
+
+ within('#admin_menu') do
+ expect(page).to have_link "Manage banners"
+ end
+ end
+
+ scenario 'Publish a banner' do
+ visit admin_root_path
+ click_link "Manage banners"
+
+ click_link "Create banner"
+
+ select 'Banner style 1', from: 'banner_style'
+ select 'Banner image 2', from: 'banner_image'
+ fill_in 'banner_title', with: 'Such banner'
+ fill_in 'banner_description', with: 'many text wow link'
+ fill_in 'banner_target_url', with: 'https://decide.madrid.es'
+ last_week = Time.now - 7.days
+ next_week = Time.now + 7.days
+ fill_in 'post_started_at', with: last_week.strftime("%d/%m/%Y")
+ fill_in 'post_ended_at', with: next_week.strftime("%d/%m/%Y")
+
+ click_button 'Save changes'
+
+ expect(page).to have_content 'Such banner'
+
+ visit proposals_path
+
+ expect(page).to have_content 'Such banner'
+ expect(page).to have_link 'Such banner many text wow link', href: 'https://decide.madrid.es'
+ end
+
+ scenario 'Edit banner with live refresh', :js do
+ banner1 = create(:banner, title: 'Hello',
+ description: 'Wrong text',
+ target_url: 'http://www.url.com',
+ style: 'banner-style.banner-one',
+ image: 'banner-img.banner-one',
+ post_started_at: (Time.now + 4.days),
+ post_ended_at: (Time.now + 10.days))
+
+ visit admin_root_path
+ click_link "Manage banners"
+
+ click_link "Edit banner"
+
+ select 'Banner style 1', from: 'banner_style'
+ select 'Banner image 2', from: 'banner_image'
+ fill_in 'banner_title', with: 'Modified title'
+ fill_in 'banner_description', with: 'Edited text'
+
+ within('div#js-banner-style') do
+ expect(page).to have_selector('h2', :text => 'Modified title')
+ expect(page).to have_selector('h3', :text => 'Edited text')
+ end
+
+ click_button 'Save changes'
+
+ visit admin_banners_path
+ expect(page).to have_content 'Modified title'
+ expect(page).to have_content 'Edited text'
+
+ expect(page).to_not have_content 'Hello'
+ expect(page).to_not have_content 'Wrong text'
+ end
+
+ scenario 'Delete a banner' do
+ banner1 = create(:banner, title: 'Ugly banner',
+ description: 'Bad text',
+ target_url: 'http://www.url.com',
+ style: 'banner-style.banner-one',
+ image: 'banner-img.banner-one',
+ post_started_at: (Time.now + 4.days),
+ post_ended_at: (Time.now + 10.days))
+ visit admin_root_path
+ click_link "Manage banners"
+
+ expect(page).to have_content 'Ugly banner'
+
+ click_link "Delete banner"
+
+ visit admin_root_path
+ expect(page).to_not have_content 'Ugly banner'
+ end
+
+end
\ No newline at end of file
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
index c5e8e224a..9dbb92705 100644
--- a/spec/models/setting_spec.rb
+++ b/spec/models/setting_spec.rb
@@ -54,4 +54,28 @@ describe Setting do
expect(setting.enabled?).to eq false
end
end
+
+ describe "#banner_style?" do
+ it "should be true if key starts with 'banner-style.'" do
+ setting = Setting.create(key: 'banner-style.whatever')
+ expect(setting.banner_style?).to eq true
+ end
+
+ it "should be false if key does not start with 'banner-style.'" do
+ setting = Setting.create(key: 'whatever')
+ expect(setting.banner_style?).to eq false
+ end
+ end
+
+ describe "#banner_img?" do
+ it "should be true if key starts with 'banner-img.'" do
+ setting = Setting.create(key: 'banner-img.whatever')
+ expect(setting.banner_img?).to eq true
+ end
+
+ it "should be false if key does not start with 'banner-img.'" do
+ setting = Setting.create(key: 'whatever')
+ expect(setting.banner_img?).to eq false
+ end
+ end
end